diff --git a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java index 79c398eaca..17f263096c 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/triggers/core/ChatTrigger.java @@ -1,23 +1,23 @@ package net.aufdemrand.denizen.scripts.triggers.core; import net.aufdemrand.denizen.Settings; -import net.aufdemrand.denizen.objects.*; import net.aufdemrand.denizen.npc.traits.ChatbotTrait; import net.aufdemrand.denizen.npc.traits.TriggerTrait; -import net.aufdemrand.denizencore.objects.Element; -import net.aufdemrand.denizencore.objects.aH; -import net.aufdemrand.denizencore.objects.dObject; -import net.aufdemrand.denizencore.scripts.commands.core.DetermineCommand; +import net.aufdemrand.denizen.objects.dNPC; +import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.InteractScriptHelper; import net.aufdemrand.denizen.scripts.triggers.AbstractTrigger; import net.aufdemrand.denizen.tags.BukkitTagContext; -import net.aufdemrand.denizencore.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.entity.Rotation; import net.aufdemrand.denizen.utilities.debugging.dB; - +import net.aufdemrand.denizen.utilities.entity.Rotation; +import net.aufdemrand.denizencore.objects.Element; +import net.aufdemrand.denizencore.objects.aH; +import net.aufdemrand.denizencore.objects.dObject; +import net.aufdemrand.denizencore.scripts.commands.core.DetermineCommand; +import net.aufdemrand.denizencore.tags.TagManager; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -28,7 +28,6 @@ import java.util.*; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -328,13 +327,13 @@ public ChatContext call() { try { ChatContext context = futureTask.get(); - event.setCancelled(context.wasTriggered()); + if (context.wasTriggered()) { + event.setCancelled(true); + } if (context.hasChanges()) { event.setMessage(context.getChanges()); } - } catch (InterruptedException e) { - dB.echoError(e); - } catch (ExecutionException e) { + } catch (Exception e) { dB.echoError(e); } }