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/0175-Fix-Spigot-annotation-mistakes.patch

@@ -517,10 +517,10 @@ index 6bafc62e2235a6b783cbf96f4dabeeaf02bd5178..50c762d777ac90a05772501a28cacff8
          cancelledCollision = cancel;
      }
 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index 6cb2bf60fb970b646451c02faf71a14a80e6a56b..7cf8ffb5a29d1cf382064b3aca0353a53b89fa9e 100644
+index 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..acba500393e1736e6081facac6ef9ab10da655de 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-@@ -514,7 +514,9 @@ public abstract class ChunkGenerator {
+@@ -656,7 +656,9 @@ public abstract class ChunkGenerator {
           * @param y the y location in the chunk from minHeight (inclusive) - maxHeight (exclusive)
           * @param z the z location in the chunk from 0-15 inclusive
           * @param material the type to set the block to
@@ -530,7 +530,7 @@ index 6cb2bf60fb970b646451c02faf71a14a80e6a56b..7cf8ffb5a29d1cf382064b3aca0353a5
          public void setBlock(int x, int y, int z, @NotNull MaterialData material);
  
          /**
-@@ -558,7 +560,9 @@ public abstract class ChunkGenerator {
+@@ -700,7 +702,9 @@ public abstract class ChunkGenerator {
           * @param yMax maximum y location (exclusive) in the chunk to set
           * @param zMax maximum z location (exclusive) in the chunk to set
           * @param material the type to set the blocks to
@@ -540,7 +540,7 @@ index 6cb2bf60fb970b646451c02faf71a14a80e6a56b..7cf8ffb5a29d1cf382064b3aca0353a5
          public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, @NotNull MaterialData material);
  
          /**
-@@ -599,8 +603,10 @@ public abstract class ChunkGenerator {
+@@ -741,8 +745,10 @@ public abstract class ChunkGenerator {
           * @param y the y location in the chunk from minHeight (inclusive) - maxHeight (exclusive)
           * @param z the z location in the chunk from 0-15 inclusive
           * @return the type and data of the block or the MaterialData for air if x, y or z are outside the chunk's bounds

patches/api/0341-Allow-delegation-to-vanilla-chunk-gen.patch

@@ -61,10 +61,10 @@ index 16f631fdde4b63e0ed3162486dba684697bdffa7..a7e1d81a8a5e14f556d6b462dfba7f2e
       * 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 7cf8ffb5a29d1cf382064b3aca0353a53b89fa9e..ab972330f6219fae8d1d443b36dd9b04df22d777 100644
+index acba500393e1736e6081facac6ef9ab10da655de..f1f60710ea44a078aa071dbf2d5c0ed3724e31b3 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-@@ -453,6 +453,22 @@ public abstract class ChunkGenerator {
+@@ -577,6 +577,22 @@ public abstract class ChunkGenerator {
          return false;
      }
  
@@ -85,5 +85,5 @@ index 7cf8ffb5a29d1cf382064b3aca0353a53b89fa9e..ab972330f6219fae8d1d443b36dd9b04
 +    // Paper end
 +
      /**
-      * Data for a Chunk.
-      */
+      * Gets if the server should generate Vanilla structures after this
+      * ChunkGenerator.

patches/server/0016-Rewrite-chunk-system.patch

@@ -18085,10 +18085,10 @@ index d5e6123622f6bbc4c3b8b91be7f9ba8e5c1c22d8..6708c2c88251f4e5f623cd785c14b2d3
          return this.getHandle().getGameProfile();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index f1a7f306fa6091462e984e2e3c77604db6434028..23b1725679d195380a902a3b03c6b6ad3aaede19 100644
+index cdf65df8a0da81eee3f159ec70dcda17712fbb21..12ebbd95cf7a8d8c926d4f2e5ba89927c26439cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-@@ -256,7 +256,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
+@@ -269,7 +269,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
              return ichunkaccess1;
          };
  

patches/server/0024-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -45,10 +45,10 @@ index e24b46820394c5f220d5bf7c4e763ef95ff9e9ab..54a8548e8d3ddee049d3fed41332c94e
          if (this.onGround) {
              this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D));
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-index c10c28eb441e65c6285c25b5d4760c876909c724..ed457aeccb91c290bbd2191c9e3e52b499dc8200 100644
+index 5b31c85d3bb5bcbd966d69c129e3caea14148821..beb542b2f810da9fb8379056b4d16c2b98717f28 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
-@@ -46,6 +46,12 @@ public class MinecartTNT extends AbstractMinecart {
+@@ -50,6 +50,12 @@ public class MinecartTNT extends AbstractMinecart {
      public void tick() {
          super.tick();
          if (this.fuse > 0) {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 9a4de0976907a81c4089cf5e8434155e77960145
+Subproject commit 38866413a790619d8d8873de5b62f807947b81f6

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 300e7448f5f0466e23b97d69aa424629c816fc8e
+Subproject commit f3dab3a488c6ef87abe9639d537c19b7a1029019