Fix script event bugs

DenizenScript · Jul 28, 2015 · c54711a · c54711a
1 parent 4e5ebbc
commit c54711a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizencore/events/ScriptEvent.java b/src/main/java/net/aufdemrand/denizencore/events/ScriptEvent.java
@@ -126,13 +126,13 @@ public static boolean matchesScript(ScriptEvent sEvent, ScriptContainer script,
             return false;
         }
         String cancelmode = getSwitch(event, "cancelled");
-        if (cancelmode.equalsIgnoreCase("false") && sEvent.cancelled) {
+        if (cancelmode != null && cancelmode.equalsIgnoreCase("false") && sEvent.cancelled) {
             return false;
         }
-        else if (cancelmode.equalsIgnoreCase("true") && !sEvent.cancelled) {
+        else if (cancelmode != null && cancelmode.equalsIgnoreCase("true") && !sEvent.cancelled) {
             return false;
         }
-        if (!getSwitch(event, "ignorecancelled").equalsIgnoreCase("true") && sEvent.cancelled) {
+        if (!checkSwitch(event, "ignorecancelled", "true") && sEvent.cancelled) {
             return false;
         }
         return sEvent.matches(script, event);