tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep players in the PlayerTab until round end (#5921)

Browse Source 
* Rework AdminSystem to keep players in the PlayerTab until round end

* Prevent sending PlayerStatus to deadminned admins

* Change _playerList to non-nullable

* Clean up unused usings

* Consolidate duplicate foreach loop code
This commit is contained in:
ShadowCommander
2021-12-30 07:12:28 -08:00
committed by GitHub
parent b4808786da
commit 9d70bdde9c
3 changed files with 34 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Client/Administration/AdminSystem.cs
View File

@@ -4,12 +4,8 @@ using System.Linq;
using Content.Shared.Administration;
using Content.Shared.Administration.Events;
using Content.Shared.GameTicking;
using Robust.Client.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Players;
namespace Content.Client.Administration
{
@@ -36,7 +32,6 @@ namespace Content.Client.Administration
InitializeMenu();
SubscribeNetworkEvent<FullPlayerListEvent>(OnPlayerListChanged);
SubscribeNetworkEvent<PlayerInfoChangedEvent>(OnPlayerInfoChanged);
SubscribeNetworkEvent<PlayerInfoRemovalMessage>(OnPlayerInfoRemoval);
SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
}
@@ -60,16 +55,6 @@ namespace Content.Client.Administration
PlayerListChanged?.Invoke(_playerList.Values.ToList());
}
private void OnPlayerInfoRemoval(PlayerInfoRemovalMessage ev)
{
if (_playerList == null) _playerList = new();
var playerInfo = _playerList[ev.NetUserId];
_playerList[ev.NetUserId] = new PlayerInfo(playerInfo.Username, playerInfo.CharacterName, playerInfo.Antag,
playerInfo.EntityUid, playerInfo.SessionId, false);
PlayerListChanged?.Invoke(_playerList.Values.ToList());
}
private void OnPlayerInfoChanged(PlayerInfoChangedEvent ev)
{
if(ev.PlayerInfo == null) return;