Unstable v0.1300.0.1

2021-03-05 17:00:56 +02:00
parent 64cdb32078
commit cb969c959f
199 changed files with 6043 additions and 3911 deletions
@@ -826,7 +826,8 @@ namespace Barotrauma
        {
            slots[index].Add(item);
            item.ParentInventory = this;
-            if (item.body != null)
+            bool equipped = (this as CharacterInventory)?.Owner is Character character && character.HasEquippedItem(item);
+            if (item.body != null && !equipped)
            {
                item.body.Enabled = false;
                item.body.BodyType = FarseerPhysics.BodyType.Dynamic;