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

SPIGOT-1567: Rework setItems to set slots correctly regardless of array reference.

Browse Source
This commit is contained in:
md_5 2016-03-01 19:59:52 +11:00
parent 4831c56cdb
commit 69e196f796
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -61,17 +61,15 @@ public class CraftInventory implements Inventory {
}
public void setContents(ItemStack[] items) {
if (getInventory().getContents().length < items.length) {
throw new IllegalArgumentException("Invalid inventory size; expected " + getInventory().getContents().length + " or less");
if (getSize() < items.length) {
throw new IllegalArgumentException("Invalid inventory size; expected " + getSize() + " or less");
}
net.minecraft.server.ItemStack[] mcItems = getInventory().getContents();
for (int i = 0; i < mcItems.length; i++) {
for (int i = 0; i < getSize(); i++) {
if (i >= items.length) {
mcItems[i] = null;
setItem(i, null);
} else {
mcItems[i] = CraftItemStack.asNMSCopy(items[i]);
setItem(i, items[i]);
}
}
}