diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs index 33a20c945a..5c255cd193 100644 --- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs +++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs @@ -49,7 +49,6 @@ namespace Content.Client.GameTicking.Managers public event Action? InfoBlobUpdated; public event Action? LobbyStatusUpdated; - public event Action? LobbyReadyUpdated; public event Action? LobbyLateJoinStatusUpdated; public event Action>>? LobbyJobsAvailableUpdated; @@ -62,7 +61,6 @@ namespace Content.Client.GameTicking.Managers SubscribeNetworkEvent(LobbyStatus); SubscribeNetworkEvent(LobbyInfo); SubscribeNetworkEvent(LobbyCountdown); - SubscribeNetworkEvent(LobbyReady); SubscribeNetworkEvent(RoundEnd); SubscribeNetworkEvent(msg => { @@ -124,11 +122,6 @@ namespace Content.Client.GameTicking.Managers Paused = message.Paused; } - private void LobbyReady(TickerLobbyReadyEvent message) - { - LobbyReadyUpdated?.Invoke(); - } - private void RoundEnd(RoundEndMessageEvent message) { if (message.LobbySong != null) diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs index 05fd59e97e..1050c7c568 100644 --- a/Content.Server/GameTicking/GameTicker.Lobby.cs +++ b/Content.Server/GameTicking/GameTicker.Lobby.cs @@ -78,22 +78,6 @@ namespace Content.Server.GameTicking ("roundId", RoundId), ("playerCount", playerCount), ("readyCount", readyCount), ("mapName", stationNames.ToString()),("gmTitle", gmTitle),("desc", desc)); } - private TickerLobbyReadyEvent GetStatusSingle(ICommonSession player, PlayerGameStatus gameStatus) - { - return new (new Dictionary { { player.UserId, gameStatus } }); - } - - private TickerLobbyReadyEvent GetPlayerStatus() - { - var players = new Dictionary(); - foreach (var player in _playerGameStatuses.Keys) - { - _playerGameStatuses.TryGetValue(player, out var status); - players.Add(player, status); - } - return new TickerLobbyReadyEvent(players); - } - private TickerLobbyStatusEvent GetStatusMsg(IPlayerSession session) { _playerGameStatuses.TryGetValue(session.UserId, out var status); @@ -160,7 +144,6 @@ namespace Content.Server.GameTicking if (!_playerManager.TryGetSessionById(playerUserId, out var playerSession)) continue; RaiseNetworkEvent(GetStatusMsg(playerSession), playerSession.ConnectedClient); - RaiseNetworkEvent(GetStatusSingle(playerSession, status)); } } @@ -180,7 +163,6 @@ namespace Content.Server.GameTicking var status = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay; _playerGameStatuses[player.UserId] = ready ? PlayerGameStatus.ReadyToPlay : PlayerGameStatus.NotReadyToPlay; RaiseNetworkEvent(GetStatusMsg(player), player.ConnectedClient); - RaiseNetworkEvent(GetStatusSingle(player, status)); // update server info to reflect new ready count UpdateInfoText(); } diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index e6930780e2..c114cf418c 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -163,7 +163,6 @@ namespace Content.Server.GameTicking RaiseNetworkEvent(new TickerJoinLobbyEvent(), client); RaiseNetworkEvent(GetStatusMsg(session), client); RaiseNetworkEvent(GetInfoMsg(), client); - RaiseNetworkEvent(GetPlayerStatus(), client); RaiseLocalEvent(new PlayerJoinedLobbyEvent(session)); } diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index fd7fc6ce88..1e519eaa6f 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -271,7 +271,6 @@ namespace Content.Server.GameTicking PlayerJoinGame(player); SpawnObserver(player); - RaiseNetworkEvent(GetStatusSingle(player, PlayerGameStatus.JoinedGame)); } /// diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index 14e8b68e9f..15f51f49a5 100644 --- a/Content.Shared/GameTicking/SharedGameTicker.cs +++ b/Content.Shared/GameTicking/SharedGameTicker.cs @@ -116,20 +116,6 @@ namespace Content.Shared.GameTicking } } - [Serializable, NetSerializable] - public sealed class TickerLobbyReadyEvent : EntityEventArgs - { - /// - /// The Status of the Player in the lobby (ready, observer, ...) - /// - public Dictionary Status { get; } - - public TickerLobbyReadyEvent(Dictionary status) - { - Status = status; - } - } - [Serializable, NetSerializable] public sealed class TickerJobsAvailableEvent : EntityEventArgs {