Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 12:51:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move priority packet handling to channelRead0.

Browse source
This commit is contained in:
Steveice10 2020-05-31 17:32:21 -07:00
parent 8dbe3d081c
commit 75f0f02d89
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCodec.java
View file

@ -46,7 +46,6 @@ public class TcpPacketCodec extends ByteToMessageCodec<Packet> {
protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> out) throws Exception {
int initial = buf.readerIndex();
Packet packet;
try {
NetInput in = new ByteBufNetInput(buf);
@ -56,12 +55,14 @@ public class TcpPacketCodec extends ByteToMessageCodec<Packet> {
return;
}
packet = this.session.getPacketProtocol().createIncomingPacket(id);
Packet packet = this.session.getPacketProtocol().createIncomingPacket(id);
packet.read(in);
if(buf.readableBytes() > 0) {
throw new IllegalStateException("Packet \"" + packet.getClass().getSimpleName() + "\" not fully read.");
}
out.add(packet);
} catch(Throwable t) {
// Advance buffer to end to make sure remaining data in this packet is skipped.
buf.readerIndex(buf.readerIndex() + buf.readableBytes());
@ -71,14 +72,6 @@ public class TcpPacketCodec extends ByteToMessageCodec<Packet> {
if(!e.shouldSuppress()) {
throw t;
}
return;
}
if(packet.isPriority()) {
this.session.callEvent(new PacketReceivedEvent(this.session, packet));
}
out.add(packet);
}
}

6
src/main/java/com/github/steveice10/packetlib/tcp/TcpSession.java
View file

@ -359,8 +359,10 @@ public abstract class TcpSession extends SimpleChannelInboundHandler<Packet> imp
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, Packet packet) throws Exception {
if(!packet.isPriority()) {
protected void channelRead0(ChannelHandlerContext ctx, Packet packet) {
if(packet.isPriority()) {
this.callEvent(new PacketReceivedEvent(this, packet));
} else {
this.packets.add(packet);
}
}