From bb7a42dff5bb08a079e10e659fcf44c0812566db Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sat, 3 Feb 2018 18:21:31 +0000 Subject: [PATCH] Woops --- src/main/java/forestry/apiculture/HiveConfig.java | 4 ++-- src/main/java/forestry/core/config/Config.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/HiveConfig.java b/src/main/java/forestry/apiculture/HiveConfig.java index 3ec667b75..084f2ae53 100644 --- a/src/main/java/forestry/apiculture/HiveConfig.java +++ b/src/main/java/forestry/apiculture/HiveConfig.java @@ -69,9 +69,9 @@ public class HiveConfig { public static boolean isDimAllowed(int dimId) { //blacklist has priority if(blacklistedDims.isEmpty() || !blacklistedDims.contains(dimId)) { - return whitelistedDims.contains(dimId); + return whitelistedDims.isEmpty() || whitelistedDims.contains(dimId); } - return false; + return true; } public static void addBlacklistedDim(int dimId) { diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index ade988ae7..a80837a66 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -179,16 +179,16 @@ public class Config { public static boolean isValidOreDim(int dimID) { //blacklist has priority if(blacklistedOreDims.isEmpty() || !blacklistedOreDims.contains(dimID)) { - return whitelistedOreDims.contains(dimID); + return whitelistedOreDims.isEmpty() || whitelistedOreDims.contains(dimID); } - return false; + return true; } public static boolean isValidTreeDim(int dimID) { //blacklist has priority if(blacklistedTreeDims.isEmpty() || !blacklistedTreeDims.contains(dimID)) { - return whitelistedTreeDims.contains(dimID); + return whitelistedTreeDims.isEmpty() || whitelistedTreeDims.contains(dimID); } - return false; + return true; } public static void load(Side side) {