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

Core/Auras: Don't remove shield only dependant auras on disarm

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/)
This commit is contained in:
hondacrx
2021-06-23 13:25:19 -04:00
parent 7eed87f51c
commit 0e8d21bae9
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Spells.cs
+17 -6
View File
@@ -1700,6 +1700,23 @@ namespace Game.Entities
{ {
if (!spellInfo.HasAttribute(SpellAttr8.ArmorSpecialization)) if (!spellInfo.HasAttribute(SpellAttr8.ArmorSpecialization))
{ {
// most used check: shield only
if ((spellInfo.EquippedItemSubClassMask & (1 << (int)ItemSubClassArmor.Shield)) != 0)
{
Item item = GetUseableItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand);
if (item != null)
if (item != ignoreItem && item.IsFitToSpellRequirements(spellInfo))
return true;
// special check to filter things like Shield Wall, the aura is not permanent and must stay even without required item
if (!spellInfo.IsPassive())
{
foreach (SpellEffectInfo effect in spellInfo.GetEffects())
if (effect != null && effect.IsAura())
return true;
}
}
// tabard not have dependent spells // tabard not have dependent spells
for (byte i = EquipmentSlot.Start; i < EquipmentSlot.MainHand; ++i) for (byte i = EquipmentSlot.Start; i < EquipmentSlot.MainHand; ++i)
{ {
@@ -1708,12 +1725,6 @@ namespace Game.Entities
if (item != ignoreItem && item.IsFitToSpellRequirements(spellInfo)) if (item != ignoreItem && item.IsFitToSpellRequirements(spellInfo))
return true; return true;
} }
// shields can be equipped to offhand slot
Item item1 = GetUseableItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand);
if (item1)
if (item1 != ignoreItem && item1.IsFitToSpellRequirements(spellInfo))
return true;
} }
else else
{ {