Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/ContainerEnchantTable.java
View File

@ -79,7 +79,7 @@ public class ContainerEnchantTable extends Container {
ItemStack itemstack = iinventory.getItem(0); ItemStack itemstack = iinventory.getItem(0);
int i; int i;
if (itemstack != null && itemstack.w()) { if (itemstack != null) { // CraftBukkit - relax condition
this.f = this.l.nextLong(); this.f = this.l.nextLong();
if (!this.world.isStatic) { if (!this.world.isStatic) {
i = 0; i = 0;
@ -125,6 +125,7 @@ public class ContainerEnchantTable extends Container {
// CraftBukkit start // CraftBukkit start
CraftItemStack item = CraftItemStack.asCraftMirror(itemstack); 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); 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); this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {