diff --git a/patches/api/Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/Add-exploded-block-state-to-BlockExplodeEvent.patch
index 2defd67f00..c6e29729d6 100644
--- a/patches/api/Add-exploded-block-state-to-BlockExplodeEvent.patch
+++ b/patches/api/Add-exploded-block-state-to-BlockExplodeEvent.patch
@@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
 @@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
- 
- /**
-  * Called when a block explodes
+  * Called when a block explodes interacting with blocks. The
+  * event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
+  * is disabled as no block interaction will occur.
 + * <p>
 + * The {@link Block} returned by this event is not necessarily
 + * the block that caused the explosion, just the block at the location where
diff --git a/patches/api/Fix-upstream-javadocs.patch b/patches/api/Fix-upstream-javadocs.patch
index 427b9caa9a..da435d3d6c 100644
--- a/patches/api/Fix-upstream-javadocs.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -200,6 +200,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @param sz The new size of the slime.
       */
      public void setSize(int sz);
+diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
++++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+@@ -0,0 +0,0 @@ import org.bukkit.event.HandlerList;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * Called when a block explodes
++ * Called when a block explodes interacting with blocks. The
++ * event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
++ * is disabled as no block interaction will occur.
+  */
+ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
+     private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
@@ -214,6 +229,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
           */
          EXPLOSION,
          /**
+diff --git a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java
+@@ -0,0 +0,0 @@ import org.bukkit.event.HandlerList;
+ import org.jetbrains.annotations.NotNull;
+ 
+ /**
+- * Called when an entity explodes
++ * Called when an entity explodes interacting with blocks. The
++ * event isn't called if the {@link org.bukkit.GameRule#MOB_GRIEFING}
++ * is disabled as no block interaction will occur.
+  */
+ public class EntityExplodeEvent extends EntityEvent implements Cancellable {
+     private static final HandlerList handlers = new HandlerList();
 diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java