mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 04:31:58 +01:00
34 lines
2.2 KiB
Diff
34 lines
2.2 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 855b3b4c90d84d4efa8395a76010b4b194591cbc..4e353432281a6dbbb49eaa4a6cb4eb051d1a08c5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
||
|
|
@@ -124,11 +124,20 @@ public class Main {
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
- File file = (File) optionset.valueOf("universe"); // CraftBukkit
|
||
|
|
+ // Paper start - fix SPIGOT-5824
|
||
|
|
+ File file;
|
||
|
|
+ File userCacheFile = new File("usercache.json");
|
||
|
|
+ if (optionset.has("universe")) {
|
||
|
|
+ file = (File) optionset.valueOf("universe"); // CraftBukkit
|
||
|
|
+ userCacheFile = new File(file, "usercache.json");
|
||
|
|
+ } else {
|
||
|
|
+ file = new File(bukkitConfiguration.getString("settings.world-container", "."));
|
||
|
|
+ }
|
||
|
|
+ // Paper end - fix SPIGOT-5824
|
||
|
|
YggdrasilAuthenticationService yggdrasilauthenticationservice = new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY); // Paper
|
||
|
|
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
|
||
|
|
GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
|
||
|
|
- GameProfileCache usercache = new GameProfileCache(gameprofilerepository, new File(file, MinecraftServer.USERID_CACHE_FILE.getName()));
|
||
|
|
+ GameProfileCache usercache = new GameProfileCache(gameprofilerepository, userCacheFile); // Paper - only move usercache.json into folder if --universe is used, not world-container
|
||
|
|
// CraftBukkit start
|
||
|
|
String s = (String) Optional.ofNullable(optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
|
||
|
|
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
|