Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-27 20:59:12 +01:00
Code Issues Projects Releases Wiki Activity

Downgrade to @netty CR1

Browse Source
This commit is contained in:
md_5 2013-05-19 18:00:03 +10:00
parent 9a0da50e6c
commit 3f994a1c4c
3 changed files with 5 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.CR2</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

@ -84,7 +84,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.
*/ */
@ -282,7 +282,7 @@ public class BungeeCord extends ProxyServer
} }
getLogger().info( "Closing IO threads" ); getLogger().info( "Closing IO threads" );
eventLoops.shutdownGracefully(); eventLoops.shutdown();
getLogger().info( "Saving reconnect locations" ); getLogger().info( "Saving reconnect locations" );
reconnectHandler.save(); reconnectHandler.save();

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

@ -1,7 +1,6 @@
package net.md_5.bungee.netty; package net.md_5.bungee.netty;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.MessageBuf;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ReplayingDecoder; import io.netty.handler.codec.ReplayingDecoder;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -26,7 +25,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
private int protocol; private int protocol;
@Override @Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, MessageBuf<Object> out) throws Exception protected byte[] decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
{ {
// While we have enough data // While we have enough data
while ( true ) while ( true )
@ -48,7 +47,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
// Checkpoint our state incase we don't have enough data for another packet // Checkpoint our state incase we don't have enough data for another packet
checkpoint(); checkpoint();
// Store our decoded message // Store our decoded message
out.add( buf ); return buf;
} }
} }
} }