From 31ec7762819feb268891d01eff3505a016e28f9f Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 3 Dec 2022 10:19:09 -0800 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#8604) Upstream has released updates that appear 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: 38866413 SPIGOT-6765: Pass WorldInfo, Random and coordinates to ChunkGenerator should methods CraftBukkit Changes: f3dab3a48 SPIGOT-7191: TNT minecart explosions crash the server b5aa0bed9 SPIGOT-7184: ExplosionPrimeEvent not called for ExplosiveMinecart e7aab5493 SPIGOT-6765: Pass WorldInfo, Random and coordinates to ChunkGenerator should methods --- patches/api/Allow-delegation-to-vanilla-chunk-gen.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/api/Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/Allow-delegation-to-vanilla-chunk-gen.patch index 8a34f1c3b8..bd9104c568 100644 --- a/patches/api/Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/api/Allow-delegation-to-vanilla-chunk-gen.patch @@ -85,5 +85,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + /** - * Data for a Chunk. - */ + * Gets if the server should generate Vanilla structures after this + * ChunkGenerator. diff --git a/work/Bukkit b/work/Bukkit index 9a4de09769..38866413a7 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 9a4de0976907a81c4089cf5e8434155e77960145 +Subproject commit 38866413a790619d8d8873de5b62f807947b81f6 diff --git a/work/CraftBukkit b/work/CraftBukkit index 300e7448f5..f3dab3a488 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 300e7448f5f0466e23b97d69aa424629c816fc8e +Subproject commit f3dab3a488c6ef87abe9639d537c19b7a1029019