From 028b561e66aebd534d5ee034eda0a85e89a49d3c Mon Sep 17 00:00:00 2001
From: Thiago Gebrim <thiagogebrim@hotmail.com>
Date: Sat, 13 Apr 2024 15:27:39 -0300
Subject: [PATCH] changes the dev asked for

---
 .../skills/herbalism/HerbalismManager.java    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
index 6b4ff35d4..5e98b9648 100644
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
@@ -763,22 +763,22 @@ public class HerbalismManager extends SkillManager {
 
         switch (blockState.getType().getKey().getKey().toLowerCase(Locale.ROOT)) {
             case "carrots":
-                seed = Material.CARROT;
+                seed = Material.matchMaterial("CARROT");
                 break;
             case "wheat":
-                seed = Material.WHEAT_SEEDS;
+                seed = Material.matchMaterial("WHEAT_SEEDS");
                 break;
             case "nether_wart":
-                seed = Material.NETHER_WART;
+                seed = Material.matchMaterial("NETHER_WART");
                 break;
             case "potatoes":
-                seed = Material.POTATO;
+                seed = Material.matchMaterial("POTATO");
                 break;
             case "beetroots":
-                seed = Material.BEETROOT_SEEDS;
+                seed = Material.matchMaterial("BEETROOT_SEEDS");
                 break;
             case "cocoa":
-                seed = Material.COCOA_BEANS;
+                seed = Material.matchMaterial("COCOA_BEANS");
                 break;
             case "torchflower":
                 seed = Material.matchMaterial("TORCHFLOWER_SEEDS");
@@ -804,23 +804,24 @@ public class HerbalismManager extends SkillManager {
             return false;
         }
 
-        // Remove seed from the appropriate inventory slot (main hand or off-hand)
-        if (playerInventory.getItemInMainHand().getType() == seed) {
-            playerInventory.removeItem(new ItemStack(seed, 1));
-        } else if (playerInventory.getItemInOffHand().getType() == seed) {
-            playerInventory.getItemInOffHand().setAmount(playerInventory.getItemInOffHand().getAmount() - 1);
-        }
-
-        player.updateInventory(); // Needed until replacement available
-
         if (!processGrowingPlants(blockState, ageable, blockBreakEvent, greenTerra)) {
             return false;
         }
 
+        // Check the SubSkillEvent before removing items
         if (EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, blockState.getBlock()).isCancelled()) {
             return false;
         } else {
-            //Play sound
+            // Remove seed from the appropriate inventory slot (main hand or off-hand)
+            if (playerInventory.getItemInMainHand().getType() == seed) {
+                playerInventory.removeItem(new ItemStack(seed, 1));
+            } else if (playerInventory.getItemInOffHand().getType() == seed) {
+                playerInventory.getItemInOffHand().setAmount(playerInventory.getItemInOffHand().getAmount() - 1);
+            }
+
+            player.updateInventory(); // Needed until replacement available
+
+            // Play sound
             SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_CONSUMED);
             return true;
         }