Removing items from their parent inventory in item.Drop

2017-01-31 20:11:19 +02:00
parent 0cd2d7a0b9
commit b8263d6a90
2 changed files with 12 additions and 1 deletions
--- a/Subsurface/Source/Items/Item.cs
+++ b/Subsurface/Source/Items/Item.cs
@@ -1529,7 +1529,17 @@ namespace Barotrauma
        {
            foreach (ItemComponent ic in components) ic.Drop(dropper);

-            if (Container != null) Container.RemoveContained(this);
+            if (Container != null)
+            {
+                Container.RemoveContained(this);
+                Container = null;
+            }
+
+            if (parentInventory != null)
+            {
+                parentInventory.RemoveItem(this);
+                parentInventory = null;
+            }
        }

        public void Equip(Character character)