Core&Tools: Fix multiple issues found by a static code coverage tool

2 files changed, 3 insertions, 5 deletions

diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 882bc176932..05496c0fcda 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -161,9 +161,9 @@ public:
     {
         if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL)
        {
-            if (npc_escortAI* pEscortAI = CAST_AI(npc_dalinda::npc_dalindaAI, creature->AI()))
+            if (npc_escortAI* escortAI = CAST_AI(npc_dalinda::npc_dalindaAI, creature->AI()))
             {
-                pEscortAI->Start(true, false, player->GetGUID());
+                escortAI->Start(true, false, player->GetGUID());
                 creature->setFaction(113);
             }
         }
@@ -186,7 +186,7 @@ public:
             switch (waypointId)
             {
                 case 1:
-                    me->IsStandState();
+                    me->SetStandState(UNIT_STAND_STATE_STAND);
                     break;
                 case 15:
                     if (player)
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index 13c9bbd722c..0d2a424b4c7 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -836,8 +836,6 @@ class npc_halion_controller : public CreatureScript
                         _twilightDamageTaken = 0;
                         return;
                     }
-                    default:
-                        break;
                 }
 
                 _materialDamageTaken = 0;