PaperMC/nms-patches/EntityFallingBlock.patch

55 lines
3 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityFallingBlock.java
+++ b/net/minecraft/server/EntityFallingBlock.java
2016-05-10 13:47:39 +02:00
@@ -5,6 +5,8 @@
import java.util.Iterator;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
public class EntityFallingBlock extends Entity {
2015-02-26 23:41:06 +01:00
private IBlockData block;
2017-05-14 04:00:00 +02:00
@@ -69,7 +71,7 @@
if (this.ticksLived++ == 0) {
blockposition = new BlockPosition(this);
- if (this.world.getType(blockposition).getBlock() == block) {
2016-07-08 03:12:40 +02:00
+ if (this.world.getType(blockposition).getBlock() == block && !CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR, 0).isCancelled()) {
this.world.setAir(blockposition);
2015-02-26 23:41:06 +01:00
} else if (!this.world.isClientSide) {
this.die();
2017-05-14 04:00:00 +02:00
@@ -110,7 +112,7 @@
2017-05-30 13:25:59 +02:00
if (!flag1 && BlockFalling.x(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
this.onGround = false;
- return;
+ // return; // CraftBukkit
}
this.motX *= 0.699999988079071D;
2017-05-14 04:00:00 +02:00
@@ -119,7 +121,13 @@
if (iblockdata.getBlock() != Blocks.PISTON_EXTENSION) {
this.die();
2016-02-29 22:32:46 +01:00
if (!this.f) {
2017-05-30 13:25:59 +02:00
- if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null) && (flag1 || !BlockFalling.x(this.world.getType(blockposition.down()))) && this.world.setTypeAndData(blockposition, this.block, 3)) {
+ // CraftBukkit start
2017-05-30 13:25:59 +02:00
+ if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null) && (flag1 || !BlockFalling.x(this.world.getType(blockposition.down())))) {
2016-07-08 03:12:40 +02:00
+ if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, this.block.getBlock(), this.block.getBlock().toLegacyData(this.block)).isCancelled()) {
2015-02-26 23:41:06 +01:00
+ return;
+ }
+ this.world.setTypeAndData(blockposition, this.block, 3);
+ // CraftBukkit end
if (block instanceof BlockFalling) {
2017-05-14 04:00:00 +02:00
((BlockFalling) block).a(this.world, blockposition, this.block, iblockdata);
2015-02-26 23:41:06 +01:00
}
2017-05-14 04:00:00 +02:00
@@ -175,7 +183,9 @@
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
+ CraftEventFactory.entityDamage = this; // CraftBukkit
entity.damageEntity(damagesource, (float) Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax));
+ CraftEventFactory.entityDamage = null; // CraftBukkit
}
if (flag && (double) this.random.nextFloat() < 0.05000000074505806D + (double) i * 0.05D) {