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 | fe298d2f5856cbd7cd295d40967dddf4cdffefeb (patch) | |
| tree | 4db33a250f8d3f14035c50a296c5b97ce5acdb25 | |
| parent | 0be847fba4859effd8223158709395bba92d910c (diff) | |
| download | Essentials-fe298d2f5856cbd7cd295d40967dddf4cdffefeb.tar Essentials-fe298d2f5856cbd7cd295d40967dddf4cdffefeb.tar.gz Essentials-fe298d2f5856cbd7cd295d40967dddf4cdffefeb.tar.lz Essentials-fe298d2f5856cbd7cd295d40967dddf4cdffefeb.tar.xz Essentials-fe298d2f5856cbd7cd295d40967dddf4cdffefeb.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; } |