From 06f53a0b477a0e6e10b05312783394e96ec24ccf Mon Sep 17 00:00:00 2001
From: Tim Ekl <lithium3141@gmail.com>
Date: Wed, 23 Nov 2011 19:32:52 -0600
Subject: [PATCH] Fix NPE on incorrect world chat color & correct in config

---
 .../java/com/onarandombox/MultiverseCore/MVWorld.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
index a791b7eb..71861e39 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
@@ -214,7 +214,14 @@ public class MVWorld implements MultiverseWorld {
     public String getColoredWorldString() {
         EnglishChatColor worldColor = ((ColorConfigProperty) this.getKnownProperty("color")).getValue();
         String alias = ((StringConfigProperty) this.getKnownProperty("alias")).getValue();
-        if (worldColor.getColor() == null) {
+        if (worldColor == null) {
+            try {
+                this.setProperty("color", "WHITE");
+            } catch(PropertyDoesNotExistException e) {
+                // Do nothing - fixing the config file just failed, but we can recover anyway
+            }
+            return alias + ChatColor.WHITE;
+        } else if (worldColor.getColor() == null) {
             return alias + ChatColor.WHITE;
         }
         if (alias.length() == 0) {