From 09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Wed, 23 Feb 2011 13:56:36 +0100 Subject: Generic code cleanup --- src/main/java/net/minecraft/server/EntityEgg.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntityEgg.java') diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index 6204c9cb..f9044d63 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -167,7 +167,7 @@ public class EntityEgg extends Entity { EntityDamageByProjectileEvent event = new EntityDamageByProjectileEvent(shooter, damagee, projectile, damageCause, damage); server.getPluginManager().callEvent(event); - if(!event.isCancelled()) { + if (!event.isCancelled()) { // this function returns if the egg should stick or not, i.e. !bounce stick = movingobjectposition.g.a(this.g, event.getDamage()); } else { @@ -184,7 +184,7 @@ public class EntityEgg extends Entity { } boolean hatching = !this.world.isStatic && this.random.nextInt(8) == 0; - byte numHatching = (this.random.nextInt(32) == 0) ? (byte) 4 : (byte) 1; + int numHatching = (this.random.nextInt(32) == 0) ? 4 : 1; if (!hatching) { numHatching = 0; } @@ -195,8 +195,9 @@ public class EntityEgg extends Entity { Type eventType = Type.PLAYER_EGG_THROW; Player player = (this.g == null) ? null : (Player) this.g.getBukkitEntity(); - PlayerEggThrowEvent event = new PlayerEggThrowEvent(eventType, player, (Egg)this.getBukkitEntity(), hatching, numHatching, hatchingType); + PlayerEggThrowEvent event = new PlayerEggThrowEvent(eventType, player, (Egg) this.getBukkitEntity(), hatching, (byte) numHatching, hatchingType); server.getPluginManager().callEvent(event); + hatching = event.isHatching(); numHatching = event.getNumHatches(); hatchingType = event.getHatchType(); -- cgit v1.2.3