diff options
author | megamage <none@none.none> | 2011-09-26 09:14:12 -0400 |
---|---|---|
committer | megamage <none@none.none> | 2011-09-26 09:14:12 -0400 |
commit | 780747f5d39cd05e22d28f80eed7eda18453e0b8 (patch) | |
tree | 928663fb3b8e94e16ec8a96b8204e0b91136935a /src | |
parent | a35deba186bef436e68750d6c4f621cdc34c8a24 (diff) |
Missing part of the previous commit.
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp | 1 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index dcb5ae8faf7..1a153474416 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -240,6 +240,7 @@ class spell_intense_cold : public SpellScriptLoader if (aurEff->GetBase()->GetStackAmount() < 2) return; Unit* caster = GetCaster(); + //TODO: the caster should be boss but not the player if (!caster || !caster->GetAI()) return; caster->GetAI()->SetGUID(GetTarget()->GetGUID(), DATA_INTENSE_COLD); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index fc1b73df482..5e08a8ae2ea 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -168,6 +168,8 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader SpellInfo const* talentSpell = sSpellMgr->GetSpellInfo(DK_SPELL_ANTI_MAGIC_SHELL_TALENT); amount = talentSpell->Effects[EFFECT_0].CalcValue(GetCaster()); Unit* caster = GetCaster(); + if(!caster) + return; if(Player* player = caster->ToPlayer()) amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK)); } |