diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-02-23 13:56:36 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-02-23 14:12:33 +0100 |
commit | 09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059 (patch) | |
tree | 4d813de09480cee3083997ee192c3c9b9e35e863 /src/main/java/net/minecraft/server/BlockCactus.java | |
parent | 332d9c4f1884a03152c11ccb0b63c2e3127618ea (diff) | |
download | craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar.gz craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar.lz craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar.xz craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.zip |
Generic code cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockCactus.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index b0831145..ffa42f97 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -80,17 +80,17 @@ public class BlockCactus extends Block { public void a(World world, int i, int j, int k, Entity entity) { // CraftBukkit start - ENTITY_DAMAGEBY_BLOCK event - if(entity instanceof EntityLiving) { + if (entity instanceof EntityLiving) { CraftServer server = ((WorldServer) world).getServer(); org.bukkit.block.Block damager = ((WorldServer) world).getWorld().getBlockAt(i, j, k); - org.bukkit.entity.Entity damagee = (entity == null)?null:entity.getBukkitEntity(); + org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); DamageCause damageType = EntityDamageEvent.DamageCause.CONTACT; int damageDone = 1; EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, damageType, damageDone); server.getPluginManager().callEvent(event); - if (!event.isCancelled()){ + if (!event.isCancelled()) { entity.a((Entity) null, event.getDamage()); } return; |