aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2017-08-21 16:44:33 +0200
committerShauren <shauren.trinity@gmail.com>2020-08-23 14:47:29 +0200
commit88a61fa9d675f8adcd76085f935bc7d7b5d3bb6d (patch)
tree3f702bdcb56792c796d0ea30ec4dd7c6e0d0b6e4 /src
parent43f76c8cddc63ed9a219447ce024776e5110b4ce (diff)
Scripts/Auchindoun: Fix a super edge case crash bug with GM far teleports during Blackheart's charm phase. Follow-up to d80d7c6.
(cherry picked from commit 165bc028893a1971d4c75b146e3cd3ce92f13982)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index e500778f660..552fce9e82c 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -59,6 +59,8 @@ class BlackheartCharmedPlayerAI : public SimpleCharmedPlayerAI
void OnCharmed(bool apply) override
{
SimpleCharmedPlayerAI::OnCharmed(apply);
+ if (!me->GetMap()->IsDungeon())
+ return;
if (Creature* blackheart = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(DATA_BLACKHEART_THE_INCITER)))
{
blackheart->AI()->SetData(0, apply);