diff --git a/Game/World/WorldHandler.cs b/Game/World/WorldHandler.cs index cf06446..d295dc6 100644 --- a/Game/World/WorldHandler.cs +++ b/Game/World/WorldHandler.cs @@ -19,6 +19,7 @@ public sealed class WorldHandler : IClientMessageHandler private const float MoveWalk = 120f; private const float MoveRun = 180f; private const float TickStepSec = 0.10f; + private static readonly TimeSpan NeutralInputGrace = TimeSpan.FromMilliseconds(180); private const long PortalCooldownTicks = 8; // 0.8s at 10hz private readonly ILogger _log; @@ -209,12 +210,34 @@ public sealed class WorldHandler : IClientMessageHandler var dy = MathF.Max(-1f, MathF.Min(1f, req.MoveY)); var len = MathF.Sqrt((dx * dx) + (dy * dy)); if (len > 1f) { dx /= len; dy /= len; } + var hasMovement = MathF.Abs(dx) > 0.001f || MathF.Abs(dy) > 0.001f; + var now = DateTime.UtcNow; // Store latest input; movement/collision is applied once per world tick to avoid input backlog. - s.PendingMoveX = dx; - s.PendingMoveY = dy; - s.PendingIsRunning = req.IsRunning; - s.PendingFacing = req.Facing; + // Keep the last non-neutral direction briefly to avoid neutral packet jitter canceling held input. + if (hasMovement) + { + s.PendingMoveX = dx; + s.PendingMoveY = dy; + s.PendingIsRunning = req.IsRunning; + s.LastNonNeutralInputAt = now; + } + else + { + var shouldStopNow = (req.IsMovingProvided && !req.IsMoving) || + (now - s.LastNonNeutralInputAt) > NeutralInputGrace; + if (shouldStopNow) + { + s.PendingMoveX = 0f; + s.PendingMoveY = 0f; + s.PendingIsRunning = req.IsRunning; + } + } + + if (!string.IsNullOrWhiteSpace(req.Facing)) + { + s.PendingFacing = req.Facing; + } s.PendingSeq = req.Seq; return Task.CompletedTask; } @@ -651,6 +674,7 @@ public sealed class WorldHandler : IClientMessageHandler TryGetUInt(source, out var seq, "seq", "clientSeq", "inputSeq"); TryGetBool(source, out var isRunning, "isRunning", "running", "sprint"); + var hasIsMoving = TryGetBool(source, out var isMoving, "isMoving", "moving"); TryGetString(source, out var facing, "facing", "dir", "direction"); return new InputReq @@ -659,7 +683,9 @@ public sealed class WorldHandler : IClientMessageHandler MoveX = moveX, MoveY = moveY, IsRunning = isRunning, - Facing = facing + Facing = facing, + IsMovingProvided = hasIsMoving, + IsMoving = isMoving }; } catch @@ -823,6 +849,7 @@ public sealed class WorldHandler : IClientMessageHandler public bool PendingIsRunning { get; set; } public string? PendingFacing { get; set; } public uint PendingSeq { get; set; } + public DateTime LastNonNeutralInputAt { get; set; } = DateTime.UtcNow; public Dictionary ChunkVersions { get; } = new(StringComparer.Ordinal); public List Errors { get; } = new(); public object? PendingPortalEvent { get; set; } @@ -844,6 +871,8 @@ public sealed class WorldHandler : IClientMessageHandler public float MoveY { get; set; } public bool IsRunning { get; set; } public string? Facing { get; set; } + public bool IsMovingProvided { get; set; } + public bool IsMoving { get; set; } } private sealed class LegacyInputReq