live player info in client
This commit is contained in:
parent
fb675e59ff
commit
a50a9770c9
14 changed files with 193 additions and 70 deletions
|
@ -1,30 +1,32 @@
|
|||
using System.Diagnostics.CodeAnalysis;
|
||||
using System.Net.WebSockets;
|
||||
using TanksServer.GameLogic;
|
||||
|
||||
namespace TanksServer.Interactivity;
|
||||
|
||||
internal sealed class PlayerServer(
|
||||
ILogger<PlayerServer> logger,
|
||||
ILogger<PlayerInfoConnection> connectionLogger,
|
||||
TankSpawnQueue tankSpawnQueue
|
||||
)
|
||||
) : WebsocketServer<PlayerInfoConnection>(logger), ITickStep
|
||||
{
|
||||
private readonly ConcurrentDictionary<string, Player> _players = new();
|
||||
|
||||
public Player? GetOrAdd(string name, Guid id)
|
||||
{
|
||||
Player AddAndSpawn()
|
||||
{
|
||||
var player = new Player(name, id);
|
||||
tankSpawnQueue.EnqueueForImmediateSpawn(player);
|
||||
return player;
|
||||
}
|
||||
|
||||
var player = _players.GetOrAdd(name, _ => AddAndSpawn());
|
||||
if (player.Id != id)
|
||||
var existingOrAddedPlayer = _players.GetOrAdd(name, _ => AddAndSpawn());
|
||||
if (existingOrAddedPlayer.Id != id)
|
||||
return null;
|
||||
|
||||
logger.LogInformation("player {} (re)joined", player.Id);
|
||||
return player;
|
||||
logger.LogInformation("player {} (re)joined", existingOrAddedPlayer.Id);
|
||||
return existingOrAddedPlayer;
|
||||
|
||||
Player AddAndSpawn()
|
||||
{
|
||||
var newPlayer = new Player(name, id);
|
||||
tankSpawnQueue.EnqueueForImmediateSpawn(newPlayer);
|
||||
return newPlayer;
|
||||
}
|
||||
}
|
||||
|
||||
public bool TryGet(Guid? playerId, [MaybeNullWhen(false)] out Player foundPlayer)
|
||||
|
@ -42,4 +44,10 @@ internal sealed class PlayerServer(
|
|||
}
|
||||
|
||||
public IEnumerable<Player> GetAll() => _players.Values;
|
||||
|
||||
public Task HandleClientAsync(WebSocket webSocket, Player player)
|
||||
=> HandleClientAsync(new PlayerInfoConnection(player, connectionLogger, webSocket));
|
||||
|
||||
public Task TickAsync(TimeSpan delta)
|
||||
=> ParallelForEachConnectionAsync(connection => connection.OnGameTickAsync());
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue