From 8d2c796fc10e37210c3ce991ca8fd7a06565b6f7 Mon Sep 17 00:00:00 2001 From: Mgazul Date: Sat, 2 Dec 2023 06:02:50 +0800 Subject: [PATCH] More fixes for FAWE --- patches/minecraft/net/minecraft/server/Main.java.patch | 2 +- .../minecraft/net/minecraft/world/storage/SaveFormat.java.patch | 2 +- src/main/java/org/bukkit/craftbukkit/v1_16_R3/CraftServer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/server/Main.java.patch b/patches/minecraft/net/minecraft/server/Main.java.patch index e2acc2c2b2..5713c409db 100644 --- a/patches/minecraft/net/minecraft/server/Main.java.patch +++ b/patches/minecraft/net/minecraft/server/Main.java.patch @@ -129,7 +129,7 @@ + } SaveFormat saveformat = SaveFormat.func_237269_a_(file1.toPath()); - SaveFormat.LevelSave saveformat$levelsave = saveformat.func_237274_c_(s); -+ SaveFormat.LevelSave saveformat$levelsave = saveformat.createAccess(s, Dimension.field_236053_b_); ++ SaveFormat.LevelSave saveformat$levelsave = saveformat.c(s, Dimension.field_236053_b_); MinecraftServer.func_240777_a_(saveformat$levelsave); DatapackCodec datapackcodec = saveformat$levelsave.func_237297_e_(); boolean flag = optionset.has(optionspec6); diff --git a/patches/minecraft/net/minecraft/world/storage/SaveFormat.java.patch b/patches/minecraft/net/minecraft/world/storage/SaveFormat.java.patch index c527dc8ffe..8988c6ebb8 100644 --- a/patches/minecraft/net/minecraft/world/storage/SaveFormat.java.patch +++ b/patches/minecraft/net/minecraft/world/storage/SaveFormat.java.patch @@ -86,7 +86,7 @@ + } + + // CraftBukkit start -+ public SaveFormat.LevelSave createAccess(String saveName, RegistryKey dimensionType) throws IOException { ++ public SaveFormat.LevelSave c(String saveName, RegistryKey dimensionType) throws IOException { + return new SaveFormat.LevelSave(saveName, dimensionType); + } + diff --git a/src/main/java/org/bukkit/craftbukkit/v1_16_R3/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/v1_16_R3/CraftServer.java index 90593fa25f..1a72445afe 100644 --- a/src/main/java/org/bukkit/craftbukkit/v1_16_R3/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/v1_16_R3/CraftServer.java @@ -1052,7 +1052,7 @@ public World createWorld(WorldCreator creator) { SaveFormat.LevelSave worldSession; try { - worldSession = SaveFormat.createDefault(getWorldContainer().toPath()).createAccess(name, actualDimension); + worldSession = SaveFormat.createDefault(getWorldContainer().toPath()).c(name, actualDimension); } catch (IOException ex) { throw new RuntimeException(ex); }