Skip to content

Commit bb4fb53

Browse files
committed
call EntityInsideBlockEvent for eyeblossom
1 parent 4806ce5 commit bb4fb53

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

patches/api/0276-Add-EntityInsideBlockEvent.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Add EntityInsideBlockEvent
66

77
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
88
new file mode 100644
9-
index 0000000000000000000000000000000000000000..314aab3eb4c802e6ebbe5a4ee7d5fbbd3f504c1b
9+
index 0000000000000000000000000000000000000000..a1a7a0af23e8833b9f127335950a0e5649d5f11b
1010
--- /dev/null
1111
+++ b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
12-
@@ -0,0 +1,85 @@
12+
@@ -0,0 +1,86 @@
1313
+package io.papermc.paper.event.entity;
1414
+
1515
+import org.bukkit.block.Block;
@@ -37,6 +37,7 @@ index 0000000000000000000000000000000000000000..314aab3eb4c802e6ebbe5a4ee7d5fbbd
3737
+ * <li>Crops</li>
3838
+ * <li>End Gateway</li>
3939
+ * <li>Ender Portal</li>
40+
+ * <li>Eye blossom</li>
4041
+ * <li>Fires</li>
4142
+ * <li>Frogspawn</li>
4243
+ * <li>Honey</li>

patches/server/0531-Add-EntityInsideBlockEvent.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,18 @@ index 8887d35d188510cf10da3dc46b0b56373ac346bd..8ca226641588a88c8b068a7acac9d7e9
136136
if (entity.canUsePortal(false)) {
137137
// CraftBukkit start - Entity in portal
138138
EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
139+
diff --git a/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java b/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java
140+
index be3ddd70a68c43cd8db5d8a25e7d5d7e7b91751d..efe3f34a32fd01c9edba937b4b8ea25f51d86ba0 100644
141+
--- a/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java
142+
+++ b/src/main/java/net/minecraft/world/level/block/EyeblossomBlock.java
143+
@@ -100,6 +100,7 @@ public class EyeblossomBlock extends FlowerBlock {
144+
145+
@Override
146+
protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
147+
+ if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
148+
if (!world.isClientSide()
149+
&& world.getDifficulty() != Difficulty.PEACEFUL
150+
&& entity instanceof Bee bee
139151
diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
140152
index aee71779f31def5f1ef7438cf06219d1de7092ec..34be6b349722240e99f91d28067578aa0b4bd1fe 100644
141153
--- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java

0 commit comments

Comments
 (0)