Update dB

DenizenScript · Jan 12, 2015 · c388e71 · c388e71
1 parent e450f4a
commit c388e71
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java b/src/main/java/net/aufdemrand/denizen/utilities/debugging/dB.java
@@ -7,14 +7,14 @@
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.Settings;
 
-import net.aufdemrand.denizen.events.EventManager;
+import net.aufdemrand.denizencore.events.OldEventManager;
 import net.aufdemrand.denizen.flags.FlagManager;
-import net.aufdemrand.denizen.objects.Element;
-import net.aufdemrand.denizen.objects.dObject;
-import net.aufdemrand.denizen.objects.dScript;
-import net.aufdemrand.denizen.scripts.ScriptEntry;
-import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
-import net.aufdemrand.denizen.tags.TagManager;
+import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.objects.dScript;
+import net.aufdemrand.denizencore.scripts.ScriptEntry;
+import net.aufdemrand.denizencore.scripts.queues.ScriptQueue;
+import net.aufdemrand.denizencore.tags.TagManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -68,9 +68,7 @@ public class dB {
 
     public static boolean showDebug = Settings.showDebug();
     public static boolean showStackTraces = true;
-    public static boolean showScriptBuilder = false;
     public static boolean showColor = true;
-    public static boolean showEventsTrimming = false;
     public static boolean debugOverride = false;
 
     public static List<String> filter = new ArrayList<String>();
@@ -238,11 +236,12 @@ else if (source != null && source.getLastEntryExecuted() != null && source.getLa
             if (script != null)
                 events.add(script.identifySimple() + " generates error");
             ScriptEntry entry = (source != null ? source.getLastEntryExecuted(): null);
-            String Determination = EventManager.doEvents(events, (entry != null ? ((BukkitScriptEntryData)entry.entryData).getNPC(): null),
-                    (entry != null ? ((BukkitScriptEntryData)entry.entryData).getPlayer(): null), context, true);
+            List<String> Determinations = OldEventManager.doEvents(events, entry.entryData, context, true);
             ThrowErrorEvent = true;
-            if (Determination.equalsIgnoreCase("CANCELLED"))
-                return;
+            for (String Determination: Determinations) {
+                if (Determination.equalsIgnoreCase("CANCELLED"))
+                    return;
+            }
         }
         if (!showDebug) return;
         ConsoleSender.sendMessage(ChatColor.LIGHT_PURPLE + " " + ChatColor.RED + "ERROR" +
@@ -281,11 +280,12 @@ public static void echoError(ScriptQueue source, Throwable ex) {
             context.put("type", new Element(thrown.getClass().getSimpleName()));
             context.put("queue", source);
             ScriptEntry entry = (source != null ? source.getLastEntryExecuted(): null);
-            String Determination = EventManager.doEvents(Arrays.asList("server generates exception"),
-                    (entry != null ? ((BukkitScriptEntryData)entry.entryData).getNPC(): null), (entry != null ? ((BukkitScriptEntryData)entry.entryData).getPlayer(): null), context);
+            List<String> Determinations = OldEventManager.doEvents(Arrays.asList("server generates exception"), entry.entryData, context);
             ThrowErrorEvent = true;
-            if (Determination.equalsIgnoreCase("CANCELLED"))
-                return;
+            for (String Determination: Determinations) {
+                if (Determination.equalsIgnoreCase("CANCELLED"))
+                    return;
+            }
         }
         if (!showDebug) return;
         if (!showStackTraces) {