From 4a11fe0db5cbb7d9bf5d23bbceb2283838fd2ec2 Mon Sep 17 00:00:00 2001 From: Tereneckla Date: Sat, 8 Mar 2025 14:45:15 +0000 Subject: [PATCH] Core/Unit: Revert AutoRepeatSpell delay application to Auto Shot (#19603) --- src/server/game/Entities/Unit/Unit.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 734496fcf..2e55c55b0 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3928,7 +3928,7 @@ void Unit::_UpdateAutoRepeatSpell() static uint32 const HUNTER_AUTOSHOOT = 75; // Check "realtime" interrupts - if ((IsPlayer() && ToPlayer()->isMoving()) || IsNonMeleeSpellCast(false, false, true, spellProto->Id == HUNTER_AUTOSHOOT)) + if ((IsPlayer() && ToPlayer()->isMoving() && spellProto->Id != HUNTER_AUTOSHOOT) || IsNonMeleeSpellCast(false, false, true, spellProto->Id == HUNTER_AUTOSHOOT)) { // cancel wand shoot if (spellProto->Id != HUNTER_AUTOSHOOT) @@ -3937,7 +3937,8 @@ void Unit::_UpdateAutoRepeatSpell() return; } - if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500) + // Apply delay (Hunter's autoshoot not affected) + if (m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500 && spellProto->Id != HUNTER_AUTOSHOOT) { setAttackTimer(RANGED_ATTACK, 500); }