more config shenanigans

This commit is contained in:
granny
2023-06-09 05:38:33 -07:00
parent b53946bebb
commit 4c83188e5b
48 changed files with 148 additions and 152 deletions

View File

@@ -32,7 +32,7 @@ index f5e9a56f6f478e241a9ffcf703e4a54e8270eac9..c4a88ef1cc23b0f7b3fe50019441535b
if (this.server != null) {
this.server.disablePlugins();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index c2b243240efacac250cb8440d215884756b66283..cd663643c38e787b06e7bc9cf74d9f78431ca988 100644
index 76477e68578674017c5b3c514bb5c78bf71f443d..0b2c90fc95889502636e7a4f95aa62bd11c89e7a 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -276,6 +276,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -67,10 +67,10 @@ index c2b243240efacac250cb8440d215884756b66283..cd663643c38e787b06e7bc9cf74d9f78
// CraftBukkit start
// this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 7d9422b06ba79dbc268d451d3753150366e0877e..fca49d64c0067cef3f29d0924b4cf4672c5fbec5 100644
index ec519c0e6388eac27f9eb6fcd85713763206d71e..1c277fca191df2ed3cc397ec247a7d785d97a894 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -422,4 +422,9 @@ public class PurpurConfig {
@@ -424,4 +424,9 @@ public class PurpurConfig {
private static void tpsCatchup() {
tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
}