# Conflicts:
#	src/server/game/AI/SmartScripts/SmartScript.cpp
This commit is contained in:
Ovahlord committed 2018-05-17 12:44:55 +02:00
commit 1998dc1287
140 files changed
+7191 -2692

No files matched your search

@@ -1719,7 +1719,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
InventoryResult msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, sDest, uItem, false);
if (msg == 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);
@@ -1734,7 +1734,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
if (item->GetPos() == dstpos)
continue;
if (_player->CanUnequipItem(dstpos, true) != EQUIP_ERR_OK)
if (_player->CanEquipItem(i, dstpos, item, true) != EQUIP_ERR_OK)
continue;
_player->SwapItem(item->GetPos(), dstpos);