From 1805cc269e2ed2ad38f5d51dc2d955b896c253b0 Mon Sep 17 00:00:00 2001 From: cctvzj <357284506@qq.com> Date: Mon, 6 Feb 2023 03:03:35 +0800 Subject: [PATCH] fix(Script/Nexus/EOE/Oculus) The Scion of Eternity(EOE) target wrong and player can not ride the dragon in Oculus (#14830) Co-authored-by: Skjalf <47818697+Nyeriah@users.noreply.github.com> --- .../Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 10 +++++++--- src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 41977c51f..abdc2b98f 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1201,9 +1201,13 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* pPlayer = i->GetSource()) { - if (!pPlayer->IsAlive() || pPlayer->IsGameMaster()) - continue; - guids.push_back(pPlayer->GetGUID()); + if (pPlayer->IsAlive()) + { + if (!pPlayer->GetVehicle()) + { + guids.push_back(pPlayer->GetGUID()); + } + } } if (!guids.empty()) if (Player* plr = ObjectAccessor::GetPlayer(*me, guids.at(urand(0, guids.size() - 1)))) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 878273ba8..d0b53a34c 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -354,7 +354,7 @@ public: void IsSummonedBy(WorldObject* summoner) override { - if (summoner->GetTypeId() != TYPEID_UNIT) + if (summoner->GetTypeId() != TYPEID_PLAYER) { return; }