Skip to content

Commit d13db8d

Browse files
Early return in ViaDecoder, cleanup code
1 parent 402ec26 commit d13db8d

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

src/main/java/com/viaversion/vialoader/netty/ViaDecoder.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ public ViaDecoder(final UserConnection user) {
4141
@Override
4242
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
4343
if (!this.user.checkIncomingPacket()) throw CancelDecoderException.generate(null);
44+
if (!this.user.shouldTransformPacket()) {
45+
out.add(in.retain());
46+
return;
47+
}
4448

4549
final ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(in);
4650
try {
47-
if (this.user.shouldTransformPacket()) {
48-
this.user.transformIncoming(transformedBuf, CancelDecoderException::generate);
49-
}
51+
this.user.transformIncoming(transformedBuf, CancelDecoderException::generate);
5052
out.add(transformedBuf.retain());
5153
} finally {
5254
transformedBuf.release();

src/main/java/com/viaversion/vialoader/netty/ViaEncoder.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,16 @@ public ViaEncoder(final UserConnection user) {
4040
}
4141

4242
@Override
43-
protected void encode(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> out) throws Exception {
44-
if (!user.checkOutgoingPacket()) throw CancelEncoderException.generate(null);
45-
if (!user.shouldTransformPacket()) {
46-
out.add(byteBuf.retain());
43+
protected void encode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
44+
if (!this.user.checkOutgoingPacket()) throw CancelEncoderException.generate(null);
45+
if (!this.user.shouldTransformPacket()) {
46+
out.add(in.retain());
4747
return;
4848
}
4949

50-
ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(byteBuf);
50+
final ByteBuf transformedBuf = ctx.alloc().buffer().writeBytes(in);
5151
try {
52-
user.transformOutgoing(transformedBuf, CancelEncoderException::generate);
53-
52+
this.user.transformOutgoing(transformedBuf, CancelEncoderException::generate);
5453
out.add(transformedBuf.retain());
5554
} finally {
5655
transformedBuf.release();

0 commit comments

Comments
 (0)