diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index 8d6e2fa37499..aa126b338492 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -105,13 +105,11 @@ private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev) foreach (var (id, data) in _playerList) { - if (!data.ActiveThisRound) + if (!data.ActiveThisRound + || !_playerManager.TryGetPlayerData(id, out var playerData) + || !_playerManager.TryGetSessionById(id, out var session)) continue; - if (!_playerManager.TryGetPlayerData(id, out var playerData)) - return; - - _playerManager.TryGetSessionById(id, out var session); _playerList[id] = GetPlayerInfo(playerData, session); } @@ -218,7 +216,7 @@ private void SendFullPlayerList(ICommonSession playerSession) RaiseNetworkEvent(ev, playerSession.Channel); } - private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession? session) + private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession session) { var name = data.UserName; var entityName = string.Empty; diff --git a/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs b/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs index 0856b2fbe6b8..4c368186ef72 100644 --- a/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs +++ b/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs @@ -87,7 +87,7 @@ private void OnExamined(EntityUid uid, DiskBurnerComponent component, ExaminedEv missing.Add("disk"); if (boardSlot.Item is null) - missing.Add("or"); + missing.Add("board"); args.PushMarkup(Loc.GetString("disk-burner-missing", ("missing", string.Join(", or ", missing)))); return;