Fix some material handling.

DenizenScript · Jun 20, 2015 · 5aca8cf · 5aca8cf
1 parent 37f218c
commit 5aca8cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java
@@ -4,6 +4,7 @@
 import net.aufdemrand.denizen.events.BukkitScriptEvent;
 import net.aufdemrand.denizen.objects.*;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.scripts.ScriptEntryData;
@@ -71,7 +72,8 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
 
         String mat = CoreUtilities.getXthArg(2, lower);
         if (!mat.equals("sign")
-                && (!mat.equals(material.identifyNoIdentifier()) && !(event.getBlock().getState() instanceof Sign))) {
+                && (!(event.getBlock().getState() instanceof Sign)
+                    && (!mat.equals(material.identifyNoIdentifier()) && !mat.equals(material.identifyFullNoIdentifier())))) {
             return false;
         }
 

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java
@@ -63,7 +63,8 @@ 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())) {
+        if (!mat.equals("block")
+                && !mat.equals(material.identifyNoIdentifier()) && !mat.equals(material.identifySimpleNoIdentifier())) {
             return false;
         }