From 80eb5064996bbf94b24be7511d4d63c598cf18d1 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 24 Apr 2013 16:50:19 +0200
Subject: [PATCH] Fixing one typo and a minor bug.

---
 src/com/massivecraft/factions/entity/BoardColls.java | 2 +-
 src/com/massivecraft/factions/entity/MConf.java      | 3 +++
 src/com/massivecraft/factions/entity/UConf.java      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/massivecraft/factions/entity/BoardColls.java b/src/com/massivecraft/factions/entity/BoardColls.java
index 1a1b3c75..5c521984 100644
--- a/src/com/massivecraft/factions/entity/BoardColls.java
+++ b/src/com/massivecraft/factions/entity/BoardColls.java
@@ -46,7 +46,7 @@ public class BoardColls extends XColls<BoardColl, Board> implements BoardInterfa
 	@Override
 	public String getBasename()
 	{
-		return Const.COLLECTION_BASENAME_UCONF;
+		return Const.COLLECTION_BASENAME_BOARD;
 	}
 	
 	@Override
diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java
index e0e5aeae..96332e82 100644
--- a/src/com/massivecraft/factions/entity/MConf.java
+++ b/src/com/massivecraft/factions/entity/MConf.java
@@ -7,6 +7,7 @@ import java.util.Set;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventPriority;
 
+import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.listeners.FactionsListenerChat;
 import com.massivecraft.mcore.store.Entity;
 
@@ -28,6 +29,8 @@ public class MConf extends Entity<MConf>
 	{
 		super.load(that);
 		
+		if (!Factions.get().isDatabaseInitialized()) return this;
+		
 		FactionsListenerChat.get().setup();
 		
 		return this;
diff --git a/src/com/massivecraft/factions/entity/UConf.java b/src/com/massivecraft/factions/entity/UConf.java
index efe45645..a4793e44 100644
--- a/src/com/massivecraft/factions/entity/UConf.java
+++ b/src/com/massivecraft/factions/entity/UConf.java
@@ -36,7 +36,7 @@ public class UConf extends Entity<UConf>
 	// DEFAULTS
 	// -------------------------------------------- //
 	
-	public String defaultPlayerFactionId = factionIdNone;
+	public String defaultPlayerFactionId = this.factionIdNone;
 	public Rel defaultPlayerRole = Rel.RECRUIT;
 	public double defaultPlayerPower = 0.0;