From fe67a3bc6e84e15a6d7082cdbcc5bcc8e6f878e0 Mon Sep 17 00:00:00 2001 From: Anubisss Date: Tue, 16 Mar 2010 23:46:20 +0100 Subject: Fix some possible crashes. --HG-- branch : trunk --- .../trial_of_the_champion/boss_grand_champions.cpp | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp index ee594a17f8b..fa0402e2d70 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_grand_champions.cpp @@ -352,11 +352,11 @@ struct boss_warrior_toc5AI : public ScriptedAI { bDone = true; - if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) m_creature->SetHomePosition(739.678,662.541,412.393,4.49); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) m_creature->SetHomePosition(746.71,661.02,411.69,4.6); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) m_creature->SetHomePosition(754.34,660.70,412.39,4.79); EnterEvadeMode(); @@ -480,11 +480,11 @@ struct boss_mage_toc5AI : public ScriptedAI { bDone = true; - if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) m_creature->SetHomePosition(739.678,662.541,412.393,4.49); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) m_creature->SetHomePosition(746.71,661.02,411.69,4.6); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) m_creature->SetHomePosition(754.34,660.70,412.39,4.79); if (pInstance) @@ -620,11 +620,11 @@ struct boss_shaman_toc5AI : public ScriptedAI { bDone = true; - if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) m_creature->SetHomePosition(739.678,662.541,412.393,4.49); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) m_creature->SetHomePosition(746.71,661.02,411.69,4.6); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) m_creature->SetHomePosition(754.34,660.70,412.39,4.79); if (pInstance) @@ -760,11 +760,11 @@ struct boss_hunter_toc5AI : public ScriptedAI { bDone = true; - if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) m_creature->SetHomePosition(739.678,662.541,412.393,4.49); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) m_creature->SetHomePosition(746.71,661.02,411.69,4.6); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) m_creature->SetHomePosition(754.34,660.70,412.39,4.79); if (pInstance) @@ -901,11 +901,11 @@ struct boss_rouge_toc5AI : public ScriptedAI { bDone = true; - if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) + if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) m_creature->SetHomePosition(739.678,662.541,412.393,4.49); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) m_creature->SetHomePosition(746.71,661.02,411.69,4.6); - else if (m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) + else if (pInstance && m_creature->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) m_creature->SetHomePosition(754.34,660.70,412.39,4.79); if (pInstance) -- cgit v1.2.3