diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java index 8a8ebd4..d630239 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -36,7 +36,7 @@ public class ServerConfig implements CustomFile { @SerializedName("custom-blocks") private ArrayList sittingBlocks = FileData.Defaults.SITTING_BLOCKS; @SerializedName("blacklisted-blocks") - private ArrayList blacklistedBlocks = new ArrayList<>(); + private ArrayList blacklistedBlocks = FileData.Defaults.BLACKLISTED_BLOCKS; public ServerConfig() {} @@ -51,7 +51,9 @@ public class ServerConfig implements CustomFile { this.blacklistedBlocks = serverConfig.blacklistedBlocks; } - public ServerConfig(Double version, String lang, boolean keepActive, boolean sitWhileSeated, PresetBlocks presetBlocks, boolean customEnabled, ArrayList sittingBlocks, ArrayList blacklistedBlocks) { + public ServerConfig(Double version, String lang, boolean keepActive, boolean sitWhileSeated, + PresetBlocks presetBlocks, boolean customEnabled, + ArrayList sittingBlocks, ArrayList blacklistedBlocks) { this.version = version; this.lang = lang; this.keepActive = keepActive; @@ -90,7 +92,7 @@ public class ServerConfig implements CustomFile { return sittingBlocks; } - public ArrayList getBlacklistedBlocks() { + public ArrayList getBlacklistedBlocks() { return blacklistedBlocks; } diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java index 7cafc96..2f4fb66 100644 --- a/src/main/java/one/oth3r/sit/utl/Utl.java +++ b/src/main/java/one/oth3r/sit/utl/Utl.java @@ -156,7 +156,7 @@ public class Utl { // only if custom is enabled if (config.isCustomEnabled()) { // if the block is on the blacklist, false - if (config.getBlacklistedBlocks().contains(getBlockID(blockState))) return null; + if (config.getBlacklistedBlocks().stream().anyMatch(c -> c.isValid(blockState))) return null; for (SittingBlock sittingBlock : config.getSittingBlocks()) { // if the block is valid, true