Fixed backwards ternaries in ban, crash, rejoin, 0 arguments no longer valid.
This commit is contained in:
parent
f305c3001b
commit
5ca5b10db8
|
@ -197,12 +197,15 @@ server.PacketHandler = (c, p) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
CommandHandler.RegisterCommand("rejoin", args => {
|
CommandHandler.RegisterCommand("rejoin", args => {
|
||||||
|
if (args.Length == 0) {
|
||||||
|
return "Usage: rejoin <* | usernames...>";
|
||||||
|
}
|
||||||
bool moreThanOne = false;
|
bool moreThanOne = false;
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
Client[] clients = (args.Length == 1 && args[0] == "*"
|
Client[] clients = (args[0] == "*"
|
||||||
? server.Clients.Where(c =>
|
? server.Clients.Where(c => c.Connected)
|
||||||
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))
|
: server.Clients.Where(c =>
|
||||||
: server.Clients.Where(c => c.Connected)).ToArray();
|
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray();
|
||||||
foreach (Client user in clients) {
|
foreach (Client user in clients) {
|
||||||
if (moreThanOne) builder.Append(", ");
|
if (moreThanOne) builder.Append(", ");
|
||||||
builder.Append(user.Name);
|
builder.Append(user.Name);
|
||||||
|
@ -214,12 +217,15 @@ CommandHandler.RegisterCommand("rejoin", args => {
|
||||||
});
|
});
|
||||||
|
|
||||||
CommandHandler.RegisterCommand("crash", args => {
|
CommandHandler.RegisterCommand("crash", args => {
|
||||||
|
if (args.Length == 0) {
|
||||||
|
return "Usage: crash <* | usernames...>";
|
||||||
|
}
|
||||||
bool moreThanOne = false;
|
bool moreThanOne = false;
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
Client[] clients = (args.Length == 1 && args[0] == "*"
|
Client[] clients = (args[0] == "*"
|
||||||
? server.Clients.Where(c =>
|
? server.Clients.Where(c => c.Connected)
|
||||||
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))
|
: server.Clients.Where(c =>
|
||||||
: server.Clients.Where(c => c.Connected)).ToArray();
|
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray();
|
||||||
foreach (Client user in clients) {
|
foreach (Client user in clients) {
|
||||||
if (moreThanOne) builder.Append(", ");
|
if (moreThanOne) builder.Append(", ");
|
||||||
moreThanOne = true;
|
moreThanOne = true;
|
||||||
|
@ -239,13 +245,16 @@ CommandHandler.RegisterCommand("crash", args => {
|
||||||
});
|
});
|
||||||
|
|
||||||
CommandHandler.RegisterCommand("ban", args => {
|
CommandHandler.RegisterCommand("ban", args => {
|
||||||
|
if (args.Length == 0) {
|
||||||
|
return "Usage: ban <* | usernames...>";
|
||||||
|
}
|
||||||
bool moreThanOne = false;
|
bool moreThanOne = false;
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
|
|
||||||
Client[] clients = (args.Length == 1 && args[0] == "*"
|
Client[] clients = (args[0] == "*"
|
||||||
? server.Clients.Where(c =>
|
? server.Clients.Where(c => c.Connected)
|
||||||
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))
|
: server.Clients.Where(c =>
|
||||||
: server.Clients.Where(c => c.Connected)).ToArray();
|
c.Connected && args.Any(x => c.Name.StartsWith(x) || (Guid.TryParse(x, out Guid result) && result == c.Id)))).ToArray();
|
||||||
foreach (Client user in clients) {
|
foreach (Client user in clients) {
|
||||||
if (moreThanOne) builder.Append(", ");
|
if (moreThanOne) builder.Append(", ");
|
||||||
moreThanOne = true;
|
moreThanOne = true;
|
||||||
|
|
Loading…
Reference in New Issue