From eaa2c39183ba88f9c4dc11b7da3be74c2049096a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 10:00:16 +0100 Subject: [PATCH] Configurable connection throttle kick message (Closes #1515) --- ...ble-connection-throttle-kick-message.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch diff --git a/Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch new file mode 100644 index 000000000..9a1edadf8 --- /dev/null +++ b/Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch @@ -0,0 +1,38 @@ +From a08c09c59deda7061bb1b28f1b761294a1e17b4f Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Tue, 2 Oct 2018 09:57:50 +0100 +Subject: [PATCH] Configurable connection throttle kick message + + +diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java +index 6b65364e22..ae91c8d5e3 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +@@ -292,6 +292,11 @@ public class PaperConfig { + authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage)); + } + ++ public static String connectionThrottleKickMessage = "Connection throttled! Please wait before reconnecting."; ++ private static void connectionThrottleKickMessage() { ++ connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage); ++ } ++ + public static boolean savePlayerData = true; + private static void savePlayerData() { + savePlayerData = getBoolean("settings.save-player-data", savePlayerData); +diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java +index a02fa29217..7dc51fd995 100644 +--- a/src/main/java/net/minecraft/server/HandshakeListener.java ++++ b/src/main/java/net/minecraft/server/HandshakeListener.java +@@ -37,7 +37,7 @@ public class HandshakeListener implements PacketHandshakingInListener { + synchronized (throttleTracker) { + if (throttleTracker.containsKey(address) && !"127.0.0.1".equals(address.getHostAddress()) && currentTime - throttleTracker.get(address) < connectionThrottle) { + throttleTracker.put(address, currentTime); +- chatmessage = new ChatMessage("Connection throttled! Please wait before reconnecting."); ++ chatmessage = new ChatMessage(com.destroystokyo.paper.PaperConfig.connectionThrottleKickMessage); // Paper - Configurable connection throttle kick message + this.b.sendPacket(new PacketLoginOutDisconnect(chatmessage)); + this.b.close(chatmessage); + return; +-- +2.19.0 +