From 08b46e1a7c0346cef98dd28a717a3e3a4ddf0156 Mon Sep 17 00:00:00 2001
From: gmcferrin <gjmcferrin@gmail.com>
Date: Tue, 8 Jan 2013 17:26:11 -0500
Subject: [PATCH] Cover ALL the bases.

---
 src/main/java/com/gmail/nossr50/util/Misc.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/src/main/java/com/gmail/nossr50/util/Misc.java
index 5ec785749..3bd6bb497 100644
--- a/src/main/java/com/gmail/nossr50/util/Misc.java
+++ b/src/main/java/com/gmail/nossr50/util/Misc.java
@@ -26,7 +26,7 @@ public class Misc {
     public static final int PLAYER_RESPAWN_COOLDOWN_SECONDS = 5;
 
     public static boolean isCitizensNPC(Player player) {
-        if (player == null || Users.getProfile(player) == null) {
+        if (player == null || Users.getProfile(player) == null || player.hasMetadata("NPC")) {
             return true;
         }