From 62ae4b53e61bbe9c7e6e3a2a210954cfe9f3df26 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Thu, 3 Jun 2021 16:30:26 +0200
Subject: [PATCH] fix(Core/Spells): On autoshot interrupt send proper packet to
 cancel autoshot clientside. (#6169)

- Closes #5734
- Closes chromiecraft/chromiecraft#454
---
 src/server/game/Entities/Player/Player.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 11b068db4..dcb4641c4 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -21093,6 +21093,9 @@ void Player::SendAutoRepeatCancel(Unit* target)
     WorldPacket data(SMSG_CANCEL_AUTO_REPEAT, target->GetPackGUID().size());
     data << target->GetPackGUID();                  // may be it's target guid
     SendMessageToSet(&data, true);
+
+    // To properly cancel autoshot done by client
+    SendAttackSwingCancelAttack();
 }
 
 void Player::SendExplorationExperience(uint32 Area, uint32 Experience)