Fix bug where water couldn't be placed outside of greenhouse.

BentoBoxWorld · Feb 1, 2021 · 39a88a4 · 39a88a4
1 parent b0a0ae6
commit 39a88a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java b/src/main/java/world/bentobox/greenhouses/listeners/GreenhouseEvents.java
@@ -66,7 +66,7 @@ public void onPlayerInteractInNether(PlayerBucketEmptyEvent e) {
             b.setType(Material.WATER);
         } else if (!e.getPlayer().getWorld().getEnvironment().equals(World.Environment.NETHER)
                 && addon.getManager().getMap().getGreenhouse(b.getLocation())
-                .map(gh -> gh.getBiomeRecipe().getBiome()).map(NETHER_BIOMES::contains).orElse(true)) {
+                .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);
@@ -93,7 +93,7 @@ public void onIceBreak(BlockBreakEvent e) {
             b.setType(Material.WATER);
         } else if (!e.getPlayer().getWorld().getEnvironment().equals(World.Environment.NETHER)
                 && addon.getManager().getMap().getGreenhouse(b.getLocation())
-                .map(gh -> gh.getBiomeRecipe().getBiome()).map(NETHER_BIOMES::contains).orElse(true)) {
+                .map(gh -> gh.getBiomeRecipe().getBiome()).map(NETHER_BIOMES::contains).orElse(false)) {
             // Not in Nether, in a nether greenhouse
             e.setCancelled(true);
             b.setType(Material.AIR);

diff --git a/src/test/java/world/bentobox/greenhouses/listeners/GreenhouseEventsTest.java b/src/test/java/world/bentobox/greenhouses/listeners/GreenhouseEventsTest.java
@@ -285,6 +285,8 @@ public void testOnIceBreakNotIce() {
         Block block = mock(Block.class);
         when(block.getType()).thenReturn(Material.ACACIA_BOAT);
         when(block.getWorld()).thenReturn(world);
+        // Nether gh
+        when(block.getLocation()).thenReturn(location2);
         BlockBreakEvent e = new BlockBreakEvent(block, player);
         ghe.onIceBreak(e);
         verify(block, never()).setType(Material.WATER);
@@ -302,6 +304,8 @@ public void testOnIceBreakNotNetherNetherGreenhouse() {
         Block block = mock(Block.class);
         when(block.getType()).thenReturn(Material.ICE);
         when(block.getWorld()).thenReturn(world);
+        // Nether gh
+        when(block.getLocation()).thenReturn(location2);
         BlockBreakEvent e = new BlockBreakEvent(block, player);
         ghe.onIceBreak(e);
         verify(block).setType(Material.AIR);