mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-21 07:49:22 +00:00
a4ed88543a
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@681c013 Bundle spark (#11093) PaperMC/Paper@5fee9c6 Move configuration option to a system property PaperMC/Paper@aa3b356 Improve server startup logging (#11110) PaperMC/Paper@9aea240 Properly lookup plugin classes when looked up by spark PaperMC/Paper@7e91a2c Update the bundled spark version
37 lines
2.2 KiB
Diff
37 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Sat, 24 Dec 2022 22:50:13 +0100
|
|
Subject: [PATCH] Make slow login timeout configurable
|
|
|
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
|
index a60651bb5e1156db2b3ccd74e18661aa3f19b9c2..1d11d0388b9763a0e0e5f3398425dafa2bb01488 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
|
@@ -122,7 +122,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
|
this.finishLoginAndWaitForClient(this.authenticatedProfile);
|
|
}
|
|
|
|
- if (this.tick++ == 600) {
|
|
+ // Gale start - make slow login timeout configurable
|
|
+ int slowLoginTimeout = GaleGlobalConfiguration.get().misc.premiumAccountSlowLoginTimeout;
|
|
+ if (this.tick++ >= (slowLoginTimeout < 1 ? MAX_TICKS_BEFORE_LOGIN : slowLoginTimeout)) {
|
|
+ // Gale end - make slow login timeout configurable
|
|
this.disconnect(Component.translatable("multiplayer.disconnect.slow_login"));
|
|
}
|
|
|
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
|
index b2ee56fa4be361e9151389787313594493dd7a2e..c9f19aa7dbf01d6dd295ae9e8d3df06c16ef75b4 100644
|
|
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
|
|
@@ -52,6 +52,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
|
|
public class Misc extends ConfigurationPart {
|
|
|
|
public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
|
|
+ public int premiumAccountSlowLoginTimeout = -1; // Gale - make slow login timeout configurable
|
|
|
|
public Keepalive keepalive;
|
|
public class Keepalive extends ConfigurationPart {
|