aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Handlers')
-rwxr-xr-xsrc/server/game/Handlers/ChannelHandler.cpp32
-rw-r--r--src/server/game/Handlers/GroupHandler.cpp10
-rw-r--r--src/server/game/Handlers/MailHandler.cpp26
-rwxr-xr-xsrc/server/game/Handlers/TaxiHandler.cpp2
-rw-r--r--src/server/game/Handlers/VehicleHandler.cpp2
5 files changed, 36 insertions, 36 deletions
diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp
index f940d658530..21f455c4fc8 100755
--- a/src/server/game/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Handlers/ChannelHandler.cpp
@@ -84,7 +84,7 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
void WorldSession::HandleChannelList(WorldPacket& recvPacket)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
-
+
uint32 length = recvPacket.ReadBits(8);
std::string channelname = recvPacket.ReadString(length);
@@ -110,13 +110,13 @@ void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)
void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
-
+
uint32 channelLength = recvPacket.ReadBits(8);
uint32 nameLength = recvPacket.ReadBits(7);
std::string newp = recvPacket.ReadString(nameLength);
std::string channelname = recvPacket.ReadString(channelLength);
-
+
if (!normalizePlayerName(newp))
return;
@@ -139,13 +139,13 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
-
+
uint32 channelLength = recvPacket.ReadBits(8);
uint32 nameLength = recvPacket.ReadBits(7);
-
+
std::string otp = recvPacket.ReadString(nameLength);
std::string channelname = recvPacket.ReadString(channelLength);
-
+
if (!normalizePlayerName(otp))
return;
@@ -157,10 +157,10 @@ void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
-
+
uint32 nameLength = recvPacket.ReadBits(7);
uint32 channelLength = recvPacket.ReadBits(8);
-
+
std::string channelname = recvPacket.ReadString(channelLength);
std::string otp = recvPacket.ReadString(nameLength);
@@ -177,7 +177,7 @@ void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
uint32 channelLength = recvPacket.ReadBits(8);
uint32 nameLength = recvPacket.ReadBits(7);
-
+
std::string channelname = recvPacket.ReadString(channelLength);
std::string otp = recvPacket.ReadString(nameLength);
@@ -198,7 +198,7 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
std::string otp = recvPacket.ReadString(nameLength);
std::string channelname = recvPacket.ReadString(channelLength);
-
+
if (!normalizePlayerName(otp))
return;
@@ -229,7 +229,7 @@ void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
uint32 channelLength = recvPacket.ReadBits(8);
uint32 nameLength = recvPacket.ReadBits(7);
-
+
std::string channelname = recvPacket.ReadString(channelLength);
std::string otp = recvPacket.ReadString(nameLength);
@@ -246,7 +246,7 @@ void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
uint32 channelLength, nameLength;
std::string channelname, otp;
-
+
channelLength = recvPacket.ReadBits(8);
nameLength = recvPacket.ReadBits(7);
@@ -267,10 +267,10 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
uint32 channelLength = recvPacket.ReadBits(7);
uint32 nameLength = recvPacket.ReadBits(8);
-
+
std::string otp = recvPacket.ReadString(nameLength);
std::string channelname = recvPacket.ReadString(channelLength);
-
+
if (!normalizePlayerName(otp))
return;
@@ -282,10 +282,10 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode());
-
+
uint32 length = recvPacket.ReadBits(8);
std::string channelname = recvPacket.ReadString(length);
-
+
if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
if (Channel* chn = cMgr->GetChannel(channelname, _player))
chn->Announce(_player->GetGUID());
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index 3953550e972..ae549d76b33 100644
--- a/src/server/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
@@ -96,7 +96,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData)
recvData.ReadByteSeq(crossRealmGuid[5]);
recvData.ReadByteSeq(crossRealmGuid[3]);
recvData.ReadByteSeq(crossRealmGuid[2]);
-
+
// attempt add selected player
// cheating
@@ -190,10 +190,10 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData)
data.WriteBit(invitedGuid[7]);
data.FlushBits();
-
+
data.WriteByteSeq(invitedGuid[1]);
data.WriteByteSeq(invitedGuid[4]);
-
+
data << int32(getMSTime());
data << int32(0);
data << int32(0);
@@ -212,7 +212,7 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData)
data.WriteByteSeq(invitedGuid[7]);
data.WriteString(player->GetName()); // invited name
-
+
data << int32(0);
player->GetSession()->SendPacket(&data);
@@ -720,7 +720,7 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData)
Player* movedPlayer = sObjectAccessor->FindPlayerByName(name.c_str());
uint64 guid;
-
+
if (movedPlayer)
guid = movedPlayer->GetGUID();
else
diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp
index 8762613fc3b..9ee962f4a3d 100644
--- a/src/server/game/Handlers/MailHandler.cpp
+++ b/src/server/game/Handlers/MailHandler.cpp
@@ -36,23 +36,23 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
std::string receiver, subject, body;
uint32 bodyLength, subjectLength, receiverLength;
uint32 unk1, unk2;
-
+
recvData >> unk1;
recvData >> unk2; // Stationery?
-
+
recvData >> money >> COD; // money and cod
bodyLength = recvData.ReadBits(12);
subjectLength = recvData.ReadBits(9);
uint8 items_count = recvData.ReadBits(5); // attached items count
-
+
if (items_count > MAX_MAIL_ITEMS) // client limit
{
GetPlayer()->SendMailResult(0, MAIL_SEND, MAIL_ERR_TOO_MANY_ATTACHMENTS);
recvData.rfinish(); // set to end to avoid warnings spam
return;
}
-
+
mailbox[0] = recvData.ReadBit();
ObjectGuid itemGUIDs[MAX_MAIL_ITEMS];
@@ -68,7 +68,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
itemGUIDs[i][4] = recvData.ReadBit();
itemGUIDs[i][5] = recvData.ReadBit();
}
-
+
mailbox[3] = recvData.ReadBit();
mailbox[4] = recvData.ReadBit();
receiverLength = recvData.ReadBits(7);
@@ -77,9 +77,9 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
mailbox[1] = recvData.ReadBit();
mailbox[7] = recvData.ReadBit();
mailbox[5] = recvData.ReadBit();
-
+
recvData.ReadByteSeq(mailbox[4]);
-
+
for (uint8 i = 0; i < items_count; ++i)
{
recvData.ReadByteSeq(itemGUIDs[i][6]);
@@ -92,22 +92,22 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
recvData.ReadByteSeq(itemGUIDs[i][4]);
recvData.ReadByteSeq(itemGUIDs[i][5]);
}
-
+
recvData.ReadByteSeq(mailbox[7]);
recvData.ReadByteSeq(mailbox[3]);
recvData.ReadByteSeq(mailbox[6]);
recvData.ReadByteSeq(mailbox[5]);
-
+
subject = recvData.ReadString(subjectLength);
receiver = recvData.ReadString(receiverLength);
-
+
recvData.ReadByteSeq(mailbox[2]);
recvData.ReadByteSeq(mailbox[0]);
-
+
body = recvData.ReadString(bodyLength);
-
+
recvData.ReadByteSeq(mailbox[1]);
-
+
// packet read complete, now do check
if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
index 175ea28a424..2a16efaf88b 100755
--- a/src/server/game/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Handlers/TaxiHandler.cpp
@@ -200,7 +200,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData)
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_MOVE_SPLINE_DONE");
recvData.read_skip<uint32>(); // unk
-
+
MovementInfo movementInfo; // used only for proper packet read
ReadMovementInfo(recvData, &movementInfo);
diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp
index 464af1d03d7..b9603cc7822 100644
--- a/src/server/game/Handlers/VehicleHandler.cpp
+++ b/src/server/game/Handlers/VehicleHandler.cpp
@@ -67,7 +67,7 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket& recvData)
recvData.GetOpcode(), GetPlayer()->GetGUIDLow(), seat->m_flags);
return;
}
-
+
switch (recvData.GetOpcode())
{
case CMSG_REQUEST_VEHICLE_PREV_SEAT: