From 13580238c4c43bf73e2d6f9c00b10bf05adf0f05 Mon Sep 17 00:00:00 2001 From: talamortis Date: Sun, 18 Mar 2018 22:41:29 +0000 Subject: [PATCH] fixed crash issue is creatures are summoned outside of the instance --- src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp | 7 +++++-- src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index a6d60dde7..dcfb1c5e7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -203,8 +203,11 @@ public: summons.DespawnAll(); Talk(SAY_DEATH); - if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_GATE))) - go->SetGoState(GO_STATE_ACTIVE); + if (pInstance) + { + if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_KELTHUZAD_GATE))) + go->SetGoState(GO_STATE_ACTIVE); + } } void MoveInLineOfSight(Unit* who) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 19359d5f9..255ccad1a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -80,8 +80,12 @@ public: BossAI::Reset(); events.Reset(); summons.DespawnAll(); - if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_MAEXXNA_GATE))) - go->SetGoState(GO_STATE_ACTIVE); + + if (pInstance) + { + if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetData64(DATA_MAEXXNA_GATE))) + go->SetGoState(GO_STATE_ACTIVE); + } }