mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 10:49:40 +01:00
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 4eb60f2772c80f9917e88c40ed2214993709e443..26099f95d68540d4e6c54c32fd9699ff01660236 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1490,6 +1490,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 22495f576b05e3f0161bfd2c4ea5e5622fdb6302..864211431ebfe9bb333943c31892dfcbdeb33037 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1256,6 +1256,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 9d7592988a2fbcc70f889b0622adbef014054d00..244a8a93c35d5a84e17672ff745051587bca384c 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.
|
|
*/
|