(cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-04 11:09:45 +03:00
parent 1966bcb4ab
commit 41da4e24a9
17 changed files with 590 additions and 71 deletions
@@ -530,7 +530,8 @@ namespace Barotrauma
                }
            }

-            if (Math.Abs(Character.AnimController.movement.X) > 0.1f && !Character.AnimController.InWater)
+            if (Math.Abs(Character.AnimController.movement.X) > 0.1f && !Character.AnimController.InWater &&
+                (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer || Character.Controlled == Character))
            {
                Character.AnimController.TargetDir = Character.WorldPosition.X < attackWorldPos.X ? Direction.Right : Direction.Left;
            }