diff --git a/README.md b/README.md
index ae0b1427..31e4cb26 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-
+
![MCore Logotype](https://raw.github.com/MassiveCraft/mcore/master/media/logo300.png)
-http://massivecraft.com/plugins/mcore
\ No newline at end of file
+http://massivecraft.com/mcore
\ 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 aliasesOuterMCore = MUtil.list("mcore");
public static List aliasesOuterMCoreUsys = MUtil.list("usys");
public static List 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
@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
// -------------------------------------------- //
// 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 permissionDeniedFormats = MUtil.map(
"some.awesome.permission.node", "You must be awesome to %s.",
"some.derp.permission.node.1", "derp",