minor cleanups/updates

DenizenScript · Jun 18, 2020 · 3915c5d · 3915c5d
1 parent e5c1944
commit 3915c5d
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/Depenizen.java b/src/main/java/com/denizenscript/depenizen/bukkit/Depenizen.java
@@ -52,7 +52,7 @@ public void onDisable() {
 
     public void checkLoadBungeeBridge() {
         String bungeeServer = getConfig().getString("Bungee server address", "none");
-        if (CoreUtilities.toLowerCase(bungeeServer).equals("none")) {
+        if (CoreUtilities.equalsIgnoreCase(bungeeServer, "none")) {
             Debug.log("<G>Depenizen will not load bungee bridge.");
             return;
         }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bridges/SentinelBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bridges/SentinelBridge.java
@@ -94,7 +94,7 @@ public boolean isTarget(LivingEntity ent, String prefix, String value) {
                     }
                     queue.start();
                     if (queue.determinations != null && queue.determinations.size() > 0) {
-                        return CoreUtilities.toLowerCase(queue.determinations.get(0)).equals("true");
+                        return CoreUtilities.equalsIgnoreCase(queue.determinations.get(0), "true");
                     }
                 }
             }

diff --git a/.../denizenscript/depenizen/bukkit/events/crackshot/CrackShotPlayerFiresProjectileEvent.java b/.../denizenscript/depenizen/bukkit/events/crackshot/CrackShotPlayerFiresProjectileEvent.java
@@ -66,7 +66,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
             }
             else if (lower.startsWith("shot_sounds:")) {
                 String newReloadSounds = determination.substring("shot_sounds:".length());
-                if (CoreUtilities.toLowerCase(newReloadSounds).equals("none")) {
+                if (CoreUtilities.equalsIgnoreCase(newReloadSounds, "none")) {
                     newReloadSounds = "";
                 }
                 event.setSounds(newReloadSounds);

diff --git a/...enscript/depenizen/bukkit/events/crackshot/CrackShotPlayerStartsReloadingWeaponEvent.java b/...enscript/depenizen/bukkit/events/crackshot/CrackShotPlayerStartsReloadingWeaponEvent.java
@@ -80,7 +80,7 @@ else if (lower.startsWith("reload_time:")) {
             }
             else if (lower.startsWith("reload_sounds:")) {
                 String newReloadSounds = determination.substring("reload_sounds:".length());
-                if (CoreUtilities.toLowerCase(newReloadSounds).equals("none")) {
+                if (CoreUtilities.equalsIgnoreCase(newReloadSounds, "none")) {
                     newReloadSounds = "";
                 }
                 event.setSounds(newReloadSounds);

diff --git a/...main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java b/...main/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaEndsScriptEvent.java
@@ -48,7 +48,7 @@ public boolean couldMatch(ScriptPath path) {
     public boolean matches(ScriptPath path) {
         String arenaname = path.eventArgLowerAt(1);
         MobArenaArenaTag a = MobArenaArenaTag.valueOf(arenaname);
-        if (!arenaname.equals("arena") && (a == null || !CoreUtilities.toLowerCase(a.getArena().arenaName()).equals(arenaname))) {
+        if (!arenaname.equals("arena") && (a == null || !CoreUtilities.equalsIgnoreCase(a.getArena().arenaName(), arenaname))) {
             return false;
         }
         return super.matches(path);

diff --git a/...in/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java b/...in/java/com/denizenscript/depenizen/bukkit/events/mobarena/MobArenaStartsScriptEvent.java
@@ -47,7 +47,7 @@ public boolean couldMatch(ScriptPath path) {
     public boolean matches(ScriptPath path) {
         String arenaname = path.eventArgLowerAt(1);
         MobArenaArenaTag a = MobArenaArenaTag.valueOf(arenaname);
-        if (!arenaname.equals("arena") && (a == null || !CoreUtilities.toLowerCase(a.getArena().arenaName()).equals(arenaname))) {
+        if (!arenaname.equals("arena") && (a == null || !CoreUtilities.equalsIgnoreCase(a.getArena().arenaName(), arenaname))) {
             return false;
         }
         return super.matches(path);

diff --git a/...a/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaimTag.java b/...a/com/denizenscript/depenizen/bukkit/objects/griefprevention/GriefPreventionClaimTag.java
@@ -320,7 +320,7 @@ public void adjust(Mechanism mechanism) {
                     PlayerTag player = mechanism.valueAsType(PlayerTag.class);
                     dataStore.changeClaimOwner(claim, player.getOfflinePlayer().getUniqueId());
                 }
-                else if (CoreUtilities.toLowerCase(mechanism.getValue().asString()).equals("admin")) {
+                else if (CoreUtilities.equalsIgnoreCase(mechanism.getValue().asString(), "admin")) {
                     dataStore.changeClaimOwner(claim, null);
                 }
             }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/libsdisguises/LibsDisguiseTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/libsdisguises/LibsDisguiseTag.java
@@ -55,7 +55,7 @@ public static LibsDisguiseTag valueOf(String string, TagContext context) {
     }
 
     public static boolean matches(String arg) {
-        return arg.startsWith("disguise@");
+        return arg.startsWith("libsdisguise@");
     }
 
     /////////////////////

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/residence/ResidenceTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/residence/ResidenceTag.java
@@ -107,7 +107,7 @@ public ClaimedResidence getResidence() {
     }
 
     public boolean equals(ResidenceTag residence) {
-        return CoreUtilities.toLowerCase(residence.getResidence().getName()).equals(CoreUtilities.toLowerCase(this.getResidence().getName()));
+        return CoreUtilities.equalsIgnoreCase(residence.getResidence().getName(), this.getResidence().getName());
     }
 
     @Override

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/objects/towny/TownTag.java b/src/main/java/com/denizenscript/depenizen/bukkit/objects/towny/TownTag.java
@@ -136,7 +136,7 @@ public Town getTown() {
     }
 
     public boolean equals(TownTag town) {
-        return CoreUtilities.toLowerCase(town.getTown().getName()).equals(CoreUtilities.toLowerCase(this.getTown().getName()));
+        return CoreUtilities.equalsIgnoreCase(town.getTown().getName(), this.getTown().getName());
     }
 
     @Override