From 60aa32d003e28496a0421c60b8804c88fbef45d1 Mon Sep 17 00:00:00 2001
From: Erik <ezeiger92@gmail.com>
Date: Tue, 15 Aug 2017 12:20:09 -0700
Subject: [PATCH 1/2] Patches! * Update bukkit version * Default vanilla  exp
 modifier for fishing is now 1 * Fixed beetroot permission for herbalism

---
 pom.xml                                                       | 2 +-
 .../java/com/gmail/nossr50/skills/fishing/FishingManager.java | 2 +-
 src/main/resources/plugin.yml                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 46a4f0863..7d50e93f8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12-pre2-SNAPSHOT</version>
+            <version>1.12-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index 6c46047b1..59e8b93cc 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -649,6 +649,6 @@ public class FishingManager extends SkillManager {
             }
         }
 
-        return 0;
+        return 1;
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 950857056..b8c12d2ff 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -340,7 +340,7 @@ permissions:
             mcmmo.ability.herbalism.greenthumb.plants.crops: true
             mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true
             mcmmo.ability.herbalism.greenthumb.plants.potato: true
-            mcmmo.ability.herbalism.greenthumb.plants.beetroot: true
+            mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: true
     mcmmo.ability.herbalism.greenthumb.plants.carrot:
         description: Allows access to the Green Thumb ability for carrots
     mcmmo.ability.herbalism.greenthumb.plants.cocoa:
@@ -351,7 +351,7 @@ permissions:
         description: Allows access to the Green Thumb ability for netherwart
     mcmmo.ability.herbalism.greenthumb.plants.potato:
         description: Allows access to the Green Thumb ability for potatoes
-    mcmmo.ability.herbalism.greenthumb.plants.beetroot:
+    mcmmo.ability.herbalism.greenthumb.plants.beetrootblock:
         description: Allows access to the Green Thumb ability for beetrootes
     mcmmo.ability.herbalism.hylianluck:
         description: Allows access to the Hylian Luck ability

From 05ca96aa7f9b82c0a11e738146033002454768d2 Mon Sep 17 00:00:00 2001
From: Erik <ezeiger92@gmail.com>
Date: Tue, 15 Aug 2017 16:45:32 -0700
Subject: [PATCH 2/2] Build against 1.12.1 to NOT break getTargetBlock

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d50e93f8..f70086d01 100755
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.12.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>