86 lines
3.3 KiB
Diff
86 lines
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: MiniDigger <admin@minidigger.me>
|
||
|
|
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 329e2dd1c057788d6bb5a1adc7ee9282820e927d..4e92ce18227c8f650fe5c6f4a670e6f56d629872 100644
|
||
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
||
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||
|
|
@@ -1344,6 +1344,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 b464cc1a70aca3450a5de84a657a1e069a1a8ab6..0653e0ffe96748dc971ec7e8027f8159696adf62 100644
|
||
|
|
--- a/src/main/java/org/bukkit/Server.java
|
||
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
||
|
|
@@ -1127,6 +1127,20 @@ public interface Server extends PluginMessageRecipient {
|
||
|
|
@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.
|
||
|
|
*/
|