diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 31ef2d3c8b..636f8bd3f8 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -44,9 +44,11 @@ namespace Content.Client.Lobby [ViewVariables] private CharacterSetupGui? _characterSetup; [ViewVariables] private LobbyGui? _lobby; + private ClientGameTicker _gameTicker = default!; + public override void Startup() { - var gameTicker = EntitySystem.Get(); + _gameTicker = EntitySystem.Get(); _characterSetup = new CharacterSetupGui(_entityManager, _resourceCache, _preferencesManager, _prototypeManager); LayoutContainer.SetAnchorPreset(_characterSetup, LayoutContainer.LayoutPreset.Wide); @@ -86,7 +88,7 @@ namespace Content.Client.Lobby _lobby.ReadyButton.OnPressed += _ => { - if (!gameTicker.IsGameStarted) + if (!_gameTicker.IsGameStarted) { return; } @@ -105,20 +107,19 @@ namespace Content.Client.Lobby UpdatePlayerList(); _playerManager.PlayerListUpdated += PlayerManagerOnPlayerListUpdated; - gameTicker.InfoBlobUpdated += UpdateLobbyUi; - gameTicker.LobbyStatusUpdated += LobbyStatusUpdated; - gameTicker.LobbyReadyUpdated += LobbyReadyUpdated; - gameTicker.LobbyLateJoinStatusUpdated += LobbyLateJoinStatusUpdated; + _gameTicker.InfoBlobUpdated += UpdateLobbyUi; + _gameTicker.LobbyStatusUpdated += LobbyStatusUpdated; + _gameTicker.LobbyReadyUpdated += LobbyReadyUpdated; + _gameTicker.LobbyLateJoinStatusUpdated += LobbyLateJoinStatusUpdated; } public override void Shutdown() { _playerManager.PlayerListUpdated -= PlayerManagerOnPlayerListUpdated; - var gameTicker = EntitySystem.Get(); - gameTicker.InfoBlobUpdated -= UpdateLobbyUi; - gameTicker.LobbyStatusUpdated -= LobbyStatusUpdated; - gameTicker.LobbyReadyUpdated -= LobbyReadyUpdated; - gameTicker.LobbyLateJoinStatusUpdated -= LobbyLateJoinStatusUpdated; + _gameTicker.InfoBlobUpdated -= UpdateLobbyUi; + _gameTicker.LobbyStatusUpdated -= LobbyStatusUpdated; + _gameTicker.LobbyReadyUpdated -= LobbyReadyUpdated; + _gameTicker.LobbyLateJoinStatusUpdated -= LobbyLateJoinStatusUpdated; _lobby?.Dispose(); _characterSetup?.Dispose();