Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Guild: Fix crash on guild creation

Browse Source 
Closes #14140
This commit is contained in:
Duarte Duarte
2015-02-15 02:40:00 +00:00
parent 6672642ee6
commit ad53be7081
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/game/Guilds/Guild.cpp
View File

@@ -2187,12 +2187,20 @@ void Guild::SendEventNewLeader(Member* newLeader, Member* oldLeader, bool isSelf
{
WorldPackets::Guild::GuildEventNewLeader eventPacket;
eventPacket.SelfPromoted = isSelfPromoted;
eventPacket.NewLeaderGUID = newLeader->GetGUID();
eventPacket.NewLeaderName = newLeader->GetName();
eventPacket.NewLeaderVirtualRealmAddress = GetVirtualRealmAddress();
eventPacket.OldLeaderGUID = oldLeader->GetGUID();
eventPacket.OldLeaderName = oldLeader->GetName();
eventPacket.OldLeaderVirtualRealmAddress = GetVirtualRealmAddress();
if (newLeader)
{
eventPacket.NewLeaderGUID = newLeader->GetGUID();
eventPacket.NewLeaderName = newLeader->GetName();
eventPacket.NewLeaderVirtualRealmAddress = GetVirtualRealmAddress();
}
if (oldLeader)
{
eventPacket.OldLeaderGUID = oldLeader->GetGUID();
eventPacket.OldLeaderName = oldLeader->GetName();
eventPacket.OldLeaderVirtualRealmAddress = GetVirtualRealmAddress();
}
BroadcastPacket(eventPacket.Write());
}
@@ -2204,7 +2212,7 @@ void Guild::SendEventPlayerLeft(Player* leaver, Player* remover, bool isRemoved)
eventPacket.LeaverName = leaver->GetName();
eventPacket.LeaverVirtualRealmAddress = GetVirtualRealmAddress();
if (isRemoved)
if (isRemoved && remover != nullptr)
{
eventPacket.RemoverGUID = remover->GetGUID();
eventPacket.RemoverName = remover->GetName();