Fixed modern decoder

artemisac · Nov 29, 2020 · 24ea54e · 24ea54e
1 parent 84c97f0
commit 24ea54e
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/src/main/java/cc/ghast/packet/codec/ArtemisDecoder.java b/src/main/java/cc/ghast/packet/codec/ArtemisDecoder.java
@@ -19,6 +19,7 @@
 import io.netty.buffer.Unpooled;
 import io.netty.channel.*;
 import io.netty.handler.codec.DecoderException;
+import org.bukkit.Bukkit;
 
 import java.util.Arrays;
 import java.util.zip.DataFormatException;
@@ -90,7 +91,14 @@ protected boolean decode(MutableByteBuf in) throws Exception {
 
         // If there's no readable bytes, the packet is empty. Don't worry, such can happen
         if (direction.equals(ProtocolDirection.IN)){
-            in = decompress(in);
+            try {
+                in = decompress(in);
+            } catch (DecoderException e){
+                Bukkit.getScheduler().runTask(PacketManager.INSTANCE.getPlugin(), () -> {
+                    Bukkit.getPlayer(profile.getUuid()).kickPlayer(e.getMessage());
+                });
+            }
+
         } else {
             profile.setProtocol(EnumProtocolCurrent.PLAY);
         }
@@ -108,24 +116,26 @@ protected boolean decode(MutableByteBuf in) throws Exception {
             // Collect the packet from the enum map. This needs to be rewritten for better accuracy tho
             Packet<?> packet = profile.getProtocol().getPacket(direction, id, profile.getUuid(), profile.getVersion());
 
-            if (packet instanceof ReadableBuffer) {
-                ReadableBuffer buffer = (ReadableBuffer) packet;
-                buffer.read(new ProtocolByteBuf(in));
-            }
+            if (packet != null) {
+                if (packet instanceof ReadableBuffer) {
+                    ReadableBuffer buffer = (ReadableBuffer) packet;
+                    buffer.read(new ProtocolByteBuf(in));
+                }
 
-            //System.out.println("pakcet=" + packet.getRealName());
+                //System.out.println("pakcet=" + packet.getRealName());
 
-            // Handle and collect the handshake
-            if (packet instanceof PacketHandshakeClientSetProtocol){
-                handleHandshake((PacketHandshakeClientSetProtocol) packet);
-            }
+                // Handle and collect the handshake
+                if (packet instanceof PacketHandshakeClientSetProtocol){
+                    handleHandshake((PacketHandshakeClientSetProtocol) packet);
+                }
 
-            PacketManager.INSTANCE.getManager().callPacket(profile, packet);
+                PacketManager.INSTANCE.getManager().callPacket(profile, packet);
 
-            if (packet.isCancelled()) {
-                return true;
+                if (packet.isCancelled()) {
+                    return true;
+                }
             }
-
+            
             // Reset the reader index to prevent following pipelines to have a sort of issue. Normally it doesn't, I'm
             // Still new to Netty. I'll need to investigate. More can be seen @ https://netty.io/4.0/api/io/netty/buffer/ByteBuf.html
             in.resetReaderIndex();
@@ -141,7 +151,7 @@ protected boolean decode(MutableByteBuf in) throws Exception {
         return false;
     }
 
-    private MutableByteBuf decompress(MutableByteBuf byteBuf) throws DataFormatException {
+    private MutableByteBuf decompress(MutableByteBuf byteBuf) throws DataFormatException, DecoderException {
         if (byteBuf.readableBytes() != 0) {
             ProtocolByteBuf packetdataserializer = new ProtocolByteBuf(byteBuf);
             int i = packetdataserializer.readVarInt();