pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-18 08:18:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

** Fix for groups with multiple players and bots.

Browse Source 
*  Fixes non-group leaders zoning with their bots.
*  Fixes non-bot owners attempting to load bots they don't own.
*  Sets bots that zone to follow owner not group leader.
*  Updates database call only load bots in group you own.
*  Tested on server 2 clients, 4 bots, all permutations of zoning.
This commit is contained in:
Allen
2017-04-12 00:54:37 -07:00
parent 478a9d115b
commit f88a6774a9
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot_database.cpp
+6 -13
View File
@@ -2459,9 +2459,10 @@ bool BotDatabase::LoadBotGroupsListByOwnerID(const uint32 owner_id, std::list<st
/* Bot owner group functions */
bool BotDatabase::LoadGroupedBotsByGroupID(const uint32 group_id, std::list<uint32>& group_list)
// added owner ID to this function to fix groups with mulitple players grouped with bots.
bool BotDatabase::LoadGroupedBotsByGroupID(const uint32 owner_id, const uint32 group_id, std::list<uint32>& group_list)
{
if (!group_id)
if (!group_id || !owner_id)
return false;
query = StringFormat(
@@ -2471,18 +2472,10 @@ bool BotDatabase::LoadGroupedBotsByGroupID(const uint32 group_id, std::list<uint
" AND `charid` IN ("
" SELECT `bot_id`"
" FROM `bot_data`"
" WHERE `owner_id` IN ("
" SELECT `charid`"
" FROM `group_id`"
" WHERE `groupid` = '%u'"
" AND `name` IN ("
" SELECT `name`"
" FROM `character_data`"
" )"
" )"
" )",
" WHERE `owner_id` = '%u'"
" )",
group_id,
group_id
owner_id
);
auto results = QueryDatabase(query);