(98ad00fa2) v0.9.1.0

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

@@ -19,6 +19,8 @@ namespace Barotrauma.Items.Components
 
         private GUIComponent inSufficientPowerWarning;
 
+        private bool pendingState;
+
         partial void InitProjSpecific(XElement element)
         {
             var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.9f), GuiFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter)
@@ -73,32 +75,34 @@ namespace Barotrauma.Items.Components
 
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
-            inSufficientPowerWarning.Visible = powerConsumption > 0 && voltage < minVoltage;
-            //activateButton.Enabled = !inSufficientPowerWarning.Visible;
+            inSufficientPowerWarning.Visible = CurrPowerConsumption > 0 && !hasPower;
         }
 
         private bool ToggleActive(GUIButton button, object obj)
         {
-            SetActive(!IsActive, Character.Controlled);
-
-            currPowerConsumption = IsActive ? powerConsumption : 0.0f;
-            
             if (GameMain.Client != null)
             {
+                pendingState = !IsActive;
                 item.CreateClientEvent(this);
             }
+            else
+            {
+                SetActive(!IsActive, Character.Controlled);
+                currPowerConsumption = IsActive ? powerConsumption : 0.0f;
+            }
 
             return true;
         }
 
         public void ClientWrite(NetBuffer msg, object[] extraData = null)
         {
-            msg.Write(IsActive);
+            msg.Write(pendingState);
         }
 
         public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
         {
             SetActive(msg.ReadBoolean());
+            progressTimer = msg.ReadSingle();
         }
     }
 }