Remove it in future! Compatible with 1.1.x, then we can do something …

…like kicking...
Creeperface01 · Oct 31, 2017 · 6e2e256 · 6e2e256 · Creeperface01 · Oct 31, 2017
1 parent 4c6c078
commit 6e2e256
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/cn/nukkit/network/Network.java b/src/main/java/cn/nukkit/network/Network.java
@@ -150,9 +150,15 @@ public void processBatch(BatchPacket packet, Player player) {
 
                 if ((pk = this.getPacket(buf[0])) != null) {
                     pk.setBuffer(buf, 3); //skip 2 more bytes
-
-                    pk.decode();
-
+                    try {
+                        pk.decode();
+                    } catch (Exception e) {
+                        //TODO: Remove it in future! Compatible with 1.1.x, then we can do something like kicking...
+                        if (pk.pid() == ProtocolInfo.LOGIN_PACKET) {
+                            pk.setBuffer(buf, 1);
+                            pk.decode();
+                        } else throw e;
+                    }
                     packets.add(pk);
                 }
             }

diff --git a/src/main/java/cn/nukkit/network/protocol/LoginPacket.java b/src/main/java/cn/nukkit/network/protocol/LoginPacket.java
@@ -38,6 +38,8 @@ public byte pid() {
     @Override
     public void decode() {
         this.protocol = this.getInt();
+        //TODO: Remove it in future! Compatible with 1.1.x, then we can do something like kicking...
+        if (this.protocol <= 113) this.getByte();
         this.setBuffer(this.getByteArray(), 0);
         decodeChainData();
         decodeSkinData();