From f78872c15755ead8ed19051be3e08e19220fbb40 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Thu, 29 Aug 2013 10:55:35 +0200
Subject: [PATCH] Oh yeah. I should not use ServerConf since this could be
 MConf.

---
 README.md                                         |  4 ++--
 src/com/massivecraft/mcore/ConfServer.java        |  3 ---
 src/com/massivecraft/mcore/EngineOfflineCase.java |  2 +-
 src/com/massivecraft/mcore/InternalListener.java  |  2 +-
 src/com/massivecraft/mcore/MCoreConf.java         | 10 ++++++++++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ae0b1427..31e4cb26 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-<a href="http://massivecraft.com/plugins/mcore">
+<a href="http://massivecraft.com/mcore">
 ![MCore Logotype](https://raw.github.com/MassiveCraft/mcore/master/media/logo300.png)<br>
-<b>http://massivecraft.com/plugins/mcore</b></a>
\ No newline at end of file
+<b>http://massivecraft.com/mcore</b></a>
\ No newline at end of file
diff --git a/src/com/massivecraft/mcore/ConfServer.java b/src/com/massivecraft/mcore/ConfServer.java
index aa3b1af2..eec3b26c 100644
--- a/src/com/massivecraft/mcore/ConfServer.java
+++ b/src/com/massivecraft/mcore/ConfServer.java
@@ -31,9 +31,6 @@ public class ConfServer extends SimpleConfig
 	
 	public static String dburi = "default";
 	
-	public static boolean useRecipientChatEvent = true;
-	public static boolean forceOnePlayerNameCase = true;
-	
 	public static List<String> aliasesOuterMCore = MUtil.list("mcore");
 	public static List<String> aliasesOuterMCoreUsys = MUtil.list("usys");
 	public static List<String> aliasesOuterMCoreMStore = MUtil.list("mstore");
diff --git a/src/com/massivecraft/mcore/EngineOfflineCase.java b/src/com/massivecraft/mcore/EngineOfflineCase.java
index 3048fa18..c99d35d3 100644
--- a/src/com/massivecraft/mcore/EngineOfflineCase.java
+++ b/src/com/massivecraft/mcore/EngineOfflineCase.java
@@ -88,7 +88,7 @@ public class EngineOfflineCase implements Listener
 	public void forceOnePlayerNameCase(PlayerLoginEvent event)
 	{
 		// Stop if the feature is disabled
-		if (!ConfServer.forceOnePlayerNameCase) return;
+		if (!MCoreConf.get().isForcingOnePlayerNameCase()) return;
 		
 		// Stop if we are using online mode
 		if (Bukkit.getOnlineMode()) return;
diff --git a/src/com/massivecraft/mcore/InternalListener.java b/src/com/massivecraft/mcore/InternalListener.java
index 238cf783..c15a00b6 100644
--- a/src/com/massivecraft/mcore/InternalListener.java
+++ b/src/com/massivecraft/mcore/InternalListener.java
@@ -81,7 +81,7 @@ public class InternalListener implements Listener
 	public void recipientChat(final AsyncPlayerChatEvent event)
 	{
 		// Return unless we are using the recipient chat event
-		if (!ConfServer.useRecipientChatEvent) return;
+		if (!MCoreConf.get().isUsingRecipientChatEvent()) return;
 		
 		// Prepare vars
 		final Player sender = event.getPlayer();
diff --git a/src/com/massivecraft/mcore/MCoreConf.java b/src/com/massivecraft/mcore/MCoreConf.java
index 6ef0682e..3497b642 100644
--- a/src/com/massivecraft/mcore/MCoreConf.java
+++ b/src/com/massivecraft/mcore/MCoreConf.java
@@ -28,6 +28,8 @@ public class MCoreConf extends Entity<MCoreConf>
 	@Override
 	public MCoreConf load(MCoreConf that)
 	{
+		this.usingRecipientChatEvent = that.usingRecipientChatEvent;
+		this.forcingOnePlayerNameCase = that.forcingOnePlayerNameCase;
 		this.permissionDeniedFormats = that.permissionDeniedFormats;
 		this.permissionToTpdelay = that.permissionToTpdelay;
 		
@@ -39,6 +41,14 @@ public class MCoreConf extends Entity<MCoreConf>
 	// -------------------------------------------- //
 	// These getters and setters are obnoxious, defensive copying, NPE avoiding and probably thread safe.
 	
+	private boolean usingRecipientChatEvent = true;
+	public boolean isUsingRecipientChatEvent() { return this.usingRecipientChatEvent; }
+	public void setUsingRecipientChatEvent(boolean usingRecipientChatEvent) { this.usingRecipientChatEvent = usingRecipientChatEvent; this.changed(); }
+	
+	private boolean forcingOnePlayerNameCase = true;
+	public boolean isForcingOnePlayerNameCase() { return this.forcingOnePlayerNameCase; }
+	public void setForcingOnePlayerNameCase(boolean forcingOnePlayerNameCase) { this.forcingOnePlayerNameCase = forcingOnePlayerNameCase; this.changed(); }
+	
 	private Map<String, String> permissionDeniedFormats = MUtil.map(
 		"some.awesome.permission.node", "<b>You must be awesome to %s<b>.",
 		"some.derp.permission.node.1", "derp",