aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-06-07 12:41:38 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-01-12 03:18:07 +0100
commit95902126a373464f9f631f89ae08293d9ad10f1b (patch)
treed0c444c3b2f79b2c90498dc85d462427dcd17d72 /src
parente9054c0bd7411f323080273ab7acd49e26fb008f (diff)
Scripts/Outland: Fix a potential crash. Closes #17308.
(cherry picked from commit 96c05dbec0de5dcff60cc7a97e1b35171f3a8930)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Outland/zone_shadowmoon_valley.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index d05b24267a6..747807fa548 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -90,8 +90,10 @@ public:
void SummonInfernal()
{
- Creature* infernal = me->SummonCreature(NPC_INFERNAL_ATTACKER, me->GetPositionX(), me->GetPositionY(), ground + 0.05f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
- infernalGUID = infernal->GetGUID();
+ if (Creature* infernal = me->SummonCreature(NPC_INFERNAL_ATTACKER, me->GetPositionX(), me->GetPositionY(), ground + 0.05f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000))
+ infernalGUID = infernal->GetGUID();
+ else
+ infernalGUID = ObjectGuid::Empty;
}
void UpdateAI(uint32 diff) override