diff --git a/zone/bot.cpp b/zone/bot.cpp index a45e575d9..17278dad0 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -8605,6 +8605,8 @@ void Bot::ProcessBotGroupInvite(Client* c, std::string botName) { g->SaveGroupLeaderAA(); database.SetGroupID(c->GetName(), g->GetID(), c->CharacterID()); database.SetGroupID(invitedBot->GetCleanName(), g->GetID(), invitedBot->GetBotID()); + } else { + delete g; } } else { AddBotToGroup(invitedBot, c->GetGroup()); diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 8ce8057a5..7f49ba5d4 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -561,8 +561,9 @@ void Client::CompleteConnect() entity_list.AddRaid(raid, raidid); raid->LoadLeadership(); // Recreating raid in new zone, get leadership from DB } - else - raid = nullptr; + else { + safe_delete(raid); + } } if (raid) { SetRaidGrouped(true); diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 2793c3a2e..a6eadfe82 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -1016,7 +1016,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) if (group->GetID() != 0) entity_list.AddGroup(group, groupid); else - group = nullptr; + safe_delete(group); } if (group)