9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-30 20:39:21 +00:00

Updated Upstream (Gale/Purpur/Leaves)

This commit is contained in:
Dreeam
2024-06-14 03:18:51 +08:00
parent 8742091121
commit 2e32ca3a7a
55 changed files with 281 additions and 571 deletions

View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Sun, 3 Dec 2023 05:33:24 -0500
Subject: [PATCH] Fix keepalive kicked name
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
index 9fa1cb2146bb8173a246981c0f73cd8c1bc44abe..487e24f1a26428cdaee3ca946ac8f5f1f599b260 100644
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -288,7 +288,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
if (GaleGlobalConfiguration.get().misc.keepalive.sendMultiple) {
if (elapsedTime >= 1000L) { // 1 second
if (!this.processedDisconnect && this.keepAlives.size() >= KEEPALIVE_LIMIT_IN_SECONDS) {
- LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName());
+ LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // Leaf - Fix keepalive kicked name
disconnect(Component.translatable("disconnect.timeout"), org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT);
} else {
this.keepAliveTime = currentTime; // hijack this field for 1 second intervals