(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -22,6 +22,10 @@ namespace Barotrauma.Items.Components

        private float blinkTimer;
        
+        private bool itemLoaded;
+
+        private float blinkTimer;
+        
        public PhysicsBody ParentBody;

        [Editable(MinValueFloat = 0.0f, MaxValueFloat = 2048.0f), Serialize(100.0f, true)]
@@ -77,7 +81,7 @@ namespace Barotrauma.Items.Components
                
                IsActive = value;
 #if SERVER
-                if (GameMain.Server != null && GameMain.Server.GameStarted) { item.CreateServerEvent(this); }
+                if (GameMain.Server != null && itemLoaded) { item.CreateServerEvent(this); }
 #endif
            }
        }