13
0
geforkt von Mirrors/Paper

Add new 1.19.3 fires of EntityInsideBlockEvent (#8629)

Dieser Commit ist enthalten in:
Jake Potrebic 2022-12-09 02:46:47 -08:00
Ursprung fb7b0bad74
Commit 7c8a0e8e83
2 geänderte Dateien mit 15 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -27,6 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * <p> + * <p>
+ * Blocks this is currently called for: + * Blocks this is currently called for:
+ * <ul> + * <ul>
+ * <li>Big dripleaf</li>
+ * <li>Bubble column</li> + * <li>Bubble column</li>
+ * <li>Buttons</li> + * <li>Buttons</li>
+ * <li>Cactus</li> + * <li>Cactus</li>
@ -35,10 +36,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * <li>Crops</li> + * <li>Crops</li>
+ * <li>Ender Portal</li> + * <li>Ender Portal</li>
+ * <li>Fires</li> + * <li>Fires</li>
+ * <li>Frogspawn</li>
+ * <li>Honey</li> + * <li>Honey</li>
+ * <li>Hopper</li> + * <li>Hopper</li>
+ * <li>Detector rails</li> + * <li>Detector rails</li>
+ * <li>Nether portals</li> + * <li>Nether portals</li>
+ * <li>Powdered snow</li>
+ * <li>Pressure plates</li> + * <li>Pressure plates</li>
+ * <li>Sweet berry bush</li> + * <li>Sweet berry bush</li>
+ * <li>Tripwire</li> + * <li>Tripwire</li>

Datei anzeigen

@ -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)) { 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 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); 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 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 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java --- a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java