From b35d5f05cd1e33c0626b5508b374332934cddc79 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Sun, 12 Feb 2012 09:54:25 -0600
Subject: [PATCH] fix

---
 src/net/citizensnpcs/EventListen.java                 | 1 -
 src/net/citizensnpcs/command/command/NPCCommands.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/net/citizensnpcs/EventListen.java b/src/net/citizensnpcs/EventListen.java
index 081110ba2..de82b91e0 100644
--- a/src/net/citizensnpcs/EventListen.java
+++ b/src/net/citizensnpcs/EventListen.java
@@ -99,7 +99,6 @@ public class EventListen implements Listener {
                     return;
             }
         }
-        npc.openInventory(player);
         if (npc.getCharacter() != null)
             npc.getCharacter().onRightClick(npc, player);
     }
diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/net/citizensnpcs/command/command/NPCCommands.java
index 7fdbc5c1b..91560dbe5 100644
--- a/src/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/net/citizensnpcs/command/command/NPCCommands.java
@@ -76,7 +76,7 @@ public class NPCCommands {
         create.addTrait(new Owner(player.getName()));
 
         // Set the mob type
-        create.addTrait(new MobType(type == CreatureType.MONSTER ? "DEFAULT" : type.toString()));
+        create.addTrait(new MobType(type == null ? "DEFAULT" : type.toString()));
 
         create.spawn(player.getLocation());
         npcManager.selectNPC(player, create);