diff --git a/pom.xml b/pom.xml index 357d4968..1bb73169 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.songoda skyblock - 2.3.15 + 2.3.16 jar UTF-8 diff --git a/src/main/java/com/songoda/skyblock/listeners/BlockListeners.java b/src/main/java/com/songoda/skyblock/listeners/BlockListeners.java index 60e098b9..9abac39b 100644 --- a/src/main/java/com/songoda/skyblock/listeners/BlockListeners.java +++ b/src/main/java/com/songoda/skyblock/listeners/BlockListeners.java @@ -717,6 +717,10 @@ public class BlockListeners implements Listener { BlockFace dispenserDirection = ((org.bukkit.material.Dispenser) event.getBlock().getState().getData()).getFacing(); org.bukkit.block.Block placeLocation = event.getBlock().getRelative(dispenserDirection); + + if (this.plugin.getConfiguration().getBoolean("Island.Nether.AllowNetherWater", false)) + placeLocation.setType(Material.WATER); + Island island = islandManager.getIslandAtLocation(placeLocation.getLocation()); if (island == null) return; diff --git a/src/main/java/com/songoda/skyblock/listeners/InteractListeners.java b/src/main/java/com/songoda/skyblock/listeners/InteractListeners.java index d109470a..9c584261 100644 --- a/src/main/java/com/songoda/skyblock/listeners/InteractListeners.java +++ b/src/main/java/com/songoda/skyblock/listeners/InteractListeners.java @@ -26,7 +26,6 @@ import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.block.data.Levelled; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -92,7 +91,14 @@ public class InteractListeners implements Listener { CompatibleMaterial type = CompatibleMaterial.getMaterial(block); - if (type.name().contains("SLAB")) { + if (type.name().contains("SLAB") + || type == CompatibleMaterial.BROWN_MUSHROOM + || type == CompatibleMaterial.RED_MUSHROOM + || type == CompatibleMaterial.CHEST + || type == CompatibleMaterial.ENDER_CHEST + || type == CompatibleMaterial.TRAPPED_CHEST + || type == CompatibleMaterial.END_PORTAL + || type == CompatibleMaterial.ENCHANTING_TABLE) { event.setCancelled(true); return; }