pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-28 06:23:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Bug Fix] Fix edge cases where camped bots would be left in a raid (#3139)

Browse Source 
* [Bug Fix] Fix edge cases where camped bots would be left in a raid

* formatting
This commit is contained in:
Aeadoin 2023-03-23 19:23:34 -04:00 committed by GitHub
parent c975dc2412
commit abc27ab423
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zone/bot_raid.cpp
View File

@ -116,6 +116,30 @@ void Raid::HandleBotGroupDisband(uint32 owner, uint32 gid)
}
}
// we need to cleanup any camped/offline bots when the owner leaves the Raid
void Raid::HandleOfflineBots(uint32 owner) {
std::list<BotsAvailableList> bots_list;
if (!database.botdb.LoadBotsList(owner, bots_list)) {
return;
}
for (const auto& b: bots_list) {
if (IsRaidMember(b.Name)) {
for (const auto& m: members) {
if (m.is_bot && strcmp(m.member_name, b.Name) == 0) {
uint32 gid = GetGroup(m.member_name);
SendRaidGroupRemove(m.member_name, gid);
RemoveMember(m.member_name);
GroupUpdate(gid);
if (!RaidCount()) {
DisbandRaid();
}
}
}
}
}
}
uint8 Bot::GetNumberNeedingHealedInRaidGroup(uint8& need_healed, uint8 hpr, bool includePets, Raid* raid) {
if (raid) {
@ -170,8 +194,8 @@ void Bot::CreateBotRaid(Mob* invitee, Client* invitor, bool group_invite, Raid*
Group* g_invitee = invitee->GetGroup();
Group* g_invitor = invitor->GetGroup();
if (g_invitee && invitor->IsClient()) {
if (!g_invitee->IsLeader(invitee)) {
if (g_invitee && invitor->IsClient() && !g_invitee->IsLeader(invitee)) {
if (g_invitee->GetLeader()) {
invitor->Message(
Chat::Red,
fmt::format(
@ -180,6 +204,9 @@ void Bot::CreateBotRaid(Mob* invitee, Client* invitor, bool group_invite, Raid*
).c_str()
);
return;
} else {
invitor->Message(Chat::Red, "You can only invite group leaders or ungrouped bots.");
return;
}
}

1
zone/client_packet.cpp
View File

@ -12180,6 +12180,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket* app)
uint32 i = raid->GetPlayerIndex(raid_command_packet->leader_name);
raid->SetNewRaidLeader(i);
raid->HandleBotGroupDisband(c_to_disband->CharacterID());
raid->HandleOfflineBots(c_to_disband->CharacterID());
raid->RemoveMember(raid_command_packet->leader_name);
raid->SendGroupDisband(c_to_disband);
raid->GroupUpdate(group);

3
zone/raids.cpp
View File

@ -1703,11 +1703,10 @@ void Raid::VerifyRaid()
//attribute before calling a client function or casting to client.
b = entity_list.GetBotByBotName(m.member_name);
m.member = b->CastToClient();
m.is_bot = true; //Used to identify those members who are Bots
m.is_bot = true;
}
else {
m.member = nullptr;
m.is_bot = false;
}
}

1
zone/raids.h
View File

@ -256,6 +256,7 @@ public:
std::vector<Bot*> GetRaidGroupBotMembers(uint32 gid);
std::vector<Bot*> GetRaidBotMembers(uint32 owner = 0);
void HandleBotGroupDisband(uint32 owner, uint32 gid = RAID_GROUPLESS);
void HandleOfflineBots(uint32 owner);
RaidMember members[MAX_RAID_MEMBERS];
char leadername[64];