Allow plugins to enchant already enchanted items. Fixes BUKKIT-1956

This causes the server to generate PrepareItemEnchantEvent even in the
case that an item is already enchanted or otherwise would normally not
be enchantable.
This commit is contained in:
Kristofer Henriksson 2013-03-24 13:27:11 -04:00 committed by riking
parent 02a5d09ddf
commit 3c02fb02a1

View File

@ -79,7 +79,7 @@ public class ContainerEnchantTable extends Container {
ItemStack itemstack = iinventory.getItem(0);
int i;
if (itemstack != null && itemstack.w()) {
if (itemstack != null) { // CraftBukkit - relax condition
this.f = this.l.nextLong();
if (!this.world.isStatic) {
i = 0;
@ -125,6 +125,7 @@ public class ContainerEnchantTable extends Container {
// CraftBukkit start
CraftItemStack item = CraftItemStack.asCraftMirror(itemstack);
PrepareItemEnchantEvent event = new PrepareItemEnchantEvent(player, this.getBukkitView(), this.world.getWorld().getBlockAt(this.x, this.y, this.z), item, this.costs, i);
event.setCancelled(!itemstack.w())
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {