aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-API-Patches-Unmapped/0215-Allow-delegation-to-vanilla-chunk-gen.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-API-Patches-Unmapped/0215-Allow-delegation-to-vanilla-chunk-gen.patch')
-rw-r--r--Spigot-API-Patches-Unmapped/0215-Allow-delegation-to-vanilla-chunk-gen.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/Spigot-API-Patches-Unmapped/0215-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-API-Patches-Unmapped/0215-Allow-delegation-to-vanilla-chunk-gen.patch
new file mode 100644
index 0000000000..1f3141b243
--- /dev/null
+++ b/Spigot-API-Patches-Unmapped/0215-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -0,0 +1,85 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MiniDigger <[email protected]>
+Date: Wed, 29 Apr 2020 02:09:17 +0200
+Subject: [PATCH] Allow delegation to vanilla chunk gen
+
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 77d352450f6bc5293efec3b75e08b857e2626fe7..1eaf6aae1e13c48a7f911e523015cb9b8cca8638 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -1478,6 +1478,22 @@ public final class Bukkit {
+ return server.createChunkData(world);
+ }
+
++ // Paper start
++ /**
++ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
++ *
++ * @param world the world to create the ChunkData for
++ * @param x the x coordinate of the chunk
++ * @param z the z coordinate of the chunk
++ * @return a new ChunkData for the world
++ *
++ */
++ @NotNull
++ public static ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
++ return server.createVanillaChunkData(world, x, z);
++ }
++ // Paper stop
++
+ /**
+ * Creates a boss bar instance to display to players. The progress
+ * defaults to 1.0
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 4b1f515f2228f16c1ce793bd45510243d758236f..8ee02c3d6cc8751704e5993fecd05293714e492f 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1245,6 +1245,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+ @NotNull
+ public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
+
++ // Paper start
++ /**
++ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
++ *
++ * @param world the world to create the ChunkData for
++ * @param x the x coordinate of the chunk
++ * @param z the z coordinate of the chunk
++ * @return a new ChunkData for the world
++ *
++ */
++ @NotNull
++ ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z);
++ // Paper end
++
+ /**
+ * Creates a boss bar instance to display to players. The progress
+ * defaults to 1.0
+diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
+index 7caef27682f22a77de283dd6f391ec8bc0b0312b..5ba77d40a38e5e592ee265e4fbd510043a0b4345 100644
+--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
++++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
+@@ -227,6 +227,22 @@ public abstract class ChunkGenerator {
+ return false;
+ }
+
++ // Paper start
++ /**
++ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
++ *
++ * @param world the world to create the ChunkData for
++ * @param x the x coordinate of the chunk
++ * @param z the z coordinate of the chunk
++ * @return a new ChunkData for the world
++ *
++ */
++ @NotNull
++ public ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
++ return Bukkit.getServer().createVanillaChunkData(world, x, z);
++ }
++ // Paper end
++
+ /**
+ * Data for a Chunk.
+ */