diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-05-14 16:29:42 +0200 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-05-15 13:41:46 +0200 |
commit | 309846d732849b68e382c53bf3a0d7a6dfd82579 (patch) | |
tree | 020932a024cd2fb20895f5834a2bde7dbdfea583 /src/main/java/net/minecraft/server/EntityPainting.java | |
parent | e54d8c33529b9495b9ca1a610dc2ff9fc5ac84b5 (diff) | |
download | craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.gz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.lz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.xz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.zip |
Whitespace + general cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPainting.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPainting.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java index b5406a71..517c58bf 100644 --- a/src/main/java/net/minecraft/server/EntityPainting.java +++ b/src/main/java/net/minecraft/server/EntityPainting.java @@ -123,11 +123,11 @@ public class EntityPainting extends Entity { if (this.f++ == 100 && !this.world.isStatic) { this.f = 0; if (!this.h()) { - // CraftBukkit start Painting painting = (Painting) getBukkitEntity(); PaintingBreakByWorldEvent event = new PaintingBreakByWorldEvent(painting); Bukkit.getServer().getPluginManager().callEvent(event); + if (event.isCancelled()) { return; } @@ -203,11 +203,11 @@ public class EntityPainting extends Entity { public boolean damageEntity(Entity entity, int i) { if (!this.dead && !this.world.isStatic) { - // CraftBukkit start Painting painting = (Painting) getBukkitEntity(); PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent(painting, entity == null ? null : entity.getBukkitEntity()); Bukkit.getServer().getPluginManager().callEvent(event); + if (event.isCancelled()) { return true; } |