(bcb06cc5c) Unstable v0.9.9.0

2020-03-27 15:22:59 -03:00
parent c81486a993
commit b143329701
326 changed files with 9692 additions and 4364 deletions
@@ -8,6 +8,11 @@ namespace Barotrauma
 {
    partial class Item : MapEntity, IDamageable, ISerializableEntity, IServerSerializable, IClientSerializable
    {
+        public override Sprite Sprite
+        {
+            get { return prefab?.sprite; }
+        }
+
        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
        {
            string errorMsg = "";
@@ -255,6 +260,8 @@ namespace Barotrauma
                msg.Write(slotIndex < 0 ? (byte)255 : (byte)slotIndex);
            }

+            msg.Write(body == null ? (byte)0 : (byte)body.BodyType);
+
            byte teamID = 0;
            foreach (WifiComponent wifiComponent in GetComponents<WifiComponent>())
            {