From 31df751f9026b8b55c19c7ff05dd2789da3f47c1 Mon Sep 17 00:00:00 2001
From: zamalaev <zamalaev88@mail.ru>
Date: Wed, 19 Feb 2020 14:21:36 +0000
Subject: [PATCH] CMSG_CANCEL_AURA 5.4.7 (18019)

Structure ok ?
---
 src/game/Server/Opcodes.h               |  2 +-
 src/game/WorldHandlers/SpellHandler.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h
index 8821b6266..7a4892355 100644
--- a/src/game/Server/Opcodes.h
+++ b/src/game/Server/Opcodes.h
@@ -376,7 +376,7 @@ enum Opcodes
     SMSG_SPELL_FAILURE                                    = 0x0C34, // 4.3.4 15595
     SMSG_SPELL_COOLDOWN                                   = 0x4B16, // 4.3.4 15595
     SMSG_COOLDOWN_EVENT                                   = 0x4F26, // 4.3.4 15595
-    CMSG_CANCEL_AURA                                      = 0x0E26, // 4.3.4 15595
+    CMSG_CANCEL_AURA                                      = 0x16E1, // 5.4.7 18019
     SMSG_EQUIPMENT_SET_ID                                 = 0x2216, // 4.3.4 15595
     SMSG_PET_CAST_FAILED                                  = 0x2B15, // 4.3.4 15595
     SMSG_CHANNEL_START                                    = 0x0A15, // 4.3.4 15595
diff --git a/src/game/WorldHandlers/SpellHandler.cpp b/src/game/WorldHandlers/SpellHandler.cpp
index 9313780be..9db324062 100644
--- a/src/game/WorldHandlers/SpellHandler.cpp
+++ b/src/game/WorldHandlers/SpellHandler.cpp
@@ -479,6 +479,30 @@ void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket)
     uint32 spellId;
     recvPacket >> spellId;
 
+    ObjectGuid guid;
+
+    recvPacket.ReadBit();
+
+    guid[1] = recvPacket.ReadBit();
+    guid[5] = recvPacket.ReadBit();
+    guid[2] = recvPacket.ReadBit();
+    guid[0] = recvPacket.ReadBit();
+    guid[3] = recvPacket.ReadBit();
+    guid[4] = recvPacket.ReadBit();
+    guid[6] = recvPacket.ReadBit();
+    guid[7] = recvPacket.ReadBit();
+
+    recvPacket.FlushBits();
+
+    recvPacket.ReadByteSeq(guid[0]);
+    recvPacket.ReadByteSeq(guid[1]);
+    recvPacket.ReadByteSeq(guid[4]);
+    recvPacket.ReadByteSeq(guid[5]);
+    recvPacket.ReadByteSeq(guid[3]);
+    recvPacket.ReadByteSeq(guid[6]);
+    recvPacket.ReadByteSeq(guid[7]);
+    recvPacket.ReadByteSeq(guid[2]);
+
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
     if (!spellInfo)
     {