Update "Improve keepalive ping system"

Author: Spottedleaf

…0025-Improve-keepalive-ping-system.patch …0025-Improve-keepalive-ping-system.patchpaper-server/patches/features_unapplied/0025-Improve-keepalive-ping-system.patch renamed to paper-server/patches/features/0025-Improve-keepalive-ping-system.patch paper-server/patches/features_unapplied/0025-Improve-keepalive-ping-system.patch renamed to paper-server/patches/features/0025-Improve-keepalive-ping-system.patch

@@ -85,22 +85,22 @@ index 0000000000000000000000000000000000000000..4a2520f554c2ee74faf86d7c93baccf0
 +    }
 +}
 diff --git a/net/minecraft/server/network/CommonListenerCookie.java b/net/minecraft/server/network/CommonListenerCookie.java
-index 21d50675bfe90c2276890779eb23de58ac915b9a..7be34e37562875313b8e43357921b5fec5079d7a 100644
+index d87a00ee3cd04ce25dbe46ae6b386b7f0799102c..ace440c2b82a6368aa27a85ff433ba2cbc8f39a5 100644
 --- a/net/minecraft/server/network/CommonListenerCookie.java
 +++ b/net/minecraft/server/network/CommonListenerCookie.java
 @@ -3,8 +3,8 @@ package net.minecraft.server.network;
  import com.mojang.authlib.GameProfile;
  import net.minecraft.server.level.ClientInformation;
 
--public record CommonListenerCookie(GameProfile gameProfile, int latency, ClientInformation clientInformation, boolean transferred, @javax.annotation.Nullable String brandName, java.util.Set<String> channels) { // Paper
-+public record CommonListenerCookie(GameProfile gameProfile, int latency, ClientInformation clientInformation, boolean transferred, @javax.annotation.Nullable String brandName, java.util.Set<String> channels, io.papermc.paper.util.KeepAlive keepAlive) { // Paper
-     public static CommonListenerCookie createInitial(GameProfile gameProfile, boolean transferred) {
+-public record CommonListenerCookie(GameProfile gameProfile, int latency, ClientInformation clientInformation, boolean transferred, @org.jspecify.annotations.Nullable String brandName, java.util.Set<String> channels) { // Paper
++public record CommonListenerCookie(GameProfile gameProfile, int latency, ClientInformation clientInformation, boolean transferred, @org.jspecify.annotations.Nullable String brandName, java.util.Set<String> channels, io.papermc.paper.util.KeepAlive keepAlive) { // Paper // Paper
+     public static CommonListenerCookie createInitial(final GameProfile gameProfile, final boolean transferred) {
 -        return new CommonListenerCookie(gameProfile, 0, ClientInformation.createDefault(), transferred, null, new java.util.HashSet<>()); // Paper
-+        return new CommonListenerCookie(gameProfile, 0, ClientInformation.createDefault(), transferred, null, new java.util.HashSet<>(), new io.papermc.paper.util.KeepAlive()); // Paper
++        return new CommonListenerCookie(gameProfile, 0, ClientInformation.createDefault(), transferred, null, new java.util.HashSet<>(), new io.papermc.paper.util.KeepAlive()); // Paper // Paper
      }
  }
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 079ab378920c0e52ef4e42ef20b37bd389f40870..b8a4b4cc02a2fc6b70f4b840796eed501aad6239 100644
+index f54d99c59bbca7fb5e0615f8fee9c3f6fbffa18a..d9b6f3826e2126d339e926afed782f6d0e890508 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -39,12 +39,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -122,7 +122,7 @@ index 079ab378920c0e52ef4e42ef20b37bd389f40870..b8a4b4cc02a2fc6b70f4b840796eed50
      // CraftBukkit start
      public final org.bukkit.craftbukkit.CraftServer cserver;
 @@ -61,13 +62,14 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie) {
+     public ServerCommonPacketListenerImpl(final MinecraftServer server, final Connection connection, final CommonListenerCookie cookie) {
          this.server = server;
          this.connection = connection;
 -        this.keepAliveTime = Util.getMillis();
@@ -140,10 +140,10 @@ index 079ab378920c0e52ef4e42ef20b37bd389f40870..b8a4b4cc02a2fc6b70f4b840796eed50
 @@ -100,13 +102,41 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
 
      @Override
-     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
+     public void handleKeepAlive(final ServerboundKeepAlivePacket packet) {
 -        if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
--            int i = (int)(Util.getMillis() - this.keepAliveTime);
--            this.latency = (this.latency * 3 + i) / 4;
+-            int time = (int)(Util.getMillis() - this.keepAliveTime);
+-            this.latency = (this.latency * 3 + time) / 4;
 -            this.keepAlivePending = false;
 -        } else if (!this.isSingleplayerOwner()) {
 -            this.disconnectAsync(TIMEOUT_DISCONNECTION_MESSAGE, io.papermc.paper.connection.DisconnectionReason.TIMEOUT); // Paper - add proper async disconnect
@@ -188,29 +188,29 @@ index 079ab378920c0e52ef4e42ef20b37bd389f40870..b8a4b4cc02a2fc6b70f4b840796eed50
 @@ -233,20 +263,23 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      protected void keepConnectionAlive() {
          Profiler.get().push("keepAlive");
-         long millis = Util.getMillis();
+         long now = Util.getMillis();
 -        // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings
 -        // This should effectively place the keepalive handling back to "as it was" before 1.12.2
--        final long elapsedTime = millis - this.keepAliveTime;
+-        final long elapsedTime = now - this.keepAliveTime;
 -        if (!this.isSingleplayerOwner() && elapsedTime >= 15000L) { // use vanilla's 15000L between keep alive packets
 -            if (this.keepAlivePending) {
 -                if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
 -                    this.disconnect(TIMEOUT_DISCONNECTION_MESSAGE, io.papermc.paper.connection.DisconnectionReason.TIMEOUT); // Paper - kick event cause
 -                }
 -                // Paper end - give clients a longer time to respond to pings as per pre 1.12.2 timings
--            } else if (this.checkIfClosed(millis)) {
+-            } else if (this.checkIfClosed(now)) {
 -                this.keepAlivePending = true;
--                this.keepAliveTime = millis;
--                this.keepAliveChallenge = millis;
+-                this.keepAliveTime = now;
+-                this.keepAliveChallenge = now;
 -                this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
 +        // Paper start - improve keepalives
-+        if (this.checkIfClosed(millis) && !this.processedDisconnect) {
++        if (this.checkIfClosed(now) && !this.processedDisconnect) {
 +            long currTime = System.nanoTime();
 +
 +            if ((currTime - this.keepAlive.lastKeepAliveTx) >= java.util.concurrent.TimeUnit.SECONDS.toNanos(1L)) {
 +                this.keepAlive.lastKeepAliveTx = currTime;
 +
-+                io.papermc.paper.util.KeepAlive.PendingKeepAlive pka = new io.papermc.paper.util.KeepAlive.PendingKeepAlive(currTime, millis);
++                io.papermc.paper.util.KeepAlive.PendingKeepAlive pka = new io.papermc.paper.util.KeepAlive.PendingKeepAlive(currTime, now);
 +                this.keepAlive.pendingKeepAlives.add(pka);
 +                this.send(new ClientboundKeepAlivePacket(pka.challengeId()));
 +            }
@@ -223,11 +223,11 @@ index 079ab378920c0e52ef4e42ef20b37bd389f40870..b8a4b4cc02a2fc6b70f4b840796eed50
              }
          }
 
-@@ -427,6 +460,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -424,6 +457,6 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      }
 
-     protected CommonListenerCookie createCookie(ClientInformation clientInformation) {
+     protected CommonListenerCookie createCookie(final ClientInformation clientInformation) {
 -        return new CommonListenerCookie(this.playerProfile(), this.latency, clientInformation, this.transferred, this.playerBrand, this.pluginMessagerChannels); // Paper
-+        return new CommonListenerCookie(this.playerProfile(), this.latency, clientInformation, this.transferred, this.playerBrand, this.pluginMessagerChannels, this.keepAlive); // Paper
++        return new CommonListenerCookie(this.playerProfile(), this.latency, clientInformation, this.transferred, this.playerBrand, this.pluginMessagerChannels, this.keepAlive); // Paper // Paper
      }
  }