Fixed inventory can hold checks

Author: bensku

src/main/java/ch/njol/skript/aliases/ItemType.java

@@ -657,7 +657,7 @@ public boolean hasSpace(final Inventory invi) {
 			if (getItem().types.size() != 1 || getItem().types.get(0).hasDataRange() || getItem().types.get(0).typeid == -1)
 				return false;
 		}
-		return addTo(getCopiedContents(invi));
+		return addTo(getStorageContents(invi));
 	}
 
 	public final static ItemStack[] getCopiedContents(final Inventory invi) {
@@ -668,6 +668,23 @@ public final static ItemStack[] getCopiedContents(final Inventory invi) {
 		return buf;
 	}
 
+	/**
+	 * Gets copy of storage contents, i.e. ignores armor and off hand. This is due to Spigot 1.9
+	 * added armor slots, and off hand to default inventory index.
+	 * @param invi Inventory
+	 * @return Copied storage contents
+	 */
+	public final static ItemStack[] getStorageContents(final Inventory invi) {
+		if (invi instanceof PlayerInventory) {
+			final ItemStack[] buf = invi.getContents();
+			final ItemStack[] tBuf = new ItemStack[36];
+			for (int i = 0; i < 36; i++)
+				if (buf[i] != null)
+					tBuf[i] = buf[i].clone();
+			return tBuf;
+		} else return getCopiedContents(invi);
+	}
+	
 	/**
 	 * @return List of ItemDatas. The returned list is not modifiable, use {@link #add(ItemData)} and {@link #remove(ItemData)} if you need to change the list, or use the
 	 *         {@link #iterator()}.

src/main/java/ch/njol/skript/conditions/CondCanHold.java

@@ -91,7 +91,7 @@ public boolean check(final ItemType t) {
 						}
 					}, isNegated());
 				}
-				final ItemStack[] buf = ItemType.getCopiedContents(invi);
+				final ItemStack[] buf = ItemType.getStorageContents(invi);
 				return items.check(e, new Checker<ItemType>() {
 					@Override
 					public boolean check(final ItemType t) {