josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix a crash in arlokk script.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-12 14:24:03 -05:00
parent ac8f322f21
commit bd88344c72
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp
+9 -7
View File
@@ -51,8 +51,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
uint32 Summon_Timer; uint32 Summon_Timer;
uint32 Visible_Timer; uint32 Visible_Timer;
Unit* markedTarget; uint64 markedTargetGUID;
Creature *Panther;
uint32 Counter; uint32 Counter;
bool PhaseTwo; bool PhaseTwo;
@@ -70,7 +69,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
Counter = 0; Counter = 0;
markedTarget = NULL; markedTargetGUID = 0;
PhaseTwo = false; PhaseTwo = false;
VanishedOnce = false; VanishedOnce = false;
@@ -108,9 +107,11 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
if (!PhaseTwo && Mark_Timer < diff) if (!PhaseTwo && Mark_Timer < diff)
{ {
markedTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
{
DoCast(markedTarget,SPELL_MARK); DoCast(target, SPELL_MARK);
markedTargetGUID = target->GetGUID();
}
Mark_Timer = 15000; Mark_Timer = 15000;
}else Mark_Timer -= diff; }else Mark_Timer -= diff;
@@ -119,7 +120,8 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
Unit* target = NULL; Unit* target = NULL;
target = SelectUnit(SELECT_TARGET_RANDOM,0); target = SelectUnit(SELECT_TARGET_RANDOM,0);
Panther = m_creature->SummonCreature(15101,-11532.79980,-1649.6734,41.4800,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); Creature *Panther = m_creature->SummonCreature(15101,-11532.79980,-1649.6734,41.4800,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
Player *markedTarget = Unit::GetPlayer(markedTargetGUID);
if(markedTarget && Panther ) if(markedTarget && Panther )
{ {