From c9e25147ccd0765fa6ffe85682347afb302c7248 Mon Sep 17 00:00:00 2001 From: vincent-michael Date: Sun, 16 Jul 2017 12:18:14 +0200 Subject: [PATCH] Scripts/Misc: Fixed static analysis issues --- src/server/scripts/Kalimdor/zone_silithus.cpp | 3 +-- src/server/scripts/Northrend/zone_grizzly_hills.cpp | 7 ++----- src/server/scripts/Outland/zone_shadowmoon_valley.cpp | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 25e78a79c70..0e8506a49c5 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -583,8 +583,7 @@ public: me->GetMotionMaster()->MoveCharge(-8117.99f, 1532.24f, 3.94f, 4); break; case 60: - if (player) - Talk(ANACHRONOS_SAY_10, player); + Talk(ANACHRONOS_SAY_10, player); me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); break; case 61: diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index a59650993dd..4c1e21d072c 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -156,11 +156,8 @@ public: } break; case 24: - if (player) - { - player->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me); - Talk(SAY_QUEST_COMPLETE, player); - } + player->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me); + Talk(SAY_QUEST_COMPLETE, player); me->SetWalk(false); break; case 25: diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index b248b0cced3..1b5f9f54612 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1189,8 +1189,7 @@ public: { me->RemoveCorpse(); if (Creature* LordIllidan = (ObjectAccessor::GetCreature(*me, LordIllidanGUID))) - if (LordIllidan) - ENSURE_AI(npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter(); + ENSURE_AI(npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter(); } void UpdateAI(uint32 diff) override