51 lines
3.5 KiB
Diff
51 lines
3.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||
|
|
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 efa3c79533ac2abff8387f3bbe6e312ffc727e77..41576d9c9518ae05f63c087736b323ce03f6046a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
||
|
|
@@ -138,8 +138,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); // Paper
|
||
|
|
+ // 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); // Paper
|
||
|
|
// 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 697ca7457115423a8c4d8a7d1f7a353237b56509..d249e0b753493eb46481ac2cd51e04af2ba0db00 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Services.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Services.java
|
||
|
|
@@ -8,12 +8,12 @@ import net.minecraft.server.players.GameProfileCache;
|
||
|
|
import net.minecraft.util.SignatureValidator;
|
||
|
|
|
||
|
|
public record Services(MinecraftSessionService sessionService, SignatureValidator serviceSignatureValidator, GameProfileRepository profileRepository, GameProfileCache profileCache) {
|
||
|
|
- 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) {
|
||
|
|
+ public static Services create(YggdrasilAuthenticationService authenticationService, File rootDirectory, File userCacheFile) { // Paper
|
||
|
|
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
|
||
|
|
SignatureValidator signatureValidator = SignatureValidator.from(authenticationService.getServicesKey());
|
||
|
|
return new Services(minecraftSessionService, signatureValidator, gameProfileRepository, gameProfileCache);
|
||
|
|
}
|