From 8a1030e21c5b707909a161655073c36915fd8043 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 16 Sep 2015 15:09:18 +1000 Subject: [PATCH] #1583: Two additions to console behaviour: 1) Stop trying to read anything if the console is hooked up to /dev/null 2) Don't even bother in the first place if --noconsole is used as an argument. --- .../src/main/java/net/md_5/bungee/BungeeCordLauncher.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java index 68f104b8..3c1bbe93 100644 --- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java @@ -23,6 +23,7 @@ public class BungeeCordLauncher OptionParser parser = new OptionParser(); parser.allowsUnrecognizedOptions(); parser.acceptsAll( Arrays.asList( "v", "version" ) ); + parser.acceptsAll( Arrays.asList( "noconsole" ) ); OptionSet options = parser.parse( args ); @@ -53,10 +54,10 @@ public class BungeeCordLauncher bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() ); bungee.start(); - while ( bungee.isRunning ) + if ( !options.has( "noconsole" ) ) { - String line = bungee.getConsoleReader().readLine( ">" ); - if ( line != null ) + String line; + while ( bungee.isRunning && ( line = bungee.getConsoleReader().readLine( ">" ) ) != null ) { if ( !bungee.getPluginManager().dispatchCommand( ConsoleCommandSender.getInstance(), line ) ) {