From 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 Mon Sep 17 00:00:00 2001 From: Nate Mortensen Date: Mon, 1 Jul 2013 06:03:00 -0500 Subject: Update CraftBukkit to 1.6.1 --- src/main/java/net/minecraft/server/EntityEnderCrystal.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntityEnderCrystal.java') diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java index 582ecac3..ebf76a0b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -4,7 +4,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntityEnderCrystal extends Entity { - public int a = 0; + public int a; public int b; public EntityEnderCrystal(World world) { @@ -16,7 +16,7 @@ public class EntityEnderCrystal extends Entity { this.a = this.random.nextInt(100000); } - protected boolean f_() { + protected boolean e_() { return false; } @@ -51,13 +51,13 @@ public class EntityEnderCrystal extends Entity { return true; } - public boolean damageEntity(DamageSource damagesource, int i) { + public boolean damageEntity(DamageSource damagesource, float f) { if (this.isInvulnerable()) { return false; } else { if (!this.dead && !this.world.isStatic) { // CraftBukkit start - All non-living entities need this - if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, i)) { + if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { return false; } // CraftBukkit end -- cgit v1.2.3