Merge branch 'master' of https://bitbucket.org/Regalis11/barotrauma

2016-03-03 21:56:29 +02:00
parent b4ff867607 0b7b52256b
commit 6240f98f14
2 changed files with 3 additions and 3 deletions
@@ -642,7 +642,8 @@ namespace Barotrauma
                body.ResetDynamics();
            }
            body.ApplyForce(buoyancy - body.LinearVelocity * volume);
-            CurrentHull.HandleItems(deltaTime, this);
+            if(CurrentHull != null)
+                CurrentHull.HandleItems(deltaTime, this);
            //apply simple angular drag
            body.ApplyTorque(body.AngularVelocity * volume * -0.05f);
        }