Update CraftBukkit to 1.6.1

2013-07-01 06:03:00 -05:00
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions
--- a/src/main/java/net/minecraft/server/Enchantment.java
+++ b/src/main/java/net/minecraft/server/Enchantment.java
@@ -71,8 +71,8 @@ public abstract class Enchantment {
        return 0;
    }

-    public int a(int i, EntityLiving entityliving) {
-        return 0;
+    public float a(int i, EntityLiving entityliving) {
+        return 0.0F;
    }

    public boolean a(Enchantment enchantment) {
@@ -106,7 +106,6 @@ public abstract class Enchantment {
        for (int j = 0; j < i; ++j) {
            Enchantment enchantment = aenchantment[j];

-
            if (enchantment != null) {
                arraylist.add(enchantment);
            }