Small tweaks

mcMMO-Dev · Apr 3, 2023 · 7264e1a · 7264e1a
1 parent e011f54
commit 7264e1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -20,7 +20,7 @@ Version 2.1.219
     Added 'Stripped_Cherry_Log' to woodcutting experience in experience.yml
     Added 'Stripped_Cherry_Wood' to woodcutting experience in experience.yml
     Added 'Skills.Mining.BlastMining.Bonus_Drops.Enabled' to advanced.yml to enable/disable bonus drops from Blast Mining
-    NOTE: There are plans to add experience for discovering items via the new brushing mechanic, but this will have to wait for new Spigot API to become available
+    NOTE: There are plans to add experience and potentially subskills for discovering items via the new brushing mechanic, but this will have to wait for new Spigot API to become available
 
 Version 2.1.218
     Fixed locale pt_BR type (thanks MrPowerGamerBR)

diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
@@ -798,7 +798,6 @@ private boolean processGreenThumbPlants(BlockState blockState, BlockBreakEvent b
             case "torchflower":
                 seed = Material.matchMaterial("TORCHFLOWER_SEEDS");
                 break;
-
             default:
                 return false;
         }
@@ -854,17 +853,17 @@ private boolean processGrowingPlants(BlockState blockState, Ageable ageable, Blo
             return true;
         }
 
-        switch (blockState.getType()) {
+        switch (blockState.getType().getKey().getKey()) {
 
-            case POTATOES:
-            case CARROTS:
-            case WHEAT:
+            case "potatoes":
+            case "carrots":
+            case "wheat":
 
                     finalAge = getGreenThumbStage(greenTerra);
                 break;
 
-            case BEETROOTS:
-            case NETHER_WART:
+            case "beetroots":
+            case "nether_wart":
 
                 if (greenTerra || greenThumbStage > 2) {
                     finalAge = 2;
@@ -875,9 +874,9 @@ else if (greenThumbStage == 2) {
                 else {
                     finalAge = 0;
                 }
-               break;
+                break;
 
-            case COCOA:
+            case "cocoa":
 
                 if (getGreenThumbStage(greenTerra) >= 2) {
                     finalAge = 1;
@@ -891,6 +890,7 @@ else if (greenThumbStage == 2) {
                 return false;
         }
 
+
         //Start the delayed replant
         startReplantTask(finalAge, blockBreakEvent, blockState, false);
         return true;