From 3da00ee41adf0ecfc31d5c330c281a8d5fe8a7b1 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Tue, 29 Nov 2011 18:10:05 +1100 Subject: Implementation of reworked EntityCombustEvents Also includes some extra comments, and a refactoring of the PaintingBreakByEntity event that is raised when lighting strikes a painting. --- src/main/java/net/minecraft/server/EntitySkeleton.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntitySkeleton.java') diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java index 0f159efd..82c2081c 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -53,11 +53,11 @@ public class EntitySkeleton extends EntityMonster { if (f > 0.5F && this.world.isChunkLoaded(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) { // CraftBukkit start - EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity()); + EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8); this.world.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - this.j(8); + this.j(event.getDuration()); } // CraftBukkit end } -- cgit v1.2.3