From 1baccc94042369f9713debe82cc6cedd139191ee Mon Sep 17 00:00:00 2001 From: Sachin Date: Fri, 21 Feb 2025 23:19:55 +0530 Subject: [PATCH] fix: DefaultServerIP functionality fix: compile error for example plugin --- CS2-SimpleAdmin/Managers/ServerManager.cs | 10 +--------- .../CS2-SimpleAdmin_ExampleModule.cs | 4 +++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CS2-SimpleAdmin/Managers/ServerManager.cs b/CS2-SimpleAdmin/Managers/ServerManager.cs index 28d522d..c65fb0c 100644 --- a/CS2-SimpleAdmin/Managers/ServerManager.cs +++ b/CS2-SimpleAdmin/Managers/ServerManager.cs @@ -46,15 +46,7 @@ public class ServerManager } } - string address = CS2_SimpleAdmin.Instance.Config.DefaultServerIP; - - if(string.IsNullOrWhiteSpace(CS2_SimpleAdmin.Instance.Config.DefaultServerIP) || !CS2_SimpleAdmin.Instance.Config.DefaultServerIP.Contains(":")) - { - if(!string.IsNullOrWhiteSpace(CS2_SimpleAdmin.Instance.Config.DefaultServerIP) && !CS2_SimpleAdmin.Instance.Config.DefaultServerIP.Contains(":")) - CS2_SimpleAdmin._logger?.LogError("DefaultServerIP was set but no port was provided!"); - - address = $"{ipAddress}:{ConVar.Find("hostport")?.GetPrimitiveValue()}"; - } + string address = $"{(!string.IsNullOrWhiteSpace(CS2_SimpleAdmin.Instance.Config.DefaultServerIP) ? CS2_SimpleAdmin.Instance.Config.DefaultServerIP : ConVar.Find("ip")!.StringValue)}:{ConVar.Find("hostport")!.GetPrimitiveValue()}"; var hostname = ConVar.Find("hostname")!.StringValue; var rcon = ConVar.Find("rcon_password")!.StringValue; diff --git a/Modules/CS2-SimpleAdmin_ExampleModule/CS2-SimpleAdmin_ExampleModule.cs b/Modules/CS2-SimpleAdmin_ExampleModule/CS2-SimpleAdmin_ExampleModule.cs index 58ca217..0d3e5ba 100644 --- a/Modules/CS2-SimpleAdmin_ExampleModule/CS2-SimpleAdmin_ExampleModule.cs +++ b/Modules/CS2-SimpleAdmin_ExampleModule/CS2-SimpleAdmin_ExampleModule.cs @@ -73,7 +73,9 @@ public class CS2_SimpleAdmin_ExampleModule: BasePlugin [CommandHelper(whoCanExecute: CommandUsage.SERVER_ONLY)] public void OnAddBanCommand(CCSPlayerController? caller, CommandInfo commandInfo) { - _sharedApi?.IssuePenalty(new SteamID(76561197960287930), null, PenaltyType.Ban, "My super reason", 10); + var player = Utilities.GetPlayerFromSteamId(76561197960287930); + if(player != null) + _sharedApi?.IssuePenalty(player, null, PenaltyType.Ban, "My super reason", 10); } private void OnPlayerPenaltied(PlayerInfo player, PlayerInfo? admin, PenaltyType penaltyType,