Update CraftBukkit to 1.6.4

9 files changed, 20 insertions, 20 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
index b2df4f5b..6ebe28d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
@@ -15,7 +15,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
     }
 
     public float getYield() {
-        return getHandle().yield;
+        return getHandle().bukkitYield;
     }
 
     public boolean isIncendiary() {
@@ -27,7 +27,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
     }
 
     public void setYield(float yield) {
-        getHandle().yield = yield;
+        getHandle().bukkitYield = yield;
     }
 
     public LivingEntity getShooter() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
index 7504bd50..b6575e96 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
@@ -49,7 +49,7 @@ public class CraftFish extends AbstractProjectile implements Fish {
         EntityFishingHook hook = getHandle();
 
         if (this.biteChance == -1) {
-            if (hook.world.F(MathHelper.floor(hook.locX), MathHelper.floor(hook.locY) + 1, MathHelper.floor(hook.locZ))) {
+            if (hook.world.isRainingAt(MathHelper.floor(hook.locX), MathHelper.floor(hook.locY) + 1, MathHelper.floor(hook.locZ))) {
                 return 1/300.0;
             }
             return 1/500.0;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java
index b0da3b9c..bca7a2d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java
@@ -54,7 +54,7 @@ public class CraftHorse extends CraftAnimals implements Horse {
     public void setCarryingChest(boolean chest) {
         if (chest == isCarryingChest()) return;
         getHandle().setHasChest(chest);
-        getHandle().cH(); // Should be loadChest
+        getHandle().loadChest();
     }
 
     public int getDomestication() {
@@ -68,7 +68,7 @@ public class CraftHorse extends CraftAnimals implements Horse {
     }
 
     public int getMaxDomestication() {
-        return getHandle().cq(); // Should be getMaxDomestication
+        return getHandle().getMaxDomestication();
     }
 
     public void setMaxDomestication(int value) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
index 59d9c0d3..ddee207e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
@@ -21,11 +21,11 @@ public class CraftIronGolem extends CraftGolem implements IronGolem {
     }
 
     public boolean isPlayerCreated() {
-        return getHandle().bW();
+        return getHandle().isPlayerCreated();
     }
 
     public void setPlayerCreated(boolean playerCreated) {
-        getHandle().f(playerCreated);
+        getHandle().setPlayerCreated(playerCreated);
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
index ba8afa31..4cb611fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
@@ -20,16 +20,16 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
             getHandle().getDataWatcher().a(2, 5);
             getHandle().getDataWatcher().h(2);
         } else {
-            getHandle().a(CraftItemStack.asNMSCopy(item));
+            getHandle().setItem(CraftItemStack.asNMSCopy(item));
         }
     }
 
     public org.bukkit.inventory.ItemStack getItem() {
-        return CraftItemStack.asBukkitCopy(getHandle().h());
+        return CraftItemStack.asBukkitCopy(getHandle().getItem());
     }
 
     public Rotation getRotation() {
-        return toBukkitRotation(getHandle().i());
+        return toBukkitRotation(getHandle().getRotation());
     }
 
     Rotation toBukkitRotation(int value) {
@@ -44,7 +44,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
         case 3:
             return Rotation.COUNTER_CLOCKWISE;
         default:
-            throw new AssertionError("Unknown rotation " + getHandle().i() + " for " + getHandle());
+            throw new AssertionError("Unknown rotation " + value + " for " + getHandle());
         }
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
index f75e74de..ca037940 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
@@ -13,7 +13,7 @@ public class CraftLargeFireball extends CraftFireball implements LargeFireball {
     @Override
     public void setYield(float yield) {
         super.setYield(yield);
-        getHandle().e = (int) yield;
+        getHandle().yield = (int) yield;
     }
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 83e0ee9d..52d4c3c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -410,21 +410,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         if (!(getHandle() instanceof EntityInsentient)) {
             return false;
         }
-        return ((EntityInsentient) getHandle()).bI() != null;
+        return ((EntityInsentient) getHandle()).getLeashHolder() != null;
     }
 
     public Entity getLeashHolder() throws IllegalStateException {
         if (!isLeashed()) {
             throw new IllegalStateException("Entity not leashed");
         }
-        return ((EntityInsentient) getHandle()).bI().getBukkitEntity();
+        return ((EntityInsentient) getHandle()).getLeashHolder().getBukkitEntity();
     }
 
     private boolean unleash() {
         if (!isLeashed()) {
             return false;
         }
-        ((EntityInsentient) getHandle()).a(true, false);
+        ((EntityInsentient) getHandle()).unleash(true, false);
         return true;
     }
 
@@ -442,7 +442,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         }
 
         unleash();
-        ((EntityInsentient) getHandle()).b(((CraftEntity) holder).getHandle(), true);
+        ((EntityInsentient) getHandle()).setLeashHolder(((CraftEntity) holder).getHandle(), true);
         return true;
     }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d5d43c9a..ac732732 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1045,7 +1045,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     }
 
     public void updateScaledHealth() {
-        AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().aW();
+        AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().aX();
         Set set = attributemapserver.b();
 
         injectScaledMaxHealth(set, true);
@@ -1070,6 +1070,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             }
             continue;
         }
-        collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
+        collection.add(new AttributeModifiable(getHandle().aX(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
     }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
index 97d266fc..18da4266 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
@@ -29,7 +29,7 @@ public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
         // We run this method once since it will set the item stack if there is none.
         getHandle().getPotionValue();
 
-        return CraftItemStack.asBukkitCopy(getHandle().c);
+        return CraftItemStack.asBukkitCopy(getHandle().item);
     }
 
     public void setItem(ItemStack item) {
@@ -39,7 +39,7 @@ public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
         // The ItemStack must be a potion.
         Validate.isTrue(item.getType() == Material.POTION, "ItemStack must be a potion. This item stack was " + item.getType() + ".");
 
-        getHandle().c = CraftItemStack.asNMSCopy(item);
+        getHandle().item = CraftItemStack.asNMSCopy(item);
     }
 
     @Override