From ba2ada569fd207d41c2a2080435737e9fed531cf Mon Sep 17 00:00:00 2001
From: unknown <jerom.sar@hotmail.com>
Date: Sat, 28 Jun 2014 11:43:05 +0200
Subject: [PATCH] [Bleeding] Fixed permissions through console. Resolves #195

---
 buildnumber.properties                        |  4 +--
 .../Listener/TFM_TelnetListener.java          |  1 -
 .../TotalFreedomMod/TFM_AdminList.java        | 28 +++++++++++--------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/buildnumber.properties b/buildnumber.properties
index decd2f5..d7f2c90 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Jun 27 23:44:06 CEST 2014
-build.number=881
+#Sat Jun 28 11:40:26 CEST 2014
+build.number=886
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java
index 9d75a92..9e44e6e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java
@@ -27,7 +27,6 @@ public class TFM_TelnetListener implements Listener
 
         if (admin == null || !admin.isTelnetAdmin())
         {
-            event.setCancelled(true);
             return;
         }
 
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
index 2df4709..e272429 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
@@ -30,7 +30,7 @@ public class TFM_AdminList
     private static final Set<UUID> superUUIDs;
     private static final Set<UUID> telnetUUIDs;
     private static final Set<UUID> seniorUUIDs;
-    private static final Set<String> seniorConsoleAliases;
+    private static final Set<String> seniorConsoleNames;
     private static final Set<String> superIps;
     private static int cleanThreshold = 24 * 7; // 1 Week in hours
 
@@ -40,7 +40,7 @@ public class TFM_AdminList
         superUUIDs = new HashSet<UUID>();
         telnetUUIDs = new HashSet<UUID>();
         seniorUUIDs = new HashSet<UUID>();
-        seniorConsoleAliases = new HashSet<String>();
+        seniorConsoleNames = new HashSet<String>();
         superIps = new HashSet<String>();
     }
 
@@ -64,9 +64,9 @@ public class TFM_AdminList
         return Collections.unmodifiableSet(seniorUUIDs);
     }
 
-    public static Set<String> getSeniorConsoleAliases()
+    public static Set<String> getSeniorConsoleNames()
     {
-        return Collections.unmodifiableSet(seniorConsoleAliases);
+        return Collections.unmodifiableSet(seniorConsoleNames);
     }
 
     public static Set<String> getSuperadminIps()
@@ -160,7 +160,7 @@ public class TFM_AdminList
         superUUIDs.clear();
         telnetUUIDs.clear();
         seniorUUIDs.clear();
-        seniorConsoleAliases.clear();
+        seniorConsoleNames.clear();
         superIps.clear();
 
         for (TFM_Admin admin : adminList.values())
@@ -182,17 +182,18 @@ public class TFM_AdminList
             if (admin.isTelnetAdmin())
             {
                 telnetUUIDs.add(uuid);
-
-                for (String alias : admin.getConsoleAliases())
-                {
-                    seniorConsoleAliases.add(alias.toLowerCase());
-                }
             }
 
 
             if (admin.isSeniorAdmin())
             {
                 seniorUUIDs.add(uuid);
+
+                seniorConsoleNames.add(admin.getLastLoginName());
+                for (String alias : admin.getConsoleAliases())
+                {
+                    seniorConsoleNames.add(alias.toLowerCase());
+                }
             }
         }
 
@@ -364,7 +365,7 @@ public class TFM_AdminList
 
         if (!(sender instanceof Player))
         {
-            return seniorConsoleAliases.contains(sender.getName())
+            return seniorConsoleNames.contains(sender.getName())
                     || (TFM_MainConfig.getInstance().getBoolean(TFM_ConfigEntry.CONSOLE_IS_SENIOR) && sender.getName().equals("CONSOLE"));
         }
 
@@ -408,6 +409,11 @@ public class TFM_AdminList
             }
         }
 
+        if (!(sender instanceof Player))
+        {
+            return true;
+        }
+
         final TFM_Admin entry = getEntry((Player) sender);
         if (entry != null)
         {