From 5e34538bd601bb22301bdb2186f9fa6e743390e8 Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Wed, 14 Mar 2012 16:48:02 -0500
Subject: [PATCH] Fix saving and loading from files. This fixes CITIZENS-30.

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

diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
index 28c1ab73a..255b8adbf 100644
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
@@ -234,10 +234,11 @@ public class Citizens extends JavaPlugin {
     }
 
     public void save() {
-        config.save();
+        //config.load();
+        //saves.load();
         for (NPC npc : npcManager)
             ((CitizensNPC) npc).save(saves.getKey("npc." + npc.getId()));
-
+        config.save();
         saves.save();
     }
 
@@ -249,8 +250,8 @@ public class Citizens extends JavaPlugin {
             if (!key.keyExists("name"))
                 throw new NPCLoadException("Could not find a name for the NPC with ID '" + id + "'.");
 
-            NPC npc = npcManager.createNPC(EntityType.valueOf(key.getString("traits.type").toUpperCase()), id,
-                    key.getString("name"), null);
+            NPC npc = npcManager.createNPC(EntityType.valueOf(key.getString("traits.type").toUpperCase()), id, key
+                    .getString("name"), null);
             try {
                 ((CitizensNPC) npc).load(key);
             } catch (NPCException ex) {
diff --git a/src/main/java/net/citizensnpcs/Settings.java b/src/main/java/net/citizensnpcs/Settings.java
index 73c40ec25..4415b3b85 100644
--- a/src/main/java/net/citizensnpcs/Settings.java
+++ b/src/main/java/net/citizensnpcs/Settings.java
@@ -15,6 +15,7 @@ public class Settings {
     }
 
     public void load() {
+        config.load();
         DataKey root = config.getKey("");
         for (Setting setting : Setting.values()) {
             if (!root.keyExists(setting.path)) {
@@ -23,7 +24,6 @@ public class Settings {
             } else
                 setting.set(root.getRaw(setting.path));
         }
-        save();
     }
 
     public void save() {