pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some leaks of groups/raids (#1242)

Browse Source 
These cases probably are exceedingly rare, but they still need to be
accounted for. (As in, I don't think anyone has run into these cases too
often to cause problems)
This commit is contained in:
Michael Cook (mackal) 2021-02-12 03:07:58 -05:00 committed by GitHub
parent f9923ffda0
commit 0ef01165ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/bot.cpp
View File

@ -8605,6 +8605,8 @@ void Bot::ProcessBotGroupInvite(Client* c, std::string botName) {
g->SaveGroupLeaderAA(); g->SaveGroupLeaderAA();
database.SetGroupID(c->GetName(), g->GetID(), c->CharacterID()); database.SetGroupID(c->GetName(), g->GetID(), c->CharacterID());
database.SetGroupID(invitedBot->GetCleanName(), g->GetID(), invitedBot->GetBotID()); database.SetGroupID(invitedBot->GetCleanName(), g->GetID(), invitedBot->GetBotID());
} else {
delete g;
} }
} else { } else {
AddBotToGroup(invitedBot, c->GetGroup()); AddBotToGroup(invitedBot, c->GetGroup());

5
zone/client_packet.cpp
View File

@ -561,8 +561,9 @@ void Client::CompleteConnect()
entity_list.AddRaid(raid, raidid); entity_list.AddRaid(raid, raidid);
raid->LoadLeadership(); // Recreating raid in new zone, get leadership from DB raid->LoadLeadership(); // Recreating raid in new zone, get leadership from DB
} }
else else {
raid = nullptr; safe_delete(raid);
}
} }
if (raid) { if (raid) {
SetRaidGrouped(true); SetRaidGrouped(true);

2
zone/worldserver.cpp
View File

@ -1016,7 +1016,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (group->GetID() != 0) if (group->GetID() != 0)
entity_list.AddGroup(group, groupid); entity_list.AddGroup(group, groupid);
else else
group = nullptr; safe_delete(group);
} }
if (group) if (group)