From 5b78f1987969066002aa79878e8820d2e8d94d5a Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 11 Feb 2017 21:01:11 +0100 Subject: [PATCH] Core/Misc: Fix static analysis issues (cherrypicked from 865a3a47eaa518cb9c7827e863d679697e38b03e) --- src/server/game/Handlers/MailHandler.cpp | 7 +------ .../UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 9917164a039..c105a784b3e 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -622,12 +622,7 @@ void WorldSession::HandleMailCreateTextItem(WorldPackets::Mail::MailCreateTextIt if (m->mailTemplateId) { MailTemplateEntry const* mailTemplateEntry = sMailTemplateStore.LookupEntry(m->mailTemplateId); - if (!mailTemplateEntry) - { - player->SendMailResult(packet.MailID, MAIL_MADE_PERMANENT, MAIL_ERR_INTERNAL_ERROR); - return; - } - + ASSERT(mailTemplateEntry); bodyItem->SetText(mailTemplateEntry->Body->Str[GetSessionDbcLocale()]); } else diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 7b60e4a9227..8eafc69d981 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -195,7 +195,7 @@ public: struct boss_palehoofAI : public BossAI { - boss_palehoofAI(Creature* creature) : BossAI(creature, DATA_GORTOK_PALEHOOF), _dungeonMode(DUNGEON_MODE(2, 4)) { } + boss_palehoofAI(Creature* creature) : BossAI(creature, DATA_GORTOK_PALEHOOF), _dungeonMode(DUNGEON_MODE(2, 4)), _encountersCount(0) { } void Reset() override {