public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Item): Meta gems sometimes ignore added sockets (#3643)

Browse Source
This commit is contained in:
placemolle
2020-11-13 11:24:16 -05:00
committed by GitHub
parent d7becdae27
commit fc63d935b9
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Item/Item.cpp
View File

@@ -962,6 +962,13 @@ bool Item::GemsFitSockets() const
return true; return true;
} }
bool Item::HasSocket() const
{
// There can only be one socket added, and it's always in slot `PRISMATIC_ENCHANTMENT_SLOT`.
// Built-in sockets Socket from upgrade
return this->GetTemplate()->Socket[0].Color || this->GetEnchantmentId(EnchantmentSlot(PRISMATIC_ENCHANTMENT_SLOT));
}
uint8 Item::GetGemCountWithID(uint32 GemID) const uint8 Item::GetGemCountWithID(uint32 GemID) const
{ {
uint8 count = 0; uint8 count = 0;

2
src/server/game/Entities/Item/Item.h
View File

@@ -246,6 +246,8 @@ public:
uint32 GetCount() const { return GetUInt32Value(ITEM_FIELD_STACK_COUNT); } uint32 GetCount() const { return GetUInt32Value(ITEM_FIELD_STACK_COUNT); }
void SetCount(uint32 value) { SetUInt32Value(ITEM_FIELD_STACK_COUNT, value); } void SetCount(uint32 value) { SetUInt32Value(ITEM_FIELD_STACK_COUNT, value); }
uint32 GetMaxStackCount() const { return GetTemplate()->GetMaxStackSize(); } uint32 GetMaxStackCount() const { return GetTemplate()->GetMaxStackSize(); }
// Checks if this item has sockets, whether built-in or added by an upgrade.
bool HasSocket() const;
uint8 GetGemCountWithID(uint32 GemID) const; uint8 GetGemCountWithID(uint32 GemID) const;
uint8 GetGemCountWithLimitCategory(uint32 limitCategory) const; uint8 GetGemCountWithLimitCategory(uint32 limitCategory) const;
InventoryResult CanBeMergedPartlyWith(ItemTemplate const* proto) const; InventoryResult CanBeMergedPartlyWith(ItemTemplate const* proto) const;

6
src/server/game/Entities/Player/Player.cpp
View File

@@ -7992,7 +7992,7 @@ void Player::_ApplyItemMods(Item* item, uint8 slot, bool apply)
uint8 attacktype = Player::GetAttackBySlot(slot); uint8 attacktype = Player::GetAttackBySlot(slot);
if (proto->Socket[0].Color) //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items if (item->HasSocket()) //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items
CorrectMetaGemEnchants(slot, apply); CorrectMetaGemEnchants(slot, apply);
if (attacktype < MAX_ATTACK) if (attacktype < MAX_ATTACK)
@@ -22578,7 +22578,7 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
if (i == slot) if (i == slot)
continue; continue;
Item* pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, i); Item* pItem2 = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
if (pItem2 && !pItem2->IsBroken() && pItem2->GetTemplate()->Socket[0].Color) if (pItem2 && !pItem2->IsBroken() && pItem2->HasSocket())
{ {
for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot <= PRISMATIC_ENCHANTMENT_SLOT; ++enchant_slot) for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot <= PRISMATIC_ENCHANTMENT_SLOT; ++enchant_slot)
{ {
@@ -22660,7 +22660,7 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, slot); Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, slot);
if (!pItem || !pItem->GetTemplate()->Socket[0].Color) if (!pItem || !pItem->HasSocket())
continue; continue;
for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + 3; ++enchant_slot) for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT + 3; ++enchant_slot)