diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/test/java/org/bukkit/MaterialTest.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/test/java/org/bukkit/MaterialTest.java')
-rw-r--r-- | src/test/java/org/bukkit/MaterialTest.java | 13 |
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); |