Core: Fix warnings and random changes

2 files changed, 13 insertions, 20 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 3ab78d14019..4dedc774bb8 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1802,16 +1802,12 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset()
     if (instance)
         instance->SetBossState(DATA_ILLIDAN_STORMRAGE, NOT_STARTED);
 
-    if (AkamaGUID)
+    if (Creature* akama = ObjectAccessor::GetCreature(*me, AkamaGUID))
     {
-        if (Creature* akama = ObjectAccessor::GetCreature(*me, AkamaGUID))
-        {
-            if (!akama->IsAlive())
-                akama->Respawn();
-            else
-                akama->AI()->EnterEvadeMode();
-        }
-        AkamaGUID = 0;
+        if (!akama->IsAlive())
+            akama->Respawn();
+        else
+            akama->AI()->EnterEvadeMode();
     }
 
     MaievGUID = 0;
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 664b0f6d963..69602baf5d4 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -443,7 +443,7 @@ public:
 
         void JustDied(Unit* /*killer*/) OVERRIDE
         {
-            if (Creature* Shade = Unit::GetCreature((*me), ShadeGUID))
+            if (Creature* Shade = ObjectAccessor::GetCreature(*me, ShadeGUID))
                 if (Shade->IsAlive())
                     CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->HasKilledAkama = true;
             me->GetMotionMaster()->Clear(true);
@@ -452,17 +452,14 @@ public:
 
         void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE
         {
-            if (!StartCombat)
+            if (spell->Id == SPELL_THREAT && !StartCombat)
             {
-                if (spell->Id == SPELL_THREAT)
-                {
-                    me->ClearUnitState(UNIT_STATE_ROOT);
-                    me->RemoveAura(SPELL_AKAMA_SOUL_CHANNEL);
-                    me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
-                    if (Creature* Shade = Unit::GetCreature((*me), ShadeGUID))
-                        Shade->RemoveAura(SPELL_AKAMA_SOUL_CHANNEL);
-                    StartCombat = true;
-                }
+                me->ClearUnitState(UNIT_STATE_ROOT);
+                me->RemoveAura(SPELL_AKAMA_SOUL_CHANNEL);
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
+                if (Creature* Shade = ObjectAccessor::GetCreature(*me, ShadeGUID))
+                    Shade->RemoveAura(SPELL_AKAMA_SOUL_CHANNEL);
+                StartCombat = true;
             }
         }