Merge branch 'origin/master'

This commit is contained in:
md_5 2013-10-19 16:44:27 +11:00
commit 6341ad4c5a
2 changed files with 2 additions and 1 deletions

View File

@ -88,7 +88,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.12.0</version>
<version>1.12.2</version>
<scope>provided</scope>
</dependency>
</dependencies>

View File

@ -150,6 +150,7 @@ public class BungeeCord extends ProxyServer
Log.setOutput( new PrintStream( ByteStreams.nullOutputStream() ) ); // TODO: Bug JLine
AnsiConsole.systemInstall();
consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false );
logger = new BungeeLogger( this );
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );