Skip to content

Commit

Permalink
Fixes Build Errors
Browse files Browse the repository at this point in the history 
- Fixes compiler errors from previous commit
  • Loading branch information
@data-bomb
data-bomb committed Mar 5, 2024
1 parent c98b47b commit a8c1cdd
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 17 deletions.
4 changes: 4 additions & 0 deletions Si_AFKManager/Si_AFK.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions Si_AutoTeamsSelect/Si_AutoTeamsSelect.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 6 additions & 2 deletions Si_BasicBanlist/Si_BasicBans.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions Si_ChatSilence/Si_Silence.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
28 changes: 17 additions & 11 deletions Si_CommManagement/Si_CmdrMgr.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}
}
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
8 changes: 5 additions & 3 deletions Si_Eject/Si_Eject.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions Si_EndRound/Si_EndRound.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions Si_Mapcycle/Si_Mapcycle.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion Si_SpawnConfigs/Si_SpawnConfigs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit a8c1cdd

Please sign in to comment.