diff options
author | t00thpick1 <t00thpick1dirko@gmail.com> | 2014-06-19 14:38:45 -0400 |
---|---|---|
committer | Wesley Wolfe <wesley.d.wolfe+git@gmail.com> | 2014-06-22 15:23:16 -0500 |
commit | 6f21d3ca8fb02001dd10f49019cfb05ed914a873 (patch) | |
tree | 304ff9a4e85d2ba38a61e9b4ead339266ddbbbd6 /src/main/java/net/minecraft/server/EntityFallingBlock.java | |
parent | bed3f7f8f54305c94356691d6b8ec9b65a1a5d4a (diff) | |
download | craftbukkit-6f21d3ca8fb02001dd10f49019cfb05ed914a873.tar craftbukkit-6f21d3ca8fb02001dd10f49019cfb05ed914a873.tar.gz craftbukkit-6f21d3ca8fb02001dd10f49019cfb05ed914a873.tar.lz craftbukkit-6f21d3ca8fb02001dd10f49019cfb05ed914a873.tar.xz craftbukkit-6f21d3ca8fb02001dd10f49019cfb05ed914a873.zip |
[Bleeding] Implement new damage api. Fixes BUKKIT-5326, BUKKIT-3878.
This commit centralizes event handling to where damage is actually applied
to the entity to avoid bugs that have resulted from nodamageticks,
modifications to damage after the event has been called, and similar
mishaps. This also implements new API for getting and setting of
modifications made to the damage amount actually applied to the entity.
This is done by storing the change in the damage amount as each modifier
is applied by vanilla code.
The method that actually damages the armor worn by an entity has been
relocated beneath the event called as to not apply durability loss when
the event has been cancelled.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFallingBlock.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityFallingBlock.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java index bc512172..e0b99367 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -3,10 +3,7 @@ package net.minecraft.server; import java.util.ArrayList; import java.util.Iterator; -// CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.event.entity.EntityDamageEvent; -// CraftBukkit end +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityFallingBlock extends Entity { @@ -156,16 +153,9 @@ public class EntityFallingBlock extends Entity { while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); - // CraftBukkit start - float damage = (float) Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax); - - EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(this, entity, EntityDamageEvent.DamageCause.FALLING_BLOCK, damage); - if (event.isCancelled()) { - continue; - } - - entity.damageEntity(damagesource, (float) event.getDamage()); - // CraftBukkit end + 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) { |