diff options
Diffstat (limited to 'patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch')
| -rw-r--r-- | patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index f897a69dd5..2a3486aa93 100644 --- a/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,7 +18,7 @@ index df955666723a8cb1e612311f0b8e77fb577d6be5..01aefce226ae82d707b38b0d56d2580d biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2747a420f2c1ba4cf103f6340c5db671af3ade81..7dc79e7c552d7ebc2dea9248c2d5647b5a6895e0 100644 +index 825a3b688099a3021ff422dd123038b6cca3e14f..168893fe1790edac8fee884b1fae4e6b7a1bd5c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1217,7 +1217,7 @@ public final class CraftServer implements Server { @@ -67,10 +67,10 @@ index 0ebacc6f35591b3f1fc740d484f30c7c2337392a..bd24cf74dfc0974f5bc132994deac45b private static final Random rand = new Random(); diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java -index aeffb30cd91d4b21850059d33070c537bd5cb25e..3918c24dfb6cda4cff18016cca807c2dbc2a9156 100644 +index aeffb30cd91d4b21850059d33070c537bd5cb25e..c5ae71a01c9e7c2a127ac4ddc842700298cc1299 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftWorldInfo.java -@@ -17,8 +17,17 @@ public class CraftWorldInfo implements WorldInfo { +@@ -17,8 +17,14 @@ public class CraftWorldInfo implements WorldInfo { private final long seed; private final int minHeight; private final int maxHeight; @@ -78,9 +78,7 @@ index aeffb30cd91d4b21850059d33070c537bd5cb25e..3918c24dfb6cda4cff18016cca807c2d + private final net.minecraft.world.level.chunk.ChunkGenerator vanillaChunkGenerator; + private final net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry; - public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager) { -+ this(worldDataServer, session, environment, dimensionManager, null, null); -+ } +- public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager) { + public CraftWorldInfo(ServerLevelData worldDataServer, LevelStorageSource.LevelStorageAccess session, World.Environment environment, DimensionType dimensionManager, net.minecraft.world.level.chunk.ChunkGenerator chunkGenerator, net.minecraft.core.Registry<net.minecraft.world.level.biome.Biome> biomeRegistry) { + this.biomeRegistry = biomeRegistry; + this.vanillaChunkGenerator = chunkGenerator; @@ -88,7 +86,7 @@ index aeffb30cd91d4b21850059d33070c537bd5cb25e..3918c24dfb6cda4cff18016cca807c2d this.name = worldDataServer.getLevelName(); this.uuid = WorldUUID.getUUID(session.levelPath.toFile()); this.environment = environment; -@@ -28,6 +37,10 @@ public class CraftWorldInfo implements WorldInfo { +@@ -28,6 +34,10 @@ public class CraftWorldInfo implements WorldInfo { } public CraftWorldInfo(String name, UUID uuid, World.Environment environment, long seed, int minHeight, int maxHeight) { @@ -99,7 +97,7 @@ index aeffb30cd91d4b21850059d33070c537bd5cb25e..3918c24dfb6cda4cff18016cca807c2d this.name = name; this.uuid = uuid; this.environment = environment; -@@ -65,4 +78,24 @@ public class CraftWorldInfo implements WorldInfo { +@@ -65,4 +75,24 @@ public class CraftWorldInfo implements WorldInfo { public int getMaxHeight() { return this.maxHeight; } |