From 5e6c592485ed54e0b3d3e8dcb0fe766249acfaab Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Mon, 29 Sep 2025 06:41:36 -0400
Subject: [PATCH] Add missing log if kicked by keepalive timeout

---
 .../features/0069-Send-multiple-keep-alive-packets.patch   | 7 ++++---
 .../0130-Mirai-Configurable-chat-message-signatures.patch  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/leaf-server/minecraft-patches/features/0069-Send-multiple-keep-alive-packets.patch b/leaf-server/minecraft-patches/features/0069-Send-multiple-keep-alive-packets.patch
index 4d83a2aa..de73c0f0 100644
--- a/leaf-server/minecraft-patches/features/0069-Send-multiple-keep-alive-packets.patch
+++ b/leaf-server/minecraft-patches/features/0069-Send-multiple-keep-alive-packets.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 149660c1196481275ca03830d64cf33b5ce98163..37de0c46b065851ea0f0d01e415980e47cc3cfb5 100644
+index 149660c1196481275ca03830d64cf33b5ce98163..9f5a5ee6a0acc2b6bad9eb4441e8404a45ae314b 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -38,10 +38,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -92,7 +92,7 @@ index 149660c1196481275ca03830d64cf33b5ce98163..37de0c46b065851ea0f0d01e415980e4
  
          for (java.util.Iterator<io.papermc.paper.util.KeepAlive.PendingKeepAlive> itr = this.keepAlive.pendingKeepAlives.iterator(); itr.hasNext();) {
              io.papermc.paper.util.KeepAlive.PendingKeepAlive ka = itr.next();
-@@ -261,6 +278,23 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -261,6 +278,24 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      protected void keepConnectionAlive() {
          long millis = Util.getMillis();
          // Paper start - improve keepalives
@@ -103,6 +103,7 @@ index 149660c1196481275ca03830d64cf33b5ce98163..37de0c46b065851ea0f0d01e415980e4
 +                if ((currTime - this.keepAlive.lastKeepAliveTx) >= java.util.concurrent.TimeUnit.SECONDS.toNanos(1L)) { // 1 second
 +                    this.keepAlive.lastKeepAliveTx = currTime;
 +                    if (this.keepAlivePending && !this.processedDisconnect && keepAlives.size() * 1000L >= KEEPALIVE_LIMIT) {
++                        LOGGER.info("{} was kicked due to keepalive timeout!", this.playerProfile().getName());
 +                        this.disconnect(TIMEOUT_DISCONNECTION_MESSAGE, io.papermc.paper.connection.DisconnectionReason.TIMEOUT);
 +                    } else if (this.checkIfClosed(millis)) {
 +                        this.keepAlivePending = true;
@@ -116,7 +117,7 @@ index 149660c1196481275ca03830d64cf33b5ce98163..37de0c46b065851ea0f0d01e415980e4
          if (this.checkIfClosed(millis) && !this.processedDisconnect) {
              long currTime = System.nanoTime();
  
-@@ -279,6 +313,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -279,6 +314,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  // Paper end - improve keepalives
              }
          }
diff --git a/leaf-server/minecraft-patches/features/0130-Mirai-Configurable-chat-message-signatures.patch b/leaf-server/minecraft-patches/features/0130-Mirai-Configurable-chat-message-signatures.patch
index 02a88aac..abef7de1 100644
--- a/leaf-server/minecraft-patches/features/0130-Mirai-Configurable-chat-message-signatures.patch
+++ b/leaf-server/minecraft-patches/features/0130-Mirai-Configurable-chat-message-signatures.patch
@@ -103,10 +103,10 @@ index 87fc8861948b50361ec04c5a23406d3abdec6eac..77f11179836636424927843f5f10c3fd
          // Paper start - Add setting for proxy online mode status
          return properties.enforceSecureProfile
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index c04772c15842a07e57d28a979bdceb1fe7547d61..3479ed772125b619dea7aed2a6695b8f7f08e1e8 100644
+index 3afb9910966bd77368b385edb3c76e9cb97b8524..f6aec052d8c76df7cb0b734893a857832a4d29b1 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -363,10 +363,30 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -364,10 +364,30 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      }
  
      public void send(Packet<?> packet) {