Refactor player validation in WasdManager methods
This commit is contained in:
parent
f2b9cec14c
commit
6805eaa746
2 changed files with 20 additions and 21 deletions
|
|
@ -7,37 +7,32 @@ public class WasdManager : IWasdMenuManager
|
|||
{
|
||||
public void OpenMainMenu(CCSPlayerController? player, IWasdMenu? menu)
|
||||
{
|
||||
if(player == null)
|
||||
return;
|
||||
WASDMenuAPI.Players[player.SteamID].OpenMainMenu((WasdMenu?)menu);
|
||||
if(!TryGetPlayer(player, out var menuPlayer)) return;
|
||||
menuPlayer.OpenMainMenu((WasdMenu?)menu);
|
||||
}
|
||||
|
||||
public void CloseMenu(CCSPlayerController? player)
|
||||
{
|
||||
if(player == null)
|
||||
return;
|
||||
WASDMenuAPI.Players[player.SteamID].OpenMainMenu(null);
|
||||
if (!TryGetPlayer(player, out var menuPlayer)) return;
|
||||
menuPlayer.OpenMainMenu(null);
|
||||
}
|
||||
|
||||
public void CloseSubMenu(CCSPlayerController? player)
|
||||
{
|
||||
if(player == null)
|
||||
return;
|
||||
WASDMenuAPI.Players[player.SteamID].CloseSubMenu();
|
||||
if (!TryGetPlayer(player, out var menuPlayer)) return;
|
||||
menuPlayer.CloseSubMenu();
|
||||
}
|
||||
|
||||
public void CloseAllSubMenus(CCSPlayerController? player)
|
||||
{
|
||||
if(player == null)
|
||||
return;
|
||||
WASDMenuAPI.Players[player.SteamID].CloseAllSubMenus();
|
||||
if (!TryGetPlayer(player, out var menuPlayer)) return;
|
||||
menuPlayer.CloseAllSubMenus();
|
||||
}
|
||||
|
||||
public void OpenSubMenu(CCSPlayerController? player, IWasdMenu? menu)
|
||||
{
|
||||
if (player == null)
|
||||
return;
|
||||
WASDMenuAPI.Players[player.SteamID].OpenSubMenu(menu);
|
||||
if (!TryGetPlayer(player, out var menuPlayer)) return;
|
||||
menuPlayer.OpenSubMenu(menu);
|
||||
}
|
||||
|
||||
public IWasdMenu CreateMenu(string title = "", string controlText = "")
|
||||
|
|
@ -52,15 +47,19 @@ public class WasdManager : IWasdMenuManager
|
|||
|
||||
public bool HasMenu(CCSPlayerController? player)
|
||||
{
|
||||
if (player == null)
|
||||
return false;
|
||||
return WASDMenuAPI.Players.ContainsKey(player.SteamID);
|
||||
return TryGetPlayer(player, out _);
|
||||
}
|
||||
|
||||
public void UpdateActiveMenu(CCSPlayerController? player, Dictionary<string, Action<CCSPlayerController, IWasdMenuOption>> list)
|
||||
{
|
||||
if (player == null)
|
||||
return;
|
||||
WASDMenuAPI.Players[player.SteamID].UpdateActiveMenu(list);
|
||||
if (!TryGetPlayer(player, out var menuPlayer)) return;
|
||||
menuPlayer.UpdateActiveMenu(list);
|
||||
}
|
||||
|
||||
private bool TryGetPlayer(CCSPlayerController? player, out WasdMenuPlayer menuPlayer)
|
||||
{
|
||||
menuPlayer = null!;
|
||||
if (player == null || !player.IsValid || player.IsBot || player.SteamID == 0) return false;
|
||||
return WASDMenuAPI.Players.TryGetValue(player.SteamID, out menuPlayer);
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue