diff --git a/src/game/Player.cpp b/src/game/Player.cpp index a0e9a204a..989732a92 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -7471,24 +7471,12 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply if (form_change) // check aura active state from other form { - bool found = false; - for (int k = 0; k < MAX_EFFECT_INDEX; ++k) + SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellInfo->Id); + for (SpellAuraHolderMap::const_iterator iter = spair.first; iter != spair.second; ++iter) { - SpellAuraHolderBounds spair = GetSpellAuraHolderBounds(spellInfo->Id); - for (SpellAuraHolderMap::const_iterator iter = spair.first; iter != spair.second; ++iter) - { - if (!item || iter->second->GetCastItemGuid() == item->GetObjectGuid()) - { - found = true; - break; - } - } - if (found) - break; + if (!item || iter->second->GetCastItemGuid() == item->GetObjectGuid()) + return; // and skip re-cast already active aura at form change } - - if (found) // and skip re-cast already active aura at form change - return; } DEBUG_LOG("WORLD: cast %s Equip spellId - %i", (item ? "item" : "itemset"), spellInfo->Id); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 29e47c736..958d2e040 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12665" + #define REVISION_NR "12666" #endif // __REVISION_NR_H__