Update CraftBukkit to Minecraft 1.4.6

2012-12-19 22:03:52 -06:00
parent 9f1bf124ee
commit 23b6764374
115 changed files with 1930 additions and 1426 deletions
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
@@ -72,6 +72,8 @@ public class CraftEnchantment extends Enchantment {
            return "OXYGEN";
        case 6:
            return "WATER_WORKER";
+        case 7:
+            return "THORNS";
        case 16:
            return "DAMAGE_ALL";
        case 17: