From 3cd922b962ba44706e89de2c384dcdbf943d1640 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Sat, 4 Feb 2017 20:15:14 +0100
Subject: [PATCH] build fix By ariel-

---
 src/server/game/Handlers/GuildHandler.cpp | 14 ++++++--------
 src/server/game/Server/WorldSession.h     |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp
index cc2ee30b0c7..d6808c733e1 100644
--- a/src/server/game/Handlers/GuildHandler.cpp
+++ b/src/server/game/Handlers/GuildHandler.cpp
@@ -24,6 +24,7 @@
 #include "GuildMgr.h"
 #include "Log.h"
 #include "Guild.h"
+#include "QueryCallback.h"
 
 void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket)
 {
@@ -991,12 +992,10 @@ void WorldSession::HandleGuildRenameRequest(WorldPacket& recvPacket)
     {
         PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_NAME);
 
-        _guildRenameCallback.SetParam(newName);
-
         stmt->setUInt32(1, pGuild->GetId());
         stmt->setString(0, newName);
 
-        _guildRenameCallback.SetFutureResult(CharacterDatabase.AsyncQuery(stmt));
+        _queryProcessor.AddQuery(CharacterDatabase.AsyncQuery(stmt).WithPreparedCallback(std::bind(&WorldSession::HandleGuildRenameCallback, this, newName, std::placeholders::_1)));
 
         WorldPacket data(SMSG_GUILD_FLAGGED_FOR_RENAME,1);
 
@@ -1007,12 +1006,11 @@ void WorldSession::HandleGuildRenameRequest(WorldPacket& recvPacket)
     }
 }
 
-void WorldSession::HandleGuildRenameCallback(std::string newName)
+void WorldSession::HandleGuildRenameCallback(std::string newName, PreparedQueryResult result)
 {
-/*
     Guild* pGuild = GetPlayer()->GetGuild();
 
-    bool hasRenamed = ((PreparedQueryResult)_guildRenameCallback.GetFutureResult)->GetRowCount() > 0 ? true : false;
+    bool hasRenamed = (result && result->GetRowCount() > 0);
 
     WorldPacket data(SMSG_GUILD_CHANGE_NAME_RESULT, 1);
     data.WriteBit(hasRenamed);
@@ -1023,7 +1021,7 @@ void WorldSession::HandleGuildRenameCallback(std::string newName)
     if(pGuild && hasRenamed)
         pGuild->SetName(newName);
 }
-
+/*
 void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket)
 {
     uint8 counter = 4;
@@ -1077,5 +1075,5 @@ void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket)
         }
         return;
     }
-*/
 }
+*/
\ No newline at end of file
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 1c53bdc1054..5598bf8fb74 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -685,7 +685,6 @@ class TC_GAME_API WorldSession
         void HandleGuildRenameRequest(WorldPacket& recvPacket);
         void HandleGuildChallengeRequest(WorldPacket& recvPacket);
         void SendGuildCancelInvite(std::string unkString, uint8 unkByte);
-        void HandleGuildRenameCallback(std::string newName);
         void HandleAutoDeclineGuildInvites(WorldPacket& recvPacket);
         void HandleGuildSwitchRankOpcode(WorldPacket& recvPacket);
         void HandleGuildRequestChallengeUpdate(WorldPacket& recvPacket);