diff --git a/Subsurface/Source/Items/Item.cs b/Subsurface/Source/Items/Item.cs
index 0967c652e..e5e3e253f 100644
--- a/Subsurface/Source/Items/Item.cs
+++ b/Subsurface/Source/Items/Item.cs
@@ -47,6 +47,7 @@ namespace Barotrauma
 
         public PhysicsBody body;
 
+        private float lastSentCondition;
         private float condition;
 
         private bool inWater;
@@ -181,6 +182,15 @@ namespace Barotrauma
                         req.Fixed = false;
                     }
                 }
+
+                if (GameMain.Server != null && lastSentCondition != condition)
+                {
+                    if (Math.Abs(lastSentCondition - condition) > 1.0f || condition == 0.0f || condition == 100.0f)
+                    {
+                        GameMain.Server.CreateEntityEvent(this, new object[] { NetEntityEvent.Type.Status });
+                        lastSentCondition = condition;
+                    }
+                }
             }
         }
 
@@ -1659,35 +1669,42 @@ namespace Barotrauma
             {
                 return;
             }
-            else if ((NetEntityEvent.Type)extraData[0] == NetEntityEvent.Type.ComponentState)
+
+            msg.WriteRangedInteger(0, 2, (int)((NetEntityEvent.Type)extraData[0]));
+
+            switch ((NetEntityEvent.Type)extraData[0])
             {
-                msg.Write(true);
+                case NetEntityEvent.Type.ComponentState:
+                    int componentIndex = (int)extraData[1];
+                    msg.WriteRangedInteger(0, components.Count-1, componentIndex);
 
-                int componentIndex = (int)extraData[1];
-                msg.Write((byte)componentIndex);
-
-                (components[componentIndex] as IServerSerializable).ServerWrite(msg, c, extraData);
-            }
-            else if ((NetEntityEvent.Type)extraData[0] == NetEntityEvent.Type.InventoryState)
-            {
-                msg.Write(false);
-
-                ownInventory.ServerWrite(msg, c, extraData);
+                    (components[componentIndex] as IServerSerializable).ServerWrite(msg, c, extraData);
+                    break;
+                case NetEntityEvent.Type.InventoryState:
+                    ownInventory.ServerWrite(msg, c, extraData);
+                    break;
+                case NetEntityEvent.Type.Status:
+                    msg.WriteRangedSingle(condition, 0.0f, 100.0f, 8);
+                    break;
             }
         }
 
         public void ClientRead(ServerNetObject type, NetIncomingMessage msg, float sendingTime) 
         {
-            bool isComponentUpdate = msg.ReadBoolean();
+            NetEntityEvent.Type eventType = (NetEntityEvent.Type)msg.ReadRangedInteger(0, 2);
 
-            if (isComponentUpdate)
+            switch (eventType)
             {
-                int componentIndex = msg.ReadByte();
-                (components[componentIndex] as IServerSerializable).ClientRead(type, msg, sendingTime);
-            }
-            else
-            {
-                ownInventory.ClientRead(type, msg, sendingTime);
+                case NetEntityEvent.Type.ComponentState:
+                    int componentIndex = msg.ReadRangedInteger(0, components.Count - 1);
+                    (components[componentIndex] as IServerSerializable).ClientRead(type, msg, sendingTime);
+                    break;
+                case NetEntityEvent.Type.InventoryState:
+                    ownInventory.ClientRead(type, msg, sendingTime);
+                    break;
+                case NetEntityEvent.Type.Status:
+                    Condition = msg.ReadRangedSingle(0.0f, 100.0f, 8);
+                    break;
             }
         }
 
@@ -1702,7 +1719,7 @@ namespace Barotrauma
                 msg.Write(true);
 
                 int componentIndex = (int)extraData[1];
-                msg.Write((byte)componentIndex);
+                msg.WriteRangedInteger(0, components.Count - 1, componentIndex);
 
                 (components[componentIndex] as IClientSerializable).ClientWrite(msg, extraData);
             }
@@ -1720,7 +1737,7 @@ namespace Barotrauma
 
             if (isComponentUpdate)
             {
-                int componentIndex = msg.ReadByte();
+                int componentIndex = msg.ReadRangedInteger(0, components.Count - 1);
                 (components[componentIndex] as IClientSerializable).ServerRead(type, msg, c);
             }
             else
diff --git a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
index 7667f7251..a1be1d147 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
@@ -11,7 +11,6 @@ namespace Barotrauma.Networking
     {
         public enum Type
         {
-            Default, 
             ComponentState, 
             InventoryState,
             Status