From a8c1cdd71bee1d1b7753d940896d4f1778fa51c5 Mon Sep 17 00:00:00 2001 From: data-bomb Date: Mon, 4 Mar 2024 20:45:15 -0800 Subject: [PATCH] Fixes Build Errors - Fixes compiler errors from previous commit --- Si_AFKManager/Si_AFK.cs | 4 ++++ Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs | 2 ++ Si_BasicBanlist/Si_BasicBans.cs | 8 +++++-- Si_ChatSilence/Si_Silence.cs | 4 ++++ Si_CommManagement/Si_CmdrMgr.cs | 28 ++++++++++++++---------- Si_Eject/Si_Eject.cs | 8 ++++--- Si_EndRound/Si_EndRound.cs | 2 ++ Si_Mapcycle/Si_Mapcycle.cs | 2 ++ Si_SpawnConfigs/Si_SpawnConfigs.cs | 6 ++++- 9 files changed, 47 insertions(+), 17 deletions(-) diff --git a/Si_AFKManager/Si_AFK.cs b/Si_AFKManager/Si_AFK.cs index b6bac2c..2947b69 100644 --- a/Si_AFKManager/Si_AFK.cs +++ b/Si_AFKManager/Si_AFK.cs @@ -122,6 +122,8 @@ public static bool ServerAlmostFull() public static void Command_Kick(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) @@ -164,6 +166,8 @@ public static void Command_Kick(Player callerPlayer, String args) public static void Command_AFK(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 0) diff --git a/Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs b/Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs index 096968c..a18fd59 100644 --- a/Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs +++ b/Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs @@ -95,6 +95,8 @@ public override void OnLateInitializeMelon() public static void Command_ChangeNextMode(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Count() - 1; if (argumentCount > 1) diff --git a/Si_BasicBanlist/Si_BasicBans.cs b/Si_BasicBanlist/Si_BasicBans.cs index 68d652e..66df83f 100644 --- a/Si_BasicBanlist/Si_BasicBans.cs +++ b/Si_BasicBanlist/Si_BasicBans.cs @@ -150,7 +150,9 @@ public static void Command_Ban(Player callerPlayer, String args) MelonLogger.Msg("Ban list unavailable. Check json syntax."); return; } - + + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) @@ -207,7 +209,9 @@ public static void Command_Unban(Player callerPlayer, String args) MelonLogger.Msg("Ban list unavailable. Check json syntax."); return; } - + + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount < 1) diff --git a/Si_ChatSilence/Si_Silence.cs b/Si_ChatSilence/Si_Silence.cs index 6c8a529..d1602c7 100644 --- a/Si_ChatSilence/Si_Silence.cs +++ b/Si_ChatSilence/Si_Silence.cs @@ -68,6 +68,8 @@ public override void OnLateInitializeMelon() public static void Command_Silence(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) @@ -111,6 +113,8 @@ public static void Command_Silence(Player callerPlayer, String args) public static void Command_UnSilence(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) diff --git a/Si_CommManagement/Si_CmdrMgr.cs b/Si_CommManagement/Si_CmdrMgr.cs index 074cf81..90c677d 100644 --- a/Si_CommManagement/Si_CmdrMgr.cs +++ b/Si_CommManagement/Si_CmdrMgr.cs @@ -540,11 +540,13 @@ public static void DemoteTeamsCommander(MP_Strategy strategyInstance, Team Targe public static void Command_CommanderDemote(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // count number of arguments int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Too many arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too many arguments"); return; } @@ -561,7 +563,7 @@ public static void Command_CommanderDemote(Player callerPlayer, String args) } else { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Too few arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too few arguments"); return; } } @@ -596,7 +598,7 @@ public static void Command_CommanderDemote(Player callerPlayer, String args) // check if we still don't have a valid target if (targetTeamIndex < 0) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Valid targets are Alien, Centauri, or Sol"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Valid targets are Alien, Centauri, or Sol"); return; } } @@ -637,17 +639,19 @@ public static void Command_CommanderUnban(Player callerPlayer, String args) { return; } - + + string commandName = args.Split(' ')[0]; + // count number of arguments int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Too many arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too many arguments"); return; } else if (argumentCount < 1) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Too few arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too few arguments"); return; } @@ -683,18 +687,20 @@ public static void Command_CommanderBan(Player callerPlayer, String args) if (MasterBanList == null) { return; - } - + } + + string commandName = args.Split(' ')[0]; + // count number of arguments int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Too many arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too many arguments"); return; } else if (argumentCount < 1) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Too few arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too few arguments"); return; } @@ -703,7 +709,7 @@ public static void Command_CommanderBan(Player callerPlayer, String args) if (playerToCmdrBan == null) { - HelperMethods.ReplyToCommand(args.Split(' ')[0] + ": Ambiguous or invalid target"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Ambiguous or invalid target"); return; } diff --git a/Si_Eject/Si_Eject.cs b/Si_Eject/Si_Eject.cs index 6b0e59d..b0cbc00 100644 --- a/Si_Eject/Si_Eject.cs +++ b/Si_Eject/Si_Eject.cs @@ -45,16 +45,18 @@ public override void OnLateInitializeMelon() } public static void Command_Eject(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) { - HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, args.Split(' ')[0], ": Too many arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too many arguments"); return; } else if (argumentCount < 1) { - HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, args.Split(' ')[0], ": Too few arguments"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Too few arguments"); return; } @@ -64,7 +66,7 @@ public static void Command_Eject(Player callerPlayer, String args) if (playerToEject == null) { - HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, args.Split(' ')[0], ": Ambiguous or invalid target"); + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": Ambiguous or invalid target"); return; } diff --git a/Si_EndRound/Si_EndRound.cs b/Si_EndRound/Si_EndRound.cs index 29400bb..3aa7137 100644 --- a/Si_EndRound/Si_EndRound.cs +++ b/Si_EndRound/Si_EndRound.cs @@ -51,6 +51,8 @@ public override void OnLateInitializeMelon() public static void Command_EndRound(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Count() - 1; if (argumentCount > 0) diff --git a/Si_Mapcycle/Si_Mapcycle.cs b/Si_Mapcycle/Si_Mapcycle.cs index 368ee34..542ec72 100644 --- a/Si_Mapcycle/Si_Mapcycle.cs +++ b/Si_Mapcycle/Si_Mapcycle.cs @@ -58,6 +58,8 @@ public override void OnLateInitializeMelon() } public static void Command_ChangeMap(Player callerPlayer, String args) { + string commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) diff --git a/Si_SpawnConfigs/Si_SpawnConfigs.cs b/Si_SpawnConfigs/Si_SpawnConfigs.cs index 2de44f7..74e554e 100644 --- a/Si_SpawnConfigs/Si_SpawnConfigs.cs +++ b/Si_SpawnConfigs/Si_SpawnConfigs.cs @@ -207,6 +207,8 @@ public override void OnLateInitializeMelon() public static void Command_UndoSpawn(Player callerPlayer, String args) { + String commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 0) @@ -231,6 +233,8 @@ public static void Command_UndoSpawn(Player callerPlayer, String args) public static void Command_Spawn(Player callerPlayer, String args) { + String commandName = args.Split(' ')[0]; + // validate argument count int argumentCount = args.Split(' ').Length - 1; if (argumentCount > 1) @@ -414,7 +418,7 @@ public static void Command_AddSetup(Player callerPlayer, String args) if (!ExecuteBatchSpawn(spawnSetup)) { - HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": bad name in config file") + HelperMethods.SendChatMessageToPlayer(callerPlayer, HelperMethods.chatPrefix, commandName, ": bad name in config file"); return; }