Update CraftBukkit to Minecraft 1.5

By: Travis Watkins <amaranth@ubuntu.com>
2013-03-13 17:33:27 -05:00
parent 0d9124396f
commit 18164ee949
21 changed files with 164 additions and 84 deletions
--- a/paper-server/src/test/java/org/bukkit/PerMaterialTest.java
+++ b/paper-server/src/test/java/org/bukkit/PerMaterialTest.java
@@ -122,7 +122,7 @@ public class PerMaterialTest extends AbstractTestingBase {
    @Test
    public void isOccluding() {
        if (material.isBlock()) {
-            assertThat(material.isOccluding(), is(Block.i(material.getId())));
+            assertThat(material.isOccluding(), is(Block.l(material.getId())));
        } else {
            assertFalse(material.isOccluding());
        }