diff options
| author | Riley Park <[email protected]> | 2024-07-21 03:42:04 -0700 |
|---|---|---|
| committer | Riley Park <[email protected]> | 2024-07-21 03:42:04 -0700 |
| commit | 2a810b77f0ce62cd3be25b8850f61b448755ef6d (patch) | |
| tree | 6b3c82b1909c678a3b1ce70ecf3e804ee63a989a /patches/server/1043-Bundle-spark.patch | |
| parent | c250671fda4de965baec473519f38879a93b4524 (diff) | |
| download | Paper-2a810b77f0ce62cd3be25b8850f61b448755ef6d.tar.gz Paper-2a810b77f0ce62cd3be25b8850f61b448755ef6d.zip | |
yeet, part 02feat/timings-removal
Diffstat (limited to 'patches/server/1043-Bundle-spark.patch')
| -rw-r--r-- | patches/server/1043-Bundle-spark.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/1043-Bundle-spark.patch b/patches/server/1043-Bundle-spark.patch index 67b496a88c..f81d34c1e1 100644 --- a/patches/server/1043-Bundle-spark.patch +++ b/patches/server/1043-Bundle-spark.patch @@ -313,10 +313,10 @@ index 8160c35368fc2c52d6f4a42df27adb2ef6eb87f3..9325d6f95165a7cee00d7de736af7236 this.profiler.push("tallying"); long j = Util.getNanos() - i; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index d43b98bdfcb00603737a309c0fb7793d42289b8c..dd56c8e041116ef3602a9f89c998c8208ab89b51 100644 +index 2eb10c11383f40bc80de19542df0379434133c31..cf0fc4bfcbae8fb152f4548b6a17becce702bde6 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -226,6 +226,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess()); this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); // Paper end - initialize global and world-defaults configuration @@ -324,7 +324,7 @@ index d43b98bdfcb00603737a309c0fb7793d42289b8c..dd56c8e041116ef3602a9f89c998c820 // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save if (this.convertOldUsers()) { this.getProfileCache().save(false); // Paper -@@ -235,6 +236,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -233,6 +234,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command |