Merge branch 'master' into animcontroller-overhaul

2016-10-19 21:15:44 +03:00
parent e2d0e7fe24 8cb9450217
commit 92b61ee816
9 changed files with 116 additions and 29 deletions
@@ -1053,6 +1053,8 @@ namespace Barotrauma
        
        private void UpdateNetPlayerPosition(float deltaTime)
        {
+            if (GameMain.NetworkMember == null) return;
+
            if (character == GameMain.NetworkMember.Character)
            {
                if (character.MemPos.Count < 2) return;