2021-10-17 17:10:03 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sat, 16 Oct 2021 17:38:35 -0700
Subject: [PATCH] Use correct LevelStem registry when loading default
end/nether
2022-03-17 00:54:52 +00:00
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2021-10-17 17:10:03 +00:00
2022-03-17 00:54:52 +00:00
diff --git a/src/main/java/net/minecraft/resources/RegistryLoader.java b/src/main/java/net/minecraft/resources/RegistryLoader.java
2022-06-08 10:40:44 +00:00
index 8da1226a6c293abb038d10c7921a77ed71ad06cc..f958f0ae738a6fb26400e17e54c8d69e95268cdd 100644
2022-03-17 00:54:52 +00:00
--- a/src/main/java/net/minecraft/resources/RegistryLoader.java
+++ b/src/main/java/net/minecraft/resources/RegistryLoader.java
2022-06-08 10:40:44 +00:00
@@ -46,6 +46,12 @@ public class RegistryLoader {
2022-03-17 00:54:52 +00:00
RegistryLoader.ReadCache<E> readCache = this.readCache(registryRef);
DataResult<Holder<E>> dataResult = readCache.values.get(entryKey);
if (dataResult != null) {
+ // Paper start - register in registry due to craftbukkit running this 3 times instead of once
+ if (registryRef == (ResourceKey) Registry.LEVEL_STEM_REGISTRY && dataResult.result().isPresent()) {
+ // OptionalInt.empty() because the LevelStem registry is only loaded from the resource manager, not the InMemory resource access
+ registry.registerOrOverride(java.util.OptionalInt.empty(), entryKey, dataResult.result().get().value(), dataResult.lifecycle());
+ }
+ // Paper end
return dataResult;
} else {
2022-06-08 10:40:44 +00:00
Holder<E> holder = registry.getOrCreateHolderOrThrow(entryKey);
2021-10-17 17:10:03 +00:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2022-06-09 08:51:45 +00:00
index 17efe9e0a17672b815c64491dbca70b7519b6aca..79153def3866e9761fcd6eca7d81574fe64f2895 100644
2021-10-17 17:10:03 +00:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2022-06-09 08:51:45 +00:00
@@ -550,7 +550,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2021-10-17 17:10:03 +00:00
long i = generatorsettings.seed();
long j = BiomeManager.obfuscateSeed(i);
List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
2022-03-01 05:43:03 +00:00
- LevelStem worlddimension = (LevelStem) iregistry.get(dimensionKey);
2021-10-17 17:10:03 +00:00
+ // Paper start - Use correct LevelStem registry
2021-11-12 22:27:26 +00:00
+ final LevelStem worlddimension;
+ if (dimensionKey == LevelStem.END || dimensionKey == LevelStem.NETHER) {
+ worlddimension = generatorsettings.dimensions().get(dimensionKey);
+ } else {
2022-03-01 05:43:03 +00:00
+ worlddimension = iregistry.get(dimensionKey);
2021-10-17 17:10:03 +00:00
+ }
+ // Paper end
2022-06-08 10:40:44 +00:00
org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.typeHolder().value());
if (biomeProvider == null && gen != null) {