diff options
| author | Aikar <[email protected]> | 2020-07-22 04:26:59 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-07-22 04:26:59 -0400 |
| commit | 2712c688856c79a6acbd2fb2c414d22127ac71d9 (patch) | |
| tree | 39466af961fb4a7849aa9b7a0b4ddf1d2034cf14 /Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch | |
| parent | 0901ffd046156b8dfdc97a797ae4c8cf0cce0449 (diff) | |
| download | Paper-2712c688856c79a6acbd2fb2c414d22127ac71d9.tar.gz Paper-2712c688856c79a6acbd2fb2c414d22127ac71d9.zip | |
[Auto] Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f1e73b03 #525: Add contributors plugin.yml field.
ef0999fe #529: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
CraftBukkit Changes:
8b831a965 #714: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
Diffstat (limited to 'Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch')
| -rw-r--r-- | Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch index 02ddb475e4..77dc33a6a1 100644 --- a/Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ 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 +index 2d981b2481dfb428b2f6a27b5649b7e6148a8776..62cc1c74c11f56dcbd1e24e9c5478497742e6351 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 { +@@ -1355,6 +1355,22 @@ public final class Bukkit { return server.createChunkData(world); } @@ -32,10 +32,10 @@ index 329e2dd1c057788d6bb5a1adc7ee9282820e927d..4e92ce18227c8f650fe5c6f4a670e6f5 * 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 +index bad2ae145ca8fd1e7eb07f0507a743c4ffd23030..6e01bf2d52e8bb6de7395f50c12f16c64aef72ae 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 { +@@ -1136,6 +1136,20 @@ public interface Server extends PluginMessageRecipient { @NotNull public ChunkGenerator.ChunkData createChunkData(@NotNull World world); |