From 275bb9303438a3e6e21e90de514723fd4aba7b05 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Thu, 2 Jul 2015 22:08:19 +0200
Subject: Scripts/EyeOfEternity: Fix crash added in
 d1853f693b2c1a60134603d946e31f71f26535c0

Close https://github.com/TrinityCore/TrinityCore/issues/14984#issuecomment-118044904
---
 .../scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 9c339e596a4..ff1ba5ee9b1 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1530,15 +1530,14 @@ public:
     {
         npc_wyrmrest_skytalonAI(Creature* creature) : VehicleAI(creature)
         {
-            _summoner = NULL;
         }
 
         void IsSummonedBy(Unit* summoner) override
         {
-            _summoner = NULL;
+            _summoner.Clear();
             if (Player* player = summoner->ToPlayer())
             {
-                _summoner = player;
+                _summoner = player->GetGUID();
                 _events.ScheduleEvent(EVENT_CAST_RIDE_SPELL, 2*IN_MILLISECONDS);
             }
         }
@@ -1553,7 +1552,8 @@ public:
                 switch (eventId)
                 {
                     case EVENT_CAST_RIDE_SPELL:
-                        me->CastSpell(_summoner, SPELL_RIDE_RED_DRAGON_TRIGGERED, true);
+                        if (Player* player = ObjectAccessor::GetPlayer(*me, _summoner))
+                            me->CastSpell(player, SPELL_RIDE_RED_DRAGON_TRIGGERED, true);
                         break;
                 }
             }
@@ -1575,7 +1575,7 @@ public:
         }
 
     private:
-        Player* _summoner;
+        ObjectGuid _summoner;
         EventMap _events;
     };
 
-- 
cgit v1.2.3