diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-07-02 22:08:19 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-03 01:16:58 +0100 |
| commit | dbf51eee460ff7dad0110f2f2f4fde654e25033d (patch) | |
| tree | 5471d949009d06eba458234bc2ebe99a3d1836d3 | |
| parent | e98b8fa7c575467dea544856c8583ff7ff73ce46 (diff) | |
Scripts/EyeOfEternity: Fix crash added in d1853f693b2c1a60134603d946e31f71f26535c0
Close https://github.com/TrinityCore/TrinityCore/issues/14984#issuecomment-118044904
(cherry picked from commit 275bb9303438a3e6e21e90de514723fd4aba7b05)
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index b939c40cabb..899dcc79a06 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; }; |