World cords stil
This commit is contained in:
@@ -213,6 +213,14 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
var hasMovement = MathF.Abs(dx) > 0.001f || MathF.Abs(dy) > 0.001f;
|
||||
var now = DateTime.UtcNow;
|
||||
|
||||
if (req.HasTargetPosition)
|
||||
{
|
||||
s.HasPendingTarget = true;
|
||||
s.PendingTargetX = req.TargetX;
|
||||
s.PendingTargetY = req.TargetY;
|
||||
s.LastNonNeutralInputAt = now;
|
||||
}
|
||||
|
||||
// Store latest input; movement/collision is applied once per world tick to avoid input backlog.
|
||||
// Keep the last non-neutral direction briefly to avoid neutral packet jitter canceling held input.
|
||||
if (hasMovement)
|
||||
@@ -231,6 +239,7 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
s.PendingMoveX = 0f;
|
||||
s.PendingMoveY = 0f;
|
||||
s.PendingIsRunning = req.IsRunning;
|
||||
s.HasPendingTarget = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -289,8 +298,33 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
|
||||
private async Task ApplyPendingInputAsync(GameDbContext db, WorldRegion region, SessionState s, CancellationToken ct)
|
||||
{
|
||||
var dx = MathF.Max(-1f, MathF.Min(1f, s.PendingMoveX));
|
||||
var dy = MathF.Max(-1f, MathF.Min(1f, s.PendingMoveY));
|
||||
float dx;
|
||||
float dy;
|
||||
if (s.HasPendingTarget)
|
||||
{
|
||||
var tx = s.PendingTargetX - s.X;
|
||||
var ty = s.PendingTargetY - s.Y;
|
||||
var targetDist = MathF.Sqrt((tx * tx) + (ty * ty));
|
||||
if (targetDist <= 1f)
|
||||
{
|
||||
s.HasPendingTarget = false;
|
||||
dx = s.PendingMoveX;
|
||||
dy = s.PendingMoveY;
|
||||
}
|
||||
else
|
||||
{
|
||||
dx = tx / targetDist;
|
||||
dy = ty / targetDist;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
dx = s.PendingMoveX;
|
||||
dy = s.PendingMoveY;
|
||||
}
|
||||
|
||||
dx = MathF.Max(-1f, MathF.Min(1f, dx));
|
||||
dy = MathF.Max(-1f, MathF.Min(1f, dy));
|
||||
var len = MathF.Sqrt((dx * dx) + (dy * dy));
|
||||
if (len > 1f)
|
||||
{
|
||||
@@ -651,8 +685,14 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
|
||||
// Compatibility: clients that send absolute target x/y (dungeon-style).
|
||||
// Prefer absolute target when directional input is missing OR effectively zero.
|
||||
var hasAbsTarget = false;
|
||||
var absTargetX = 0f;
|
||||
var absTargetY = 0f;
|
||||
if (hasRawX && hasRawY && (!IsDirectionalValue(rawX) || !IsDirectionalValue(rawY)))
|
||||
{
|
||||
hasAbsTarget = true;
|
||||
absTargetX = rawX;
|
||||
absTargetY = rawY;
|
||||
var dx = rawX - currentX;
|
||||
var dy = rawY - currentY;
|
||||
var len = MathF.Sqrt((dx * dx) + (dy * dy));
|
||||
@@ -685,7 +725,10 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
IsRunning = isRunning,
|
||||
Facing = facing,
|
||||
IsMovingProvided = hasIsMoving,
|
||||
IsMoving = isMoving
|
||||
IsMoving = isMoving,
|
||||
HasTargetPosition = hasAbsTarget,
|
||||
TargetX = absTargetX,
|
||||
TargetY = absTargetY
|
||||
};
|
||||
}
|
||||
catch
|
||||
@@ -850,6 +893,9 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
public string? PendingFacing { get; set; }
|
||||
public uint PendingSeq { get; set; }
|
||||
public DateTime LastNonNeutralInputAt { get; set; } = DateTime.UtcNow;
|
||||
public bool HasPendingTarget { get; set; }
|
||||
public float PendingTargetX { get; set; }
|
||||
public float PendingTargetY { get; set; }
|
||||
public Dictionary<string, long> ChunkVersions { get; } = new(StringComparer.Ordinal);
|
||||
public List<string> Errors { get; } = new();
|
||||
public object? PendingPortalEvent { get; set; }
|
||||
@@ -873,6 +919,9 @@ public sealed class WorldHandler : IClientMessageHandler
|
||||
public string? Facing { get; set; }
|
||||
public bool IsMovingProvided { get; set; }
|
||||
public bool IsMoving { get; set; }
|
||||
public bool HasTargetPosition { get; set; }
|
||||
public float TargetX { get; set; }
|
||||
public float TargetY { get; set; }
|
||||
}
|
||||
|
||||
private sealed class LegacyInputReq
|
||||
|
||||
Reference in New Issue
Block a user