Merge branch 'release/0.3.1'

KillenCraft · Dec 14, 2014 · d2d4072 · d2d4072
2 parents 566905a + bed2a43
commit d2d4072
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## Ancient Trees
-**LATEST OFFICIAL VERSION**: [Ancient Trees 0.3.0 for MC 1.7.10][release]
-[release]: https://github.com/MinecraftModArchive/Dendrology/releases/download/v0.3.0/AncientTrees-1.7.10-0.3.0.jar
+**LATEST OFFICIAL VERSION**: [Ancient Trees 0.3.1 for MC 1.7.10][release]
+[release]: https://github.com/MinecraftModArchive/Dendrology/releases/download/v0.3.0/AncientTrees-1.7.10-0.3.1.jar
 
 [Contributing](#contributing)
 
@@ -30,7 +30,7 @@ Something not quite right?  Have a suggestion?  Found a bug?  Create an issue no
 
 ##### Textures
 
-Some textures from [The Painterly Pack][pack] by [Rhodox][rhodox_tweet] and friends. Used by permission.
+Some textures are from [The Painterly Pack][pack] by [Rhodox][rhodox_tweet] and friends. Used by permission.
 
 [pack]: http://painterlypack.net/
 [rhodox_tweet]: https://twitter.com/PainterlyPack

diff --git a/src/main/java/com/scottkillen/mod/kore/tree/block/ModSaplingBlock.java b/src/main/java/com/scottkillen/mod/kore/tree/block/ModSaplingBlock.java
@@ -118,7 +118,10 @@ public String getUnlocalizedName()
     @SuppressWarnings("ReturnOfNull")
     public String getPotionEffect(ItemStack itemStack)
     {
-        final ProvidesSapling sapling = trees.get(itemStack.getItemDamage());
+        final int itemDamage = itemStack.getItemDamage();
+        if (itemDamage > trees.size()) return null;
+
+        final ProvidesSapling sapling = trees.get(itemDamage);
         return sapling instanceof ProvidesPotionEffect ? ((ProvidesPotionEffect) sapling).getPotionEffect() : null;
     }
 

diff --git a/version/gradle.properties b/version/gradle.properties
@@ -1,6 +1,6 @@
-#Sat, 13 Dec 2014 17:58:52 -0500
+#Sun, 14 Dec 2014 00:15:22 -0500
 mcversion=1.7.10
 forgeversion=10.13.2.1235
 version_major=0
 version_series=3
-version_revision=0
+version_revision=1