diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-03-14 01:26:23 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-14 01:27:31 -0400 |
| commit | 373afd1b22a3c2195be82d3f4f465288d417771e (patch) | |
| tree | 01d81e66b2706768aa60abfa06a3c05188e38dae /src | |
| parent | f219f0efe95c3a62b66a920303e65812e4b3c052 (diff) | |
| download | craftbukkit-373afd1b22a3c2195be82d3f4f465288d417771e.tar craftbukkit-373afd1b22a3c2195be82d3f4f465288d417771e.tar.gz craftbukkit-373afd1b22a3c2195be82d3f4f465288d417771e.tar.lz craftbukkit-373afd1b22a3c2195be82d3f4f465288d417771e.tar.xz craftbukkit-373afd1b22a3c2195be82d3f4f465288d417771e.zip | |
Made snowmen melting fire EntityDamage events with DamageCause FIRE_TICK. Fixes BUKKIT-1164
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntitySnowman.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java index 59fe5a0c..c7d618d8 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java @@ -5,6 +5,7 @@ import java.util.List; import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.EntityBlockFormEvent; +import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end public class EntitySnowman extends EntityGolem { @@ -39,7 +40,12 @@ public class EntitySnowman extends EntityGolem { int j = MathHelper.floor(this.locZ); if (this.world.getBiome(i, j).h() > 1.0F) { - this.damageEntity(DamageSource.BURN, 1); + EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.FIRE_TICK, 1); + this.world.getServer().getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + this.damageEntity(DamageSource.BURN, event.getDamage()); + } } for (i = 0; i < 4; ++i) { |