From c783ba38d2e6a01f7a695737bc2f9297f824c62f Mon Sep 17 00:00:00 2001 From: trickerer Date: Mon, 30 Aug 2021 16:26:37 +0700 Subject: Core/Combat Fix first autoattack being skipped after charging (#26860) Fixes #25014 Fixes #24626 (cherry picked from commit 8729bec8449d06ce2bcd25c2a176923221bca2dd) --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2fcf09032c2..1e0343efd96 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1005,7 +1005,7 @@ void Player::Update(uint32 p_time) m_achievementMgr->UpdateTimedCriteria(p_time); - if (HasUnitState(UNIT_STATE_MELEE_ATTACKING) && !HasUnitState(UNIT_STATE_CASTING)) + if (HasUnitState(UNIT_STATE_MELEE_ATTACKING) && !HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_CHARGING)) { if (Unit* victim = GetVictim()) { -- cgit v1.2.3