From 9e99db035f554c8f4954e025f599ef752c1f4e01 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Fri, 21 Mar 2014 22:47:58 +0100
Subject: Core/Misc: Fix some static analysis issues

Add some asserts and additional NULL checks as sanity checks.
---
 .../BlackTemple/boss_reliquary_of_souls.cpp        | 48 ++++++++++++----------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'src/server/scripts/Outland')

diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index ca0ea947295..d92d8aaf5db 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -295,13 +295,13 @@ public:
                     Timer = 1000;
                     if (Phase == 3)
                     {
-                        if (!Essence->IsAlive())
+                        if (Essence && !Essence->IsAlive())
                             DoCast(me, 7, true);
                         else return;
                     }
                     else
                     {
-                        if (Essence->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                        if (Essence && Essence->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
                         {
                             MergeThreatList(Essence);
                             Essence->RemoveAllAuras();
@@ -312,31 +312,37 @@ public:
                     break;
                 case 4:
                     Timer = 1500;
-                    if (Essence->IsWithinDistInMap(me, 10))
+                    if (Essence)
                     {
-                        Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE, 374); //rotate and disappear
-                        Timer = 2000;
-                        me->RemoveAurasDueToSpell(SPELL_SUBMERGE);
-                    }
-                    else
-                    {
-                        MergeThreatList(Essence);
-                        Essence->RemoveAllAuras();
-                        Essence->DeleteThreatList();
-                        Essence->GetMotionMaster()->MoveFollow(me, 0, 0);
-                        return;
+                        if (Essence->IsWithinDistInMap(me, 10))
+                        {
+                            Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE, 374); //rotate and disappear
+                            Timer = 2000;
+                            me->RemoveAurasDueToSpell(SPELL_SUBMERGE);
+                        }
+                        else
+                        {
+                            MergeThreatList(Essence);
+                            Essence->RemoveAllAuras();
+                            Essence->DeleteThreatList();
+                            Essence->GetMotionMaster()->MoveFollow(me, 0, 0);
+                            return;
+                        }
                     }
                     break;
                 case 5:
-                    if (Phase == 1)
+                    if (Essence)
                     {
-                        Essence->AI()->Talk(SUFF_SAY_AFTER);
-                    }
-                    else
-                    {
-                        Essence->AI()->Talk(DESI_SAY_AFTER);
+                        if (Phase == 1)
+                        {
+                            Essence->AI()->Talk(SUFF_SAY_AFTER);
+                        }
+                        else
+                        {
+                            Essence->AI()->Talk(DESI_SAY_AFTER);
+                        }
+                        Essence->DespawnOrUnsummon();
                     }
-                    Essence->DespawnOrUnsummon();
                     me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
                     EssenceGUID = 0;
                     SoulCount = 0;
-- 
cgit v1.2.3