PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Musical versions

Browse Source
This commit is contained in:
md_5 2013-06-05 20:30:34 +10:00
parent b1e3f6a75b
commit ce8f1b44b6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -59,7 +59,7 @@
<properties> <properties>
<build.number>unknown</build.number> <build.number>unknown</build.number>
<netty.version>4.0.0.CR3</netty.version> <netty.version>4.0.0.CR1</netty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>

4
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -81,7 +81,7 @@ public class BungeeCord extends ProxyServer
* Thread pools. * Thread pools.
*/ */
public final ScheduledThreadPoolExecutor executors = new BungeeThreadPool( new ThreadFactoryBuilder().setNameFormat( "Bungee Pool Thread #%1$d" ).build() ); public final ScheduledThreadPoolExecutor executors = new BungeeThreadPool( new ThreadFactoryBuilder().setNameFormat( "Bungee Pool Thread #%1$d" ).build() );
public final MultithreadEventLoopGroup eventLoops = new NioEventLoopGroup( NioEventLoopGroup.DEFAULT_EVENT_LOOP_THREADS, new ThreadFactoryBuilder().setNameFormat( "Netty IO Thread #%1$d" ).build() ); public final MultithreadEventLoopGroup eventLoops = new NioEventLoopGroup( 0, new ThreadFactoryBuilder().setNameFormat( "Netty IO Thread #%1$d" ).build() );
/** /**
* locations.yml save thread. * locations.yml save thread.
*/ */
@ -293,7 +293,7 @@ public class BungeeCord extends ProxyServer
} }
getLogger().info( "Closing IO threads" ); getLogger().info( "Closing IO threads" );
eventLoops.shutdownGracefully(); eventLoops.shutdown();
try try
{ {
eventLoops.awaitTermination( Long.MAX_VALUE, TimeUnit.NANOSECONDS ); eventLoops.awaitTermination( Long.MAX_VALUE, TimeUnit.NANOSECONDS );

6
proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java
View File

@ -28,7 +28,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
private Protocol protocol; private Protocol protocol;
@Override @Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, MessageBuf<Object> out) throws Exception protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
{ {
// While we have enough data // While we have enough data
while ( true ) while ( true )
@ -53,10 +53,10 @@ public class PacketDecoder extends ReplayingDecoder<Void>
// Store our decoded message // Store our decoded message
if ( packet != null ) if ( packet != null )
{ {
out.add( new PacketWrapper( packet, buf ) ); return( new PacketWrapper( packet, buf ) );
} else } else
{ {
out.add( buf ); return( buf );
} }
} }
} }