From 29f04ef67363b7308fa4fcaef56f32db1bf83d8a Mon Sep 17 00:00:00 2001 From: tastybento Date: Wed, 17 Feb 2021 12:43:39 -0800 Subject: [PATCH] Fix bug with water in offhand and nether greenhouse Fixes https://github.com/BentoBoxWorld/Greenhouses/issues/76 --- .../bentobox/greenhouses/listeners/GreenhouseEvents.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java index 2b34760..5c15d33 100644 --- a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java +++ b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java @@ -69,7 +69,12 @@ public class GreenhouseEvents implements Listener { .map(gh -> gh.getBiomeRecipe().getBiome()).map(NETHER_BIOMES::contains).orElse(false)) { // Not in Nether, in a nether greenhouse e.setCancelled(true); - e.getPlayer().getInventory().getItemInMainHand().setType(Material.BUCKET); + if (e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.WATER_BUCKET)) { + e.getPlayer().getInventory().getItemInMainHand().setType(Material.BUCKET); + } else if (e.getPlayer().getInventory().getItemInOffHand().getType().equals(Material.WATER_BUCKET)) { + e.getPlayer().getInventory().getItemInOffHand().setType(Material.BUCKET); + } + b.getWorld().spawnParticle(Particle.SMOKE_NORMAL, b.getLocation(), 10); b.getWorld().playSound(b.getLocation(), Sound.ENTITY_GENERIC_EXTINGUISH_FIRE, 1F, 5F); }