From f1b527064d531069395480c8809bedd3eb123d25 Mon Sep 17 00:00:00 2001
From: HappyPikachu <dbaez4465@yahoo.com>
Date: Wed, 15 Apr 2015 12:55:29 -0400
Subject: [PATCH] Disallow Quest Journals in Item Frames, fixes #86

---
 .../java/me/blackvein/quests/PlayerListener.java     | 12 +++++++++++-
 src/main/java/me/blackvein/quests/util/Lang.java     |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/blackvein/quests/PlayerListener.java b/src/main/java/me/blackvein/quests/PlayerListener.java
index 576d7132c..a97a682d5 100644
--- a/src/main/java/me/blackvein/quests/PlayerListener.java
+++ b/src/main/java/me/blackvein/quests/PlayerListener.java
@@ -359,6 +359,16 @@ public class PlayerListener implements Listener, ColorUtil {
 
     }
 
+    @EventHandler
+    public void onPlayerInteractEntity(PlayerInteractEntityEvent evt) {
+    	if (evt.getRightClicked().getType() == EntityType.ITEM_FRAME) {
+    		if(ItemUtil.isJournal(evt.getPlayer().getItemInHand())) {
+                evt.setCancelled(true);
+    			evt.getPlayer().sendMessage(RED + Lang.get("journalDenied"));
+    		}
+    	}
+    }
+
     @EventHandler
     public void onPlayerChat(AsyncPlayerChatEvent evt) {
 
@@ -502,7 +512,7 @@ public class PlayerListener implements Listener, ColorUtil {
 
             for (Quest quest : quester.currentQuests.keySet()) {
 
-                if (evt.getEntity().getType().equals(EntityType.SHEEP) && quester.hasObjective(quest, "shearSheep")) {
+                if (evt.getEntity().getType() == EntityType.SHEEP && quester.hasObjective(quest, "shearSheep")) {
 
                     Sheep sheep = (Sheep) evt.getEntity();
                     quester.shearSheep(quest, sheep.getColor());
diff --git a/src/main/java/me/blackvein/quests/util/Lang.java b/src/main/java/me/blackvein/quests/util/Lang.java
index d6c6ddfb8..192ba1b34 100644
--- a/src/main/java/me/blackvein/quests/util/Lang.java
+++ b/src/main/java/me/blackvein/quests/util/Lang.java
@@ -957,6 +957,7 @@ public class Lang {
         langMap.put("journalAlreadyHave", "You already have your Quest Journal out.");
         langMap.put("journalNoRoom", "You have no room in your inventory for your Quest Journal!");
         langMap.put("journalNoQuests", "You have no accepted quests!");
+        langMap.put("journalDenied", "You cannot do that with your Quest Journal.");
                     //
 
                 //