From 00e9b4ea1f1009f1b54cc93bc5c0e39dc4b981e7 Mon Sep 17 00:00:00 2001
From: unknown <jerom.sar@hotmail.com>
Date: Mon, 21 Apr 2014 14:56:24 +0200
Subject: [PATCH] [Bleeding] Cleaned up TFM_Command.senderHasPermission()

---
 .../TotalFreedomMod/Commands/TFM_Command.java | 71 ++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
index 58e14881..0ad089cd 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
@@ -85,47 +85,52 @@ public abstract class TFM_Command
             {
                 return false;
             }
-            else if (level == AdminLevel.SENIOR && !isSenior)
-            {
-                return false;
-            }
-            else if (blockHostConsole && TFM_Util.isFromHostConsole(commandSender.getName()))
-            {
-                return false;
-            }
-        }
-        else
-        {
-            final Player sender_p = (Player) commandSender;
 
-            if (source == SourceType.ONLY_CONSOLE)
+            if (level == AdminLevel.SENIOR && !isSenior)
             {
                 return false;
             }
-            else if (level == AdminLevel.SENIOR)
-            {
-                if (isSenior)
-                {
-                    TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
-                    if (!playerdata.isSuperadminIdVerified())
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else if (level == AdminLevel.SUPER && !isSuper)
-            {
-                return false;
-            }
-            else if (level == AdminLevel.OP && !sender_p.isOp())
+
+            if (blockHostConsole && TFM_Util.isFromHostConsole(commandSender.getName()))
             {
                 return false;
             }
+
+            return true;
         }
+
+        final Player senderPlayer = (Player) commandSender;
+
+        if (source == SourceType.ONLY_CONSOLE)
+        {
+            return false;
+        }
+
+        if (level == AdminLevel.SENIOR)
+        {
+            if (!isSenior)
+            {
+                return false;
+            }
+
+            if (!TFM_PlayerData.getPlayerData(senderPlayer).isSuperadminIdVerified())
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        if (level == AdminLevel.SUPER && !isSuper)
+        {
+            return false;
+        }
+
+        if (level == AdminLevel.OP && !senderPlayer.isOp())
+        {
+            return false;
+        }
+
         return true;
     }