Unstable v0.1100.0.4 (November 11th 2020)

2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
@@ -291,6 +291,7 @@ namespace Barotrauma.Items.Components
            bool broken     = msg.ReadBoolean();
            bool forcedOpen = msg.ReadBoolean();
            bool isStuck    = msg.ReadBoolean();
+            bool isJammed   = msg.ReadBoolean();
            SetState(open, isNetworkMessage: true, sendNetworkMessage: false, forcedOpen: forcedOpen);
            stuck = msg.ReadRangedSingle(0.0f, 100.0f, 8);
            UInt16 lastUserID = msg.ReadUInt16();
@@ -301,6 +302,7 @@ namespace Barotrauma.Items.Components
                toggleCooldownTimer = ToggleCoolDown;
            }
            this.isStuck = isStuck;
+            this.isJammed = isJammed;
            if (isStuck) { OpenState = 0.0f; }
            IsBroken = broken;
            PredictedState = null;