Skip to content

Commit 26ded9f

Browse files
Remove CancelCodecException usages
1 parent 9bcf9c1 commit 26ded9f

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

src/main/java/com/viaversion/aas/codec/FrameCodec.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.viaversion.aas.codec;
22

33
import com.viaversion.aas.UtilKt;
4-
import com.viaversion.viaversion.api.type.Type;
54
import com.viaversion.viaversion.api.type.Types;
6-
import com.viaversion.viaversion.exception.CancelDecoderException;
75
import io.netty.buffer.ByteBuf;
86
import io.netty.channel.ChannelHandlerContext;
97
import io.netty.handler.codec.ByteToMessageCodec;
@@ -15,9 +13,8 @@ public class FrameCodec extends ByteToMessageCodec<ByteBuf> {
1513
@Override
1614
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
1715
if (!ctx.channel().isActive()) {
18-
in.clear();
19-
// Netty throws an exception when there's no output
20-
throw CancelDecoderException.CACHED;
16+
in.readerIndex(in.writerIndex());
17+
return;
2118
}
2219
// Ignore, should prevent DoS https://github.com/SpigotMC/BungeeCord/pull/2908
2320

src/main/java/com/viaversion/aas/codec/MinecraftCodec.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.viaversion.aas.util.StacklessException;
88
import com.viaversion.viaversion.api.protocol.packet.Direction;
99
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
10-
import com.viaversion.viaversion.exception.CancelEncoderException;
1110
import io.netty.buffer.ByteBuf;
1211
import io.netty.buffer.ByteBufAllocator;
1312
import io.netty.channel.ChannelHandlerContext;
@@ -19,8 +18,6 @@
1918
public class MinecraftCodec extends MessageToMessageCodec<ByteBuf, Packet> {
2019
@Override
2120
protected void encode(@NotNull ChannelHandlerContext ctx, @NotNull Packet msg, @NotNull List<Object> out) {
22-
if (!ctx.channel().isActive()) throw CancelEncoderException.generate(null);
23-
2421
var buf = ByteBufAllocator.DEFAULT.buffer();
2522

2623
try {

0 commit comments

Comments
 (0)