From 3c02fb02a1d76c97743917a029c2495a42fb3bc7 Mon Sep 17 00:00:00 2001 From: Kristofer Henriksson Date: Sun, 24 Mar 2013 13:27:11 -0400 Subject: [PATCH] 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. --- src/main/java/net/minecraft/server/ContainerEnchantTable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java index 02d861e0bb..c36ce7d972 100644 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java @@ -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()) {