(5a377a8ee) Unstable v0.9.1000.0

2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -71,6 +71,8 @@ namespace Barotrauma.Items.Components
            base.ClientRead(type, msg, sendingTime);
            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)
            {
@@ -84,6 +86,7 @@ namespace Barotrauma.Items.Components
                {
                    Drop(false, null);
                    item.SetTransform(simPosition, 0.0f);
+                    item.Submarine = sub;
                    AttachToWall();
                }
            }
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Text;
 using System.Xml.Linq;