Unstable 1.1.14.0

2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -331,6 +331,11 @@ namespace Barotrauma
                    }
                }
                if (targetSlot < 0) { return false; }
+                //the item should always stay in the Any slot if it's containable in one
+                if (pickable.AllowedSlots.Contains(InvSlotType.Any))
+                {
+                    targetInventory.TryPutItem(item, Character, CharacterInventory.AnySlot);
+                }
                return targetInventory.TryPutItem(item, targetSlot, allowSwapping, allowCombine: false, Character);
            }
            else
@@ -521,8 +526,5 @@ namespace Barotrauma

        protected virtual void OnStateChanged(AIState from, AIState to) { }
        protected virtual void OnTargetChanged(AITarget previousTarget, AITarget newTarget) { }
-
-        public virtual void ClientRead(IReadMessage msg) { }
-        public virtual void ServerWrite(IWriteMessage msg) { }
    }
 }