Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-02-20 14:21:43 +01:00
Code Issues Projects Releases Wiki Activity

Sweetberries interaction while sneaking fix

Browse Source
This commit is contained in:
Zrips 2024-06-10 13:44:08 +03:00
parent 722add6656
commit ad577e60ff
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -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) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
final Block block = event.getClickedBlock(); final Block block = event.getClickedBlock();
@ -1739,8 +1744,10 @@ public final class JobsPaymentListener implements Listener {
JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(p); JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(p);
Material hand = CMIItemStack.getItemInMainHand(p).getType(); Material hand = CMIItemStack.getItemInMainHand(p).getType();
if (event.useInteractedBlock() != org.bukkit.event.Event.Result.DENY if (event.useInteractedBlock() != org.bukkit.event.Event.Result.DENY &&
&& event.getAction() == Action.RIGHT_CLICK_BLOCK && jPlayer != null && !p.isSneaking()) { event.getAction() == Action.RIGHT_CLICK_BLOCK &&
jPlayer != null &&
(!p.isSneaking() || !holdsItem(p))) {
if (Version.isCurrentEqualOrHigher(Version.v1_14_R1)) { if (Version.isCurrentEqualOrHigher(Version.v1_14_R1)) {
if (cmat == CMIMaterial.COMPOSTER) { if (cmat == CMIMaterial.COMPOSTER) {
org.bukkit.block.data.Levelled level = (org.bukkit.block.data.Levelled) block.getBlockData(); 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) { if (cmat == CMIMaterial.SWEET_BERRY_BUSH) {
Ageable age = (Ageable) block.getBlockData(); Ageable age = (Ageable) block.getBlockData();
if (age.getAge() == 2 && hand != CMIMaterial.BONE_MEAL.getMaterial()) { 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 if (age.getAge() == 3) {
Jobs.action(jPlayer, new BlockCollectInfo(CMIMaterial.SWEET_BERRIES, ActionType.COLLECT, age.getAge()), block); Jobs.action(jPlayer, new BlockCollectInfo(CMIMaterial.SWEET_BERRIES, ActionType.COLLECT, age.getAge()), block);
} }
} else { } else {