mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 13:37:05 +00:00
[11534] Guild disban memory losses and unsafe code.
* Make sure that guild object deleted in all cases after disband. * Avoid recusive like way call Disband from DelMember
This commit is contained in:
parent
b5c3ec952f
commit
2cbde12458
6 changed files with 59 additions and 19 deletions
|
|
@ -4174,8 +4174,16 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe
|
|||
|
||||
// remove from guild
|
||||
if (uint32 guildId = GetGuildIdFromDB(playerguid))
|
||||
{
|
||||
if (Guild* guild = sGuildMgr.GetGuildById(guildId))
|
||||
guild->DelMember(playerguid);
|
||||
{
|
||||
if (guild->DelMember(playerguid))
|
||||
{
|
||||
guild->Disband();
|
||||
delete guild;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// remove from arena teams
|
||||
LeaveAllArenaTeams(playerguid);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue