From 86af11b6621beb5f304efe5b3322f4ecdc0d837c Mon Sep 17 00:00:00 2001
From: fernferret <fernferret@gmail.com>
Date: Tue, 11 Oct 2011 21:57:35 -0400
Subject: [PATCH] Fixes for hidden worlds displaying as null

---
 .../com/onarandombox/MultiverseCore/MVWorld.java    |  3 +++
 .../MultiverseCore/commands/ListCommand.java        | 13 ++++++-------
 .../MultiverseCore/listeners/MVPlayerListener.java  |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
index c012377c..e80e507c 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
@@ -200,6 +200,9 @@ public class MVWorld implements MultiverseWorld {
     }
 
     public String getColoredWorldString() {
+        if (this.getColor() == null) {
+            return this.getAlias() + ChatColor.WHITE;
+        }
         return this.getColor() + this.getAlias() + ChatColor.WHITE;
     }
 
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
index ef6aee55..e0323f23 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
@@ -40,7 +40,6 @@ public class ListCommand extends MultiverseCommand {
         String output = ChatColor.LIGHT_PURPLE + "Worlds which you can view:\n";
         for (MultiverseWorld world : this.plugin.getMVWorldManager().getMVWorlds()) {
 
-
             if (p != null && (!this.plugin.getMVPerms().canEnterWorld(p, world))) {
                 continue;
             }
@@ -57,14 +56,14 @@ public class ListCommand extends MultiverseCommand {
             String outputCache = world.getColoredWorldString() + ChatColor.WHITE + " - " + color + world.getEnvironment() + " \n";
             if (world.isHidden()) {
                 // TODO: Add an actual permission for this.
-                if (p != null && !p.isOp()) {
-                    continue;
+                if (p == null || p.isOp()) {
+                    // Prefix hidden worlds with an "[H]"
+                    outputCache = ChatColor.GRAY + "[H]" + outputCache;
+                    output += outputCache;
                 }
-                // Prefix hidden worlds with an "[H]"
-                outputCache = ChatColor.GRAY + "[H]" + outputCache;
+            } else {
+                output += outputCache;
             }
-            output += outputCache;
-
         }
         String[] response = output.split("\n");
         for (String msg : response) {
diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
index 00464bb3..b52efe67 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java
@@ -47,6 +47,9 @@ public class MVPlayerListener extends PlayerListener {
                 return;
             }
             MultiverseWorld mvworld = this.worldManager.getMVWorld(world);
+            if(mvworld.isHidden()) {
+                return;
+            }
             prefix = mvworld.getColoredWorldString();
             String format = event.getFormat();
             event.setFormat("[" + prefix + "]" + format);