diff options
| author | Shauren <none@none> | 2010-10-18 13:19:04 +0200 |
|---|---|---|
| committer | Shauren <none@none> | 2010-10-18 13:19:04 +0200 |
| commit | 09260ee6c13e6350c8aa6dc0602ee3031537f16e (patch) | |
| tree | fa2e034507ede94e55f1d6b901bdc4e6b32ec071 /src/server/game/Spells | |
| parent | b4c62b9646b2b8cc08921679d72e80f1da9e90e2 (diff) | |
Scripts/Forge of Souls: Revisited Bronjahm script, removed ugly hacks and fixed spells properly
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Spells')
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 3 | ||||
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 13 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 87baad480a7..a629ba995ff 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -5792,9 +5792,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo if (aurApp->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) target->CastSpell(target, 58601, true); break; - case 68839: // Corrupt Soul - target->CastSpell(target, 68846, true, NULL, this, GetCasterGUID()); - break; } break; case SPELLFAMILY_MAGE: diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 92492f5b4c7..700ebcce95c 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1098,7 +1098,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, if (*itr < 0) target->RemoveAurasDueToSpell(-(*itr)); else if (removeMode != AURA_REMOVE_BY_DEFAULT) - target->CastSpell(target, *itr, true, 0, 0, GetCasterGUID()); + target->CastSpell(target, *itr, true, NULL, NULL, GetCasterGUID()); } } if (customAttr & SPELL_ATTR_CU_LINK_AURA) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 5ff52cf5e28..4b6dd2c90ad 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2776,7 +2776,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) case 72444: case 72445: case 72446: - for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end();) + for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end();) { if (!(*itr)->HasAura(72293)) itr = unitList.erase(itr); @@ -2795,6 +2795,17 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur) if (unitList.empty()) return; break; + case 68921: case 69049: // Soulstorm + for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end();) + { + Position pos; + (*itr)->GetPosition(&pos); + if (m_caster->GetExactDist2d(&pos) <= 10.0f) + itr = unitList.erase(itr); + else + ++itr; + } + break; } // Death Pact if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] & 0x00080000) |