From 7c8a0e8e830d1e806098ac502041b0e39c56a732 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 9 Dec 2022 02:46:47 -0800
Subject: [PATCH] Add new 1.19.3 fires of EntityInsideBlockEvent (#8629)

---
 patches/api/Add-EntityInsideBlockEvent.patch    |  3 +++
 patches/server/Add-EntityInsideBlockEvent.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/patches/api/Add-EntityInsideBlockEvent.patch b/patches/api/Add-EntityInsideBlockEvent.patch
index 318be8224..76b4ebcdc 100644
--- a/patches/api/Add-EntityInsideBlockEvent.patch
+++ b/patches/api/Add-EntityInsideBlockEvent.patch
@@ -27,6 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * <p>
 + * Blocks this is currently called for:
 + * <ul>
++ *     <li>Big dripleaf</li>
 + *     <li>Bubble column</li>
 + *     <li>Buttons</li>
 + *     <li>Cactus</li>
@@ -35,10 +36,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + *     <li>Crops</li>
 + *     <li>Ender Portal</li>
 + *     <li>Fires</li>
++ *     <li>Frogspawn</li>
 + *     <li>Honey</li>
 + *     <li>Hopper</li>
 + *     <li>Detector rails</li>
 + *     <li>Nether portals</li>
++ *     <li>Powdered snow</li>
 + *     <li>Pressure plates</li>
 + *     <li>Sweet berry bush</li>
 + *     <li>Tripwire</li>
diff --git a/patches/server/Add-EntityInsideBlockEvent.patch b/patches/server/Add-EntityInsideBlockEvent.patch
index 5abbaf967..6288d5470 100644
--- a/patches/server/Add-EntityInsideBlockEvent.patch
+++ b/patches/server/Add-EntityInsideBlockEvent.patch
@@ -124,6 +124,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (world instanceof ServerLevel && !entity.isPassenger() && !entity.isVehicle() && entity.canChangeDimensions() && Shapes.joinIsNotEmpty(Shapes.create(entity.getBoundingBox().move((double) (-pos.getX()), (double) (-pos.getY()), (double) (-pos.getZ()))), state.getShape(world, pos), BooleanOp.AND)) {
              ResourceKey<Level> resourcekey = world.getTypeKey() == LevelStem.END ? Level.OVERWORLD : Level.END; // CraftBukkit - SPIGOT-6152: send back to main overworld in custom ends
              ServerLevel worldserver = ((ServerLevel) world).getServer().getLevel(resourcekey);
+diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
+@@ -0,0 +0,0 @@ public class FrogspawnBlock extends Block {
+ 
+     @Override
+     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
++        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
+         if (entity.getType().equals(EntityType.FALLING_BLOCK)) {
+             this.destroyBlock(world, pos);
+         }
 diff --git a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java