diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 0d1e851052..6604eb0b8d 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -924,7 +924,7 @@ void WorldSession::HandleGuildAchievementMembers(WorldPacket& recvPacket) data.WriteBits(achievement->guids.size(),26); - for(std::set::iterator itr = achievement->guids.begin(); itr != achievement->guids.end(); ++itr) + for(std::set::iterator itr = achievement->guids.begin(); itr != achievement->guids.end(); ++itr) { ObjectGuid pguid = (*itr); @@ -947,7 +947,7 @@ void WorldSession::HandleGuildAchievementMembers(WorldPacket& recvPacket) data.WriteByteSeq(gguid[5]); - for(std::set::iterator itr = achievement->guids.begin(); itr != achievement->guids.end(); ++itr) + for(std::set::iterator itr = achievement->guids.begin(); itr != achievement->guids.end(); ++itr) { ObjectGuid pguid = (*itr); diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 653635b52b..467f8cf0ec 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1120,6 +1120,15 @@ void WorldSession::ProcessQueryCallbacks() HandleStableSwapPetCallback(result, param); _stableSwapCallback.FreeResult(); } + + //- HandleRenameGuild + if(_guildRenameCallback.IsReady()) + { + std::string param = _guildRenameCallback.GetParam(); + _guildRenameCallback.GetResult(result); + HandleGuildRenameCallback(param); + _guildRenameCallback.FreeResult(); + } } void WorldSession::InitWarden(BigNumber* k, std::string const& os) diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index a909470dc6..7e2bb48669 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1087,6 +1087,7 @@ class TC_GAME_API WorldSession QueryCallback _stableSwapCallback; QueryCallback _sendStabledPetCallback; QueryCallback _charCreateCallback; + QueryCallback _guildRenameCallback; QueryResultHolderFuture _charLoginCallback; friend class World;