Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-05 02:10:14 +01:00
Code Issues Projects Releases Wiki Activity

Race condition that would occationally skip STATUS packets. Fixes 198

Browse Source
This commit is contained in:
Kristian S. Stangeland 2014-01-29 01:06:05 +01:00
parent bf8c16e22d
commit ef4bd2ddcd
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java
View File

@ -101,7 +101,7 @@ public class NettyProtocolInjector implements ChannelListener {
Object serverConnection = serverConnectionMethod.invoke(server); Object serverConnection = serverConnectionMethod.invoke(server);
// Handle connected channels // Handle connected channels
final ChannelInboundHandler initProtocol = new ChannelInitializer<Channel>() { final ChannelInboundHandler endInitProtocol = new ChannelInitializer<Channel>() {
@Override @Override
protected void initChannel(Channel channel) throws Exception { protected void initChannel(Channel channel) throws Exception {
try { try {
@ -116,15 +116,24 @@ public class NettyProtocolInjector implements ChannelListener {
} }
}; };
// This is executed before Minecraft's channel handler
final ChannelInboundHandler beginInitProtocol = new ChannelInitializer<Channel>() {
@Override
protected void initChannel(Channel channel) throws Exception {
// Our only job is to add init protocol
channel.pipeline().addLast(endInitProtocol);
}
};
// Add our handler to newly created channels // Add our handler to newly created channels
final ChannelHandler connectionHandler = new ChannelInboundHandlerAdapter() { final ChannelHandler connectionHandler = new ChannelInboundHandlerAdapter() {
@Override @Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
Channel channel = (Channel) msg; Channel channel = (Channel) msg;
// Execute the other handlers before adding our own // Prepare to initialize ths channel
channel.pipeline().addFirst(beginInitProtocol);
ctx.fireChannelRead(msg); ctx.fireChannelRead(msg);
channel.pipeline().addLast(initProtocol);
} }
}; };