From 1aa14980fff4816052f6c468516b2e4c399e6662 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 20 Aug 2013 11:03:01 +0300 Subject: [PATCH] Enable line of sight check in Chat Trigger again. Remove thread check that doesn't do anything. --- .../denizen/scripts/triggers/core/ChatTrigger.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 64d0668d77..5645a6ff47 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 @@ -39,8 +39,6 @@ public void onEnable() { public void chatTrigger(final AsyncPlayerChatEvent event) { if (event.isCancelled()) return; - boolean wasInterrupted = Thread.interrupted(); - Callable call = new Callable() { public Boolean call() { @@ -74,10 +72,8 @@ public Boolean call() { // if enabled. Should the Player chat only when looking at the NPC? This may // reduce accidental chats with NPCs. - // TODO: CraftBukkit 1.6 broke the two lines below. Think of a workaround. - - //if (Settings.ChatMustSeeNPC()) - // if (!npc.getEntity().hasLineOfSight(event.getPlayer())) return null; + if (Settings.ChatMustSeeNPC()) + if (!npc.getEntity().hasLineOfSight(event.getPlayer())) return null; if (Settings.ChatMustLookAtNPC()) if (!Rotation.isFacingEntity(event.getPlayer(), npc.getEntity(), 45)) return null; @@ -205,10 +201,6 @@ else if (event.getMessage().toUpperCase().contains(keyword.toUpperCase())) e.printStackTrace(); } - if (wasInterrupted) { - Thread.currentThread().interrupt(); - } - if (cancelled == null) return; event.setCancelled(cancelled);