From 2a46f97b7252e8d8bb59aa6bd46d382dca8a3146 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 12 Jun 2011 16:11:14 +0200 Subject: Scripts/Icecrown Citadel: Removed unneccessary PreventDefaultAction call Closes #1943 --- src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 6c7f619bf30..2dbca8f4f8f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1034,7 +1034,6 @@ class spell_sindragosa_instability : public SpellScriptLoader void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { - PreventDefaultAction(); if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) GetTarget()->CastCustomSpell(SPELL_BACKLASH, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff, GetCasterGUID()); } -- cgit v1.2.3 From 4123fbc25431845e5acc21f6daab6d54d772a014 Mon Sep 17 00:00:00 2001 From: Lopin Date: Sun, 12 Jun 2011 17:02:34 +0200 Subject: Scripts/Ulduar: Flash Freeze will despawn after Hodir is defeated, raid is wiped or victim is not the summoner --- src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index bfe24f4ea88..90a9840fd54 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -192,6 +192,9 @@ class npc_flash_freeze : public CreatureScript if (!UpdateVictim() || me->getVictim()->HasAura(SPELL_BLOCK_OF_ICE) || me->getVictim()->HasAura(SPELL_FLASH_FREEZE_HELPER)) return; + if (me->getVictim()->GetGUID() != targetGUID || instance->GetBossState(BOSS_HODIR) != IN_PROGRESS) + me->DespawnOrUnsummon(); + if (checkDespawnTimer <= diff) { if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID)) -- cgit v1.2.3