Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Items: Fixed heirloom items counting for item set bonuses past their max scaling level and implemented new heirloom upgrade levels

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3c12a189e430b1b6e0a452f272860f58b2dca7bd)
This commit is contained in:
hondacrx
2022-01-28 17:33:49 -05:00
parent 26bec9ecb4
commit a1411aef94
5 changed files with 66 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Items.cs
+12 -7
View File
@@ -1869,7 +1869,7 @@ namespace Game.Entities
// item set bonuses applied only at equip and removed at unequip, and still active for broken items
ItemTemplate pProto = pItem.GetTemplate();
if (pProto != null && pProto.GetItemSet() != 0)
Item.RemoveItemsSetItem(this, pProto);
Item.RemoveItemsSetItem(this, pItem);
_ApplyItemMods(pItem, slot, false, update);
@@ -3826,10 +3826,6 @@ namespace Game.Entities
if (spellproto == null)
continue;
if (spellproto.HasAura(AuraType.ModXpPct) && !GetSession().GetCollectionMgr().CanApplyHeirloomXpBonus(item.GetEntry(), GetLevel())
&& Global.DB2Mgr.GetHeirloomByItemId(item.GetEntry()) != null)
continue;
if (effectData.ChrSpecializationID != 0 && effectData.ChrSpecializationID != GetPrimarySpecialization())
continue;
@@ -3939,7 +3935,7 @@ namespace Game.Entities
// item set bonuses not dependent from item broken state
if (proto.GetItemSet() != 0)
Item.RemoveItemsSetItem(this, proto);
Item.RemoveItemsSetItem(this, m_items[i]);
if (m_items[i].IsBroken() || !CanUseAttackType(GetAttackBySlot(i, m_items[i].GetTemplate().GetInventoryType())))
continue;
@@ -4019,6 +4015,15 @@ namespace Game.Entities
continue;
_ApplyItemMods(m_items[i], i, apply);
// Update item sets for heirlooms
if (Global.DB2Mgr.GetHeirloomByItemId(m_items[i].GetEntry()) != null && m_items[i].GetTemplate().GetItemSet() != 0)
{
if (apply)
Item.AddItemsSetItem(this, m_items[i]);
else
Item.RemoveItemsSetItem(this, m_items[i]);
}
}
}
}
@@ -5459,7 +5464,7 @@ namespace Game.Entities
{
// item set bonuses applied only at equip and removed at unequip, and still active for broken items
if (pProto != null && pProto.GetItemSet() != 0)
Item.RemoveItemsSetItem(this, pProto);
Item.RemoveItemsSetItem(this, pItem);
_ApplyItemMods(pItem, slot, false);
}