diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-08 11:45:14 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-08 11:45:14 +0000 |
commit | 70e72d7744b625d3c4d1af76f222ad042e21e93d (patch) | |
tree | c64d33edb6fb39fec5410c1b193aff7eba7107b5 | |
parent | 22f9b76d77b78645b7a340980eadd241c5ef86c0 (diff) | |
download | Essentials-70e72d7744b625d3c4d1af76f222ad042e21e93d.tar Essentials-70e72d7744b625d3c4d1af76f222ad042e21e93d.tar.gz Essentials-70e72d7744b625d3c4d1af76f222ad042e21e93d.tar.lz Essentials-70e72d7744b625d3c4d1af76f222ad042e21e93d.tar.xz Essentials-70e72d7744b625d3c4d1af76f222ad042e21e93d.zip |
[trunk] empty fields in Inventory now return null instead of Material.AIR
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1157 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r-- | Essentials/src/com/earth2me/essentials/InventoryWorkaround.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java index dd1051159..d4250bc7c 100644 --- a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java +++ b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java @@ -19,6 +19,9 @@ public class InventoryWorkaround { ItemStack[] inventory = ci.getContents(); for (int i = start; i < inventory.length; i++) { ItemStack cItem = inventory[i]; + if (cItem == null) { + continue; + } if (item.getTypeId() == cItem.getTypeId() && (!forceAmount || item.getAmount() == cItem.getAmount()) && (!forceDurability || cItem.getDurability() == item.getDurability())) { return i; } |