Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/Items/CharacterInventory.cs Subsurface/Source/Items/Inventory.cs Subsurface/Source/Items/Item.cs
2016-10-12 21:12:21 +03:00
parent 170e1a0da8 1cdb218fe0
commit e12fe29f80
9 changed files with 89 additions and 19 deletions
@@ -378,7 +378,12 @@ namespace Barotrauma.Items.Components
        {
            base.RemoveComponentSpecific();

-            GameMain.World.RemoveBody(body.FarseerBody);
+            if (body != null)
+            {                
+                body.Remove();
+                body = null;
+            }
+

            if (linkedGap!=null) linkedGap.Remove();