More use of Material instead of ids...

NoCheatPlus · Jun 14, 2014 · ae9415a · ae9415a
1 parent c23e5e1
commit ae9415a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/InventoryUtil.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/InventoryUtil.java
@@ -1,5 +1,6 @@
 package fr.neatmonster.nocheatplus.utilities;
 
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
@@ -14,6 +15,10 @@
  */
 public class InventoryUtil {
 
+	private static boolean isEmpty(Material mat) {
+		return mat == null || mat == Material.AIR;
+	}
+
 	/**
 	 * Does not account for special slots like armor.
 	 * @param inventory
@@ -24,7 +29,7 @@ public static int getFreeSlots(final Inventory inventory){
 		int count = 0;
 		for (int i = 0; i < contents.length; i++){
 			final ItemStack stack = contents[i];
-			if (stack == null || stack.getTypeId() == 0){
+			if (stack == null || isEmpty(stack.getType())){
 				count ++;
 			}
 		}
@@ -40,7 +45,7 @@ public static int getFreeSlots(final Inventory inventory){
 	public static int getStackCount(final Inventory inventory, final ItemStack reference) {
 		if (inventory == null) return 0;
 		if (reference == null) return getFreeSlots(inventory);
-		final int id = reference.getTypeId();
+		final Material mat = reference.getType();
 		final int durability = reference.getDurability();
 		final ItemStack[] contents = inventory.getContents();
 		int count = 0;
@@ -49,7 +54,7 @@ public static int getStackCount(final Inventory inventory, final ItemStack refer
 			if (stack == null){
 				continue;
 			}
-			else if (stack.getTypeId() == id && stack.getDurability() == durability){
+			else if (stack.getType() == mat && stack.getDurability() == durability){
 				count ++;
 			}
 		}