diff options
| author | jackpoz <giacomopoz@gmail.com> | 2016-04-23 18:20:18 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2016-04-28 17:08:42 +0100 |
| commit | b8f10a514f4c3c892ccc468f3d92199657efebaa (patch) | |
| tree | bc306ddd442caaa220f47ae470bbcde766e1f90b /src | |
| parent | 19ba030370e4035129ed3646bdf100d3f7144cc2 (diff) | |
Core/Misc: Fix issues reported by static analysis
(cherry picked from commit 3e73ba9da5e9d09017cb48389adc930d9c9c3a55)
Diffstat (limited to 'src')
3 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/AI/PlayerAI/PlayerAI.cpp b/src/server/game/AI/PlayerAI/PlayerAI.cpp index cdd2de792e4..006cbd07116 100644 --- a/src/server/game/AI/PlayerAI/PlayerAI.cpp +++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp @@ -157,7 +157,7 @@ void SimpleCharmedPlayerAI::UpdateAI(const uint32 /*diff*/) for (Player::AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) if ((*iter)->GetCasterGUID() == charmer->GetGUID() && (*iter)->GetBase()->IsPermanent()) { - me->Kill(me); + me->KillSelf(); return; } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 32054b67915..ef6ccf5bf4b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -393,6 +393,7 @@ public: GluthGUID = creature->GetInstanceScript()->GetGuidData(DATA_GLUTH); DoCast(me, SPELL_INFECTED_WOUND); + timer = 0; state = STATE_ZOMBIE_NORMAL; } diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index c5969c7b15a..89b7a8cbd46 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -542,6 +542,7 @@ public: npc_earthen_ring_flamecallerAI(Creature* creature) : ScriptedAI(creature) { _instance = me->GetInstanceScript(); + _mySpot = 0; } void Reset() override |