From 15d00870644e673d1efaf12c794f6b6b757d88f3 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Mon, 5 Mar 2012 18:32:53 -0600
Subject: [PATCH] small changes

---
 src/main/java/net/citizensnpcs/Citizens.java    |  4 ++--
 src/main/java/net/citizensnpcs/EventListen.java | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
index bc53e3b6b..c4eb2951e 100644
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
@@ -262,8 +262,8 @@ public class Citizens extends JavaPlugin {
             if (!key.keyExists("name"))
                 throw new NPCLoadException("Could not find a name for the NPC with ID '" + id + "'.");
 
-            String type = key.getString("traits.type").toUpperCase();
-            NPC npc = npcManager.createNPC(EntityType.valueOf(type), id, key.getString("name"), null);
+            NPC npc = npcManager.createNPC(EntityType.valueOf(key.getString("traits.type").toUpperCase()), id, key
+                    .getString("name"), null);
             try {
                 npc.load(key);
             } catch (NPCException ex) {
diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
index 3834cdd63..ba4fc976b 100644
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
@@ -43,7 +43,7 @@ public class EventListen implements Listener {
     }
 
     /*
-     * World events
+     * Chunk events
      */
     @EventHandler
     public void onChunkLoad(ChunkLoadEvent event) {
@@ -122,6 +122,9 @@ public class EventListen implements Listener {
             npc.getCharacter().onRightClick(npc, player);
     }
 
+    /*
+     * Player events
+     */
     @EventHandler
     public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
         if (!(((CraftPlayer) event.getPlayer()).getHandle() instanceof EntityHumanNPC))
@@ -139,14 +142,14 @@ public class EventListen implements Listener {
                 new EntityTargetEvent(event.getRightClicked(), event.getPlayer(), TargetReason.CUSTOM));
     }
 
-    /*
-     * Player events
-     */
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         Editor.leave(event.getPlayer());
     }
 
+    /*
+     * World events
+     */
     @EventHandler
     public void onWorldLoad(WorldLoadEvent event) {
         for (Pair<Integer, Integer> chunk : toRespawn.keySet()) {