2f107db...5202af9

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -94,7 +94,7 @@ namespace Barotrauma.Items.Components
                         Entity.Spawner.AddToSpawnQueue(itemPrefab, outputContainer.Inventory, condition);
                     }
                 }
-
+                
                 inputContainer.Inventory.RemoveItem(targetItem);
                 Entity.Spawner.AddToRemoveQueue(targetItem);
                 MoveInputQueue();
@@ -109,7 +109,7 @@ namespace Barotrauma.Items.Components
 
         private void PutItemsToLinkedContainer()
         {
-            if (GameMain.Client != null) { return; }
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
             if (outputContainer.Inventory.Items.All(it => it == null)) return;
             
             foreach (MapEntity linkedTo in item.linkedTo)
@@ -153,10 +153,14 @@ namespace Barotrauma.Items.Components
 
             IsActive = active;
 
+#if SERVER
             if (user != null)
             {
                 GameServer.Log(user.LogName + (IsActive ? " activated " : " deactivated ") + item.Name, ServerLog.MessageType.ItemInteraction);
             }
+#endif
+
+            if (!IsActive) { progressState = 0.0f; }
 
             if (!IsActive) { progressState = 0.0f; }
 
@@ -174,22 +178,5 @@ namespace Barotrauma.Items.Components
 
             inputContainer.Inventory.Locked = IsActive;            
         }
-        
-        public void ServerRead(ClientNetObject type, NetBuffer msg, Client c)
-        {
-            bool active = msg.ReadBoolean();
-
-            item.CreateServerEvent(this);
-
-            if (item.CanClientAccess(c))
-            {
-                SetActive(active, c.Character);
-            }
-        }
-
-        public void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
-        {
-            msg.Write(IsActive);
-        }
     }
 }