aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <runningnak3d@gmail.com>2009-12-20 20:23:39 -0700
committerBrian <runningnak3d@gmail.com>2009-12-20 20:23:39 -0700
commit5a0d0157ce14cef51e2730bc35bed6d1bcfe3760 (patch)
tree31437214f06ea1727a0fc6a330bb7235aaff17c5 /src
parent5300226feebec5bab585819f7cdce214ec14dce9 (diff)
parent9b2b1615de5d55c9d5c0097d921137a22d918923 (diff)
* merge
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
index 49dc134eb51..a5801ee4fd8 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
@@ -748,7 +748,8 @@ struct TRINITY_DLL_DECL mob_palehoof_orbAI : public ScriptedAI
case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*m_creature), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break;
case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*m_creature), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break;
}
- DoCast(pNext, SPELL_ORB_CHANNEL, false);
+ if(pNext)
+ DoCast(pNext, SPELL_ORB_CHANNEL, false);
currentPhase=(Phase)id;
SummonTimer=5000;
}