Core/PacketIO: updated CMSG_TOGGLE_PVP opcode (#24476)

* Core/PacketIO: updated CMSG_TOGGLE_PVP opcode

* Use Optional<T>.
Restore ApplyModFlag() code.

* Fix no-pch build

Co-authored-by: jackpoz <giacomopoz@gmail.com>

3 files changed, 21 insertions, 1 deletions

diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp
index 879449ec031..bfd279bbd68 100644
--- a/src/server/game/Server/Packets/MiscPackets.cpp
+++ b/src/server/game/Server/Packets/MiscPackets.cpp
@@ -188,6 +188,12 @@ WorldPacket const* WorldPackets::Misc::UITime::Write()
     return &_worldPacket;
 }
 
+void WorldPackets::Misc::TogglePvP::Read()
+{
+    if (HasPvPStatus())
+        _worldPacket >> *Enable;
+}
+
 void WorldPackets::Misc::WorldTeleport::Read()
 {
     _worldPacket >> Time;
diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h
index 6e9d9858b50..7478061850a 100644
--- a/src/server/game/Server/Packets/MiscPackets.h
+++ b/src/server/game/Server/Packets/MiscPackets.h
@@ -21,6 +21,7 @@
 #include "Packet.h"
 #include "Position.h"
 #include "ObjectGuid.h"
+#include "Optional.h"
 #include "Weather.h"
 
 enum WeatherState : uint32;
@@ -297,6 +298,18 @@ namespace WorldPackets
             ObjectGuid Roller;
         };
 
+        class TogglePvP final : public ClientPacket
+        {
+        public:
+            TogglePvP(WorldPacket&& packet) : ClientPacket(CMSG_TOGGLE_PVP, std::move(packet)) { }
+
+            void Read() override;
+
+            bool HasPvPStatus() const { return GetSize() == 1; }
+
+            Optional<bool> Enable;
+        };
+
         class UITime final : public ServerPacket
         {
         public:
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 7ff716f838d..1621ba03de7 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -141,6 +141,7 @@ namespace WorldPackets
         class NextCinematicCamera;
         class OpeningCinematic;
         class RandomRollClient;
+        class TogglePvP;
         class WorldTeleport;
     }
 
@@ -631,7 +632,7 @@ class TC_GAME_API WorldSession
         void HandleReportLag(WorldPacket& recvPacket);
         void HandleGMResponseResolve(WorldPacket& recvPacket);
 
-        void HandleTogglePvP(WorldPacket& recvPacket);
+        void HandleTogglePvP(WorldPackets::Misc::TogglePvP& togglePvP);
 
         void HandleZoneUpdateOpcode(WorldPacket& recvPacket);
         void HandleSetSelectionOpcode(WorldPacket& recvPacket);