From 9664c0ab5cc7449f2e839fb60b6b87c9d56dfb92 Mon Sep 17 00:00:00 2001
From: Spp <spp@jorge.gr>
Date: Thu, 30 May 2013 13:14:06 +0200
Subject: Core/Misc: Another batch of fixes for issues found by static analysis

---
 .../EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 9e312ef8f94..b6b701c513d 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -716,27 +716,27 @@ public:
             if (CheckTimer <= diff)
             {
                 Creature* Kalec = Unit::GetCreature(*me, KalecGUID);
-                if (!Kalec || (Kalec && !Kalec->isAlive()))
+                if (!Kalec || !Kalec->isAlive())
                 {
                     if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID))
                         Kalecgos->AI()->EnterEvadeMode();
-                        return;
+                    return;
                 }
+
                 if (HealthBelowPct(10) && !isEnraged)
                 {
                     if (Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID))
                         Kalecgos->AI()->DoAction(DO_ENRAGE);
                     DoAction(DO_ENRAGE);
                 }
+
                 Creature* Kalecgos = Unit::GetCreature(*me, KalecgosGUID);
-                if (Kalecgos)
+                if (Kalecgos && !Kalecgos->isInCombat())
                 {
-                    if (!Kalecgos->isInCombat())
-                    {
-                        me->AI()->EnterEvadeMode();
-                        return;
-                    }
+                    me->AI()->EnterEvadeMode();
+                    return;
                 }
+
                 if (!isBanished && HealthBelowPct(1))
                 {
                     if (Kalecgos)
@@ -746,8 +746,7 @@ public:
                             me->DealDamage(me, me->GetHealth());
                             return;
                         }
-                        else
-                            DoAction(DO_BANISH);
+                        DoAction(DO_BANISH);
                     }
                     else
                     {
-- 
cgit v1.2.3