aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch')
-rw-r--r--patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
new file mode 100644
index 0000000000..2e36f96bd3
--- /dev/null
+++ b/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Fri, 10 Jul 2020 13:12:33 -0500
+Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
+
+
+diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+index 5374a6b70a9780cfe9f62207b290b9a3ab82c7e9..976d5e9c965324537720e38acf6a6deda079a324 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -175,8 +175,17 @@ public class Main {
+ return;
+ }
+
+- File file = (File) optionset.valueOf("universe"); // CraftBukkit
+- Services services = Services.create(new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY), file, optionset); // Paper - pass OptionSet to load paper config files; override authentication service
++ // Paper start - fix SPIGOT-5824
++ File file;
++ File userCacheFile = new File(Services.USERID_CACHE_FILE);
++ if (optionset.has("universe")) {
++ file = (File) optionset.valueOf("universe"); // CraftBukkit
++ userCacheFile = new File(file, Services.USERID_CACHE_FILE);
++ } else {
++ file = new File(bukkitConfiguration.getString("settings.world-container", "."));
++ }
++ // Paper end - fix SPIGOT-5824
++ Services services = Services.create(new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionset); // Paper - pass OptionSet to load paper config files; override authentication service; fix world-container
+ // CraftBukkit start
+ String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
+ LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
+diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/net/minecraft/server/Services.java
+index d200619b4aa820e273c26f2f6133589c727f8a0e..d89c624554ab08bd1b33a3f62b52aa57aaafb8b4 100644
+--- a/src/main/java/net/minecraft/server/Services.java
++++ b/src/main/java/net/minecraft/server/Services.java
+@@ -22,12 +22,12 @@ public record Services(MinecraftSessionService sessionService, ServicesKeySet se
+ return java.util.Objects.requireNonNull(this.paperConfigurations);
+ }
+ // Paper end - add paper configuration files
+- private static final String USERID_CACHE_FILE = "usercache.json";
++ public static final String USERID_CACHE_FILE = "usercache.json"; // Paper - private -> public
+
+- public static Services create(YggdrasilAuthenticationService authenticationService, File rootDirectory, joptsimple.OptionSet optionSet) throws Exception { // Paper - add optionset to load paper config files
++ public static Services create(YggdrasilAuthenticationService authenticationService, File rootDirectory, File userCacheFile, joptsimple.OptionSet optionSet) throws Exception { // Paper - add optionset to load paper config files; add userCacheFile parameter
+ MinecraftSessionService minecraftSessionService = authenticationService.createMinecraftSessionService();
+ GameProfileRepository gameProfileRepository = authenticationService.createProfileRepository();
+- GameProfileCache gameProfileCache = new GameProfileCache(gameProfileRepository, new File(rootDirectory, "usercache.json"));
++ GameProfileCache gameProfileCache = new GameProfileCache(gameProfileRepository, userCacheFile); // Paper - use specified user cache file
+ // Paper start - load paper config files from cli options
+ final java.nio.file.Path legacyConfigPath = ((File) optionSet.valueOf("paper-settings")).toPath();
+ final java.nio.file.Path configDirPath = ((File) optionSet.valueOf("paper-settings-directory")).toPath();