From c8687bfc74af5b5a1c7fe4e349c20437085b755e Mon Sep 17 00:00:00 2001 From: Glitchfinder Date: Tue, 8 Jan 2013 14:23:07 -0800 Subject: [PATCH 1/2] Setting up Travis CI. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100755 index 000000000..d1aff14b1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: java +jdk: + - oraclejdk7 + - openjdk7 + - openjdk6 +script: "mvn clean install" \ No newline at end of file From 9b31520684d035cdccfc8fe7091165e0559678f2 Mon Sep 17 00:00:00 2001 From: Glitchfinder Date: Tue, 8 Jan 2013 14:39:08 -0800 Subject: [PATCH 2/2] Basic error check for backwards compatibility with dye colors. --- src/main/java/com/gmail/nossr50/skills/mining/Mining.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java index 4e2b2408c..8f60987a8 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java @@ -246,7 +246,12 @@ public class Mining { case LAPIS_ORE: if (config.getLapisDoubleDropsEnabled()) { - item = (new MaterialData(Material.INK_SACK, DyeColor.BLUE.getDyeData())).toItemStack(1); + try { + item = (new MaterialData(Material.INK_SACK, DyeColor.BLUE.getDyeData())).toItemStack(1); + } + catch(Exception e) { + item = (new MaterialData(Material.INK_SACK, (byte) 4)).toItemStack(1); + } Misc.dropItems(location, item, 4); Misc.randomDropItems(location, item, 50, 4);