Update CraftBukkit to Minecraft 1.5

By: Travis Watkins <amaranth@ubuntu.com>
This commit is contained in:
CraftBukkit/Spigot 2013-03-13 17:33:27 -05:00
commit 18164ee949
21 changed files with 164 additions and 84 deletions

View file

@ -41,7 +41,7 @@ public class DyeColorsTest extends AbstractTestingBase {
@Test
public void checkFireworkColor() {
Color color = dye.getFireworkColor();
int nmsColor = ItemDye.b[dye.getDyeData()];
int nmsColor = ItemDye.c[dye.getDyeData()];
assertThat(color, is(Color.fromRGB(nmsColor)));
}
}

View file

@ -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());
}