aboutsummaryrefslogtreecommitdiff
path: root/src/bindings/scripts
diff options
context:
space:
mode:
authormegamage <none@none>2009-06-01 15:53:03 -0500
committermegamage <none@none>2009-06-01 15:53:03 -0500
commit2c350bcb803ab386a3680227aa6e641e3ae8ad03 (patch)
tree1ea4bd25064fdce3e497531e67a7b0fd52194c2a /src/bindings/scripts
parent751665248146001f45c30924037bb200a2821d60 (diff)
parent16e0e9931edf21f837672cdc14f5a8298eba444e (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/bindings/scripts')
-rw-r--r--src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
index 02d90903c3b..d85dd7a5887 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
@@ -247,7 +247,7 @@ CreatureAI* GetAI_boss_nexusprince_shaffar(Creature *_Creature)
struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
{
- mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c), CanEvade(false)
+ mob_ethereal_beaconAI(Creature *c) : ScriptedAI(c)
{
HeroicMode = m_creature->GetMap()->IsHeroic();
}
@@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
void EnterCombat(Unit *who)
{
// Send Shaffar to fight
- Unit* Shaffar = FindCreature(ENTRY_SHAFFAR, 100, m_creature);
+ Unit* Shaffar = me->FindNearestCreature(ENTRY_SHAFFAR, 100);
if(!Shaffar || Shaffar->isDead())
{
KillSelf();
@@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
void JustDied(Unit* Killer)
{
- Unit *Shaffar = FindCreature(ENTRY_SHAFFAR, 100, m_creature);
+ Unit *Shaffar = me->FindNearestCreature(ENTRY_SHAFFAR, 100);
if(Shaffar)
((boss_nexusprince_shaffarAI*)(((Creature*)Shaffar)->AI()))->RemoveBeaconFromList(m_creature);
}
@@ -301,7 +301,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
if(Check_Timer < diff)
{
- Unit *Shaffar = FindCreature(ENTRY_SHAFFAR, 100, m_creature);
+ Unit *Shaffar = me->FindNearestCreature(ENTRY_SHAFFAR, 100);
if(!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat())
{
KillSelf();