Unstable 0.1300.0.8

2021-04-09 15:07:09 +03:00
parent 538c3dbfc3
commit 29bd4d6f49
38 changed files with 162 additions and 76 deletions
@@ -70,17 +70,15 @@ namespace Barotrauma.Items.Components
        public override void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
        {
            base.ClientRead(type, msg, sendingTime);
+
+            bool readAttachData = msg.ReadBoolean();
+            if (!readAttachData) { return; }
+
            bool shouldBeAttached = msg.ReadBoolean();
            Vector2 simPosition = new Vector2(msg.ReadSingle(), msg.ReadSingle());
            UInt16 submarineID = msg.ReadUInt16();
            Submarine sub = Entity.FindEntityByID(submarineID) as Submarine;

-            if (!attachable)
-            {
-                DebugConsole.ThrowError("Received an attachment event for an item that's not attachable.");
-                return;
-            }
-
            if (shouldBeAttached)
            {
                if (!attached)
@@ -96,7 +94,6 @@ namespace Barotrauma.Items.Components
                if (attached)
                {
                    DropConnectedWires(null);
-
                    if (body != null)
                    {
                        item.body = body;