fix: added checking max players per room from config

This commit is contained in:
2024-05-19 08:59:36 +03:00
parent e9dc45265a
commit 6199af3d1e
3 changed files with 41 additions and 20 deletions
@@ -29,10 +29,17 @@ namespace Ragon.Server.Handler
private readonly RagonRoomParameters _roomParameters = new(); private readonly RagonRoomParameters _roomParameters = new();
private readonly IServerPlugin _serverPlugin; private readonly IServerPlugin _serverPlugin;
private readonly RagonServerConfiguration _configuration;
public RoomCreateOperation(RagonBuffer reader, RagonBuffer writer, IServerPlugin serverPlugin) : base(reader, public RoomCreateOperation(
RagonBuffer reader,
RagonBuffer writer,
IServerPlugin serverPlugin,
RagonServerConfiguration configuration
) : base(reader,
writer) writer)
{ {
_configuration = configuration;
_serverPlugin = serverPlugin; _serverPlugin = serverPlugin;
} }
@@ -74,6 +81,9 @@ namespace Ragon.Server.Handler
Min = _roomParameters.Min, Min = _roomParameters.Min,
}; };
if (information.Max > _configuration.LimitPlayersPerRoom)
information.Max = _configuration.LimitPlayersPerRoom;
var lobbyPlayer = context.LobbyPlayer; var lobbyPlayer = context.LobbyPlayer;
var roomPlayer = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name); var roomPlayer = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name);
@@ -26,15 +26,22 @@ namespace Ragon.Server.Handler;
public sealed class RoomJoinOrCreateOperation : BaseOperation public sealed class RoomJoinOrCreateOperation : BaseOperation
{ {
private IRagonLogger _logger = LoggerManager.GetLogger(nameof(RoomJoinOrCreateOperation)); private IRagonLogger _logger = LoggerManager.GetLogger(nameof(RoomJoinOrCreateOperation));
private readonly RagonRoomParameters _roomParameters = new(); private readonly RagonRoomParameters _roomParameters = new();
private readonly IServerPlugin _serverPlugin; private readonly IServerPlugin _serverPlugin;
private readonly RagonServerConfiguration _configuration;
public RoomJoinOrCreateOperation(RagonBuffer reader, RagonBuffer writer, IServerPlugin serverPlugin): base(reader, writer) public RoomJoinOrCreateOperation(
RagonBuffer reader,
RagonBuffer writer,
IServerPlugin serverPlugin,
RagonServerConfiguration configuration
) : base(reader, writer)
{ {
_configuration = configuration;
_serverPlugin = serverPlugin; _serverPlugin = serverPlugin;
} }
public override void Handle(RagonContext context, NetworkChannel channel) public override void Handle(RagonContext context, NetworkChannel channel)
{ {
if (context.ConnectionStatus == ConnectionStatus.Unauthorized) if (context.ConnectionStatus == ConnectionStatus.Unauthorized)
@@ -45,17 +52,17 @@ public sealed class RoomJoinOrCreateOperation : BaseOperation
var roomId = Guid.NewGuid().ToString(); var roomId = Guid.NewGuid().ToString();
var lobbyPlayer = context.LobbyPlayer; var lobbyPlayer = context.LobbyPlayer;
_roomParameters.Deserialize(Reader); _roomParameters.Deserialize(Reader);
if (context.Lobby.FindRoomByScene(_roomParameters.Scene, out var existsRoom)) if (context.Lobby.FindRoomByScene(_roomParameters.Scene, out var existsRoom))
{ {
var player = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name); var player = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name);
context.SetRoom(existsRoom, player); context.SetRoom(existsRoom, player);
JoinSuccess(player, existsRoom, Writer); JoinSuccess(player, existsRoom, Writer);
existsRoom.RestoreBufferedEvents(player); existsRoom.RestoreBufferedEvents(player);
existsRoom.Plugin.OnPlayerJoined(player); existsRoom.Plugin.OnPlayerJoined(player);
@@ -69,19 +76,23 @@ public sealed class RoomJoinOrCreateOperation : BaseOperation
Min = _roomParameters.Min, Min = _roomParameters.Min,
}; };
if (information.Max > _configuration.LimitPlayersPerRoom)
information.Max = _configuration.LimitPlayersPerRoom;
var roomPlayer = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name); var roomPlayer = new RagonRoomPlayer(context, lobbyPlayer.Id, lobbyPlayer.Name);
var roomPlugin = _serverPlugin.CreateRoomPlugin(information); var roomPlugin = _serverPlugin.CreateRoomPlugin(information);
var room = new RagonRoom(roomId, information, roomPlugin); var room = new RagonRoom(roomId, information, roomPlugin);
_serverPlugin.OnRoomCreate(lobbyPlayer, room); _serverPlugin.OnRoomCreate(lobbyPlayer, room);
room.Plugin.OnAttached(room); room.Plugin.OnAttached(room);
context.Lobby.Persist(room); context.Lobby.Persist(room);
context.Scheduler.Run(room); context.Scheduler.Run(room);
context.SetRoom(room, roomPlayer); context.SetRoom(room, roomPlayer);
_logger.Trace($"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} with scene {information.Scene}"); _logger.Trace(
$"Player {context.Connection.Id}|{context.LobbyPlayer.Name} create room {room.Id} with scene {information.Scene}");
JoinSuccess(roomPlayer, room, Writer); JoinSuccess(roomPlayer, room, Writer);
@@ -99,22 +110,22 @@ public sealed class RoomJoinOrCreateOperation : BaseOperation
writer.WriteString(room.Scene); writer.WriteString(room.Scene);
writer.WriteString(player.Id); writer.WriteString(player.Id);
writer.WriteString(room.Owner.Id); writer.WriteString(room.Owner.Id);
room.UserData.Snapshot(writer); room.UserData.Snapshot(writer);
writer.WriteUShort((ushort)room.PlayerList.Count); writer.WriteUShort((ushort)room.PlayerList.Count);
foreach (var roomPlayer in room.PlayerList) foreach (var roomPlayer in room.PlayerList)
{ {
writer.WriteUShort(roomPlayer.Connection.Id); writer.WriteUShort(roomPlayer.Connection.Id);
writer.WriteString(roomPlayer.Id); writer.WriteString(roomPlayer.Id);
writer.WriteString(roomPlayer.Name); writer.WriteString(roomPlayer.Name);
roomPlayer.Context.UserData.Snapshot(writer); roomPlayer.Context.UserData.Snapshot(writer);
} }
var sendData = writer.ToArray(); var sendData = writer.ToArray();
player.Connection.Reliable.Send(sendData); player.Connection.Reliable.Send(sendData);
_logger.Trace($"{player.Connection.Id}|{player.Name} joined to room {room.Id}"); _logger.Trace($"{player.Connection.Id}|{player.Name} joined to room {room.Id}");
} }
} }
+2 -2
View File
@@ -76,8 +76,8 @@ public class RagonServer : IRagonServer, INetworkListener
_handlers = new BaseOperation[byte.MaxValue]; _handlers = new BaseOperation[byte.MaxValue];
_handlers[(byte)RagonOperation.AUTHORIZE] = new AuthorizationOperation(_reader, _writer, _serverPlugin, contextObserver, configuration); _handlers[(byte)RagonOperation.AUTHORIZE] = new AuthorizationOperation(_reader, _writer, _serverPlugin, contextObserver, configuration);
_handlers[(byte)RagonOperation.JOIN_OR_CREATE_ROOM] = new RoomJoinOrCreateOperation(_reader, _writer, plugin); _handlers[(byte)RagonOperation.JOIN_OR_CREATE_ROOM] = new RoomJoinOrCreateOperation(_reader, _writer, plugin, _configuration);
_handlers[(byte)RagonOperation.CREATE_ROOM] = new RoomCreateOperation(_reader, _writer, plugin); _handlers[(byte)RagonOperation.CREATE_ROOM] = new RoomCreateOperation(_reader, _writer, plugin, _configuration);
_handlers[(byte)RagonOperation.JOIN_ROOM] = new RoomJoinOperation(_reader, _writer); _handlers[(byte)RagonOperation.JOIN_ROOM] = new RoomJoinOperation(_reader, _writer);
_handlers[(byte)RagonOperation.LEAVE_ROOM] = new RoomLeaveOperation(_reader, _writer); _handlers[(byte)RagonOperation.LEAVE_ROOM] = new RoomLeaveOperation(_reader, _writer);
_handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadOperation(_reader, _writer); _handlers[(byte)RagonOperation.LOAD_SCENE] = new SceneLoadOperation(_reader, _writer);