1 files changed, 18 insertions, 15 deletions

diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 4fb361209c1..0b703d4bcb2 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -30,6 +30,7 @@
 #include "ScriptMgr.h"
 #include "SocialMgr.h"
 #include "Opcodes.h"
+#include "ChatPackets.h"
 
 #define MAX_GUILD_BANK_TAB_TEXT_LEN 500
 #define EMBLEM_PRICE 10 * GOLD
@@ -1481,23 +1482,23 @@ void Guild::SendQueryResponse(WorldSession* session)
     response.GuildGuid = GetGUID();
     response.Info.HasValue = true;
 
-    response.Info.value.GuildGUID = GetGUID();
-    response.Info.value.VirtualRealmAddress = GetVirtualRealmAddress();
+    response.Info.Value.GuildGUID = GetGUID();
+    response.Info.Value.VirtualRealmAddress = GetVirtualRealmAddress();
 
-    response.Info.value.EmblemStyle = m_emblemInfo.GetStyle();
-    response.Info.value.EmblemColor = m_emblemInfo.GetColor();
-    response.Info.value.BorderStyle = m_emblemInfo.GetBorderStyle();
-    response.Info.value.BorderColor = m_emblemInfo.GetBorderColor();
-    response.Info.value.BackgroundColor = m_emblemInfo.GetBackgroundColor();
+    response.Info.Value.EmblemStyle = m_emblemInfo.GetStyle();
+    response.Info.Value.EmblemColor = m_emblemInfo.GetColor();
+    response.Info.Value.BorderStyle = m_emblemInfo.GetBorderStyle();
+    response.Info.Value.BorderColor = m_emblemInfo.GetBorderColor();
+    response.Info.Value.BackgroundColor = m_emblemInfo.GetBackgroundColor();
 
     for (uint8 i = 0; i < _GetRanksSize(); ++i)
     {
         WorldPackets::Guild::QueryGuildInfoResponse::GuildInfo::GuildInfoRank info
             (m_ranks[i].GetId(), i, m_ranks[i].GetName());
-        response.Info.value.Ranks.insert(info);
+        response.Info.Value.Ranks.insert(info);
     }
 
-    response.Info.value.GuildName = m_name;
+    response.Info.Value.GuildName = m_name;
 
     session->SendPacket(response.Write());
     TC_LOG_DEBUG("guild", "SMSG_GUILD_QUERY_RESPONSE [%s]", session->GetPlayerInfo().c_str());
@@ -2593,13 +2594,14 @@ void Guild::BroadcastToGuild(WorldSession* session, bool officerOnly, std::strin
 {
     if (session && session->GetPlayer() && _HasRankRight(session->GetPlayer(), officerOnly ? GR_RIGHT_OFFCHATSPEAK : GR_RIGHT_GCHATSPEAK))
     {
-        WorldPacket data;
-        ChatHandler::BuildChatPacket(data, officerOnly ? CHAT_MSG_OFFICER : CHAT_MSG_GUILD, Language(language), session->GetPlayer(), NULL, msg);
+        WorldPackets::Chat::Chat packet;
+        ChatHandler::BuildChatPacket(&packet, officerOnly ? CHAT_MSG_OFFICER : CHAT_MSG_GUILD, Language(language), session->GetPlayer(), NULL, msg);
+        WorldPacket const* data = packet.Write();
         for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
             if (Player* player = itr->second->FindConnectedPlayer())
                 if (player->GetSession() && _HasRankRight(player, officerOnly ? GR_RIGHT_OFFCHATLISTEN : GR_RIGHT_GCHATLISTEN) &&
                     !player->GetSocial()->HasIgnore(session->GetPlayer()->GetGUID()))
-                    player->GetSession()->SendPacket(&data);
+                    player->GetSession()->SendPacket(data);
     }
 }
 
@@ -2607,14 +2609,15 @@ void Guild::BroadcastAddonToGuild(WorldSession* session, bool officerOnly, std::
 {
     if (session && session->GetPlayer() && _HasRankRight(session->GetPlayer(), officerOnly ? GR_RIGHT_OFFCHATSPEAK : GR_RIGHT_GCHATSPEAK))
     {
-        WorldPacket data;
-        ChatHandler::BuildChatPacket(data, officerOnly ? CHAT_MSG_OFFICER : CHAT_MSG_GUILD, LANG_ADDON, session->GetPlayer(), NULL, msg, 0, "", DEFAULT_LOCALE, prefix);
+        WorldPackets::Chat::Chat packet;
+        ChatHandler::BuildChatPacket(&packet, officerOnly ? CHAT_MSG_OFFICER : CHAT_MSG_GUILD, LANG_ADDON, session->GetPlayer(), NULL, msg, 0, "", DEFAULT_LOCALE, prefix);
+        WorldPacket const* data = packet.Write();
         for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
             if (Player* player = itr->second->FindPlayer())
                 if (player->GetSession() && _HasRankRight(player, officerOnly ? GR_RIGHT_OFFCHATLISTEN : GR_RIGHT_GCHATLISTEN) &&
                     !player->GetSocial()->HasIgnore(session->GetPlayer()->GetGUID()) &&
                     player->GetSession()->IsAddonRegistered(prefix))
-                        player->GetSession()->SendPacket(&data);
+                        player->GetSession()->SendPacket(data);
     }
 }