v0.2: iteminventory sync bugfix, meleeweapon "reload time", spears can be picked even if they're stuck inside a wall, tutorial bugfixes, "submarine godmode", removed round duration, drag character sync, reliable structure damage messages, job assignment bugfixes, some extra sounds

2015-10-17 16:01:42 +03:00
parent 838022fcd5
commit 3c1a66078c
51 changed files with 457 additions and 213 deletions
@@ -155,7 +155,12 @@ namespace Barotrauma
                if (items[i].Combine(item))
                {
                    //PutItem(items[i], i, false, false);
-                    new Networking.NetworkEvent(Networking.NetworkEventType.InventoryUpdate, items[i].ID, true);
+                    Inventory otherInventory = items[i].inventory;
+                    if (otherInventory!=null)
+                    {
+                        new Networking.NetworkEvent(Networking.NetworkEventType.InventoryUpdate, otherInventory.ID, true);
+                    }
+
                    combined = true;
                }