Handle block state in EntityDamageByBlockEvent (#9396)

patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch

@@ -0,0 +1,130 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Fri, 22 Oct 2021 16:24:17 -0700
+Subject: [PATCH] Add exploded block state to BlockExplodeEvent and
+ EntityDamageByBlockEvent
+
+
+diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+index 641c71ab66bd2499b35cf3c1d533fd105d096e10..7dcbb75170296c1dd1d784a032bf369602328b29 100644
+--- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
++++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
+@@ -10,18 +10,31 @@ import org.jetbrains.annotations.NotNull;
+  * 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
++ * the explosion originated. See {@link #getExplodedBlockState()}
+  */
+ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
+     private static final HandlerList handlers = new HandlerList();
+     private boolean cancel;
+     private final List<Block> blocks;
+     private float yield;
++    private final org.bukkit.block.BlockState explodedBlockState; // Paper
+ 
++    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
+     public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield) {
++        // Paper start
++        this(what, blocks, yield, null);
++    }
++    @org.jetbrains.annotations.ApiStatus.Internal
++    public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield, @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState explodedBlockState) {
++        // Paper end
+         super(what);
+         this.blocks = blocks;
+         this.yield = yield;
+         this.cancel = false;
++        this.explodedBlockState = explodedBlockState; // Paper
+     }
+ 
+     @Override
+@@ -34,6 +47,22 @@ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
+         this.cancel = cancel;
+     }
+ 
++    // Paper start
++    /**
++     * Get a capture of the block that directly caused
++     * the explosion, like a bed or respawn anchor. This
++     * block state is not placed so {@link org.bukkit.block.BlockState#isPlaced}
++     * will be false.
++     * <p>
++     * Can be null if no block directly caused the explosion.
++     *
++     * @return the exploded block state or null if not applicable
++     */
++    public @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState getExplodedBlockState() {
++        return this.explodedBlockState;
++    }
++    // Paper end
++
+     /**
+      * Returns the list of blocks that would have been removed or were removed
+      * from the explosion event.
+diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+index 461727dc7f06efb3550fc370e0db5bd04ba89711..ab18f35b686ec79551c307dde9e43c7dfad1b182 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
+@@ -9,18 +9,38 @@ import org.jetbrains.annotations.Nullable;
+ 
+ /**
+  * Called when an entity is damaged by a block
++ * <p>
++ * For explosions, the Block returned by {@link #getDamager()} has
++ * already been cleared. See {@link #getDamagerBlockState()} for a snapshot
++ * of the block if it has already been changed.
+  */
+ public class EntityDamageByBlockEvent extends EntityDamageEvent {
+     private final Block damager;
++    private final org.bukkit.block.BlockState damagerBlockState; // Paper
+ 
+     public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) {
++        // Paper start
++        this(damager, damagee, cause, damage, null);
++    }
++    @org.jetbrains.annotations.ApiStatus.Internal
++    public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage, final @Nullable org.bukkit.block.BlockState damagerBlockState) {
++        // Paper end
+         super(damagee, cause, damage);
+         this.damager = damager;
++        this.damagerBlockState = damagerBlockState; // Paper
+     }
+ 
+     public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions) {
++        // Paper start
++        this(damager, damagee, cause, modifiers, modifierFunctions, null);
++    }
++
++    @org.jetbrains.annotations.ApiStatus.Internal
++    public EntityDamageByBlockEvent(@Nullable final Block damager, @NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final Map<DamageModifier, Double> modifiers, @NotNull final Map<DamageModifier, ? extends Function<? super Double, Double>> modifierFunctions, final @Nullable org.bukkit.block.BlockState damagerBlockState) {
++        // Paper end
+         super(damagee, cause, modifiers, modifierFunctions);
+         this.damager = damager;
++        this.damagerBlockState = damagerBlockState; // Paper
+     }
+ 
+     /**
+@@ -32,4 +52,20 @@ public class EntityDamageByBlockEvent extends EntityDamageEvent {
+     public Block getDamager() {
+         return damager;
+     }
++
++    // Paper start
++    /**
++    * Get a capture of the block that directly caused
++    * the damage, like a bed or respawn anchor. This
++    * block state is not placed so {@link org.bukkit.block.BlockState#isPlaced}
++    * will be false.
++    * <p>
++    * Can be null if the block wasn't changed before the event
++    *
++    * @return the damager block state or null if not applicable
++    */
++    public @Nullable org.bukkit.block.BlockState getDamagerBlockState() {
++        return this.damagerBlockState;
++    }
++    // Paper end
+ }

patches/api/0402-Add-exploded-block-state-to-BlockExplodeEvent.patch

@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 22 Oct 2021 16:24:17 -0700
-Subject: [PATCH] Add exploded block state to BlockExplodeEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-index 641c71ab66bd2499b35cf3c1d533fd105d096e10..d8b5362d0cdc3440efe30d619985018509b669e7 100644
---- a/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-+++ b/src/main/java/org/bukkit/event/block/BlockExplodeEvent.java
-@@ -10,18 +10,29 @@ import org.jetbrains.annotations.NotNull;
-  * 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
-+ * the explosion originated. See {@link #getExplodedBlockState()}
-  */
- public class BlockExplodeEvent extends BlockEvent implements Cancellable {
-     private static final HandlerList handlers = new HandlerList();
-     private boolean cancel;
-     private final List<Block> blocks;
-     private float yield;
-+    private final org.bukkit.block.BlockState explodedBlockState; // Paper
- 
-     public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield) {
-+        // Paper start
-+        this(what, blocks, yield, null);
-+    }
-+    public BlockExplodeEvent(@NotNull final Block what, @NotNull final List<Block> blocks, final float yield, @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState explodedBlockState) {
-+        // Paper end
-         super(what);
-         this.blocks = blocks;
-         this.yield = yield;
-         this.cancel = false;
-+        this.explodedBlockState = explodedBlockState; // Paper
-     }
- 
-     @Override
-@@ -34,6 +45,22 @@ public class BlockExplodeEvent extends BlockEvent implements Cancellable {
-         this.cancel = cancel;
-     }
- 
-+    // Paper start
-+    /**
-+     * Get a capture of the block that directly caused
-+     * the explosion, like a bed or respawn anchor. This
-+     * block state is not placed so {@link org.bukkit.block.BlockState#isPlaced}
-+     * will be false.
-+     * <p>
-+     * Can be null if no block directly caused the explosion.
-+     *
-+     * @return the exploded block state or null if not applicable
-+     */
-+    public @org.jetbrains.annotations.Nullable org.bukkit.block.BlockState getExplodedBlockState() {
-+        return this.explodedBlockState;
-+    }
-+    // Paper end
-+
-     /**
-      * Returns the list of blocks that would have been removed or were removed
-      * from the explosion event.

patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch

@@ -1,7 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Fri, 22 Oct 2021 16:25:07 -0700
-Subject: [PATCH] Add exploded block state to BlockExplodeEvent
+Subject: [PATCH] Add exploded block state to BlockExplodeEvent and
+ EntityDamageByBlockEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
@@ -128,3 +129,16 @@ index da4609caecc8183d02c301c7cedbca52ed39323f..716021520c228b5bbced525b751f5d41
  
      // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity)
      private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index f55705610aa9b12bca8a7ae280ea271aee38daa4..44212a65f0943e72b56e7654e2d181e6d825899d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -992,7 +992,7 @@ public class CraftEventFactory {
+             CraftEventFactory.entityDamage = null;
+             EntityDamageEvent event;
+             if (damager == null) {
+-                event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.BLOCK_EXPLOSION, modifiers, modifierFunctions);
++                event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.BLOCK_EXPLOSION, modifiers, modifierFunctions, source.explodedBlockState); // Paper - handle block state in damage
+             } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) {
+                 event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions);
+             } else {