From 742a1a3a4e81604c222d5a611862477043d4c68c Mon Sep 17 00:00:00 2001
From: fullwall <fullwall@optusnet.com>
Date: Fri, 2 Mar 2012 19:10:46 +0800
Subject: [PATCH] Merge selection fix

---
 src/main/java/net/citizensnpcs/EventListen.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
index 9b49b1357..06ec02fe9 100644
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
@@ -101,7 +101,8 @@ public class EventListen implements Listener {
 
         NPC npc = npcManager.getNPC(event.getEntity());
         Player player = (Player) event.getTarget();
-        if (player.getMetadata("selected").size() == 0 || player.getMetadata("selected").get(0).asInt() != npc.getId()) {
+        if (!player.hasMetadata("selected") || player.getMetadata("selected").size() == 0
+                || player.getMetadata("selected").get(0).asInt() != npc.getId()) {
             if (player.getItemInHand().getTypeId() == Setting.SELECTION_ITEM.asInt()
                     && (npc.getTrait(Owner.class).getOwner().equals(player.getName()) || player
                             .hasPermission("citizens.admin"))) {