1 files changed, 55 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/entity/item/EntityFallingBlock.patch b/patch-remap/og/net/minecraft/world/entity/item/EntityFallingBlock.patch
new file mode 100644
index 0000000000..db4e674df7
--- /dev/null
+++ b/patch-remap/og/net/minecraft/world/entity/item/EntityFallingBlock.patch
@@ -0,0 +1,55 @@
+--- a/net/minecraft/world/entity/item/EntityFallingBlock.java
++++ b/net/minecraft/world/entity/item/EntityFallingBlock.java
+@@ -49,6 +49,10 @@
+ import net.minecraft.world.phys.Vec3D;
+ import org.slf4j.Logger;
+ 
++// CraftBukkit start;
++import org.bukkit.craftbukkit.event.CraftEventFactory;
++// CraftBukkit end
++
+ public class EntityFallingBlock extends Entity {
+ 
+     private static final Logger LOGGER = LogUtils.getLogger();
+@@ -83,10 +87,17 @@
+     }
+ 
+     public static EntityFallingBlock fall(World world, BlockPosition blockposition, IBlockData iblockdata) {
++        // CraftBukkit start
++        return fall(world, blockposition, iblockdata, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
++    }
++
++    public static EntityFallingBlock fall(World world, BlockPosition blockposition, IBlockData iblockdata, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
++        // CraftBukkit end
+         EntityFallingBlock entityfallingblock = new EntityFallingBlock(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, iblockdata.hasProperty(BlockProperties.WATERLOGGED) ? (IBlockData) iblockdata.setValue(BlockProperties.WATERLOGGED, false) : iblockdata);
++        if (!CraftEventFactory.callEntityChangeBlockEvent(entityfallingblock, blockposition, iblockdata.getFluidState().createLegacyBlock())) return entityfallingblock; // CraftBukkit
+ 
+         world.setBlock(blockposition, iblockdata.getFluidState().createLegacyBlock(), 3);
+-        world.addFreshEntity(entityfallingblock);
++        world.addFreshEntity(entityfallingblock, spawnReason); // CraftBukkit
+         return entityfallingblock;
+     }
+ 
+@@ -169,6 +180,12 @@
+                                     this.blockState = (IBlockData) this.blockState.setValue(BlockProperties.WATERLOGGED, true);
+                                 }
+ 
++                                // CraftBukkit start
++                                if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, this.blockState)) {
++                                    this.discard(); // SPIGOT-6586 called before the event in previous versions
++                                    return;
++                                }
++                                // CraftBukkit end
+                                 if (this.level().setBlock(blockposition, this.blockState, 3)) {
+                                     ((WorldServer) this.level()).getChunkSource().chunkMap.broadcast(this, new PacketPlayOutBlockChange(blockposition, this.level().getBlockState(blockposition)));
+                                     this.discard();
+@@ -255,7 +272,9 @@
+                 float f2 = (float) Math.min(MathHelper.floor((float) i * this.fallDamagePerDistance), this.fallDamageMax);
+ 
+                 this.level().getEntities((Entity) this, this.getBoundingBox(), predicate).forEach((entity) -> {
++                    CraftEventFactory.entityDamage = this; // CraftBukkit
+                     entity.hurt(damagesource2, f2);
++                    CraftEventFactory.entityDamage = null; // CraftBukkit
+                 });
+                 boolean flag = this.blockState.is(TagsBlock.ANVIL);
+