(4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-27 13:52:38 +02:00
parent 8d42f777db
commit eada5e222a
5 changed files with 17 additions and 5 deletions
@@ -804,6 +804,11 @@ namespace Barotrauma
                var newItem = Item.Load(itemElement, inventory.Owner.Submarine, createNetworkEvent: true);
                if (newItem == null) { continue; }

+                if (!MathUtils.NearlyEqual(newItem.Condition, newItem.MaxCondition))
+                {
+                    GameMain.NetworkMember.CreateEntityEvent(newItem, new object[] { NetEntityEvent.Type.Status });
+                }
+
                int[] slotIndices = itemElement.GetAttributeIntArray("i", new int[] { 0 });
                if (!slotIndices.Any())
                {