Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 17:07:34 +01:00
Code Issues Projects Releases Wiki Activity

add missing call to EntityInsideBlockEvent

Browse Source
This commit is contained in:
Jake Potrebic 2023-06-08 17:34:35 -07:00
parent 59060aaec3
commit e325e37268
No known key found for this signature in database
GPG Key ID: ECE0B3C133C016C5
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
patches/api/0289-Add-EntityInsideBlockEvent.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Add EntityInsideBlockEvent
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java diff --git a/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..447fed3d39d68f13fd6cd94332c7ec7553d8e0df index 0000000000000000000000000000000000000000..109dd7e6d0e7bb0a83fc4c5230f7d5dc122f2bb5
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java +++ b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
@@ -0,0 +1,83 @@ @@ -0,0 +1,84 @@
+package io.papermc.paper.event.entity; +package io.papermc.paper.event.entity;
+ +
+import org.bukkit.block.Block; +import org.bukkit.block.Block;
@ -41,6 +41,7 @@ index 0000000000000000000000000000000000000000..447fed3d39d68f13fd6cd94332c7ec75
+ * <li>Hopper</li> + * <li>Hopper</li>
+ * <li>Detector rails</li> + * <li>Detector rails</li>
+ * <li>Nether portals</li> + * <li>Nether portals</li>
+ * <li>Pitcher crop</li>
+ * <li>Powdered snow</li> + * <li>Powdered snow</li>
+ * <li>Pressure plates</li> + * <li>Pressure plates</li>
+ * <li>Sweet berry bush</li> + * <li>Sweet berry bush</li>

12
patches/server/0614-Add-EntityInsideBlockEvent.patch
View File

@ -196,6 +196,18 @@ index 69f34c566bf825259253abbefd7d7ba2e847231b..a6ab0d0defc05e56a91084c498970596
if (entity.canChangeDimensions()) { if (entity.canChangeDimensions()) {
// CraftBukkit start - Entity in portal // CraftBukkit start - Entity in portal
EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ())); 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/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
index 94e0bf98753d3dee5ad275e4783682025f687ddf..593eae04ecf6dee86c9c3664ddcdc3f86d042e66 100644
--- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
@@ -96,6 +96,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl
@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 instanceof Ravager && world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
world.destroyBlock(pos, true, entity);
}
diff --git a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java diff --git a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
index 47f54002654d198a56a85884de34e305e545eb4b..518d3832c36c9ecf1ed9267ffc1f926dc84b7989 100644 index 47f54002654d198a56a85884de34e305e545eb4b..518d3832c36c9ecf1ed9267ffc1f926dc84b7989 100644
--- a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java --- a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java