Merge branch 'master' of https://github.com/Regalis11/Barotrauma

2023-06-21 10:36:16 -03:00
parent fd74c08a8f c67f6688fd
commit 6b149e0498
30 changed files with 242 additions and 137 deletions
@@ -135,7 +135,7 @@ namespace Barotrauma.Items.Components
        private void CreateTriggerBody()
        {
            System.Diagnostics.Debug.Assert(trigger == null, "LevelResource trigger already created!");
-            var body = item.body ?? holdable.Body;
+            var body = item.body ?? holdable?.Body;
            if (body != null && Attached)
            {
                trigger = new PhysicsBody(body.Width, body.Height, body.Radius,