core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix force upgrade patch (#5699)

This commit is contained in:
Nassim 2021-05-21 10:29:49 +02:00 committed by GitHub
parent dab6ec6cdf
commit 3dcbdc73bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Spigot-Server-Patches/0737-Fix-and-optimise-world-force-upgrading.patch
View File

@ -375,7 +375,7 @@ index ebb0d6988f87013ea5d523ab4a1b31cb669ccc43..74d826853389b8e01ffe2b076cf2b179
return this.cache.getAndMoveToFirst(ChunkCoordIntPair.pair(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c51e9b50323f5e33bad5fd25d74c572241377059..2483d25014dd6a1031dd0f2c27b2e6e9b51f2887 100644
index c51e9b50323f5e33bad5fd25d74c572241377059..ff79c13bc7717eb9529e802b8e31a1f756b02f97 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1147,14 +1147,7 @@ public final class CraftServer implements Server {
@ -394,3 +394,18 @@ index c51e9b50323f5e33bad5fd25d74c572241377059..2483d25014dd6a1031dd0f2c27b2e6e9
long j = BiomeManager.a(creator.seed());
List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(worlddata));
@@ -1171,6 +1164,14 @@ public final class CraftServer implements Server {
chunkgenerator = worlddimension.c();
}
+ // Paper start - fix and optimise world upgrading
+ if (console.options.has("forceUpgrade")) {
+ net.minecraft.server.Main.convertWorldButItWorks(
+ actualDimension, net.minecraft.world.level.World.getDimensionKey(dimensionmanager), worldSession.getLevelName(), DataConverterRegistry.getDataFixer(), console.options.has("eraseCache")
+ );
+ }
+ // Paper end - fix and optimise world upgrading
+
ResourceKey<net.minecraft.world.level.World> worldKey;
String levelName = this.getServer().getDedicatedServerProperties().levelName;
if (name.equals(levelName + "_nether")) {