Core/PacketIO: update some combat packets to new system (#24236)

7 files changed, 208 insertions, 19 deletions

diff --git a/src/server/game/Server/Packets/AllPackets.h b/src/server/game/Server/Packets/AllPackets.h
index c161bc8d871..e377bb07215 100644
--- a/src/server/game/Server/Packets/AllPackets.h
+++ b/src/server/game/Server/Packets/AllPackets.h
@@ -19,6 +19,7 @@
 #define AllPackets_h__
 
 #include "ChatPackets.h"
+#include "CombatPackets.h"
 #include "NPCPackets.h"
 #include "MiscPackets.h"
 #include "QueryPackets.h"
diff --git a/src/server/game/Server/Packets/CombatPackets.cpp b/src/server/game/Server/Packets/CombatPackets.cpp
new file mode 100644
index 00000000000..fa9d0370dd2
--- /dev/null
+++ b/src/server/game/Server/Packets/CombatPackets.cpp
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * 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 "CombatPackets.h"
+#include "Unit.h"
+
+void WorldPackets::Combat::AttackSwing::Read()
+{
+    _worldPacket >> Victim;
+}
+
+WorldPacket const* WorldPackets::Combat::AttackStart::Write()
+{
+    _worldPacket << Attacker;
+    _worldPacket << Victim;
+
+    return &_worldPacket;
+}
+
+WorldPackets::Combat::SAttackStop::SAttackStop(Unit const* attacker, Unit const* victim) : ServerPacket(SMSG_ATTACK_STOP, 8 + 8 + 4)
+{
+    Attacker = attacker->GetPackGUID();
+    if (victim)
+    {
+        Victim = victim->GetPackGUID();
+        NowDead = victim->isDead();
+    }
+}
+
+WorldPacket const* WorldPackets::Combat::SAttackStop::Write()
+{
+    _worldPacket << Attacker;
+    _worldPacket << Victim;
+    _worldPacket << uint32(NowDead);
+
+    return &_worldPacket;
+}
+
+WorldPacket const* WorldPackets::Combat::CancelAutoRepeat::Write()
+{
+    _worldPacket << Guid;
+
+    return &_worldPacket;
+}
+
diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h
new file mode 100644
index 00000000000..6b6fc7c85ee
--- /dev/null
+++ b/src/server/game/Server/Packets/CombatPackets.h
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * 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/>.
+ */
+
+#ifndef CombatPackets_h__
+#define CombatPackets_h__
+
+#include "Packet.h"
+#include "ObjectGuid.h"
+
+class Unit;
+
+namespace WorldPackets
+{
+    namespace Combat
+    {
+        class AttackSwing final : public ClientPacket
+        {
+        public:
+            AttackSwing(WorldPacket&& packet) : ClientPacket(CMSG_ATTACK_SWING, std::move(packet)) { }
+
+            void Read() override;
+
+            ObjectGuid Victim;
+        };
+        
+        class AttackSwingNotInRange final : public ServerPacket
+        {
+        public:
+            AttackSwingNotInRange() : ServerPacket(SMSG_ATTACK_SWING_NOT_IN_RANGE, 0) { }
+
+            WorldPacket const* Write() override { return &_worldPacket; }
+        };
+
+        class AttackSwingBadFacing final : public ServerPacket
+        {
+        public:
+            AttackSwingBadFacing() : ServerPacket(SMSG_ATTACK_SWING_BAD_FACING, 0) { }
+
+            WorldPacket const* Write() override { return &_worldPacket; }
+        };
+
+        class AttackSwingDeadTarget final : public ServerPacket
+        {
+        public:
+            AttackSwingDeadTarget() : ServerPacket(SMSG_ATTACK_SWING_DEAD_TARGET, 0) { }
+
+            WorldPacket const* Write() override { return &_worldPacket; }
+        };
+
+        class AttackSwingCantAttack final : public ServerPacket
+        {
+        public:
+            AttackSwingCantAttack() : ServerPacket(SMSG_ATTACK_SWING_CANT_ATTACK, 0) { }
+
+            WorldPacket const* Write() override { return &_worldPacket; }
+        };
+
+        class AttackStop final : public ClientPacket
+        {
+        public:
+            AttackStop(WorldPacket&& packet) : ClientPacket(CMSG_ATTACK_STOP, std::move(packet)) { }
+
+            void Read() override { }
+        };
+
+        class AttackStart final : public ServerPacket
+        {
+        public:
+            AttackStart() : ServerPacket(SMSG_ATTACK_START, 8 + 8) { }
+
+            WorldPacket const* Write() override;
+
+            ObjectGuid Attacker;
+            ObjectGuid Victim;
+        };
+
+        class SAttackStop final : public ServerPacket
+        {
+        public:
+            SAttackStop() : ServerPacket(SMSG_ATTACK_STOP, 8 + 8 + 4) { }
+            SAttackStop(Unit const* attacker, Unit const* victim);
+
+            WorldPacket const* Write() override;
+
+            PackedGuid Attacker;
+            PackedGuid Victim;
+            bool NowDead = false;
+        };
+
+        class CancelCombat final : public ServerPacket
+        {
+        public:
+            CancelCombat() : ServerPacket(SMSG_CANCEL_COMBAT, 0) { }
+
+            WorldPacket const* Write() override { return &_worldPacket; }
+        };
+
+        class CancelAutoRepeat final : public ServerPacket
+        {
+        public:
+            CancelAutoRepeat() : ServerPacket(SMSG_CANCEL_AUTO_REPEAT, 8) { }
+
+            WorldPacket const* Write() override;
+
+            PackedGuid Guid;
+        };
+    }
+}
+
+#endif // CombatPackets_h__
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index fa8b1ecfbde..8dffc86d4c3 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -449,15 +449,15 @@ void OpcodeTable::Initialize()
     /*0x13E*/ DEFINE_HANDLER(CMSG_DELETEEQUIPMENT_SET,                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEquipmentSetDelete        );
     /*0x13F*/ DEFINE_HANDLER(CMSG_INSTANCE_LOCK_RESPONSE,                  STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleInstanceLockResponse      );
     /*0x140*/ DEFINE_HANDLER(CMSG_DEBUG_PASSIVE_AURA,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    /*0x141*/ DEFINE_HANDLER(CMSG_ATTACKSWING,                             STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleAttackSwingOpcode         );
-    /*0x142*/ DEFINE_HANDLER(CMSG_ATTACKSTOP,                              STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleAttackStopOpcode          );
-    /*0x143*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSTART,               STATUS_NEVER);
-    /*0x144*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSTOP,                STATUS_NEVER);
-    /*0x145*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_NOTINRANGE,    STATUS_NEVER);
-    /*0x146*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_BADFACING,     STATUS_NEVER);
+    /*0x141*/ DEFINE_HANDLER(CMSG_ATTACK_SWING,                            STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleAttackSwingOpcode         );
+    /*0x142*/ DEFINE_HANDLER(CMSG_ATTACK_STOP,                             STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleAttackStopOpcode          );
+    /*0x143*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_START,              STATUS_NEVER);
+    /*0x144*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_STOP,               STATUS_NEVER);
+    /*0x145*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_SWING_NOT_IN_RANGE, STATUS_NEVER);
+    /*0x146*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_SWING_BAD_FACING,   STATUS_NEVER);
     /*0x147*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_LOCK_WARNING_QUERY, STATUS_NEVER);
-    /*0x148*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_DEADTARGET,    STATUS_NEVER);
-    /*0x149*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKSWING_CANT_ATTACK,   STATUS_NEVER);
+    /*0x148*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_SWING_DEAD_TARGET,  STATUS_NEVER);
+    /*0x149*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACK_SWING_CANT_ATTACK,  STATUS_NEVER);
     /*0x14A*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_ATTACKERSTATEUPDATE,       STATUS_NEVER);
     /*0x14B*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_BATTLEFIELD_PORT_DENIED,   STATUS_NEVER);
     /*0x14C*/ DEFINE_HANDLER(CMSG_PERFORM_ACTION_SET,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index ac4fde65eca..6f09e5d1561 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -347,15 +347,15 @@ enum Opcodes : uint16
     CMSG_DELETEEQUIPMENT_SET                        = 0x13E,
     CMSG_INSTANCE_LOCK_RESPONSE                     = 0x13F,
     CMSG_DEBUG_PASSIVE_AURA                         = 0x140,
-    CMSG_ATTACKSWING                                = 0x141,
-    CMSG_ATTACKSTOP                                 = 0x142,
-    SMSG_ATTACKSTART                                = 0x143,
-    SMSG_ATTACKSTOP                                 = 0x144,
-    SMSG_ATTACKSWING_NOTINRANGE                     = 0x145,
-    SMSG_ATTACKSWING_BADFACING                      = 0x146,
+    CMSG_ATTACK_SWING                               = 0x141,
+    CMSG_ATTACK_STOP                                = 0x142,
+    SMSG_ATTACK_START                               = 0x143,
+    SMSG_ATTACK_STOP                                = 0x144,
+    SMSG_ATTACK_SWING_NOT_IN_RANGE                  = 0x145,
+    SMSG_ATTACK_SWING_BAD_FACING                    = 0x146,
     SMSG_INSTANCE_LOCK_WARNING_QUERY                = 0x147,
-    SMSG_ATTACKSWING_DEADTARGET                     = 0x148,
-    SMSG_ATTACKSWING_CANT_ATTACK                    = 0x149,
+    SMSG_ATTACK_SWING_DEAD_TARGET                   = 0x148,
+    SMSG_ATTACK_SWING_CANT_ATTACK                   = 0x149,
     SMSG_ATTACKERSTATEUPDATE                        = 0x14A,
     SMSG_BATTLEFIELD_PORT_DENIED                    = 0x14B,
     CMSG_PERFORM_ACTION_SET                         = 0x14C,
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index df5197be094..765efafd344 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -1359,7 +1359,7 @@ uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) co
         case CMSG_NAME_QUERY:                           //   0               1
         case CMSG_PET_NAME_QUERY:                       //   0               1
         case CMSG_NPC_TEXT_QUERY:                       //   0               1
-        case CMSG_ATTACKSTOP:                           //   0               1
+        case CMSG_ATTACK_STOP:                          //   0               1
         case CMSG_QUERY_QUESTS_COMPLETED:               //   0               1
         case CMSG_QUERY_TIME:                           //   0               1
         case CMSG_CORPSE_MAP_POSITION_QUERY:            //   0               1
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 641e902ac55..6e8379b994b 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -82,6 +82,11 @@ namespace WorldPackets
     {
         class EmoteClient;
     }
+    namespace Combat
+    {
+        class AttackSwing;
+        class AttackStop;
+    }
     namespace NPC
     {
         class Hello;
@@ -748,8 +753,8 @@ class TC_GAME_API WorldSession
         void HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket);
         void HandleWrapItemOpcode(WorldPacket& recvPacket);
 
-        void HandleAttackSwingOpcode(WorldPacket& recvPacket);
-        void HandleAttackStopOpcode(WorldPacket& recvPacket);
+        void HandleAttackSwingOpcode(WorldPackets::Combat::AttackSwing& packet);
+        void HandleAttackStopOpcode(WorldPackets::Combat::AttackStop& packet);
         void HandleSetSheathedOpcode(WorldPacket& recvPacket);
 
         void HandleUseItemOpcode(WorldPacket& recvPacket);