5 files changed, 21 insertions, 9 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index dd6090a0d62..d5d9f6e0b3a 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -806,14 +806,8 @@ void WorldSession::HandleContinuePlayerLogin()
     _charLoginCallback = CharacterDatabase.DelayQueryHolder(holder);
 }
 
-void WorldSession::HandleLoadScreenOpcode(WorldPacket& recvPacket)
+void WorldSession::HandleLoadScreenOpcode(WorldPackets::Character::LoadingScreenNotify& /*loadingScreenNotify*/)
 {
-    TC_LOG_INFO("misc", "WORLD: Recvd CMSG_LOAD_SCREEN");
-    uint32 mapID;
-
-    recvPacket >> mapID;
-    recvPacket.ReadBit();
-
     // TODO: Do something with this packet
 }
 
diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp
index 9f5aa56aedd..4027f4c7cac 100644
--- a/src/server/game/Server/Packets/CharacterPackets.cpp
+++ b/src/server/game/Server/Packets/CharacterPackets.cpp
@@ -297,3 +297,9 @@ WorldPacket const* WorldPackets::Character::LogoutComplete::Write()
     _worldPacket << SwitchToCharacter;
     return &_worldPacket;
 }
+
+void WorldPackets::Character::LoadingScreenNotify::Read()
+{
+    _worldPacket >> MapID;
+    Showing = _worldPacket.ReadBit();
+}
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index 184c9b42cb7..9ac13111241 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -349,6 +349,17 @@ namespace WorldPackets
 
             WorldPacket const* Write() override { return &_worldPacket; }
         };
+
+        class LoadingScreenNotify final : public ClientPacket
+        {
+        public:
+            LoadingScreenNotify(WorldPacket&& packet) : ClientPacket(CMSG_LOAD_SCREEN, std::move(packet)) { }
+
+            void Read() override;
+
+            int32 MapID = -1;
+            bool Showing = false;
+        };
     }
 }
 
diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h
index 74408652c5e..67d6883746c 100644
--- a/src/server/game/Server/Packets/MiscPackets.h
+++ b/src/server/game/Server/Packets/MiscPackets.h
@@ -27,11 +27,11 @@ namespace WorldPackets
         class ViolenceLevel final : public ClientPacket
         {
         public:
-            ViolenceLevel(WorldPacket&& packet) : ClientPacket(CMSG_VIOLENCE_LEVEL, std::move(packet) { }
+            ViolenceLevel(WorldPacket&& packet) : ClientPacket(CMSG_VIOLENCE_LEVEL, std::move(packet)) { }
 
             void Read() override;
 
-            int8 ViolenceLevel;
+            int8 ViolenceLevel = -1; ///< 0 - no combat effects, 1 - display some combat effects, 2 - blood, 3 - bloody, 4 - bloodier, 5 - bloodiest
         };
     }
 }
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index dc2c5005e75..34df6e6429a 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -89,6 +89,7 @@ namespace WorldPackets
         class PlayerLogin;
         class LogoutRequest;
         class LogoutCancel;
+        class LoadingScreenNotify;
     }
 
     namespace Guild