Core/Handlers: Fixed equipament manager with empty slots.
Port From (https://github.com/TrinityCore/TrinityCore/commit/1fcabb40920d870f81c75986ca8f6f1573abeb54)
This commit is contained in:
@@ -1629,7 +1629,7 @@ namespace Game
|
|||||||
InventoryResult inventoryResult = GetPlayer().CanStoreItem(ItemConst.NullBag, ItemConst.NullSlot, itemPosCount, uItem, false);
|
InventoryResult inventoryResult = GetPlayer().CanStoreItem(ItemConst.NullBag, ItemConst.NullSlot, itemPosCount, uItem, false);
|
||||||
if (inventoryResult == InventoryResult.Ok)
|
if (inventoryResult == InventoryResult.Ok)
|
||||||
{
|
{
|
||||||
if (_player.CanEquipItem(ItemConst.NullSlot, out dstPos, uItem, false) != InventoryResult.Ok)
|
if (_player.CanUnequipItem(dstPos, true) != InventoryResult.Ok)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
GetPlayer().RemoveItem(InventorySlots.Bag0, i, true);
|
GetPlayer().RemoveItem(InventorySlots.Bag0, i, true);
|
||||||
@@ -1644,7 +1644,7 @@ namespace Game
|
|||||||
if (item.GetPos() == dstPos)
|
if (item.GetPos() == dstPos)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (_player.CanUnequipItem(dstPos, true) != InventoryResult.Ok)
|
if (_player.CanEquipItem(ItemConst.NullSlot, out dstPos, item, false) != InventoryResult.Ok)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
GetPlayer().SwapItem(item.GetPos(), dstPos);
|
GetPlayer().SwapItem(item.GetPos(), dstPos);
|
||||||
|
|||||||
Reference in New Issue
Block a user