2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/EntityFallingBlock.java
|
|
|
|
|
+++ b/net/minecraft/server/EntityFallingBlock.java
|
2015-08-01 08:48:20 +02:00
|
|
|
@@ -4,13 +4,15 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class EntityFallingBlock extends Entity {
|
|
|
|
|
|
2015-02-26 23:41:06 +01:00
|
|
|
private IBlockData block;
|
2015-08-01 08:48:20 +02:00
|
|
|
public int ticksLived;
|
|
|
|
|
public boolean dropItem = true;
|
|
|
|
|
private boolean e;
|
|
|
|
|
- private boolean hurtEntities;
|
|
|
|
|
+ public boolean hurtEntities; // PAIL: private -> public
|
|
|
|
|
private int fallHurtMax = 40;
|
|
|
|
|
private float fallHurtAmount = 2.0F;
|
|
|
|
|
public NBTTagCompound tileEntityData;
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -56,7 +58,7 @@
|
|
|
|
|
|
|
|
|
|
if (this.ticksLived++ == 0) {
|
|
|
|
|
blockposition = new BlockPosition(this);
|
|
|
|
|
- if (this.world.getType(blockposition).getBlock() == block) {
|
|
|
|
|
+ if (this.world.getType(blockposition).getBlock() == block && !CraftEventFactory.callEntityChangeBlockEvent(this, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) {
|
|
|
|
|
this.world.setAir(blockposition);
|
2015-02-26 23:41:06 +01:00
|
|
|
} else if (!this.world.isClientSide) {
|
2014-11-25 22:32:16 +01:00
|
|
|
this.die();
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -78,7 +80,12 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
if (this.world.getType(blockposition).getBlock() != Blocks.PISTON_EXTENSION) {
|
|
|
|
|
this.die();
|
2015-02-26 23:41:06 +01:00
|
|
|
if (!this.e) {
|
|
|
|
|
- if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null, (ItemStack) null) && !BlockFalling.canFall(this.world, blockposition.down()) && this.world.setTypeAndData(blockposition, this.block, 3)) {
|
|
|
|
|
+ if (this.world.a(block, blockposition, true, EnumDirection.UP, (Entity) null, (ItemStack) null) && !BlockFalling.canFall(this.world, blockposition.down()) /* mimic the false conditions of setTypeIdAndData */ && blockposition.getX() >= -30000000 && blockposition.getZ() >= -30000000 && blockposition.getX() < 30000000 && blockposition.getZ() < 30000000 && blockposition.getY() >= 0 && blockposition.getY() < 256 && this.world.getType(blockposition) != this.block) {
|
|
|
|
|
+ if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.block.getBlock(), this.block.getBlock().toLegacyData(this.block)).isCancelled()) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ this.world.setTypeAndData(blockposition, this.block, 3);
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
if (block instanceof BlockFalling) {
|
|
|
|
|
((BlockFalling) block).a_(this.world, blockposition);
|
|
|
|
|
}
|
|
|
|
|
@@ -137,7 +144,9 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
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) {
|
