ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Spells): Spells and auras activated by item use should not be removed on unequip. (#6255)

Browse source 
- Closes #5124
- Closes chromiecraft/chromiecraft#327
This commit is contained in:
UltraNix 2021-06-10 15:19:15 +02:00 • committed by GitHub
parent cb1aaec4af
commit 69c214bec5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/server/game/Entities/Player/Player.cpp
View file

@ -8618,8 +8618,21 @@ void Player::ApplyItemEquipSpell(Item* item, bool apply, bool form_change)
continue;
// wrong triggering type
if ((apply || form_change) && spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP)
continue;
if (apply)
{
if (spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP)
{
continue;
}
}
else
{
// Auras activated by use should not be removed on unequip
if (spellData.SpellTrigger == ITEM_SPELLTRIGGER_ON_USE)
{
continue;
}
}
// check if it is valid spell
SpellInfo const* spellproto = sSpellMgr->GetSpellInfo(spellData.SpellId);