diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java index 97431305..60a64fad 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java @@ -181,24 +181,26 @@ public class ChatRule { } String rawLocation = Utils.getLocationRaw(); Boolean isLocationValid = null; - for (String validLocation : validLocations.replace(" ", "").split(",")) {//the locations are raw locations split by "," and start with ! if not locations - if (validLocation.startsWith("!")) {//not location ( - if (Objects.equals(validLocation.substring(1), rawLocation)) { - isLocationValid = false; - break; - } - }else { - if (Objects.equals(validLocation, rawLocation)) { //normal location - isLocationValid = true; - break; - } + for (String validLocation : validLocations.replace(" ", "").toLowerCase().split(",")) {//the locations are raw locations split by "," and start with ! if not locations + String rawValidLocation = ChatRulesHandler.locations.get(validLocation.replace("!","")); + if (rawValidLocation == null) continue; + if (validLocation.startsWith("!")) {//not location + if (Objects.equals(rawValidLocation, rawLocation.toLowerCase())) { + isLocationValid = false; + break; } + } + else { + if (Objects.equals(rawValidLocation, rawLocation.toLowerCase())) { //normal location + isLocationValid = true; + break; + } + } } - if (isLocationValid == null || isLocationValid){//if location is not in the list at all and is a not a "!" location or and is a normal location + if (isLocationValid != null && isLocationValid){//if location is not in the list at all and is a not a "!" location or and is a normal location return true; } - return false; } |