Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly handle null and air items. Fixes BUKKIT-435 and BUKKIT-550

Browse Source 
We'll probably want to implement an ItemStack.EMPTY and return that
instead of NULL in the near future.
This commit is contained in:
EvilSeph
2012-01-20 02:26:26 -05:00
parent 4b0f819af2
commit 76d7a1ce1d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
public ItemStack getItem(int index) {
return new CraftItemStack(getInventory().getItem(index));
return getInventory().getItem(index).id == 0 ? null : new CraftItemStack(getInventory().getItem(index));
}
public ItemStack[] getContents() {
@@ -59,7 +59,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
public void setItem(int index, ItemStack item) {
getInventory().setItem(index, (item == null ? null : CraftItemStack.createNMSItemStack(item)));
getInventory().setItem(index, ((item == null || item.getTypeId() == 0) ? null : CraftItemStack.createNMSItemStack(item)));
}
public boolean contains(int materialId) {
@@ -170,7 +170,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
ItemStack[] inventory = getContents();
for (int i = 0; i < inventory.length; i++) {
if (inventory[i] == null) continue;
boolean equals = false;
if (withAmount) {