Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

Return the level, not ID. Fixes BUKKIT-3326

Browse Source 
CraftItemStack was erroneously using the enchantment ID instead of level
for the return value of remove enchantment.
This commit is contained in:
Wesley Wolfe 2012-12-29 20:53:27 -06:00
parent 8954cb291c
commit bb83795815
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
View File

@ -220,12 +220,16 @@ public final class CraftItemStack extends ItemStack {
if (list == null) { if (list == null) {
return 0; return 0;
} }
int index = Integer.MIN_VALUE, size = list.size(), level; int index = Integer.MIN_VALUE;
int level = Integer.MIN_VALUE;
int size = list.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
short id = ((NBTTagCompound) list.get(i)).getShort(ENCHANTMENTS_ID.NBT); NBTTagCompound enchantment = (NBTTagCompound) list.get(i);
int id = 0xffff & enchantment.getShort(ENCHANTMENTS_ID.NBT);
if (id == ench.getId()) { if (id == ench.getId()) {
index = i; index = i;
level = 0xffff & enchantment.getShort(ENCHANTMENTS_LVL.NBT);
break; break;
} }
} }
@ -233,24 +237,23 @@ public final class CraftItemStack extends ItemStack {
if (index == Integer.MIN_VALUE) { if (index == Integer.MIN_VALUE) {
return 0; return 0;
} }
if (index == 0 && size == 1) { if (size == 1) {
handle.tag.o(ENCHANTMENTS.NBT); handle.tag.o(ENCHANTMENTS.NBT);
if (handle.tag.d()) { if (handle.tag.d()) {
handle.tag = null; handle.tag = null;
} }
return ((NBTTagCompound) list.get(0)).getShort(ENCHANTMENTS_ID.NBT); return level;
} }
// This is workaround for not having an index removal
listCopy = new NBTTagList(ENCHANTMENTS.NBT); listCopy = new NBTTagList(ENCHANTMENTS.NBT);
level = Integer.MAX_VALUE;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
if (i == index) { if (i != index) {
level = ((NBTTagCompound) list.get(i)).getShort(ENCHANTMENTS_ID.NBT); listCopy.add(list.get(i));
continue;
} }
listCopy.add(list.get(i));
} }
handle.tag.set(ENCHANTMENTS.NBT, listCopy); handle.tag.set(ENCHANTMENTS.NBT, listCopy);
return level; return level;
} }