twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of universe flag and forceUpgrade

Browse Source
This commit is contained in:
Jake Potrebic
2021-06-25 18:56:12 -07:00
parent 254ac170de
commit 28e57942d7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/Fix-and-optimise-world-force-upgrading.patch
View File

@@ -67,15 +67,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private final ResourceKey<LevelStem> dimensionType; + private final ResourceKey<LevelStem> dimensionType;
+ private final ResourceKey<DimensionType> worldKey; + private final ResourceKey<DimensionType> worldKey;
+ private final String worldName; + private final String worldName;
+ private final File worldDir;
+ private final ExecutorService threadPool; + private final ExecutorService threadPool;
+ private final DataFixer dataFixer; + private final DataFixer dataFixer;
+ private final boolean removeCaches; + private final boolean removeCaches;
+ +
+ public ThreadedWorldUpgrader(final ResourceKey<LevelStem> dimensionType, final ResourceKey<DimensionType> worldKey, final String worldName, final int threads, + public ThreadedWorldUpgrader(final ResourceKey<LevelStem> dimensionType, final ResourceKey<DimensionType> worldKey, final String worldName, final File worldDir, final int threads,
+ final DataFixer dataFixer, final boolean removeCaches) { + final DataFixer dataFixer, final boolean removeCaches) {
+ this.dimensionType = dimensionType; + this.dimensionType = dimensionType;
+ this.worldKey = worldKey; + this.worldKey = worldKey;
+ this.worldName = worldName; + this.worldName = worldName;
+ this.worldDir = worldDir;
+ this.threadPool = Executors.newFixedThreadPool(Math.max(1, threads), new ThreadFactory() { + this.threadPool = Executors.newFixedThreadPool(Math.max(1, threads), new ThreadFactory() {
+ private final AtomicInteger threadCounter = new AtomicInteger(); + private final AtomicInteger threadCounter = new AtomicInteger();
+ +
@@ -96,7 +98,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ public void convert() { + public void convert() {
+ final File worldFolder = LevelStorageSource.getFolder(new File(this.worldName), this.dimensionType); + final File worldFolder = LevelStorageSource.getFolder(this.worldDir, this.dimensionType);
+ final DimensionDataStorage worldPersistentData = new DimensionDataStorage(new File(worldFolder, "data"), this.dataFixer); + final DimensionDataStorage worldPersistentData = new DimensionDataStorage(new File(worldFolder, "data"), this.dataFixer);
+ +
+ final File regionFolder = new File(worldFolder, "region"); + final File regionFolder = new File(worldFolder, "region");
@@ -251,10 +253,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// Paper end // Paper end
+ // Paper start - fix and optimise world upgrading + // Paper start - fix and optimise world upgrading
+ public static void convertWorldButItWorks(ResourceKey<LevelStem> dimensionType, ResourceKey<DimensionType> worldKey, String worldName, + public static void convertWorldButItWorks(ResourceKey<LevelStem> dimensionType, ResourceKey<DimensionType> worldKey, net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess worldSession,
+ DataFixer dataFixer, boolean removeCaches) { + DataFixer dataFixer, boolean removeCaches) {
+ int threads = Runtime.getRuntime().availableProcessors() * 3 / 8; + int threads = Runtime.getRuntime().availableProcessors() * 3 / 8;
+ final ThreadedWorldUpgrader worldUpgrader = new ThreadedWorldUpgrader(dimensionType, worldKey, worldName, threads, dataFixer, removeCaches); + final ThreadedWorldUpgrader worldUpgrader = new ThreadedWorldUpgrader(dimensionType, worldKey, worldSession.getLevelId(), worldSession.levelPath.toFile(), threads, dataFixer, removeCaches);
+ worldUpgrader.convert(); + worldUpgrader.convert();
+ } + }
+ // Paper end - fix and optimise world upgrading + // Paper end - fix and optimise world upgrading
@@ -288,7 +290,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - fix and optimise world upgrading + // Paper start - fix and optimise world upgrading
+ if (options.has("forceUpgrade")) { + if (options.has("forceUpgrade")) {
+ net.minecraft.server.Main.convertWorldButItWorks( + net.minecraft.server.Main.convertWorldButItWorks(
+ dimensionKey, Level.getDimensionKey(dimensionmanager), worldSession.getLevelId(), DataFixers.getDataFixer(), options.has("eraseCache") + dimensionKey, Level.getDimensionKey(dimensionmanager), worldSession, DataFixers.getDataFixer(), options.has("eraseCache")
+ ); + );
+ } + }
+ // Paper end - fix and optimise world upgrading + // Paper end - fix and optimise world upgrading
@@ -376,7 +378,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - fix and optimise world upgrading + // Paper start - fix and optimise world upgrading
+ if (console.options.has("forceUpgrade")) { + if (console.options.has("forceUpgrade")) {
+ net.minecraft.server.Main.convertWorldButItWorks( + net.minecraft.server.Main.convertWorldButItWorks(
+ actualDimension, net.minecraft.world.level.Level.getDimensionKey(dimensionmanager), worldSession.getLevelId(), DataFixers.getDataFixer(), console.options.has("eraseCache") + actualDimension, net.minecraft.world.level.Level.getDimensionKey(dimensionmanager), worldSession, DataFixers.getDataFixer(), console.options.has("eraseCache")
+ ); + );
+ } + }
+ // Paper end - fix and optimise world upgrading + // Paper end - fix and optimise world upgrading