Merge pull request #10724 from jackpoz/guild_disband_leak
Core/Guild: Fix memory leak on Guild disband
This commit is contained in:
commit
287dc307bc
5 files changed
+17
-5
No files matched your search
@@ -4713,7 +4713,7 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
|
||||
|
||||
if (uint32 guildId = GetGuildIdFromDB(playerguid))
|
||||
if (Guild* guild = sGuildMgr->GetGuildById(guildId))
|
||||
guild->DeleteMember(guid);
|
||||
guild->DeleteMember(guid, false, false, true);
|
||||
|
||||
// remove from arena teams
|
||||
LeaveAllArenaTeams(playerguid);
|
||||
|
||||
@@ -1578,6 +1578,8 @@ void Guild::HandleAcceptMember(WorldSession* session)
|
||||
void Guild::HandleLeaveMember(WorldSession* session)
|
||||
{
|
||||
Player* player = session->GetPlayer();
|
||||
bool disband = false;
|
||||
|
||||
// If leader is leaving
|
||||
if (_IsLeader(player))
|
||||
{
|
||||
@@ -1585,8 +1587,11 @@ void Guild::HandleLeaveMember(WorldSession* session)
|
||||
// Leader cannot leave if he is not the last member
|
||||
SendCommandResult(session, GUILD_COMMAND_QUIT, ERR_GUILD_LEADER_LEAVE);
|
||||
else
|
||||
{
|
||||
// Guild is disbanded if leader leaves.
|
||||
Disband();
|
||||
disband = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1599,6 +1604,9 @@ void Guild::HandleLeaveMember(WorldSession* session)
|
||||
}
|
||||
|
||||
sCalendarMgr->RemovePlayerGuildEventsAndSignups(player->GetGUID(), GetId());
|
||||
|
||||
if (disband)
|
||||
delete this;
|
||||
}
|
||||
|
||||
void Guild::HandleRemoveMember(WorldSession* session, std::string const& name)
|
||||
@@ -1812,6 +1820,7 @@ void Guild::HandleDisband(WorldSession* session)
|
||||
{
|
||||
Disband();
|
||||
TC_LOG_DEBUG(LOG_FILTER_GUILD, "Guild Successfully Disbanded");
|
||||
delete this;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2272,7 +2281,7 @@ bool Guild::AddMember(uint64 guid, uint8 rankId)
|
||||
return true;
|
||||
}
|
||||
|
||||
void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked)
|
||||
void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked, bool canDeleteGuild)
|
||||
{
|
||||
uint32 lowguid = GUID_LOPART(guid);
|
||||
Player* player = ObjectAccessor::FindPlayer(guid);
|
||||
@@ -2294,6 +2303,8 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked)
|
||||
if (!newLeader)
|
||||
{
|
||||
Disband();
|
||||
if (canDeleteGuild)
|
||||
delete this;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -727,7 +727,7 @@ public:
|
||||
// Members
|
||||
// Adds member to guild. If rankId == GUILD_RANK_NONE, lowest rank is assigned.
|
||||
bool AddMember(uint64 guid, uint8 rankId = GUILD_RANK_NONE);
|
||||
void DeleteMember(uint64 guid, bool isDisbanding = false, bool isKicked = false);
|
||||
void DeleteMember(uint64 guid, bool isDisbanding = false, bool isKicked = false, bool canDeleteGuild = false);
|
||||
bool ChangeMemberRank(uint64 guid, uint8 newRank);
|
||||
|
||||
// Bank
|
||||
|
||||
@@ -1918,7 +1918,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData)
|
||||
PreparedQueryResult result = CharacterDatabase.Query(stmt);
|
||||
if (result)
|
||||
if (Guild* guild = sGuildMgr->GetGuildById((result->Fetch()[0]).GetUInt32()))
|
||||
guild->DeleteMember(MAKE_NEW_GUID(lowGuid, 0, HIGHGUID_PLAYER));
|
||||
guild->DeleteMember(MAKE_NEW_GUID(lowGuid, 0, HIGHGUID_PLAYER), false, false, true);
|
||||
}
|
||||
|
||||
if (!HasPermission(RBAC_PERM_TWO_SIDE_ADD_FRIEND))
|
||||
|
||||
@@ -118,6 +118,7 @@ public:
|
||||
return false;
|
||||
|
||||
targetGuild->Disband();
|
||||
delete targetGuild;
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -164,7 +165,7 @@ public:
|
||||
if (!targetGuild)
|
||||
return false;
|
||||
|
||||
targetGuild->DeleteMember(targetGuid, false, true);
|
||||
targetGuild->DeleteMember(targetGuid, false, true, true);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user