nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 21:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix(Core/CharacterHandler): Incorrect behavior using an equipment set… (#18253)

Browse Source 
* Fix(Core/CharacterHandler): Incorrect behavior using an equipment set if it will result in a full inventory.

* Fixing the error message to -Equiment swap failed - inventory is full- like the Blizzlike error message
This commit is contained in:
Kalimist
2024-02-03 08:34:33 -05:00
committed by GitHub
parent 3113ba2bd0
commit 1324f420f2
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -1804,6 +1804,8 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
{
LOG_DEBUG("network", "CMSG_EQUIPMENT_SET_USE");
std::vector<std::unique_ptr<SavedItem>> savedItems;
uint8 errorId = 0;
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
{
ObjectGuid itemGuid;
@@ -1829,7 +1831,6 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
uint16 dstpos = i | (INVENTORY_SLOT_BAG_0 << 8);
InventoryResult msg;
Item* uItem = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
if (uItem)
{
@@ -1849,11 +1850,19 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, sDest, uItem, false);
if (msg == EQUIP_ERR_OK)
{
savedItems.emplace_back(std::make_unique<SavedItem>(uItem, dstpos));
_player->RemoveItem(INVENTORY_SLOT_BAG_0, i, true);
_player->StoreItem(sDest, uItem, true);
}
else
_player->SendEquipError(msg, uItem, nullptr);
{
errorId = 4;
for (uint8_t j = 0; j < savedItems.size(); ++j)
{
_player->SwapItem(savedItems[j].get()->item->GetPos(), savedItems[j].get()->dstpos);
}
break;
}
continue;
}
@@ -1880,7 +1889,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
}
WorldPacket data(SMSG_EQUIPMENT_SET_USE_RESULT, 1);
data << uint8(0); // 4 - equipment swap failed - inventory is full
data << uint8(errorId); // 4 - equipment swap failed - inventory is full
SendPacket(&data);
}