From e7e4e6d8e7fbc3c2a525ae7583c70a201b17278d Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 2 Jul 2013 22:56:10 +0300 Subject: [PATCH] Make Chat Trigger stop being completely broken in 1.6 --- .../denizen/scripts/triggers/core/ChatTrigger.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 727c12ff4e..adfa5d2e60 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 @@ -72,8 +72,12 @@ public Boolean call() { // Should we check 'line of sight'? Players cannot talk to NPCs through walls // if enabled. Should the Player chat only when looking at the NPC? This may // reduce accidental chats with NPCs. - if (Settings.ChatMustSeeNPC()) - if (!npc.getEntity().hasLineOfSight(event.getPlayer())) return null; + + // 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.ChatMustLookAtNPC()) if (!Rotation.isFacingEntity(event.getPlayer(), npc.getEntity(), 45)) return null;