From 228644d40f7e0f3e03d075f1cd932b817802d1aa Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 19 Sep 2019 15:44:12 -0700 Subject: [PATCH] Fixes where water could be placed in nether https://github.com/BentoBoxWorld/Greenhouses/issues/3 https://github.com/BentoBoxWorld/Greenhouses/issues/22 --- .../bentobox/greenhouses/listeners/GreenhouseEvents.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java index e5a1f2a..246898d 100644 --- a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java +++ b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java @@ -43,7 +43,8 @@ public class GreenhouseEvents implements Listener { if (!e.getPlayer().getWorld().getEnvironment().equals(World.Environment.NETHER)) { return; } - if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK) && e.getItem() != null && e.getItem().getType().equals(Material.WATER_BUCKET)) { + if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK) && e.getItem() != null && e.getItem().getType().equals(Material.WATER_BUCKET) + && plugin.getManager().getMap().getGreenhouse(e.getClickedBlock().getLocation()).isPresent()) { e.setCancelled(true); e.getClickedBlock().getRelative(e.getBlockFace()).setType(Material.WATER); e.getItem().setType(Material.BUCKET); @@ -120,7 +121,7 @@ public class GreenhouseEvents implements Listener { * Checks is broken blocks cause the greenhouse to fail * @param e - event */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled=true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled=true) public void onBlockBreak(final BlockBreakEvent e) { User user = User.getInstance(e.getPlayer()); plugin.getManager().getMap().getGreenhouse(e.getBlock().getLocation()).ifPresent(g -> {