From 5ca5b10db85a5f777794e7efb64b91730b91786c Mon Sep 17 00:00:00 2001 From: TheUbMunster <66451362+TheUbMunster@users.noreply.github.com> Date: Tue, 26 Jul 2022 16:08:57 -0600 Subject: [PATCH] Fixed backwards ternaries in ban, crash, rejoin, 0 arguments no longer valid. --- Server/Program.cs | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/Server/Program.cs b/Server/Program.cs index 548d85b..0434204 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -197,12 +197,15 @@ server.PacketHandler = (c, p) => { }; CommandHandler.RegisterCommand("rejoin", args => { + if (args.Length == 0) { + return "Usage: rejoin <* | usernames...>"; + } bool moreThanOne = false; StringBuilder builder = new StringBuilder(); - Client[] clients = (args.Length == 1 && args[0] == "*" - ? server.Clients.Where(c => - c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id))) - : server.Clients.Where(c => c.Connected)).ToArray(); + Client[] clients = (args[0] == "*" + ? server.Clients.Where(c => c.Connected) + : server.Clients.Where(c => + c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray(); foreach (Client user in clients) { if (moreThanOne) builder.Append(", "); builder.Append(user.Name); @@ -214,12 +217,15 @@ CommandHandler.RegisterCommand("rejoin", args => { }); CommandHandler.RegisterCommand("crash", args => { + if (args.Length == 0) { + return "Usage: crash <* | usernames...>"; + } bool moreThanOne = false; StringBuilder builder = new StringBuilder(); - Client[] clients = (args.Length == 1 && args[0] == "*" - ? server.Clients.Where(c => - c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id))) - : server.Clients.Where(c => c.Connected)).ToArray(); + Client[] clients = (args[0] == "*" + ? server.Clients.Where(c => c.Connected) + : server.Clients.Where(c => + c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray(); foreach (Client user in clients) { if (moreThanOne) builder.Append(", "); moreThanOne = true; @@ -239,13 +245,16 @@ CommandHandler.RegisterCommand("crash", args => { }); CommandHandler.RegisterCommand("ban", args => { + if (args.Length == 0) { + return "Usage: ban <* | usernames...>"; + } bool moreThanOne = false; StringBuilder builder = new StringBuilder(); - Client[] clients = (args.Length == 1 && args[0] == "*" - ? server.Clients.Where(c => - c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id))) - : server.Clients.Where(c => c.Connected)).ToArray(); + Client[] clients = (args[0] == "*" + ? server.Clients.Where(c => c.Connected) + : server.Clients.Where(c => + c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray(); foreach (Client user in clients) { if (moreThanOne) builder.Append(", "); moreThanOne = true;