aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMalcrom <malcromdev@gmail.com>2013-07-08 14:44:10 -0230
committerMalcrom <malcromdev@gmail.com>2013-07-08 14:44:10 -0230
commitac85fac97753693c9f5d058b156cbb6aca14bbc0 (patch)
treee27876878d9d63fb87a134f293024ba464f28e9c /src
parent92eec6831a5f0bc32b641f85515ce4c9d243e24d (diff)
Core / Scripting: fix a few warnings.
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 1f8e57498a5..e3d7ff110b0 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -416,7 +416,6 @@ public:
npc_akamaAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
-
}
void Reset()
@@ -752,6 +751,7 @@ public:
npc_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature)
{
instance = creature->GetInstanceScript();
+
if (instance)
{
akamaGUID = instance->GetData64(DATA_AKAMA_SHADE);
@@ -761,14 +761,19 @@ public:
void Reset()
{
- if(!startedBanishing)
+ if (!startedBanishing)
+ {
if (Creature* Shade = (Unit::GetCreature((*me), shadeGUID)))
+ {
if (Shade->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
me->GetMotionMaster()->MovePoint(0, Shade->GetPositionX(), Shade->GetPositionY(), Shade->GetPositionZ(), false);
else
+ {
if (Unit* target = me->GetCreature(*me, akamaGUID))
AttackStart(target);
-
+ }
+ }
+ }
startedBanishing = false;
switchToCombat = false;
}