From f37f615a88ad755a115db8fb6a35a620fc372f5f Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 5 Nov 2011 20:14:26 +0000 Subject: [PATCH] Added new --noconsole command argument, thanks to mkurzeja for the idea By: Nathan Adams --- .../src/main/java/org/bukkit/craftbukkit/CraftServer.java | 4 ++++ .../src/main/java/org/bukkit/craftbukkit/Main.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 6f69bd7bdd4..8b2c93e225b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -105,6 +105,10 @@ public final class CraftServer implements Server { this.serverVersion = CraftServer.class.getPackage().getImplementationVersion(); Bukkit.setServer(this); + + if (!Main.useConsole) { + getLogger().info("Console input is disabled due to --noconsole command argument"); + } configuration = YamlConfiguration.loadConfiguration(getConfigFile()); configuration.options().copyDefaults(true); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java index 68b9abd289a..4c3bb0c3a46 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java @@ -13,6 +13,7 @@ import net.minecraft.server.MinecraftServer; public class Main { public static boolean useJline = true; + public static boolean useConsole = true; public static void main(String[] args) { // Todo: Installation script @@ -93,6 +94,8 @@ public class Main { .describedAs("Yml file"); acceptsAll(asList("nojline"), "Disables jline and emulates the vanilla console"); + + acceptsAll(asList("noconsole"), "Disables the console"); acceptsAll(asList("v", "version"), "Show the CraftBukkit Version"); } @@ -123,6 +126,10 @@ public class Main { System.setProperty("user.language", "en"); useJline = false; } + + if (options.has("noconsole")) { + useConsole = false; + } MinecraftServer.main(options); } catch (Throwable t) {