From 79fb3a5bbc9e27752a3133a83d56a9c72dc44ed6 Mon Sep 17 00:00:00 2001
From: kadeshar <kadeshar@gmail.com>
Date: Sat, 7 Feb 2026 17:53:55 +0100
Subject: [PATCH] - Fixed Oculus drake mounting

---
 .../Dungeon/Oculus/Action/OculusActions.cpp   |  2 +-
 src/Bot/PlayerbotAI.cpp                       | 34 ++++++++++++++++---
 src/Bot/PlayerbotAI.h                         |  3 +-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/Ai/Dungeon/Oculus/Action/OculusActions.cpp b/src/Ai/Dungeon/Oculus/Action/OculusActions.cpp
index 414acc4b..bbb94d11 100644
--- a/src/Ai/Dungeon/Oculus/Action/OculusActions.cpp
+++ b/src/Ai/Dungeon/Oculus/Action/OculusActions.cpp
@@ -62,7 +62,7 @@ bool MountDrakeAction::Execute(Event event)
             break;
     }
 
-    std::vector<Player*> players = botAI->GetPlayersInGroup();
+    std::vector<Player*> players = botAI->GetAllPlayersInGroup();
     for (Player* player : players)
     {
         if (!player || !player->IsInWorld() || player->IsDuringRemoveFromWorld())
diff --git a/src/Bot/PlayerbotAI.cpp b/src/Bot/PlayerbotAI.cpp
index 437e62fc..8d95981e 100644
--- a/src/Bot/PlayerbotAI.cpp
+++ b/src/Bot/PlayerbotAI.cpp
@@ -2580,7 +2580,7 @@ std::string PlayerbotAI::GetLocalizedGameObjectName(uint32 entry)
     return name;
 }
 
-std::vector<Player*> PlayerbotAI::GetPlayersInGroup()
+std::vector<Player*> PlayerbotAI::GetRealPlayersInGroup()
 {
     std::vector<Player*> members;
 
@@ -2607,6 +2607,30 @@ std::vector<Player*> PlayerbotAI::GetPlayersInGroup()
     return members;
 }
 
+std::vector<Player*> PlayerbotAI::GetAllPlayersInGroup()
+{
+    std::vector<Player*> members;
+
+    Group* group = bot->GetGroup();
+
+    if (!group)
+        return members;
+
+    for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
+    {
+        Player* member = ref->GetSource();
+
+        if (!member)
+        {
+            continue;
+        }
+
+        members.push_back(ref->GetSource());
+    }
+
+    return members;
+}
+
 bool PlayerbotAI::SayToGuild(const std::string& msg)
 {
     if (msg.empty())
@@ -2715,9 +2739,9 @@ bool PlayerbotAI::SayToParty(const std::string& msg)
     ChatHandler::BuildChatPacket(data, CHAT_MSG_PARTY, msg.c_str(), LANG_UNIVERSAL, CHAT_TAG_NONE, bot->GetGUID(),
                                  bot->GetName());
 
-    for (auto reciever : GetPlayersInGroup())
+    for (auto receiver : GetRealPlayersInGroup())
     {
-        ServerFacade::instance().SendPacket(reciever, &data);
+        ServerFacade::instance().SendPacket(receiver, &data);
     }
 
     return true;
@@ -2732,9 +2756,9 @@ bool PlayerbotAI::SayToRaid(const std::string& msg)
     ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID, msg.c_str(), LANG_UNIVERSAL, CHAT_TAG_NONE, bot->GetGUID(),
                                  bot->GetName());
 
-    for (auto reciever : GetPlayersInGroup())
+    for (auto receiver : GetRealPlayersInGroup())
     {
-        ServerFacade::instance().SendPacket(reciever, &data);
+        ServerFacade::instance().SendPacket(receiver, &data);
     }
 
     return true;
diff --git a/src/Bot/PlayerbotAI.h b/src/Bot/PlayerbotAI.h
index c2d4aeb7..3364b31a 100644
--- a/src/Bot/PlayerbotAI.h
+++ b/src/Bot/PlayerbotAI.h
@@ -446,7 +446,8 @@ public:
     GameObject* GetGameObject(ObjectGuid guid);
     // static GameObject* GetGameObject(GameObjectData const* gameObjectData);
     WorldObject* GetWorldObject(ObjectGuid guid);
-    std::vector<Player*> GetPlayersInGroup();
+    std::vector<Player*> GetAllPlayersInGroup();
+    std::vector<Player*> GetRealPlayersInGroup();
     const AreaTableEntry* GetCurrentArea();
     const AreaTableEntry* GetCurrentZone();
     static std::string GetLocalizedAreaName(const AreaTableEntry* entry);