From 4da96dee7e39c515c95229e9d7ead749a32fae5e Mon Sep 17 00:00:00 2001
From: HappyPikachu <dbaez4465@yahoo.com>
Date: Wed, 3 Jun 2015 04:44:49 -0400
Subject: [PATCH] Do not break after checking first Quest, fixes #57

---
 src/main/java/me/blackvein/quests/NpcListener.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/blackvein/quests/NpcListener.java b/src/main/java/me/blackvein/quests/NpcListener.java
index 0d4ec92d9..5bd7cf870 100644
--- a/src/main/java/me/blackvein/quests/NpcListener.java
+++ b/src/main/java/me/blackvein/quests/NpcListener.java
@@ -69,7 +69,8 @@ public class NpcListener implements Listener {
                     if (found != null) {
 
                         for (Integer n : quester.getCurrentStage(quest).itemDeliveryTargets) {
-                            if (n == clicked.getId()) {
+
+                            if (n.equals(clicked.getId())) {
                                 quester.deliverItem(quest, hand);
                                 delivery = true;
                                 break;
@@ -81,7 +82,8 @@ public class NpcListener implements Listener {
                     } else if (!hand.getType().equals(Material.AIR)){
 
                         for (Integer n : quester.getCurrentStage(quest).itemDeliveryTargets) {
-                            if (n == clicked.getId()) {
+
+                            if (n.equals(clicked.getId())) {
                             	String text = "";
 
                             	if (hand.hasItemMeta()) {
@@ -101,7 +103,7 @@ public class NpcListener implements Listener {
                             }
                         }
 
-                        break;
+                        //break;
 
                     }
 
@@ -216,7 +218,7 @@ public class NpcListener implements Listener {
 
                             }
 
-                        } else {
+                        } else if (npcQuests.isEmpty()) {
 
                         	evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get("noMoreQuest"));