From 165bc028893a1971d4c75b146e3cd3ce92f13982 Mon Sep 17 00:00:00 2001 From: Treeston Date: Mon, 21 Aug 2017 16:44:33 +0200 Subject: Scripts/Auchindoun: Fix a super edge case crash bug with GM far teleports during Blackheart's charm phase. Follow-up to d80d7c6. --- .../Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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 62a81af385c..499896ff35f 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 @@ -60,6 +60,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); -- cgit v1.2.3