Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package io.papermc.paper.event.entity;

import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.EntityEvent;
import org.jspecify.annotations.NullMarked;

/**
* Called when an {@link Entity} lands on the block after falling.
* This event is called before {@link org.bukkit.event.entity.EntityDamageEvent}, {@link org.bukkit.event.entity.EntityChangeBlockEvent}, {@link org.bukkit.event.player.PlayerInteractEvent}
* and {@link org.bukkit.event.entity.EntityInteractEvent}.
*/
@NullMarked
public class EntityLandEvent extends EntityEvent implements Cancellable {

private static final HandlerList HANDLER_LIST = new HandlerList();

private final Block block;
private boolean cancelled;

public EntityLandEvent(final Entity entity, final Block block) {
super(entity);
this.block = block;
}

@Override
public HandlerList getHandlers() {
return HANDLER_LIST;
}

public static HandlerList getHandlerList() {
return HANDLER_LIST;
}

/**
* Returns the block that the entity landed on.
*
* @return the block that the entity landed on
*/
public Block getBlock() {
return this.block;
}

@Override
public boolean isCancelled() {
return this.cancelled;
}

/**
* Sets whether to cancel the landing, cancelling this event will prevent
* the entity from taking fall damage and interact with the block. (ex: break turtle egg)
*
* @param cancel true if the event should be cancelled, false otherwise
*/
@Override
public void setCancelled(final boolean cancel) {
this.cancelled = cancel;
}
}
Comment thread
Clexus marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,16 @@
}

public void setPlacedBy(final Level level, final BlockPos pos, final BlockState state, final @Nullable LivingEntity by, final ItemStack itemStack) {
@@ -488,6 +_,9 @@
}

public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
Comment thread
Clexus marked this conversation as resolved.
Outdated
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, false)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
entity.causeFallDamage(fallDistance, 1.0F, entity.damageSources().fall());
}

@@ -613,12 +_,20 @@
return this.builtInRegistryHolder;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/FarmlandBlock.java
+++ b/net/minecraft/world/level/block/FarmlandBlock.java
@@ -94,31 +_,59 @@
@@ -94,31 +_,62 @@
@Override
protected void randomTick(final BlockState state, final ServerLevel level, final BlockPos pos, final RandomSource random) {
int moisture = state.getValue(MOISTURE);
Expand All @@ -21,6 +21,9 @@

@Override
public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, true)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
+ super.fallOn(level, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
if (level instanceof ServerLevel serverLevel
&& level.getRandom().nextFloat() < fallDistance - 0.5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
--- a/net/minecraft/world/level/block/HoneyBlock.java
+++ b/net/minecraft/world/level/block/HoneyBlock.java
@@ -51,6 +_,9 @@

@Override
public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, true)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
entity.playSound(SoundEvents.HONEY_BLOCK_SLIDE, 1.0F, 1.0F);
if (!level.isClientSide()) {
level.broadcastEntityEvent(entity, EntityEvent.HONEY_JUMP);
@@ -70,6 +_,7 @@
final InsideBlockEffectApplier effectApplier,
final boolean isPrecise
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
--- a/net/minecraft/world/level/block/PointedDripstoneBlock.java
+++ b/net/minecraft/world/level/block/PointedDripstoneBlock.java
@@ -63,7 +_,7 @@
@@ -62,8 +_,11 @@

@Override
public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, true)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
if (state.getValue(TIP_DIRECTION) == Direction.UP && state.getValue(THICKNESS) == SpeleothemThickness.TIP) {
- entity.causeFallDamage(fallDistance + 2.5, 2.0F, level.damageSources().stalagmite());
+ entity.causeFallDamage(fallDistance + 2.5, 2.0F, level.damageSources().stalagmite().eventBlockDamager(level, pos)); // CraftBukkit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,13 @@
level.destroyBlock(position, false);
}
}
@@ -104,6 +_,9 @@

@Override
public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, true)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
if (!(fallDistance < 4.0) && entity instanceof LivingEntity livingEntity) {
LivingEntity.Fallsounds entityFallsounds = livingEntity.getFallSounds();
SoundEvent fallSound = fallDistance < 7.0 ? entityFallsounds.small() : entityFallsounds.big();
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- a/net/minecraft/world/level/block/SlimeBlock.java
+++ b/net/minecraft/world/level/block/SlimeBlock.java
@@ -21,6 +_,9 @@

@Override
public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, false)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
if (!entity.isSuppressingBounce()) {
entity.causeFallDamage(fallDistance, 0.0F, level.damageSources().fall());
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
--- a/net/minecraft/world/level/block/TurtleEggBlock.java
+++ b/net/minecraft/world/level/block/TurtleEggBlock.java
@@ -63,6 +_,9 @@

@Override
public void fallOn(final Level level, final BlockState state, final BlockPos pos, final Entity entity, final double fallDistance) {
+ if(!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityLandEvent(state, level, pos, entity, true)){ // Paper start - Add EntityLandEvent
+ return;
+ } // Paper end - Add EntityLandEvent
if (!(entity instanceof Zombie)) {
this.destroyEgg(level, state, pos, entity, 3);
}
@@ -75,6 +_,19 @@
&& level instanceof ServerLevel serverLevel
&& this.canDestroyEgg(serverLevel, entity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import io.papermc.paper.event.block.BlockLockCheckEvent;
import io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent;
import io.papermc.paper.event.entity.EntityIgniteEvent;
import io.papermc.paper.event.entity.EntityLandEvent;
import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;
import io.papermc.paper.event.player.PlayerBedFailEnterEvent;
import io.papermc.paper.event.player.PlayerToggleEntityAgeLockEvent;
Expand Down Expand Up @@ -69,6 +70,7 @@
import net.minecraft.world.level.Explosion;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
Expand Down Expand Up @@ -2425,4 +2427,15 @@ public static int callEntityIgniteEvent(Entity entity, int fuseTime) {
}
return event.getFuseTime();
}

public static boolean callEntityLandEvent(net.minecraft.world.level.block.state.BlockState state, Level level, BlockPos pos, Entity entity, boolean isOverrideMethod) {
if (EntityLandEvent.getHandlerList().getRegisteredListeners().length == 0) {
return true; // No listeners, skip event creation
}
if(!isOverrideMethod && (state.is(Blocks.POINTED_DRIPSTONE) || state.is(Blocks.TURTLE_EGG) || state.is(Blocks.FARMLAND))){
return true; // Event will be called in the class separately
}
EntityLandEvent event = new EntityLandEvent(entity.getBukkitEntity(), CraftBlock.at(level, pos));
return event.callEvent();
}
}
Loading