From ca2357fe13e589dede84ccb05e28d409b8f17c89 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 29 May 2022 21:00:44 -0400 Subject: [PATCH] Core/Combat Fix first autoattack being skipped after charging Port From (https://github.com/TrinityCore/TrinityCore/commit/c783ba38d2e6a01f7a695737bc2f9297f824c62f) --- Source/Game/Entities/Player/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index adae983ff..8c70f5eea 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -428,7 +428,7 @@ namespace Game.Entities m_achievementSys.UpdateTimedCriteria(diff); - if (HasUnitState(UnitState.MeleeAttacking) && !HasUnitState(UnitState.Casting)) + if (HasUnitState(UnitState.MeleeAttacking) && !HasUnitState(UnitState.Casting | UnitState.Charging)) { Unit victim = GetVictim(); if (victim != null)