Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x

8 files changed, 114 insertions, 209 deletions

diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 51760b3323e..15a6fe1556e 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -254,8 +254,8 @@ void InitOpcodes()
      DEFINE_OPCODE_HANDLER(MSG_MOVE_START_PITCH_UP,                      STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
      DEFINE_OPCODE_HANDLER(MSG_MOVE_START_PITCH_DOWN,                    STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
      DEFINE_OPCODE_HANDLER(MSG_MOVE_STOP_PITCH,                          STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
-     DEFINE_OPCODE_HANDLER(SMSG_MOVE_SPLINE_SET_RUN_MODE,                        STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
-     DEFINE_OPCODE_HANDLER(SMSG_MOVE_SPLINE_SET_WALK_MODE,                       STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
+     DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_RUN_MODE,                        STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
+     DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_WALK_MODE,                       STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
      //DEFINE_OPCODE_HANDLER(MSG_MOVE_TOGGLE_LOGGING,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      DEFINE_OPCODE_HANDLER(SMSG_MOVE_TELEPORT,                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      //DEFINE_OPCODE_HANDLER(CMSG_MOVE_TELEPORT_CHEAT,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
@@ -304,10 +304,10 @@ void InitOpcodes()
      //DEFINE_OPCODE_HANDLER(SMSG_MOVE_UPDATE_KNOCK_BACK,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      //DEFINE_OPCODE_HANDLER(SMSG_MOVE_SPLINE_SET_FEATHER_FALL,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      //DEFINE_OPCODE_HANDLER(SMSG_MOVE_SPLINE_SET_NORMAL_FALL,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-     //DEFINE_OPCODE_HANDLER(SMSG_MOVE_SPLINE_SET_HOVER,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-     //DEFINE_OPCODE_HANDLER(SMSG_MOVE_SPLINE_UNSET_HOVER,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+     //DEFINE_OPCODE_HANDLER(SMSG_SPLINE_MOVE_SET_HOVER,                          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+     //DEFINE_OPCODE_HANDLER(SMSG_MOVE_UNSET_HOVER,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      //DEFINE_OPCODE_HANDLER(CMSG_MOVE_HOVER_ACK,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMoveHoverAck              );
-     //DEFINE_OPCODE_HANDLER(SMSG_MOVE_SET_HOVERING,                               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+     //DEFINE_OPCODE_HANDLER(SMSG_MOVE_SET_HOVER,                               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      //DEFINE_OPCODE_HANDLER(CMSG_TRIGGER_CINEMATIC_CHEAT,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      DEFINE_OPCODE_HANDLER(CMSG_OPENING_CINEMATIC,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      DEFINE_OPCODE_HANDLER(SMSG_TRIGGER_CINEMATIC,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
@@ -937,7 +937,7 @@ void InitOpcodes()
      DEFINE_OPCODE_HANDLER(CMSG_LFG_SET_ROLES,                           STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgSetRolesOpcode         );
      //DEFINE_OPCODE_HANDLER(CMSG_LFG_SET_NEEDS,                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
      //DEFINE_OPCODE_HANDLER(CMSG_LFG_SET_BOOT_VOTE,                       STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgSetBootVoteOpcode      );
-      DEFINE_OPCODE_HANDLER(SMSG_LFG_BOOT_PLAYER,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+      DEFINE_OPCODE_HANDLER(SMSG_LFG_BOOT_PROPOSAL_UPDATE,                        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      //DEFINE_OPCODE_HANDLER(SMSG_LFG_BOOT_PROPOSAL_UPDATE,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
      //DEFINE_OPCODE_HANDLER(CMSG_LFD_PLAYER_LOCK_INFO_REQUEST,            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLfgPlayerLockInfoRequestOpcode);
      //DEFINE_OPCODE_HANDLER(SMSG_LFG_PLAYER_INFO,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index a32ad631dd9..f818a36cd25 100755
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -791,7 +791,7 @@ enum Opcodes
     SMSG_LEARNED_DANCE_MOVES                         = 0xE52,
     SMSG_LEARNED_SPELL                               = 0x88D3,
     SMSG_LEVELUP_INFO                                = 0x9A73,
-    SMSG_LFG_BOOT_PLAYER                             = 0x4A5F,
+    SMSG_LFG_BOOT_PROPOSAL_UPDATE                    = 0x4A5F,
     SMSG_LFG_DISABLED                                = 0xCAEA,
     SMSG_LFG_JOIN_RESULT                             = 0xCCCB,
     SMSG_LFG_OFFER_CONTINUE                          = 0x8E7E,
@@ -843,22 +843,22 @@ enum Opcodes
     SMSG_MOUNTSPECIAL_ANIM                           = 0x9E77,
     SMSG_MOVE_DISABLE_COLLISION                      = 0xF2DE, //forced, for self
     SMSG_MOVE_DISABLE_GRAVITY                        = 0x60DC, //forced, for self
-    SMSG_MOVE_DISABLE_TRANSITION_BETWEEN_SWIM_AND_FLY= 0x365E, //forced, for self
+    SMSG_MOVE_UNSET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY= 0x365E, //forced, for self
     SMSG_MOVE_ENABLE_COLLISION                       = 0x64DC, //forced, for self
     SMSG_MOVE_ENABLE_GRAVITY                         = 0x645E, //forced, for self
-    SMSG_MOVE_ENABLE_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x60CC, //forced, for self
+    SMSG_MOVE_SET_CAN_TRANSITION_BETWEEN_SWIM_AND_FLY = 0x60CC, //forced, for self
     SMSG_MOVE_KNOCK_BACK                             = 0x60FE, //forced, for self
     SMSG_MOVE_ROOT                                   = 0xB0DE, //forced, for self
     SMSG_MOVE_SET_ACTIVE_MOVER                       = 0xA0DE,
     SMSG_MOVE_SET_CAN_FLY                            = 0xB66E, //forced, for self
     SMSG_MOVE_SET_COLLISION_HEIGHT                   = 0x20DC, //forced, for self
     SMSG_MOVE_SET_COMPOUND_STATE                     = 0xF25E,
-    SMSG_MOVE_SET_FEATHER_FALL                       = 0xF2CC, //forced, for self
+    SMSG_MOVE_FEATHER_FALL                       = 0xF2CC, //forced, for self
     SMSG_MOVE_SET_FLIGHT_BACK_SPEED                  = 0x627C, //forced, for self
     SMSG_MOVE_SET_FLIGHT_SPEED                       = 0x365C, //forced, for self
-    SMSG_MOVE_SET_HOVERING                           = 0x74FC, //forced, for self
-    SMSG_MOVE_SET_LAND_WALK                          = 0x76CE, //forced, for self
-    SMSG_MOVE_SET_NORMAL_FALL                        = 0xF4DC, //forced, for self
+    SMSG_MOVE_SET_HOVER                           = 0x74FC, //forced, for self
+    SMSG_MOVE_LAND_WALK                          = 0x76CE, //forced, for self
+    SMSG_MOVE_NORMAL_FALL                        = 0xF4DC, //forced, for self
     SMSG_MOVE_SET_PITCH_RATE                         = 0x24FE, //forced, for self
     SMSG_MOVE_SET_RUN_BACK_SPEED                     = 0x747C, //forced, for self
     SMSG_MOVE_SET_RUN_SPEED                          = 0xE24E, // for self
@@ -868,28 +868,28 @@ enum Opcodes
     SMSG_MOVE_SET_VEHICLE_REC_ID                     = 0xA44C, //forced, for self
     SMSG_MOVE_SET_WALK_IN_AIR                        = 0x00,
     SMSG_MOVE_SET_WALK_SPEED                         = 0x246E, //forced, for self
-    SMSG_MOVE_SET_WATER_WALK                         = 0x625E, //forced, for self
+    SMSG_MOVE_WATER_WALK                         = 0x625E, //forced, for self
     SMSG_MOVE_SKIP_TIME                              = 0x32DE,
     SMSG_MOVE_SPLINE_DISABLE_COLLISION               = 0xE04E,
-    SMSG_MOVE_SPLINE_DISABLE_GRAVITY                 = 0xF04C,
+    SMSG_SPLINE_MOVE_GRAVITY_DISABLE                 = 0xF04C,
     SMSG_MOVE_SPLINE_ENABLE_COLLISION                = 0x227C,
-    SMSG_MOVE_SPLINE_ENABLE_GRAVITY                  = 0xA4DE,
+    SMSG_SPLINE_MOVE_GRAVITY_ENABLE                  = 0xA4DE,
     SMSG_MOVE_SPLINE_ROOT                            = 0x265C,
     SMSG_MOVE_SPLINE_SET_FEATHER_FALL                = 0xB6CC,
     SMSG_MOVE_SPLINE_SET_FLIGHT_BACK_SPEED           = 0x70EC,
     SMSG_MOVE_SPLINE_SET_FLIGHT_SPEED                = 0x644C,
     SMSG_MOVE_SPLINE_SET_FLYING                      = 0x70DC,
-    SMSG_MOVE_SPLINE_SET_HOVER                       = 0x667E,
+    SMSG_SPLINE_MOVE_SET_HOVER                       = 0x667E,
     SMSG_MOVE_SPLINE_SET_LAND_WALK                   = 0xA65E,
     SMSG_MOVE_SPLINE_SET_NORMAL_FALL                 = 0xE2FC,
     SMSG_MOVE_SPLINE_SET_PITCH_RATE                  = 0x60CE,
     SMSG_MOVE_SPLINE_SET_RUN_BACK_SPEED              = 0x624E,
-    SMSG_MOVE_SPLINE_SET_RUN_MODE                    = 0x26CC,
+    SMSG_SPLINE_MOVE_SET_RUN_MODE                    = 0x26CC,
     SMSG_MOVE_SPLINE_SET_RUN_SPEED                   = 0xB2CE, // for others
     SMSG_MOVE_SPLINE_SET_SWIM_BACK_SPEED             = 0x326C,
     SMSG_MOVE_SPLINE_SET_SWIM_SPEED                  = 0x327E,
     SMSG_MOVE_SPLINE_SET_TURN_RATE                   = 0x745C,
-    SMSG_MOVE_SPLINE_SET_WALK_MODE                   = 0xF65C,
+    SMSG_SPLINE_MOVE_SET_WALK_MODE                   = 0xF65C,
     SMSG_MOVE_SPLINE_SET_WALK_SPEED                  = 0x0000, // exists, but not yet known
     SMSG_MOVE_SPLINE_SET_WATER_WALK                  = 0xA24E,
     SMSG_MOVE_SPLINE_START_SWIM                      = 0xF0FC,
@@ -900,7 +900,7 @@ enum Opcodes
     SMSG_MOVE_TELEPORT                               = 0xF25C,
     SMSG_MOVE_UNROOT                                 = 0xB0CE, //forced, for self
     SMSG_MOVE_UNSET_CAN_FLY                          = 0xA24C, //forced, for self
-    SMSG_MOVE_UNSET_HOVERING                         = 0x325E, //forced, for self
+    SMSG_MOVE_UNSET_HOVER                            = 0x325E, //forced, for self
     SMSG_MOVE_UNSET_WALK_IN_AIR                      = 0x00,
     SMSG_MOVE_UPDATE_KNOCK_BACK                      = 0x725C,
     SMSG_MOVE_UPDATE_TELEPORT                        = 0xF6DC,
@@ -1112,7 +1112,7 @@ enum SessionStatus
     STATUS_AUTHED = 0,                                      // Player authenticated (_player == NULL, m_playerRecentlyLogout = false or will be reset before handler call, m_GUID have garbage)
     STATUS_LOGGEDIN,                                        // Player in game (_player != NULL, m_GUID == _player->GetGUID(), inWorld())
     STATUS_TRANSFER,                                        // Player transferring to another map (_player != NULL, m_GUID == _player->GetGUID(), !inWorld())
-    STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT,                    // _player!= NULL or _player == NULL && m_playerRecentlyLogout, m_GUID store last _player guid)
+    STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT,                    // _player != NULL or _player == NULL && m_playerRecentlyLogout && m_playerLogout, m_GUID store last _player guid)
     STATUS_NEVER,                                           // Opcode not accepted from client (deprecated or server side only)
     STATUS_UNHANDLED,                                       // Opcode not handled yet
 };
diff --git a/src/server/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp
new file mode 100644
index 00000000000..cb6dcdbdb9e
--- /dev/null
+++ b/src/server/game/Server/Protocol/PacketLog.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "PacketLog.h"
+#include "Config.h"
+#include "ByteBuffer.h"
+#include "WorldPacket.h"
+
+PacketLog::PacketLog() : _file(NULL)
+{
+    Initialize();
+}
+
+PacketLog::~PacketLog()
+{
+    if (_file)
+        fclose(_file);
+
+    _file = NULL;
+}
+
+void PacketLog::Initialize()
+{
+    std::string logsDir = ConfigMgr::GetStringDefault("LogsDir", "");
+
+    if (!logsDir.empty())
+        if ((logsDir.at(logsDir.length()-1) != '/') && (logsDir.at(logsDir.length()-1) != '\\'))
+            logsDir.push_back('/');
+
+    std::string logname = ConfigMgr::GetStringDefault("PacketLogFile", "");
+    if (!logname.empty())
+        _file = fopen((logsDir + logname).c_str(), "wb");
+}
+
+void PacketLog::LogPacket(WorldPacket const& packet, Direction direction)
+{
+    ByteBuffer data(4+4+4+1+packet.size());
+    data << int32(packet.GetOpcode());
+    data << int32(packet.size());
+    data << uint32(time(NULL));
+    data << uint8(direction);
+
+    for (uint32 i = 0; i < packet.size(); i++)
+        data << const_cast<WorldPacket&>(packet)[i];
+
+    fwrite(data.contents(), 1, data.size(), _file);
+    fflush(_file);
+}
diff --git a/src/server/game/Server/Protocol/WorldLog.h b/src/server/game/Server/Protocol/PacketLog.h
index fb344f195de..b899daae198 100755..100644
--- a/src/server/game/Server/Protocol/WorldLog.h
+++ b/src/server/game/Server/Protocol/PacketLog.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -16,46 +15,36 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// \addtogroup u2w
-/// @{
-/// \file
-
-#ifndef TRINITY_WORLDLOG_H
-#define TRINITY_WORLDLOG_H
+#ifndef TRINITY_PACKETLOG_H
+#define TRINITY_PACKETLOG_H
 
 #include "Common.h"
 #include <ace/Singleton.h>
-#include "Errors.h"
 
-#include <stdarg.h>
+enum Direction
+{
+    CLIENT_TO_SERVER,
+    SERVER_TO_CLIENT
+};
+
+class WorldPacket;
 
-/// %Log packets to a file
-class WorldLog
+class PacketLog
 {
-    friend class ACE_Singleton<WorldLog, ACE_Thread_Mutex>;
+    friend class ACE_Singleton<PacketLog, ACE_Thread_Mutex>;
 
     private:
-        WorldLog();
-        ~WorldLog();
-        WorldLog(const WorldLog &);
-        WorldLog& operator=(const WorldLog &);
-        ACE_Thread_Mutex Lock;
+        PacketLog();
+        ~PacketLog();
 
     public:
         void Initialize();
-        /// Is the world logger active?
-        bool LogWorld(void) const { return (i_file != NULL); }
-        /// %Log to the file
-        void outLog(char const* fmt, ...);
-        void outTimestampLog(char const* fmt, ...);
+        bool CanLogPacket() const { return (_file != NULL); }
+        void LogPacket(WorldPacket const& packet, Direction direction);
 
     private:
-        FILE* i_file;
-
-        bool m_dbWorld;
+        FILE* _file;
 };
 
-#define sWorldLog ACE_Singleton<WorldLog, ACE_Thread_Mutex>::instance()
+#define sPacketLog ACE_Singleton<PacketLog, ACE_Thread_Mutex>::instance()
 #endif
-/// @}
-
diff --git a/src/server/game/Server/Protocol/WorldLog.cpp b/src/server/game/Server/Protocol/WorldLog.cpp
deleted file mode 100755
index 38b13dff095..00000000000
--- a/src/server/game/Server/Protocol/WorldLog.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
-    \ingroup u2w
-*/
-
-#include "WorldLog.h"
-#include "Config.h"
-#include "Log.h"
-#include "DatabaseWorkerPool.h"
-
-WorldLog::WorldLog() : i_file(NULL)
-{
-    Initialize();
-}
-
-WorldLog::~WorldLog()
-{
-    if (i_file != NULL)
-        fclose(i_file);
-
-    i_file = NULL;
-}
-
-/// Open the log file (if specified so in the configuration file)
-void WorldLog::Initialize()
-{
-    std::string logsDir = ConfigMgr::GetStringDefault("LogsDir", "");
-
-    if (!logsDir.empty())
-    {
-        if ((logsDir.at(logsDir.length()-1) != '/') && (logsDir.at(logsDir.length()-1) != '\\'))
-            logsDir.push_back('/');
-    }
-
-    std::string logname = ConfigMgr::GetStringDefault("WorldLogFile", "");
-    if (!logname.empty())
-    {
-        i_file = fopen((logsDir+logname).c_str(), "w");
-    }
-
-    m_dbWorld = ConfigMgr::GetBoolDefault("LogDB.World", false); // can be VERY heavy if enabled
-}
-
-void WorldLog::outTimestampLog(char const* fmt, ...)
-{
-    if (LogWorld())
-    {
-        TRINITY_GUARD(ACE_Thread_Mutex, Lock);
-        ASSERT(i_file);
-
-        Log::outTimestamp(i_file);
-        va_list args;
-        va_start(args, fmt);
-        vfprintf(i_file, fmt, args);
-        //fprintf(i_file, "\n");
-        va_end(args);
-
-        fflush(i_file);
-    }
-
-    if (sLog->GetLogDB() && m_dbWorld)
-    {
-        va_list ap2;
-        va_start(ap2, fmt);
-        char nnew_str[MAX_QUERY_LEN];
-        vsnprintf(nnew_str, MAX_QUERY_LEN, fmt, ap2);
-        sLog->outDB(LOG_TYPE_WORLD, nnew_str);
-        va_end(ap2);
-    }
-}
-
-void WorldLog::outLog(char const* fmt, ...)
-{
-    if (LogWorld())
-    {
-        TRINITY_GUARD(ACE_Thread_Mutex, Lock);
-        ASSERT(i_file);
-
-        va_list args;
-        va_start(args, fmt);
-        vfprintf(i_file, fmt, args);
-        //fprintf(i_file, "\n");
-        va_end(args);
-
-        fflush(i_file);
-    }
-
-    if (sLog->GetLogDB() && m_dbWorld)
-    {
-        va_list ap2;
-        va_start(ap2, fmt);
-        char nnew_str[MAX_QUERY_LEN];
-        vsnprintf(nnew_str, MAX_QUERY_LEN, fmt, ap2);
-        sLog->outDB(LOG_TYPE_WORLD, nnew_str);
-        va_end(ap2);
-    }
-}
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index a9e4ffbf362..ad4bf24aeae 100755
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -218,7 +218,7 @@ void WorldSession::QueuePacket(WorldPacket* new_packet)
 /// Logging helper for unexpected opcodes
 void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, const char* status, const char *reason)
 {
-    sLog->outError("SESSION (account: %u, guidlow: %u, char: %s): received unexpected opcode %s (0x%.4X, status: %s) %s",
+    sLog->outDebug(LOG_FILTER_NETWORKIO, "SESSION (account: %u, guidlow: %u, char: %s): received unexpected opcode %s (0x%.4X, status: %s) %s",
         GetAccountId(), m_GUIDLow, _player ? _player->GetName() : "<none>",
         LookupOpcodeName(packet->GetOpcode()), packet->GetOpcode(), status, reason);
 }
@@ -226,7 +226,7 @@ void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, const char* status,
 /// Logging helper for unexpected opcodes
 void WorldSession::LogUnprocessedTail(WorldPacket* packet)
 {
-    sLog->outError("SESSION: opcode %s (0x%.4X) have unprocessed tail data (read stop at %u from %u)",
+    sLog->outDebug(LOG_FILTER_NETWORKIO, "SESSION: opcode %s (0x%.4X) have unprocessed tail data (read stop at %u from %u)",
         LookupOpcodeName(packet->GetOpcode()), packet->GetOpcode(), uint32(packet->rpos()), uint32(packet->wpos()));
     packet->print_storage();
 }
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index c370b0dd0f3..ded1d675a24 100755
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -333,7 +333,7 @@ class WorldSession
         void LoadTutorialsData();
         void SendTutorialsData();
         void SaveTutorialsData(SQLTransaction& trans);
-        uint32 GetTutorialInt(uint8 index) { return m_Tutorials[index]; }
+        uint32 GetTutorialInt(uint8 index) const { return m_Tutorials[index]; }
         void SetTutorialInt(uint8 index, uint32 value)
         {
             if (m_Tutorials[index] != value)
@@ -400,8 +400,8 @@ class WorldSession
         }
 
         // Recruit-A-Friend Handling
-        uint32 GetRecruiterId() { return recruiterId; }
-        bool IsARecruiter() { return isRecruiter; }
+        uint32 GetRecruiterId() const { return recruiterId; }
+        bool IsARecruiter() const { return isRecruiter; }
 
     public:                                                 // opcodes handlers
 
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 11837b0cbab..0f13674dae3 100755
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -42,7 +42,7 @@
 #include "WorldSession.h"
 #include "WorldSocketMgr.h"
 #include "Log.h"
-#include "WorldLog.h"
+#include "PacketLog.h"
 #include "ScriptMgr.h"
 #include "AccountMgr.h"
 
@@ -78,7 +78,7 @@ struct ServerPktHeader
         return 2+(isLargePacket()?3:2);
     }
 
-    bool isLargePacket()
+    bool isLargePacket() const
     {
         return size > 0x7FFF;
     }
@@ -152,7 +152,7 @@ const std::string& WorldSocket::GetRemoteAddress (void) const
     return m_Address;
 }
 
-int WorldSocket::SendPacket(const WorldPacket& pct)
+int WorldSocket::SendPacket(WorldPacket const& pct)
 {
     ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
 
@@ -160,24 +160,8 @@ int WorldSocket::SendPacket(const WorldPacket& pct)
         return -1;
 
     // Dump outgoing packet.
-    if (sWorldLog->LogWorld())
-    {
-        sWorldLog->outTimestampLog ("SERVER:\nSOCKET: %u\nLENGTH: %u\nOPCODE: %s (0x%.4X)\nDATA:\n",
-                     (uint32) get_handle(),
-                     pct.size(),
-                     LookupOpcodeName (pct.GetOpcode()),
-                     pct.GetOpcode());
-
-        uint32 p = 0;
-        while (p < pct.size())
-        {
-            for (uint32 j = 0; j < 16 && p < pct.size(); j++)
-                sWorldLog->outLog("%.2X ", const_cast<WorldPacket&>(pct)[p++]);
-
-            sWorldLog->outLog("\n");
-        }
-        sWorldLog->outLog("\n");
-    }
+    if (sPacketLog->CanLogPacket())
+        sPacketLog->LogPacket(pct, SERVER_TO_CLIENT);
 
     sLog->outOpCode(uint32(pct.GetOpcode()), LookupOpcodeName(pct.GetOpcode()), true);
 
@@ -668,7 +652,7 @@ int WorldSocket::schedule_wakeup_output (GuardType& g)
     return 0;
 }
 
-int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
+int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
 {
     ACE_ASSERT (new_pct);
 
@@ -681,24 +665,8 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
         return -1;
 
     // Dump received packet.
-    if (sWorldLog->LogWorld())
-    {
-        sWorldLog->outTimestampLog ("CLIENT:\nSOCKET: %u\nLENGTH: %u\nOPCODE: %s (0x%.4X)\nDATA:\n",
-                     (uint32) get_handle(),
-                     new_pct->size(),
-                     LookupOpcodeName (new_pct->GetOpcode()),
-                     new_pct->GetOpcode());
-
-        uint32 p = 0;
-        while (p < new_pct->size())
-        {
-            for (uint32 j = 0; j < 16 && p < new_pct->size(); j++)
-                sWorldLog->outLog ("%.2X ", (*new_pct)[p++]);
-
-            sWorldLog->outLog ("\n");
-        }
-        sWorldLog->outLog ("\n");
-    }
+    if (sPacketLog->CanLogPacket())
+        sPacketLog->LogPacket(*new_pct, CLIENT_TO_SERVER);
 
     sLog->outOpCode(uint32(Opcodes(opcode)), LookupOpcodeName(Opcodes(opcode)), false);
 
@@ -998,7 +966,7 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
 
     std::string address = GetRemoteAddress();
 
-    sLog->outStaticDebug ("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
+    sLog->outStaticDebug("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
         account.c_str(),
         address.c_str());