minor fixes

DenizenScript · Jul 7, 2015 · c62c1ff · c62c1ff
1 parent f7b2ceb
commit c62c1ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityDespawnScriptEvent.java
@@ -47,7 +47,7 @@ public boolean couldMatch(ScriptContainer scriptContainer, String s) {
     @Override
     public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
-        return entity.matchesEntity(CoreUtilities.getXthArg(0, CoreUtilities.toLowerCase(s)))
+        return entity.matchesEntity(CoreUtilities.getXthArg(0, s))
                 && checkSwitch(lower, "cause", CoreUtilities.toLowerCase(cause.asString()));
     }
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -209,17 +209,15 @@ else if (split.length == 6)
         return null;
     }
 
-    final static Pattern location_by_saved = Pattern.compile("(l@)(.+)");
-
     public static boolean matches(String string) {
-        if (string == null || string.length() == 0)
+        if (string == null || string.length() == 0) {
             return false;
+        }
 
         if (string.startsWith("l@")) {
             return true;
         }
 
-
         return dLocation.valueOf(string, new BukkitTagContext(null, null, false, null, false, null)) != null;
     }