From 6be695078b5f544296625bea0ea9ea5a845f9dba Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Wed, 18 Mar 2026 00:59:15 -0700
Subject: [PATCH] fix: clear spell queue in stopCasting; fix SMSG_SPELL_DELAYED
 castTimeTotal; clear cast on same-map res

- stopCasting() (invoked by /stopcasting) now clears queuedSpellId_/
  queuedSpellTarget_ and craftQueueSpellId_/craftQueueRemaining_ so a
  queued spell cannot fire silently after the player explicitly cancels.
- SMSG_SPELL_DELAYED now extends castTimeTotal alongside castTimeRemaining
  for the local player, matching the existing other-unit handling and
  keeping the cast bar progress percentage accurate after server-imposed
  cast delays.
- Same-map resurrection path (SMSG_NEW_WORLD same-map) now resets casting,
  castIsChannel, currentCastSpellId, castTimeRemaining, and the spell queue
  as a defensive measure (player is dead and cannot be casting, but this
  ensures state is clean on respawn).
---
 src/game/game_handler.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/game/game_handler.cpp b/src/game/game_handler.cpp
index f459637a..59f72641 100644
--- a/src/game/game_handler.cpp
+++ b/src/game/game_handler.cpp
@@ -4176,7 +4176,10 @@ void GameHandler::handlePacket(network::Packet& packet) {
             if (delayMs == 0) break;
             float delaySec = delayMs / 1000.0f;
             if (caster == playerGuid) {
-                if (casting) castTimeRemaining += delaySec;
+                if (casting) {
+                    castTimeRemaining += delaySec;
+                    castTimeTotal     += delaySec;  // keep progress percentage correct
+                }
             } else {
                 auto it = unitCastStates_.find(caster);
                 if (it != unitCastStates_.end() && it->second.casting) {
@@ -13936,7 +13939,7 @@ void GameHandler::stopCasting() {
         socket->send(packet);
     }
 
-    // Reset casting state
+    // Reset casting state and clear any queued spell so it doesn't fire later
     casting = false;
     castIsChannel = false;
     currentCastSpellId = 0;
@@ -13944,6 +13947,10 @@ void GameHandler::stopCasting() {
     lastInteractedGoGuid_ = 0;
     castTimeRemaining = 0.0f;
     castTimeTotal = 0.0f;
+    craftQueueSpellId_ = 0;
+    craftQueueRemaining_ = 0;
+    queuedSpellId_ = 0;
+    queuedSpellTarget_ = 0;
 
     LOG_INFO("Cancelled spell cast");
 }
@@ -22050,6 +22057,12 @@ void GameHandler::handleNewWorld(network::Packet& packet) {
         hostileAttackers_.clear();
         stopAutoAttack();
         tabCycleStale = true;
+        casting = false;
+        castIsChannel = false;
+        currentCastSpellId = 0;
+        castTimeRemaining = 0.0f;
+        queuedSpellId_ = 0;
+        queuedSpellTarget_ = 0;
 
         if (socket) {
             network::Packet ack(wireOpcode(Opcode::MSG_MOVE_WORLDPORT_ACK));