From 617a935ee469641f3689061bb390158040b5d8d7 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sat, 5 Jun 2021 13:52:09 +0200 Subject: [PATCH] fix(Core/Spells): Changing druid forms should not remove items auras triggered on use. (#6135) - Closes #5637 - Closes https://github.com/chromiecraft/chromiecraft/issues/525 --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index dcb4641c4..792fb616d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8618,7 +8618,7 @@ void Player::ApplyItemEquipSpell(Item* item, bool apply, bool form_change) continue; // wrong triggering type - if (apply && spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP) + if ((apply || form_change) && spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP) continue; // check if it is valid spell