diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 33 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 27 insertions, 8 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 34c90ddfe8a..e861136c286 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9807,14 +9807,14 @@ void Player::SendRespecWipeConfirm(ObjectGuid const& guid, uint32 cost) const /*** STORAGE SYSTEM ***/ /*********************************************************/ -uint8 Player::FindEquipSlot(ItemTemplate const* proto, uint32 slot, bool swap) const +uint8 Player::FindEquipSlot(Item const* item, uint32 slot, bool swap) const { uint8 slots[4]; slots[0] = NULL_SLOT; slots[1] = NULL_SLOT; slots[2] = NULL_SLOT; slots[3] = NULL_SLOT; - switch (proto->GetInventoryType()) + switch (item->GetTemplate()->GetInventoryType()) { case INVTYPE_HEAD: slots[0] = EQUIPMENT_SLOT_HEAD; @@ -9922,10 +9922,29 @@ uint8 Player::FindEquipSlot(ItemTemplate const* proto, uint32 slot, bool swap) c if (slots[i] != EQUIPMENT_SLOT_OFFHAND || !IsTwoHandUsed()) return slots[i]; - // if not found free and can swap return first appropriate from used - for (uint8 i = 0; i < 4; ++i) - if (slots[i] != NULL_SLOT && swap) - return slots[i]; + // if not found free and can swap return slot with lower item level equipped + if (swap) + { + uint32 minItemLevel = std::numeric_limits<uint32>::max(); + uint8 minItemLevelIndex = 0; + for (uint8 i = 0; i < 4; ++i) + { + if (slots[i] != NULL_SLOT) + { + if (Item const* equipped = GetItemByPos(INVENTORY_SLOT_BAG_0, slots[i])) + { + uint32 itemLevel = equipped->GetItemLevel(this); + if (itemLevel < minItemLevel) + { + minItemLevel = itemLevel; + minItemLevelIndex = i; + } + } + } + } + + return slots[minItemLevelIndex]; + } } // no free position @@ -11382,7 +11401,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool if (requiredLevels && requiredLevels->MaxLevel < DEFAULT_MAX_LEVEL && requiredLevels->MaxLevel < getLevel() && !sDB2Manager.GetHeirloomByItemId(pProto->GetId())) return EQUIP_ERR_NOT_EQUIPPABLE; - uint8 eslot = FindEquipSlot(pProto, slot, swap); + uint8 eslot = FindEquipSlot(pItem, slot, swap); if (eslot == NULL_SLOT) return EQUIP_ERR_NOT_EQUIPPABLE; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 36a9006cb0a..5d66e6d451c 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1236,7 +1236,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void UpdateAverageItemLevelTotal(); void UpdateAverageItemLevelEquipped(); - uint8 FindEquipSlot(ItemTemplate const* proto, uint32 slot, bool swap) const; + uint8 FindEquipSlot(Item const* item, uint32 slot, bool swap) const; uint32 GetItemCount(uint32 item, bool inBankAlso = false, Item* skipItem = nullptr) const; uint32 GetItemCountWithLimitCategory(uint32 limitCategory, Item* skipItem = nullptr) const; Item* GetItemByGuid(ObjectGuid guid) const; |