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

Core/Scripts: Avoid some possible crashes

Browse Source 
Temporary fix since Sartura obviously needs a rewrite.
This commit is contained in:
kaelima
2011-06-13 13:06:02 +02:00
parent de41092cab
commit f45121ebe9
2 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+26 -28
View File
@@ -105,13 +105,12 @@ public:
if (WhirlWindRandom_Timer <= diff) if (WhirlWindRandom_Timer <= diff)
{ {
//Attack random Gamers //Attack random Gamers
Unit *pTarget = NULL; if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true))
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); {
if (pTarget) me->AddThreat(target, 1.0f);
me->AddThreat(pTarget, 1.0f); me->TauntApply(target);
me->TauntApply(pTarget); AttackStart(target);
AttackStart(pTarget); }
WhirlWindRandom_Timer = 3000 + rand()%4000; WhirlWindRandom_Timer = 3000 + rand()%4000;
} else WhirlWindRandom_Timer -= diff; } else WhirlWindRandom_Timer -= diff;
@@ -134,15 +133,14 @@ public:
if (AggroReset_Timer <= diff) if (AggroReset_Timer <= diff)
{ {
//Attack random Gamers //Attack random Gamers
Unit *pTarget = NULL; if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true))
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); {
if (pTarget) me->AddThreat(target, 1.0f);
me->AddThreat(pTarget, 1.0f); me->TauntApply(target);
me->TauntApply(pTarget); AttackStart(target);
AttackStart(pTarget); }
AggroReset = true;
AggroReset = true; AggroReset_Timer = 2000 + rand()%3000;
AggroReset_Timer = 2000 + rand()%3000;
} else AggroReset_Timer -= diff; } else AggroReset_Timer -= diff;
if (AggroReset) if (AggroReset)
@@ -242,12 +240,12 @@ public:
if (WhirlWindRandom_Timer <= diff) if (WhirlWindRandom_Timer <= diff)
{ {
//Attack random Gamers //Attack random Gamers
Unit *pTarget = NULL; if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true))
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); {
if (pTarget) me->AddThreat(target, 1.0f);
me->AddThreat(pTarget, 1.0f); me->TauntApply(target);
me->TauntApply(pTarget); AttackStart(target);
AttackStart(pTarget); }
WhirlWindRandom_Timer = 3000 + rand()%4000; WhirlWindRandom_Timer = 3000 + rand()%4000;
} else WhirlWindRandom_Timer -= diff; } else WhirlWindRandom_Timer -= diff;
@@ -263,12 +261,12 @@ public:
if (AggroReset_Timer <= diff) if (AggroReset_Timer <= diff)
{ {
//Attack random Gamers //Attack random Gamers
Unit *pTarget = NULL; if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true))
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); {
if (pTarget) me->AddThreat(pTarget, 1.0f);
me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget);
me->TauntApply(pTarget); AttackStart(pTarget);
AttackStart(pTarget); }
AggroReset = true; AggroReset = true;
AggroReset_Timer = 2000 + rand()%3000; AggroReset_Timer = 2000 + rand()%3000;
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+4 -5
View File
@@ -169,11 +169,10 @@ public:
if (uiCurseFatigueTimer <= diff) if (uiCurseFatigueTimer <= diff)
{ {
//WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically." //WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically."
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
Unit *pTarget_1 = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); DoCast(target, SPELL_CURSE_OF_FATIGUE);
if (Unit* tankTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true);
DoCast(pTarget, SPELL_CURSE_OF_FATIGUE); DoCast(tankTarget, SPELL_CURSE_OF_FATIGUE);
DoCast(pTarget_1, SPELL_CURSE_OF_FATIGUE);
uiCurseFatigueTimer = 10*IN_MILLISECONDS; uiCurseFatigueTimer = 10*IN_MILLISECONDS;
} else uiCurseFatigueTimer -= diff; } else uiCurseFatigueTimer -= diff;