From 05134b0a66f927ac100f435dc5aa17ac2d59c322 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Sun, 22 Apr 2018 14:53:01 +0200 Subject: Core/Guild: Handle changing the leader in one db transaction --- src/server/game/Handlers/CharacterHandler.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/server/game/Handlers/CharacterHandler.cpp') diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 673ced13f10..a428843d6be 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -956,21 +956,17 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) { Field* fields = resultGuild->Fetch(); pCurrChar->SetInGuild(fields[0].GetUInt64()); - pCurrChar->SetRank(fields[1].GetUInt8()); + pCurrChar->SetGuildRank(fields[1].GetUInt8()); if (Guild* guild = sGuildMgr->GetGuildById(pCurrChar->GetGuildId())) pCurrChar->SetGuildLevel(guild->GetLevel()); } else if (pCurrChar->GetGuildId()) // clear guild related fields in case wrong data about non existed membership { pCurrChar->SetInGuild(UI64LIT(0)); - pCurrChar->SetRank(0); + pCurrChar->SetGuildRank(0); pCurrChar->SetGuildLevel(0); } - //WorldPacket data(SMSG_LEARNED_DANCE_MOVES, 4+4); - //data << uint64(0); - //SendPacket(&data); - // TODO: Move this to BattlePetMgr::SendJournalLock() just to have all packets in one file WorldPackets::BattlePet::BattlePetJournalLockAcquired lock; SendPacket(lock.Write()); -- cgit v1.2.3