From cbd3904e0224f0ceec9fb7133bb925a83fe0089b Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 3 Sep 2020 11:52:57 -0400 Subject: [PATCH] Core/Handlers: Fixed changing equipment while charmed with equipament manager Port From (https://github.com/TrinityCore/TrinityCore/commit/6210fc10ae28a06a92e7d4796b66115eb1fe028e) --- Source/Game/Handlers/CharacterHandler.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index c090cee1d..39376782e 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -1557,6 +1557,9 @@ namespace Game InventoryResult inventoryResult = GetPlayer().CanStoreItem(ItemConst.NullBag, ItemConst.NullSlot, itemPosCount, uItem, false); if (inventoryResult == InventoryResult.Ok) { + if (_player.CanEquipItem(ItemConst.NullSlot, out dstPos, uItem, false) != InventoryResult.Ok) + continue; + GetPlayer().RemoveItem(InventorySlots.Bag0, i, true); GetPlayer().StoreItem(itemPosCount, uItem, true); } @@ -1569,6 +1572,9 @@ namespace Game if (item.GetPos() == dstPos) continue; + if (_player.CanUnequipItem(dstPos, true) != InventoryResult.Ok) + continue; + GetPlayer().SwapItem(item.GetPos(), dstPos); }