From 4758f1202f701bdba5d77f84552372b710f69f65 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:49:46 +0100 Subject: [PATCH] call EntityInsideBlockEvent for eyeblossom --- patches/api/Add-EntityInsideBlockEvent.patch | 1 + patches/server/Add-EntityInsideBlockEvent.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/patches/api/Add-EntityInsideBlockEvent.patch b/patches/api/Add-EntityInsideBlockEvent.patch index 3095d0b233..68a77f1179 100644 --- a/patches/api/Add-EntityInsideBlockEvent.patch +++ b/patches/api/Add-EntityInsideBlockEvent.patch @@ -37,6 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + *
  • Crops
    • + *
  • End Gateway
    • + *
  • Ender Portal
    • ++ *
  • Eye blossom
    • + *
  • Fires
    • + *
  • Frogspawn
    • + *
  • Honey
    • diff --git a/patches/server/Add-EntityInsideBlockEvent.patch b/patches/server/Add-EntityInsideBlockEvent.patch index df914580b0..a90fe34831 100644 --- a/patches/server/Add-EntityInsideBlockEvent.patch +++ b/patches/server/Add-EntityInsideBlockEvent.patch @@ -136,6 +136,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (entity.canUsePortal(false)) { // CraftBukkit start - Entity in portal EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ())); +diff --git a/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java b/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java +@@ -0,0 +0,0 @@ public class EyeblossomBlock extends FlowerBlock { + + @Override + protected 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 - Add EntityInsideBlockEvent + if (!world.isClientSide() + && world.getDifficulty() != Difficulty.PEACEFUL + && entity instanceof Bee bee 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