diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index e861b854..e9d5d805 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -439,7 +439,7 @@ public final class SubCommand extends CommandX { success++; } } - if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were already running"); + if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " already running"); if (success > 0) sender.sendMessage("SubServers > Started " + success + " subserver"+((success == 1)?"":"s")); } } else { @@ -513,7 +513,7 @@ public final class SubCommand extends CommandX { success++; } } - if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were already offline"); + if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " already offline"); if (success > 0) sender.sendMessage("SubServers > Stopping " + success + " subserver"+((success == 1)?"":"s")); } } else { @@ -531,7 +531,7 @@ public final class SubCommand extends CommandX { success++; } } - if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were already offline"); + if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " already offline"); if (success > 0) sender.sendMessage("SubServers > Terminated " + success + " subserver"+((success == 1)?"":"s")); } } else { @@ -557,7 +557,7 @@ public final class SubCommand extends CommandX { success++; } } - if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?"":"s") + " were offline"); + if (running > 0) sender.sendMessage("SubServers > " + running + " subserver"+((running == 1)?" was":"s were") + " offline"); if (success > 0) sender.sendMessage("SubServers > Sent command to " + success + " subserver"+((success == 1)?"":"s")); } else { sender.sendMessage("SubServers > No command was entered"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index f2711ffc..c1577d79 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -452,7 +452,7 @@ public class SubCommand { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were already running"); + if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running"); if (success.value > 0) sender.sendMessage("Started " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -609,7 +609,7 @@ public class SubCommand { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); + if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("Stopping " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -653,7 +653,7 @@ public class SubCommand { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); + if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("Terminated " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -707,7 +707,7 @@ public class SubCommand { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?"":"s") + " were offline"); + if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " offline"); if (success.value > 0) sender.sendMessage("Sent command to " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index 66bec9d0..118bf196 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -367,7 +367,7 @@ public final class SubCommand extends CommandX { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were already running"); + if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running"); if (success.value > 0) sender.sendMessage("SubServers > Started " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -501,7 +501,7 @@ public final class SubCommand extends CommandX { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); + if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("SubServers > Stopping " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -534,7 +534,7 @@ public final class SubCommand extends CommandX { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were already offline"); + if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("SubServers > Terminated " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -574,7 +574,7 @@ public final class SubCommand extends CommandX { PrimitiveContainer success = new PrimitiveContainer(0); PrimitiveContainer running = new PrimitiveContainer(0); AsyncConsolidator merge = new AsyncConsolidator(() -> { - if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?"":"s") + " were offline"); + if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " offline"); if (success.value > 0) sender.sendMessage("SubServers > Sent command to " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) {