Merge pull request #14344 from DJScias/opcodes2

Core/Packets: Update & enable more opcodes (names inside)

5 files changed, 55 insertions, 2 deletions

diff --git a/src/server/game/Server/Packets/CombatPackets.cpp b/src/server/game/Server/Packets/CombatPackets.cpp
index 69718cb932f..f7430e08f21 100644
--- a/src/server/game/Server/Packets/CombatPackets.cpp
+++ b/src/server/game/Server/Packets/CombatPackets.cpp
@@ -176,3 +176,10 @@ void WorldPackets::Combat::SetSheathed::Read()
     _worldPacket >> CurrentSheathState;
     Animate = _worldPacket.ReadBit();
 }
+
+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
index 4eeb61d3523..766c4024cab 100644
--- a/src/server/game/Server/Packets/CombatPackets.h
+++ b/src/server/game/Server/Packets/CombatPackets.h
@@ -215,6 +215,16 @@ namespace WorldPackets
             int32 CurrentSheathState = 0;
             bool Animate = true;
         };
+
+        class CancelAutoRepeat final : public ServerPacket
+        {
+        public:
+            CancelAutoRepeat() : ServerPacket(SMSG_CANCEL_AUTO_REPEAT, 16) { }
+
+            WorldPacket const* Write() override;
+
+            ObjectGuid Guid;
+        };
     }
 }
 
diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h
index dedc3a389ce..063c9fc5cb9 100644
--- a/src/server/game/Server/Packets/ItemPackets.h
+++ b/src/server/game/Server/Packets/ItemPackets.h
@@ -261,13 +261,13 @@ namespace WorldPackets
         class SellResponse final : public ServerPacket
         {
         public:
-            SellResponse() : ServerPacket(SMSG_SELL_RESPONSE, 8 + 8 + 1) { }
+            SellResponse() : ServerPacket(SMSG_SELL_RESPONSE, 16 + 16 + 1) { }
 
             WorldPacket const* Write() override;
 
             ObjectGuid VendorGUID;
             ObjectGuid ItemGUID;
-            SellResult Reason;
+            SellResult Reason = SELL_ERR_UNK;
         };
 
         ByteBuffer& operator>>(ByteBuffer& data, InvUpdate& invUpdate);
diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index cdd205c1326..d840a4aae49 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -605,3 +605,18 @@ WorldPacket const* WorldPackets::Spells::ClearTarget::Write()
 
     return &_worldPacket;
 }
+
+WorldPacket const* WorldPackets::Spells::CancelOrphanSpellVisual::Write()
+{
+    _worldPacket << int32(SpellVisualID);
+
+    return &_worldPacket;
+}
+
+WorldPacket const* WorldPackets::Spells::CancelSpellVisual::Write()
+{
+    _worldPacket << Source;
+    _worldPacket << int32(SpellVisualID);
+
+    return &_worldPacket;
+}
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index a313627786c..f29e7599707 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -556,6 +556,27 @@ namespace WorldPackets
 
             ObjectGuid Guid;
         };
+
+        class CancelOrphanSpellVisual final : public ServerPacket
+        {
+        public:
+            CancelOrphanSpellVisual() : ServerPacket(SMSG_CANCEL_ORPHAN_SPELL_VISUAL, 4) { }
+
+            WorldPacket const* Write() override;
+
+            int32 SpellVisualID = 0;
+        };
+
+        class CancelSpellVisual final : public ServerPacket
+        {
+        public:
+            CancelSpellVisual() : ServerPacket(SMSG_CANCEL_SPELL_VISUAL, 16 + 4) { }
+
+            WorldPacket const* Write() override;
+
+            ObjectGuid Source;
+            int32 SpellVisualID = 0;
+        };
     }
 }