From f5e21f69fd7dc468dd914bcdf510e728cbadff11 Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Fri, 23 Aug 2013 16:29:46 -0400
Subject: [PATCH] More guest list changes.

---
 .../Commands/Command_adminworld.java          | 20 ++++++++++++++-----
 .../TotalFreedomMod/TFM_AdminWorld.java       | 10 +++++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
index ccf0057c..391241c2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 @CommandParameters(description = "Go to the AdminWorld.", usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]")
 public class Command_adminworld extends TFM_Command
 {
@@ -82,13 +82,13 @@ public class Command_adminworld extends TFM_Command
                     {
                         if ("list".equalsIgnoreCase(args[1]))
                         {
-                            playerMsg("AdminWorld Guest List: " + TFM_AdminWorld.getInstance().guestListToString());
+                            playerMsg("AdminWorld guest list: " + TFM_AdminWorld.getInstance().guestListToString());
                         }
                         else if ("purge".equalsIgnoreCase(args[1]))
                         {
                             assertCommandPerms(sender, sender_p);
                             TFM_AdminWorld.getInstance().purgeGuestList();
-                            playerMsg("AdminWorld guest list purged.");
+                            TFM_Util.adminAction(sender.getName(), "AdminWorld guest list purged.", false);
                         }
                         else
                         {
@@ -101,22 +101,32 @@ public class Command_adminworld extends TFM_Command
 
                         if ("add".equalsIgnoreCase(args[1]))
                         {
+                            Player player;
                             try
                             {
-                                TFM_AdminWorld.getInstance().addGuest(getPlayer(args[2]), sender_p);
+                                player = getPlayer(args[2]);
                             }
                             catch (PlayerNotFoundException ex)
                             {
                                 sender.sendMessage(ex.getMessage());
                                 return true;
                             }
+
+                            if (player != null && TFM_AdminWorld.getInstance().addGuest(player, sender_p))
+                            {
+                                TFM_Util.adminAction(sender.getName(), "AdminWorld guest added: " + player.getName(), false);
+                            }
+                            else
+                            {
+                                playerMsg("Could not add player to guest list.");
+                            }
                         }
                         else if (TFM_Util.isRemoveCommand(args[1]))
                         {
                             Player player = TFM_AdminWorld.getInstance().removeGuest(args[2]);
                             if (player != null)
                             {
-                                playerMsg("Guest removed: " + player.getName());
+                                TFM_Util.adminAction(sender.getName(), "AdminWorld guest removed: " + player.getName(), false);
                             }
                             else
                             {
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
index 8a0a295f..2dc3c32f 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminWorld.java
@@ -74,13 +74,21 @@ public final class TFM_AdminWorld extends TFM_CustomWorld
         return world;
     }
 
-    public void addGuest(Player guest, Player supervisor)
+    public boolean addGuest(Player guest, Player supervisor)
     {
+        if (guest == supervisor || TFM_SuperadminList.isUserSuperadmin(guest))
+        {
+            return false;
+        }
+
         if (TFM_SuperadminList.isUserSuperadmin(supervisor))
         {
             guestList.put(guest, supervisor);
             wipeAccessCache();
+            return true;
         }
+
+        return false;
     }
 
     public Player removeGuest(Player guest)