From 7a8d48356143a30c223e840aa70df6a77f50a6f7 Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Thu, 9 Mar 2023 19:01:31 +0100
Subject: [PATCH] Improved b1.8 -> b1.7.3 keep alive packet translation

---
 .../Protocolb1_8_0_1tob1_7_0_3.java                 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/Protocolb1_8_0_1tob1_7_0_3.java b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/Protocolb1_8_0_1tob1_7_0_3.java
index 4405da7..1f91874 100644
--- a/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/Protocolb1_8_0_1tob1_7_0_3.java
+++ b/src/main/java/net/raphimc/vialegacy/protocols/beta/protocolb1_8_0_1tob1_7_0_3/Protocolb1_8_0_1tob1_7_0_3.java
@@ -56,11 +56,8 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
 
     @Override
     protected void registerPackets() {
-        this.registerClientbound(ClientboundPacketsb1_7.KEEP_ALIVE, new PacketHandlers() {
-            @Override
-            public void register() {
-                handler(wrapper -> wrapper.write(Type.INT, ThreadLocalRandom.current().nextInt(Short.MAX_VALUE))); // key
-            }
+        this.registerClientbound(ClientboundPacketsb1_7.KEEP_ALIVE, wrapper -> {
+            wrapper.write(Type.INT, ThreadLocalRandom.current().nextInt(1, Short.MAX_VALUE)); // key
         });
         this.registerClientbound(ClientboundPacketsb1_7.JOIN_GAME, new PacketHandlers() {
             @Override
@@ -323,7 +320,11 @@ public class Protocolb1_8_0_1tob1_7_0_3 extends AbstractProtocol<ClientboundPack
                 });
             }
         });
-        this.cancelServerbound(ServerboundPacketsb1_8.KEEP_ALIVE); // beta client only sends this packet every second if in downloading terrain screen
+        this.registerServerbound(ServerboundPacketsb1_8.KEEP_ALIVE, wrapper -> {
+            if (wrapper.read(Type.INT) != 0) { // beta client only sends this packet with the key set to 0 every second if in downloading terrain screen
+                wrapper.cancel();
+            }
+        });
     }
 
     @Override