nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-08 21:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2124 from kadeshar/oculus-drake-fix

Browse Source 
Oculus drake mounting fix
This commit is contained in:
kadeshar
2026-02-08 17:10:18 +01:00
committed by GitHub
parent e9e79ad696 79fb3a5bbc
commit cfb2ed4bf3
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ai/Dungeon/Oculus/Action/OculusActions.cpp
View File

@@ -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())

34
src/Bot/PlayerbotAI.cpp
View File

@@ -2584,7 +2584,7 @@ std::string PlayerbotAI::GetLocalizedGameObjectName(uint32 entry)
return name;
}
std::vector<Player*> PlayerbotAI::GetPlayersInGroup()
std::vector<Player*> PlayerbotAI::GetRealPlayersInGroup()
{
std::vector<Player*> members;
@@ -2611,6 +2611,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())
@@ -2719,9 +2743,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;
@@ -2736,9 +2760,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;

3
src/Bot/PlayerbotAI.h
View File

@@ -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);