Core/Creatures: Moved autoattack handling from scripts to game

2 files changed, 3 insertions, 10 deletions

diff --git a/src/server/game/Server/Packets/CombatPackets.cpp b/src/server/game/Server/Packets/CombatPackets.cpp
index d662128556f..33dd2c9a64a 100644
--- a/src/server/game/Server/Packets/CombatPackets.cpp
+++ b/src/server/game/Server/Packets/CombatPackets.cpp
@@ -96,7 +96,7 @@ WorldPacket const* WorldPackets::Combat::AIReaction::Write()
 
 WorldPacket const* WorldPackets::Combat::AttackSwingError::Write()
 {
-    _worldPacket.WriteBits(Reason, 3);
+    _worldPacket.WriteBits(AsUnderlyingType(Reason), 3);
     _worldPacket.FlushBits();
     return &_worldPacket;
 }
diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h
index 4aaa57ceba9..27dc7ec44ad 100644
--- a/src/server/game/Server/Packets/CombatPackets.h
+++ b/src/server/game/Server/Packets/CombatPackets.h
@@ -20,6 +20,7 @@
 
 #include "Packet.h"
 #include "ObjectGuid.h"
+#include "UnitDefines.h"
 
 class Unit;
 enum Powers : int8;
@@ -41,20 +42,12 @@ namespace WorldPackets
         class AttackSwingError final : public ServerPacket
         {
         public:
-            enum AttackSwingErr : uint8
-            {
-                NotInRange = 0,
-                BadFacing = 1,
-                CantAttack = 2,
-                DeadTarget = 3
-            };
-
             AttackSwingError() : ServerPacket(SMSG_ATTACK_SWING_ERROR, 4) { }
             AttackSwingError(AttackSwingErr reason) : ServerPacket(SMSG_ATTACK_SWING_ERROR, 4), Reason(reason) { }
 
             WorldPacket const* Write() override;
 
-            AttackSwingErr Reason = CantAttack;
+            AttackSwingErr Reason = AttackSwingErr::CantAttack;
         };
 
         class AttackStop final : public ClientPacket