Skip to content

Commit b8cde73

Browse files
fix: properly checks AllowCombatMovement on player's input (AscensionGameDev#2193)
Fixes an issue where attacker time was updated even though the player never attacked when AllowCombatMovement setting was set to false
1 parent 98b9961 commit b8cde73

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Intersect.Client/Entities/Player.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public override bool Update()
269269
}
270270
else if (!Globals.Me.TryAttack())
271271
{
272-
if (!Globals.Me.IsAttacking)
272+
if (!Globals.Me.IsAttacking && (!IsMoving || Options.Instance.PlayerOpts.AllowCombatMovement))
273273
{
274274
Globals.Me.AttackTimer = Timing.Global.Milliseconds + Globals.Me.CalculateAttackTime();
275275
}

0 commit comments

Comments
 (0)