Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/Characters/AICharacter.cs
2017-02-17 19:31:25 +02:00
parent c46856167c a5e56f7d4d
commit 68b0f2132a
3 changed files with 48 additions and 10 deletions
@@ -47,7 +47,7 @@ namespace Barotrauma
                AnimController.SimplePhysicsEnabled = false;
            }

-            if (IsDead || Health <= 0.0f) return;
+            if (IsDead || Health <= 0.0f || IsUnconscious || Stun > 0.0f) return;

            if (Controlled == this || !aiController.Enabled) return;