1 files changed, 11 insertions, 2 deletions
diff --git a/src/test/java/org/bukkit/MaterialTest.java b/src/test/java/org/bukkit/MaterialTest.java
index dbb60de0..a63c0f4d 100644
--- a/src/test/java/org/bukkit/MaterialTest.java
+++ b/src/test/java/org/bukkit/MaterialTest.java
@@ -12,6 +12,8 @@ import org.bukkit.support.AbstractTestingBase;
 import org.junit.Test;
 
 import com.google.common.collect.Maps;
+import java.util.Iterator;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 
 public class MaterialTest extends AbstractTestingBase {
 
@@ -19,14 +21,21 @@ public class MaterialTest extends AbstractTestingBase {
     public void verifyMapping() {
         Map<Integer, Material> materials = Maps.newHashMap();
         for (Material material : Material.values()) {
+            if (INVALIDATED_MATERIALS.contains(material)) {
+                continue;
+            }
+
             materials.put(material.getId(), material);
         }
         materials.remove(0); // Purge air.
 
-        for (Item item : Item.byId) {
+        Iterator<Item> items = Item.REGISTRY.iterator();
+
+        while (items.hasNext()) {
+            Item item = items.next();
             if (item == null) continue;
 
-            int id = item.id;
+            int id = CraftMagicNumbers.getId(item);
             String name = item.getName();
 
             Material material = materials.remove(id);