Commits

md_5 authored 921ae06d602
Revert "SPIGOT-7447: Fix --forceUpgrade"

This reverts commit 70e0bc050a2ef1bb5b0d8ac97be24484f3891ceb.
No tags

nms-patches/net/minecraft/server/MinecraftServer.patch

Modified
262 262 +
263 263 + WorldDimensions.b worlddimensions_b = worlddimensions.bake(iregistry);
264 264 + Lifecycle lifecycle = worlddimensions_b.lifecycle().add(worldloader_a.datapackWorldgen().allRegistriesLifecycle());
265 265 +
266 266 + worlddata = new WorldDataServer(worldsettings, worldoptions, worlddimensions_b.specialWorldProperty(), lifecycle);
267 267 + }
268 268 + worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
269 269 + if (options.has("forceUpgrade")) {
270 270 + net.minecraft.server.Main.forceUpgrade(worldSession, DataConverterRegistry.getDataFixer(), options.has("eraseCache"), () -> {
271 271 + return true;
272 -+ }, dimensions);
272 ++ }, iregistry);
273 273 + }
274 274 +
275 275 + WorldDataServer iworlddataserver = worlddata;
276 276 + boolean flag = worlddata.isDebugWorld();
277 277 + WorldOptions worldoptions = worlddata.worldGenOptions();
278 278 + long i = worldoptions.seed();
279 279 + long j = BiomeManager.obfuscateSeed(i);
280 280 + List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
281 281 + WorldDimension worlddimension = (WorldDimension) dimensions.get(dimensionKey);
282 282 +

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut