From 1fcabb40920d870f81c75986ca8f6f1573abeb54 Mon Sep 17 00:00:00 2001 From: Keader Date: Tue, 24 Apr 2018 21:18:07 -0300 Subject: Core/Handlers: Fixed equipament manager with empty slots. Yes kids, dont use drugs ! Followup: 42be04898c6fd001160ee4fdf00fc2ba5c5c1ee3 (cherry picked from commit dec75903cf2ac3bf62d83300a7526cb44ae5b128) --- src/server/game/Handlers/CharacterHandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index e1f6bafa238..8313c4b74b6 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1972,7 +1972,7 @@ void WorldSession::HandleUseEquipmentSet(WorldPackets::EquipmentSet::UseEquipmen InventoryResult inventoryResult = _player->CanStoreItem(NULL_BAG, NULL_SLOT, itemPosCountVec, uItem, false); if (inventoryResult == EQUIP_ERR_OK) { - if (_player->CanEquipItem(NULL_SLOT, dstPos, uItem, false) != EQUIP_ERR_OK) + if (_player->CanUnequipItem(dstPos, true) != EQUIP_ERR_OK) continue; _player->RemoveItem(INVENTORY_SLOT_BAG_0, i, true); @@ -1986,7 +1986,7 @@ void WorldSession::HandleUseEquipmentSet(WorldPackets::EquipmentSet::UseEquipmen if (item->GetPos() == dstPos) continue; - if (_player->CanUnequipItem(dstPos, true) != EQUIP_ERR_OK) + if (_player->CanEquipItem(NULL_SLOT, dstPos, item, false) != EQUIP_ERR_OK) continue; _player->SwapItem(item->GetPos(), dstPos); -- cgit v1.2.3