Core/Misc: Fix static analysis issues

TrinityCoreLegacy · Nov 12, 2017 · 9595e0c · 9595e0c
1 parent 51d0bef
commit 9595e0c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
@@ -406,12 +406,12 @@ void BattlegroundAB::_NodeOccupied(uint8 node, Team team)
 
 void BattlegroundAB::_NodeDeOccupied(uint8 node)
 {
+    //only dynamic nodes, no start points
     if (node >= BG_AB_DYNAMIC_NODES_COUNT)
         return;
 
     //remove bonus honor aura trigger creature when node is lost
-    if (node < BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points
-        DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides
+    DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides
 
     RelocateDeadPlayers(BgCreatures[node]);
 

diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
@@ -152,7 +152,7 @@ bool ItemChatLink::Initialize(std::istringstream& iss)
                     return false;
                 }
             }
-            else if (id < 0)
+            else
             {
                 _suffix = sItemRandomSuffixStore.LookupEntry(-id);
                 if (!_suffix)

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
@@ -7737,7 +7737,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, QuestRelationsReve
             if (reverseMap)
                 reverseMap->insert(QuestRelationsReverse::value_type(quest, id));
         }
-        else if (starter)
+        else
             poolRelationMap->insert(PooledQuestRelation::value_type(quest, id));
 
         ++count;

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -570,15 +570,12 @@ class npc_felkael_phoenix : public CreatureScript
                     Rebirth = true;
                 }
 
-                if (Rebirth)
+                if (Death_Timer <= diff)
                 {
-                    if (Death_Timer <= diff)
-                    {
-                        me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
-                        me->DisappearAndDie();
-                        Rebirth = false;
-                    } else Death_Timer -= diff;
-                }
+                    me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
+                    me->DisappearAndDie();
+                    Rebirth = false;
+                } else Death_Timer -= diff;
             }
 
             if (!UpdateVictim())