From 70031c65e778c5ae277c504d50768f9ad1e38932 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Sat, 12 Dec 2020 00:45:41 -0600
Subject: [PATCH] Handle keepalives better (Closes #965)

Bedrock cuts off the last 3 digits consistently every time, meaning that the keepalive returned from bedrock is never fully accurate. However, if we multiply the value by 1000, then divide by 1000 when sending back to java, the proper value is returned.
---
 .../geysermc/connector/network/session/GeyserSession.java   | 6 ------
 .../bedrock/BedrockNetworkStackLatencyTranslator.java       | 4 +---
 .../network/translators/java/JavaKeepAliveTranslator.java   | 3 +--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index 8ac0b743..36b14a1e 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -196,12 +196,6 @@ public class GeyserSession implements CommandSender {
     @Setter
     private long lastWindowCloseTime = 0;
 
-    /**
-     * Saves the timestamp of the last keep alive packet
-     */
-    @Setter
-    private long lastKeepAliveTimestamp = 0;
-
     @Setter
     private VillagerTrade[] villagerTrades;
     @Setter
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
index d480b526..13f2ea3c 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
@@ -39,8 +39,6 @@ public class BedrockNetworkStackLatencyTranslator extends PacketTranslator<Netwo
 
     @Override
     public void translate(NetworkStackLatencyPacket packet, GeyserSession session) {
-        // The client sends a timestamp back but it's rounded and therefore unreliable when we need the exact number
-        ClientKeepAlivePacket keepAlivePacket = new ClientKeepAlivePacket(session.getLastKeepAliveTimestamp());
-        session.sendDownstreamPacket(keepAlivePacket);
+        session.sendDownstreamPacket(new ClientKeepAlivePacket(packet.getTimestamp() / 1000));
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java
index 1dd156e4..268e3f2c 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/JavaKeepAliveTranslator.java
@@ -39,10 +39,9 @@ public class JavaKeepAliveTranslator extends PacketTranslator<ServerKeepAlivePac
 
     @Override
     public void translate(ServerKeepAlivePacket packet, GeyserSession session) {
-        session.setLastKeepAliveTimestamp(packet.getPingId());
         NetworkStackLatencyPacket latencyPacket = new NetworkStackLatencyPacket();
         latencyPacket.setFromServer(true);
-        latencyPacket.setTimestamp(packet.getPingId());
+        latencyPacket.setTimestamp(packet.getPingId() * 1000);
         session.sendUpstreamPacket(latencyPacket);
     }
 }