summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/EntityFallingBlock.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index dd8b64f4..4142650a 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
import java.util.ArrayList;
import java.util.Iterator;
+import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit
+
public class EntityFallingBlock extends Entity {
public int id;
@@ -124,7 +126,16 @@ public class EntityFallingBlock extends Entity {
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
- entity.damageEntity(damagesource, Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax));
+ // CraftBukkit start
+ int damage = Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax);
+
+ EntityDamageEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDamageEvent(this, entity, EntityDamageEvent.DamageCause.FALLING_BLOCK, damage);
+ if (event.isCancelled()) {
+ continue;
+ }
+
+ entity.damageEntity(damagesource, event.getDamage());
+ // CraftBukkit end
}
if (this.id == Block.ANVIL.id && (double) this.random.nextFloat() < 0.05000000074505806D + (double) i * 0.05D) {