(b5250291f) Merge branch 'dev' into human-ai

2019-05-16 05:15:16 +03:00
parent b02565796a
commit 108e42edb0
32 changed files with 574 additions and 360 deletions
@@ -238,7 +238,7 @@ namespace Barotrauma
            }

            float ambienceVolume = 0.8f;
-            if (Character.Controlled != null)
+            if (Character.Controlled != null && !Character.Controlled.Removed)
            {
                AnimController animController = Character.Controlled.AnimController;
                if (animController.HeadInWater)