Slightly update the event system

Announce determination results!
DenizenScript · Feb 6, 2015 · 888dd5e · 888dd5e
1 parent 910c370
commit 888dd5e
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizencore/events/ScriptEvent.java b/src/main/java/net/aufdemrand/denizencore/events/ScriptEvent.java
@@ -72,13 +72,13 @@ public static boolean matchesScript(ScriptEvent sEvent, ScriptContainer script,
             if (sEvent.cancelled) {
                 return false;
             }
-            event = event.substring(0, event.length() - "cancelled:false".length());
+            event = event.substring(0, event.length() - " cancelled:false".length());
         }
         if (event.endsWith(" cancelled:true")) {
             if (!sEvent.cancelled) {
                 return false;
             }
-            event = event.substring(0, event.length() - "cancelled:true".length());
+            event = event.substring(0, event.length() - " cancelled:true".length());
         }
         return sEvent.matches(script, event);
     }
@@ -121,14 +121,17 @@ public boolean checkSwitch(String event, String switcher, String value) {
         return true;
     }
 
-    public boolean applyDetermination(String determination) {
+    public boolean applyDetermination(ScriptContainer container, String determination) {
         if (determination.equalsIgnoreCase("CANCELLED")) {
+            dB.echoDebug(container, "Event cancelled!");
             cancelled = true;
         }
         else if (determination.equalsIgnoreCase("CANCELLED:FALSE")) {
+            dB.echoDebug(container, "Event uncancelled!");
             cancelled = false;
         }
         else {
+            dB.echoError("Unknown determination '" + determination + "'");
             return false;
         }
         return true;
@@ -185,7 +188,7 @@ public void run(ScriptContainer script, String event) {
         List<String> determinations = DetermineCommand.getOutcome(id);
         if (determinations != null) {
             for (String determination : determinations) {
-                applyDetermination(determination);
+                applyDetermination(script, determination);
             }
         }
     }