Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 22:13:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix for log stripping

Browse Source
This commit is contained in:
Zrips 2020-12-17 17:25:53 +02:00
parent 7544eea2ac
commit 3637c77f42
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1581,6 +1581,9 @@ public class JobsPaymentListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
if (event.isCancelled())
return;
Player p = event.getPlayer(); Player p = event.getPlayer();
if (!Jobs.getGCManager().canPerformActionInWorld(p.getWorld())) if (!Jobs.getGCManager().canPerformActionInWorld(p.getWorld()))
return; return;
@ -1653,7 +1656,7 @@ public class JobsPaymentListener implements Listener {
"[max]", jPlayer.getMaxOwnerShipAllowed(blockOwner.getType()) == 0 ? "-" : jPlayer.getMaxOwnerShipAllowed(blockOwner.getType()))); "[max]", jPlayer.getMaxOwnerShipAllowed(blockOwner.getType()) == 0 ? "-" : jPlayer.getMaxOwnerShipAllowed(blockOwner.getType())));
} }
} else if (Version.isCurrentEqualOrHigher(Version.v1_13_R1) && } else if (Version.isCurrentEqualOrHigher(Version.v1_13_R1) &&
block.getType().toString().startsWith("STRIPPED_") && !block.getType().toString().startsWith("STRIPPED_") && block.getType().toString().endsWith("_LOG") &&
event.getAction() == Action.RIGHT_CLICK_BLOCK && jPlayer != null && hand.toString().endsWith("_AXE")) { event.getAction() == Action.RIGHT_CLICK_BLOCK && jPlayer != null && hand.toString().endsWith("_AXE")) {
// check if player is riding // check if player is riding
if (Jobs.getGCManager().disablePaymentIfRiding && p.isInsideVehicle()) if (Jobs.getGCManager().disablePaymentIfRiding && p.isInsideVehicle())