Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-22 10:15:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-10-26 14:56:26 -05:00
commit 391d92b4de
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId>
<version>2.3.15</version>
<version>2.3.16</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

4
src/main/java/com/songoda/skyblock/listeners/BlockListeners.java
View File

@ -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;

10
src/main/java/com/songoda/skyblock/listeners/InteractListeners.java
View File

@ -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;
}