diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-12 17:19:38 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-12 17:19:38 +0200 |
| commit | 78981e08553e9e03d19e4db63a024048d92dd04c (patch) | |
| tree | ba15c5fab9e7dce2f44c840a42d2879115e35166 /src | |
| parent | b138bc31ca3742a2c11014d353c94f4e258ba8c7 (diff) | |
| parent | 4123fbc25431845e5acc21f6daab6d54d772a014 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
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()); } 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)) |