Port flat bedrock (generator settings) to 1.18 (#6960)

1 files changed, 0 insertions, 33 deletions

diff --git a/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
deleted file mode 100644
index 86102faf60..0000000000
--- a/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 e0c1e4e38ff49429a587c59afb86e95c452d52a0..e2882c60621d64458a480abaceeddd0417afc5d0 100644
---- a/src/main/java/net/minecraft/server/Main.java
-+++ b/src/main/java/net/minecraft/server/Main.java
-@@ -134,11 +134,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((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
-             LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());