Handle blocks with data, optimize tLC()

DenizenScript · Jun 29, 2015 · be9a108 · be9a108
1 parent a250c08
commit be9a108
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java
@@ -61,16 +61,18 @@ public PlayerBreaksBlockScriptEvent() {
 
     @Override
     public boolean couldMatch(ScriptContainer scriptContainer, String s) {
-        return s.toLowerCase().startsWith("player breaks");
+        return CoreUtilities.toLowerCase(s).startsWith("player breaks");
     }
 
     @Override
     public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
 
         String mat = CoreUtilities.getXthArg(2, lower);
-        if (!mat.equals("block") && !mat.equals(material.identifyNoIdentifier())) {
-            return false;
+        if (!mat.equals("block")
+                && !mat.equals(material.identifySimpleNoIdentifier())
+                && !mat.equals(material.identifyFullNoIdentifier())) {
+                return false;
         }
 
         if (!runInCheck(scriptContainer, s, lower, location)) {