aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/AI/PlayerAI/PlayerAI.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp1
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp1
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 680ecfb9414..12bfb86251b 100644
--- a/src/server/game/AI/PlayerAI/PlayerAI.cpp
+++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp
@@ -177,7 +177,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