From ad577e60ff2e5610137af62e7744392f9de74016 Mon Sep 17 00:00:00 2001
From: Zrips <zripas@gmail.com>
Date: Mon, 10 Jun 2024 13:44:08 +0300
Subject: [PATCH] Sweetberries interaction while sneaking fix

---
 .../jobs/listeners/JobsPaymentListener.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
index ae224e21..e24aa84b 100644
--- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
+++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
@@ -1723,6 +1723,11 @@ public final class JobsPaymentListener implements Listener {
         }
     }
 
+    private boolean holdsItem(Player player) {
+        return CMIItemStack.getItemInMainHand(player) != null && !CMIItemStack.getItemInMainHand(player).getType().equals(Material.AIR) ||
+            CMIItemStack.getItemInOffHand(player) != null && !CMIItemStack.getItemInOffHand(player).getType().equals(Material.AIR);
+    }
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerInteract(PlayerInteractEvent event) {
         final Block block = event.getClickedBlock();
@@ -1739,8 +1744,10 @@ public final class JobsPaymentListener implements Listener {
         JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(p);
         Material hand = CMIItemStack.getItemInMainHand(p).getType();
 
-        if (event.useInteractedBlock() != org.bukkit.event.Event.Result.DENY
-            && event.getAction() == Action.RIGHT_CLICK_BLOCK && jPlayer != null && !p.isSneaking()) {
+        if (event.useInteractedBlock() != org.bukkit.event.Event.Result.DENY &&
+            event.getAction() == Action.RIGHT_CLICK_BLOCK &&
+            jPlayer != null &&
+            (!p.isSneaking() || !holdsItem(p))) {
             if (Version.isCurrentEqualOrHigher(Version.v1_14_R1)) {
                 if (cmat == CMIMaterial.COMPOSTER) {
                     org.bukkit.block.data.Levelled level = (org.bukkit.block.data.Levelled) block.getBlockData();
@@ -1752,9 +1759,7 @@ public final class JobsPaymentListener implements Listener {
 
                     if (cmat == CMIMaterial.SWEET_BERRY_BUSH) {
                         Ageable age = (Ageable) block.getBlockData();
-                        if (age.getAge() == 2 && hand != CMIMaterial.BONE_MEAL.getMaterial()) {
-                            Jobs.action(jPlayer, new BlockCollectInfo(CMIMaterial.SWEET_BERRIES, ActionType.COLLECT, age.getAge()), block);
-                        } else if (age.getAge() == 3) {
+                        if (age.getAge() == 2 && hand != CMIMaterial.BONE_MEAL.getMaterial() || age.getAge() == 3) {
                             Jobs.action(jPlayer, new BlockCollectInfo(CMIMaterial.SWEET_BERRIES, ActionType.COLLECT, age.getAge()), block);
                         }
                     } else {