5 files changed, 16 insertions, 16 deletions

diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index c2e88f2d4d0..c589480a517 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -1222,7 +1222,7 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/)
         memberData << uint32(0);                                   // Remaining guild week Rep
 
         if (pubNoteLength)
-            memberData.append(member->GetPublicNote().c_str(), pubNoteLength);
+            memberData.WriteString(member->GetPublicNote());
 
         memberData.WriteByteSeq(guid[3]);
         memberData << uint8(player ? player->getLevel() : member->GetLevel());
@@ -1234,10 +1234,10 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/)
         memberData << float(player ? 0.0f : float(::time(NULL) - member->GetLogoutTime()) / DAY);
 
         if (offNoteLength)
-            memberData.append(member->GetOfficerNote().c_str(), offNoteLength);
+            memberData.WriteString(member->GetOfficerNote());
 
         memberData.WriteByteSeq(guid[6]);
-        memberData.append(member->GetName().c_str(), member->GetName().length());
+        memberData.WriteString(member->GetName());
     }
 
     size_t infoLength = m_info.length();
@@ -1247,9 +1247,9 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/)
     data.append(memberData);
 
     if (infoLength)
-        data.append(m_info.c_str(), infoLength);
+        data.WriteString(m_info);
 
-    data.append(m_motd.c_str(), m_motd.length());
+    data.WriteString(m_motd);
     data << uint32(0);
     data << uint32(0);
     data << uint32(0);
@@ -1333,7 +1333,7 @@ void Guild::HandleGuildRanks(WorldSession* session)
         rankData << uint32(rankInfo->GetRights());
 
         if (rankInfo->GetName().length())
-            rankData.append(rankInfo->GetName().c_str(), rankInfo->GetName().length());
+            rankData.WriteString(rankInfo->GetName());
 
         rankData << uint32(rankInfo->GetId());
     }
@@ -1584,12 +1584,12 @@ void Guild::HandleInviteMember(WorldSession* session, const std::string& name)
     data.WriteByteSeq(newGuildGuid[0]);
 
     if (!pInvitee->GetGuildName().empty())
-        data.append(pInvitee->GetGuildName().c_str(), pInvitee->GetGuildName().length());
+        data.WriteString(pInvitee->GetGuildName());
 
     data.WriteByteSeq(newGuildGuid[7]);
     data.WriteByteSeq(newGuildGuid[2]);
 
-    data.append(player->GetName(), strlen(player->GetName()));
+    data.WriteString(player->GetName());
 
     data.WriteByteSeq(oldGuildGuid[7]);
     data.WriteByteSeq(oldGuildGuid[6]);
@@ -1597,7 +1597,7 @@ void Guild::HandleInviteMember(WorldSession* session, const std::string& name)
     data.WriteByteSeq(oldGuildGuid[0]);
     data.WriteByteSeq(newGuildGuid[4]);
 
-    data.append(m_name.c_str(), m_name.length());
+    data.WriteString(m_name);
 
     data.WriteByteSeq(newGuildGuid[5]);
     data.WriteByteSeq(newGuildGuid[3]);
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp
index c2cd470a7ac..27ec8433fe1 100755
--- a/src/server/game/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Handlers/ArenaTeamHandler.cpp
@@ -354,10 +354,10 @@ void WorldSession::SendArenaTeamCommandResult(uint32 teamAction, const std::stri
     data.WriteBits(team.length(), 8);
     data.FlushBits();
 
-    data << player;
+    data.WriteString(player);
     data << uint32(teamAction);
     data << uint32(errorId);
-    data << team;
+    data.WriteString(team);
     SendPacket(&data);
 }
 
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 17da692c305..7c83139f6f5 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -2125,6 +2125,6 @@ void WorldSession::HandleRandomizeCharNameOpcode(WorldPacket& recvData)
     WorldPacket data(SMSG_RANDOMIZE_CHAR_NAME, 10);
     data.WriteBit(0); // unk
     data.WriteBits(name->size(), 7);
-    data.append(name->c_str(), name->size());
+    data.WriteString(*name);
     SendPacket(&data);
 }
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index 5b3c82a6f16..3953550e972 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -211,7 +211,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData)
 
             data.WriteByteSeq(invitedGuid[7]);
 
-            data.append((uint8 const*)player->GetName(), strlen(player->GetName())); // invited name
+            data.WriteString(player->GetName()); // invited name
     
             data << int32(0);
 
@@ -313,7 +313,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData)
 
     data.WriteByteSeq(invitedGuid[7]);
 
-    data.append((uint8 const*)player->GetName(), strlen(player->GetName())); // invited name
+    data.WriteString(player->GetName());
 
     data << int32(0);
 
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index f8a08200c42..aa48dcca787 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -2601,7 +2601,7 @@ void World::SendAutoBroadcast()
         WorldPacket data(SMSG_NOTIFICATION, 2 + msg.length());
         data.WriteBits(msg.length(), 13);
         data.FlushBits();
-        data.append(msg.c_str(), msg.length());
+        data.WriteString(msg);
         sWorld->SendGlobalMessage(&data);
     }
 
@@ -2612,7 +2612,7 @@ void World::SendAutoBroadcast()
         WorldPacket data(SMSG_NOTIFICATION, 2 + msg.length());
         data.WriteBits(msg.length(), 13);
         data.FlushBits();
-        data.append(msg.c_str(), msg.length());
+        data.WriteString(msg);
         sWorld->SendGlobalMessage(&data);
     }