From 23af6e7012069f0b1c5676425bfd16fd551bb61a Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 11 Nov 2018 10:22:18 +0100 Subject: [PATCH] Few fixes to COARSE_DIRT_TILLING flag #337 --- .../listeners/flags/CoarseDirtTillingListener.java | 8 ++++++-- src/main/resources/locales/en-US.yml | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/CoarseDirtTillingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/CoarseDirtTillingListener.java index f2b95b098..c6e9b1f19 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/CoarseDirtTillingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/CoarseDirtTillingListener.java @@ -6,13 +6,15 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; import world.bentobox.bentobox.api.flags.FlagListener; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.lists.Flags; public class CoarseDirtTillingListener extends FlagListener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onTillingCoarseDirt(PlayerInteractEvent e) { - if (!e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) { + if (!e.getAction().equals(Action.RIGHT_CLICK_BLOCK) || e.getItem() == null) { return; } @@ -26,7 +28,9 @@ public class CoarseDirtTillingListener extends FlagListener { if (e.getClickedBlock().getType().equals(Material.COARSE_DIRT) && getIWM().inWorld(e.getClickedBlock().getWorld()) && !Flags.COARSE_DIRT_TILLING.isSetForWorld(e.getClickedBlock().getWorld())) { - noGo(e, Flags.COARSE_DIRT_TILLING); + e.setCancelled(true); + User user = User.getInstance(e.getPlayer()); + user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation(Flags.COARSE_DIRT_TILLING.getHintReference())); } break; default: diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 8d34fcdd8..4990ef2ce 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -442,9 +442,9 @@ protection: name: "Clean Super Flat" COARSE_DIRT_TILLING: description: |- - &aPrevent the players from - &atilling the coarse dirt - &ato obtain dirt + &aToggle tilling the + &acoarse dirt to + &aobtain dirt name: "Coarse dirt tilling" hint: "No coarse dirt tilling" COLLECT_LAVA: