summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityEgg.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-02-23 13:56:36 +0100
committerErik Broes <erikbroes@grum.nl>2011-02-23 14:12:33 +0100
commit09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059 (patch)
tree4d813de09480cee3083997ee192c3c9b9e35e863 /src/main/java/net/minecraft/server/EntityEgg.java
parent332d9c4f1884a03152c11ccb0b63c2e3127618ea (diff)
downloadcraftbukkit-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/EntityEgg.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityEgg.java7
1 files changed, 4 insertions, 3 deletions
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();