diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index abd3af115..8ccf78b1b 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -6251,22 +6251,6 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) unitTarget->CastSpell(unitTarget, roll_chance_i(50) ? 24714 : 24715, true); return; } - case 26275: // PX-238 Winter Wondervolt TRAP - { - uint32 spells[4] = { 26272, 26157, 26273, 26274 }; - - // check presence - for(int j = 0; j < 4; ++j) - if (unitTarget->HasAura(spells[j], EFFECT_INDEX_0)) - return; - - // select spell - uint32 iTmpSpellId = spells[urand(0,3)]; - - // cast - unitTarget->CastSpell(unitTarget, iTmpSpellId, true); - return; - } case 25140: // Orb teleport spells case 25143: case 25650: @@ -6315,6 +6299,22 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) m_caster->CastSpell(unitTarget, spells[urand(0, 2)], true); return; } + case 26275: // PX-238 Winter Wondervolt TRAP + { + uint32 spells[4] = { 26272, 26157, 26273, 26274 }; + + // check presence + for(int j = 0; j < 4; ++j) + if (unitTarget->HasAura(spells[j], EFFECT_INDEX_0)) + return; + + // select spell + uint32 iTmpSpellId = spells[urand(0,3)]; + + // cast + unitTarget->CastSpell(unitTarget, iTmpSpellId, true); + return; + } case 26465: // Mercurial Shield - need remove one 26464 Mercurial Shield aura unitTarget->RemoveAuraHolderFromStack(26464); return; @@ -6355,14 +6355,6 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) break; } - case 38358: // Tidal Surge - { - if (!unitTarget) - return; - - unitTarget->CastSpell(unitTarget, 38353, true, NULL, NULL, m_caster->GetObjectGuid()); - return; - } case 30918: // Improved Sprint { if (!unitTarget) @@ -6372,6 +6364,14 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) unitTarget->RemoveAurasAtMechanicImmunity(IMMUNE_TO_ROOT_AND_SNARE_MASK,30918,true); break; } + case 38358: // Tidal Surge + { + if (!unitTarget) + return; + + unitTarget->CastSpell(unitTarget, 38353, true, NULL, NULL, m_caster->GetObjectGuid()); + return; + } case 41055: // Copy Weapon { if (m_caster->GetTypeId() != TYPEID_UNIT || !unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ab2ce4e7c..b625210de 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 "11393" + #define REVISION_NR "11394" #endif // __REVISION_NR_H__