Merge pull request #3330 from hoorigan/ench-book-fixes

Enchanted book fixes

src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -586,6 +586,11 @@ public class FishingManager extends SkillManager {
             double dropRate = TreasureConfig.getInstance().getEnchantmentDropRate(getLootTier(), rarity);
 
             if (diceRoll <= dropRate) {
+                // Make sure enchanted books always get some kind of enchantment.  --hoorigan
+                if (treasureDrop.getType() == Material.ENCHANTED_BOOK) {
+                    diceRoll = dropRate + 1;
+                    continue;
+                }
                 fishingEnchantments = TreasureConfig.getInstance().fishingEnchantments.get(rarity);
                 break;
             }

src/main/java/com/gmail/nossr50/util/ItemUtils.java

@@ -503,6 +503,7 @@ public final class ItemUtils {
      */
     public static boolean isEnchantable(ItemStack item) {
         switch (item.getType()) {
+            case ENCHANTED_BOOK:
             case SHEARS:
             case FISHING_ROD:
             case CARROT_STICK: