(5a377a8ee) Unstable v0.9.1000.0

2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -125,7 +125,7 @@ namespace Barotrauma
        {
            public readonly Entity Entity;

-            public readonly UInt16 OriginalID;
+            public readonly UInt16 OriginalID, OriginalInventoryID;

            public readonly bool Remove = false;

@@ -133,6 +133,10 @@ namespace Barotrauma
            {
                Entity = entity;
                OriginalID = entity.ID;
+                if (entity is Item item && item.ParentInventory?.Owner != null)
+                {
+                    OriginalInventoryID = item.ParentInventory.Owner.ID;
+                }
                Remove = remove;
            }
        }