Accept legacy WORLD_INPUT payload fields and ignore malformed input packets

This commit is contained in:
dingo
2026-02-14 21:18:26 -05:00
parent c221604ff2
commit 3c03bc40fa
+34 -2
View File
@@ -164,8 +164,8 @@ public sealed class WorldHandler : IClientMessageHandler
{
if (!_players.TryGetValue(conn.Id, out var s)) { await SendErrorAsync(conn, "world_not_spawned", ct); return; }
if (s.AccountId != accountId) { await SendErrorAsync(conn, "session_account_mismatch", ct); return; }
var req = Parse<InputReq>(payload);
if (req == null) { await SendErrorAsync(conn, "invalid_world_input", ct); return; }
var req = ParseWorldInput(payload);
if (req == null) { return; }
var dx = MathF.Max(-1f, MathF.Min(1f, req.MoveX));
var dy = MathF.Max(-1f, MathF.Min(1f, req.MoveY));
@@ -377,6 +377,29 @@ public sealed class WorldHandler : IClientMessageHandler
catch { return default; }
}
private InputReq? ParseWorldInput(ReadOnlyMemory<byte> payload)
{
if (payload.IsEmpty) return null;
var direct = Parse<InputReq>(payload);
if (direct != null) return direct;
var legacy = Parse<LegacyInputReq>(payload);
if (legacy != null)
{
return new InputReq
{
Seq = legacy.ClientSeq,
MoveX = legacy.Dx,
MoveY = legacy.Dy,
IsRunning = legacy.IsRunning,
Facing = legacy.Facing
};
}
return null;
}
private async Task BroadcastAsync(int opCode, object payload, int regionId, Guid? exceptConnectionId = null)
{
var tasks = _players.Values
@@ -443,4 +466,13 @@ public sealed class WorldHandler : IClientMessageHandler
public bool IsRunning { get; set; }
public string? Facing { get; set; }
}
private sealed class LegacyInputReq
{
public uint ClientSeq { get; set; }
public float Dx { get; set; }
public float Dy { get; set; }
public bool IsRunning { get; set; }
public string? Facing { get; set; }
}
}