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

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs
View File

@@ -19,8 +19,8 @@ namespace Content.Client.UserInterface.AdminMenu
[Dependency] private readonly IClientAdminManager _clientAdminManager = default!;
[Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
private AdminMenuWindow _window;
private List<SS14Window> _commandWindows;
private AdminMenuWindow? _window;
private List<SS14Window> _commandWindows = new();
public void Initialize()
{
@@ -29,10 +29,10 @@ namespace Content.Client.UserInterface.AdminMenu
_commandWindows = new List<SS14Window>();
// Reset the AdminMenu Window on disconnect
_netManager.Disconnect += (sender, channel) => ResetWindow();
_netManager.Disconnect += (_, _) => ResetWindow();
_inputManager.SetInputCommand(ContentKeyFunctions.OpenAdminMenu,
InputCmdHandler.FromDelegate(session => Toggle()));
InputCmdHandler.FromDelegate(_ => Toggle()));
_clientAdminManager.AdminStatusUpdated += () =>
{
@@ -68,7 +68,7 @@ namespace Content.Client.UserInterface.AdminMenu
private void HandlePlayerListMessage(AdminMenuPlayerListMessage msg)
{
_window.RefreshPlayerList(msg.NamesToPlayers);
_window?.RefreshPlayerList(msg.NamesToPlayers);
}
public void ResetWindow()