summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-21 18:52:39 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-21 19:31:28 -0600
commitec211ed952173ac0be311afbb216471998532038 (patch)
tree70eb0ee8668a5a66584f8c6d63d4c6bedc7bc364 /src
parentf71be2506dea09ce405e8f961fb1e2290c168f3f (diff)
downloadcraftbukkit-ec211ed952173ac0be311afbb216471998532038.tar
craftbukkit-ec211ed952173ac0be311afbb216471998532038.tar.gz
craftbukkit-ec211ed952173ac0be311afbb216471998532038.tar.lz
craftbukkit-ec211ed952173ac0be311afbb216471998532038.tar.xz
craftbukkit-ec211ed952173ac0be311afbb216471998532038.zip
Update enchantment handling to 1.4.6. Fixes BUKKIT-3256
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
index a6245248..5e69163d 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
@@ -1,6 +1,6 @@
package org.bukkit.craftbukkit.enchantments;
-import net.minecraft.server.Item;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.enchantments.EnchantmentTarget;
import org.bukkit.enchantments.EnchantmentWrapper;
@@ -52,7 +52,7 @@ public class CraftEnchantment extends Enchantment {
@Override
public boolean canEnchantItem(ItemStack item) {
- return target.slot.canEnchant(Item.byId[item.getTypeId()]);
+ return target.canEnchant(CraftItemStack.asNMSCopy(item));
}
@Override