From 4b91de741479408c0545f4e40a3a289a965a3ccd Mon Sep 17 00:00:00 2001
From: StevenLawson <steven@smlawson.com>
Date: Mon, 12 Aug 2013 12:51:30 -0400
Subject: [PATCH] More AdminWorld tweaks.

---
 .../Commands/Command_adminworld.java             | 13 ++++++++++---
 .../TotalFreedomMod/TFM_AdminWorld.java          | 16 +++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
index 6f5c910d..9f3fd4e6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
@@ -12,9 +12,16 @@ public class Command_adminworld extends TFM_Command
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        playerMsg("Going to world: adminworld");
-        TFM_AdminWorld.getInstance().sendToAdminWorld(sender_p);
-
+        if (sender_p.getWorld() == TFM_AdminWorld.getInstance().getAdminWorld())
+        {
+            playerMsg("Going to the main world.");
+            sender_p.teleport(server.getWorlds().get(0).getSpawnLocation());
+        }
+        else
+        {
+            playerMsg("Going to the AdminWorld.");
+            TFM_AdminWorld.getInstance().sendToAdminWorld(sender_p);
+        }
         return true;
     }
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
index 64c58bbe..fed7ad5d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
@@ -10,11 +10,9 @@ import org.bukkit.WorldCreator;
 import org.bukkit.WorldType;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.Sign;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.material.MaterialData;
 import org.bukkit.scheduler.BukkitRunnable;
 
 public class TFM_AdminWorld
@@ -74,6 +72,11 @@ public class TFM_AdminWorld
         }
     }
 
+    public World getAdminWorld()
+    {
+        return adminWorld;
+    }
+
     private boolean cachedIsUserSuperadmin(CommandSender user)
     {
         long currentTimeMillis = System.currentTimeMillis();
@@ -107,12 +110,11 @@ public class TFM_AdminWorld
 
         Block welcomeSignBlock = adminWorld.getBlockAt(0, 50, 0);
         welcomeSignBlock.setType(Material.SIGN_POST);
-        Sign welcomeSign = (Sign) welcomeSignBlock.getState();
-        
-        org.bukkit.material.Sign signData = new org.bukkit.material.Sign(Material.SIGN_POST);
+        org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign) welcomeSignBlock.getState();
+
+        org.bukkit.material.Sign signData = (org.bukkit.material.Sign) welcomeSign.getData();
         signData.setFacingDirection(BlockFace.NORTH);
-        welcomeSign.setData(signData);
-        
+
         welcomeSign.setLine(0, ChatColor.GREEN + "AdminWorld");
         welcomeSign.setLine(1, ChatColor.DARK_GRAY + "---");
         welcomeSign.setLine(2, ChatColor.YELLOW + "Spawn Point");