PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

We can now get pings!

Browse Source
This commit is contained in:
md_5 2013-03-09 09:54:19 +11:00
parent 45c848a4fd
commit 8a96555cc7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,11 +187,11 @@ public class BungeeCord extends ProxyServer
for ( ListenerInfo info : config.getListeners() ) for ( ListenerInfo info : config.getListeners() )
{ {
Channel server = new ServerBootstrap() Channel server = new ServerBootstrap()
.channel( NioServerSocketChannel.class) .channel( NioServerSocketChannel.class )
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops ) .group( eventLoops )
.localAddress( info.getHost() ) .localAddress( info.getHost() )
.attr( PipelineUtils.LISTENER, info)
.bind().channel(); .bind().channel();
listeners.add( server ); listeners.add( server );

1
proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
View File

@ -60,6 +60,7 @@ public class HandlerBoss extends ChannelInboundMessageHandlerAdapter<ByteBuf>
@Override @Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
{ {
super.exceptionCaught( ctx, cause );
if ( ctx.channel().isActive() ) if ( ctx.channel().isActive() )
{ {
ctx.close(); ctx.close();

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

@ -27,7 +27,10 @@ public class PacketDecoder extends ReplayingDecoder<ByteBuf>
@Override @Override
protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
{ {
int startIndex = in.readerIndex();
PacketReader.readPacket( in, protocol ); PacketReader.readPacket( in, protocol );
return in.copy(); ByteBuf readPacket = in.copy( startIndex, in.readerIndex() - startIndex );
System.out.println( readPacket );
return readPacket;
} }
} }

2
proxy/src/main/java/net/md_5/bungee/packet/DefinedPacket.java
View File

@ -88,7 +88,7 @@ public abstract class DefinedPacket implements ByteBuf
public static DefinedPacket packet(ByteBuf buf) public static DefinedPacket packet(ByteBuf buf)
{ {
int id = buf.getUnsignedShort( 0 ); short id = buf.getUnsignedByte( 0 );
Class<? extends DefinedPacket> clazz = classes[id]; Class<? extends DefinedPacket> clazz = classes[id];
DefinedPacket ret = null; DefinedPacket ret = null;
if ( clazz != null ) if ( clazz != null )