mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 18:27:41 +01:00
53 lines
2.8 KiB
Diff
53 lines
2.8 KiB
Diff
--- a/net/minecraft/world/entity/item/EntityFallingBlock.java
|
|
+++ b/net/minecraft/world/entity/item/EntityFallingBlock.java
|
|
@@ -45,6 +45,8 @@
|
|
import net.minecraft.world.phys.MovingObjectPositionBlock;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
+
|
|
public class EntityFallingBlock extends Entity {
|
|
|
|
private static final int REMOVAL_DELAY_MILLIS = 50;
|
|
@@ -122,7 +124,7 @@
|
|
|
|
if (this.time++ == 0) {
|
|
blockposition = this.blockPosition();
|
|
- if (this.level.getBlockState(blockposition).is(block)) {
|
|
+ if (this.level.getBlockState(blockposition).is(block) && !CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR.defaultBlockState()).isCancelled()) {
|
|
this.level.removeBlock(blockposition, false);
|
|
} else if (!this.level.isClientSide) {
|
|
this.discard();
|
|
@@ -173,6 +175,12 @@
|
|
this.blockState = (IBlockData) this.blockState.setValue(BlockProperties.WATERLOGGED, true);
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, this.blockState).isCancelled()) {
|
|
+ this.discard(); // SPIGOT-6586 called before the event in previous versions
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (this.level.setBlock(blockposition, this.blockState, 3)) {
|
|
((WorldServer) this.level).getChunkSource().chunkMap.broadcast(this, new PacketPlayOutBlockChange(blockposition, this.level.getBlockState(blockposition)));
|
|
this.discard();
|
|
@@ -252,7 +260,7 @@
|
|
if (i < 0) {
|
|
return false;
|
|
} else {
|
|
- Predicate predicate;
|
|
+ Predicate<Entity> predicate; // CraftBukkit - decompile error
|
|
DamageSource damagesource1;
|
|
|
|
if (this.blockState.getBlock() instanceof Fallable) {
|
|
@@ -268,7 +276,9 @@
|
|
float f2 = (float) Math.min(MathHelper.floor((float) i * this.fallDamagePerDistance), this.fallDamageMax);
|
|
|
|
this.level.getEntities((Entity) this, this.getBoundingBox(), predicate).forEach((entity) -> {
|
|
+ CraftEventFactory.entityDamage = this; // CraftBukkit
|
|
entity.hurt(damagesource1, f2);
|
|
+ CraftEventFactory.entityDamage = null; // CraftBukkit
|
|
});
|
|
boolean flag = this.blockState.is((Tag) TagsBlock.ANVIL);
|
|
|