cleanup perms check done; closes #202

weaondara · Dec 26, 2015 · f679b17 · f679b17
1 parent 3c2c930
commit f679b17
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/src/main/java/net/alpenblock/bungeeperms/Statics.java b/src/main/java/net/alpenblock/bungeeperms/Statics.java
@@ -232,11 +232,6 @@ public static String toLower(String s)
         return s == null ? null : s.toLowerCase();
     }
 
-    public static boolean isBungeeConsole(Object o)
-    {
-        return o.getClass().getName().equals("net.md_5.bungee.command.ConsoleCommandSender");
-    }
-
     @SneakyThrows
     public static void unregisterListener(Listener l)
     {

diff --git a/src/main/java/net/alpenblock/bungeeperms/platform/bukkit/BukkitPermissionsChecker.java b/src/main/java/net/alpenblock/bungeeperms/platform/bukkit/BukkitPermissionsChecker.java
@@ -122,7 +122,7 @@ public boolean has(CommandSender sender, String perm, boolean msg)
      */
     public boolean hasOrConsole(CommandSender sender, String perm, boolean msg)
     {
-        boolean isperm = (hasPerm(sender, perm) | (sender instanceof ConsoleCommandSender));
+        boolean isperm = hasPerm(sender, perm) || (sender instanceof ConsoleCommandSender);
         if (!isperm && msg)
         {
             sender.sendMessage(Color.Error + "You don't have permission to do that!" + ChatColor.RESET);
@@ -166,7 +166,7 @@ public boolean hasOnServer(CommandSender sender, String perm, boolean msg)
      */
     public boolean hasOrConsoleOnServer(CommandSender sender, String perm, boolean msg)
     {
-        boolean isperm = (hasPermOnServer(sender, perm) | (sender instanceof ConsoleCommandSender));
+        boolean isperm = hasPermOnServer(sender, perm) || (sender instanceof ConsoleCommandSender);
         if (!isperm && msg)
         {
             sender.sendMessage(Color.Error + "You don't have permission to do that!" + ChatColor.RESET);
@@ -210,7 +210,7 @@ public boolean hasOnServerInWorld(CommandSender sender, String perm, boolean msg
      */
     public boolean hasOrConsoleOnServerInWorld(CommandSender sender, String perm, boolean msg)
     {
-        boolean isperm = (hasPermOnServerInWorld(sender, perm) | (sender instanceof ConsoleCommandSender));
+        boolean isperm = hasPermOnServerInWorld(sender, perm) || (sender instanceof ConsoleCommandSender);
         if (!isperm && msg)
         {
             sender.sendMessage(Color.Error + "You don't have permission to do that!" + ChatColor.RESET);

diff --git a/src/main/java/net/alpenblock/bungeeperms/platform/bungee/BungeePermissionsChecker.java b/src/main/java/net/alpenblock/bungeeperms/platform/bungee/BungeePermissionsChecker.java
@@ -3,7 +3,6 @@
 import lombok.AllArgsConstructor;
 import net.alpenblock.bungeeperms.Color;
 import net.alpenblock.bungeeperms.PermissionsChecker;
-import net.alpenblock.bungeeperms.Statics;
 import net.alpenblock.bungeeperms.User;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
@@ -12,8 +11,9 @@
 @AllArgsConstructor
 public class BungeePermissionsChecker extends PermissionsChecker
 {
+
     private final BungeeConfig config;
-    
+
 //with messageout
     /**
      * Checks if a user (no console) has a specific permission (globally).
@@ -44,7 +44,7 @@ public boolean hasPermOrConsole(CommandSender sender, String permission)
         {
             return (config.isUseUUIDs() ? pm().getUser(((ProxiedPlayer) sender).getUniqueId()) : pm().getUser(sender.getName())).hasPerm(permission);
         }
-        else if (Statics.isBungeeConsole(sender))
+        else if (new BungeeSender(sender).isConsole())
         {
             return true;
         }
@@ -90,7 +90,7 @@ public boolean hasPermOrConsoleOnServer(CommandSender sender, String permission)
             }
             return user.hasPermOnServer(permission, ((ProxiedPlayer) sender).getServer().getInfo().getName());
         }
-        else if (Statics.isBungeeConsole(sender))
+        else if (new BungeeSender(sender).isConsole())
         {
             return true;
         }
@@ -154,7 +154,7 @@ public boolean hasPermOrConsoleOnServerInWorld(CommandSender sender, String perm
 
             return user.hasPermOnServerInWorld(permission, ((ProxiedPlayer) sender).getServer().getInfo().getName(), world);
         }
-        else if (Statics.isBungeeConsole(sender))
+        else if (new BungeeSender(sender).isConsole())
         {
             return true;
         }
@@ -198,7 +198,7 @@ public boolean has(CommandSender sender, String perm, boolean msg)
      */
     public boolean hasOrConsole(CommandSender sender, String perm, boolean msg)
     {
-        boolean isperm = (hasPerm(sender, perm) | (Statics.isBungeeConsole(sender)));
+        boolean isperm = hasPerm(sender, perm) || new BungeeSender(sender).isConsole();
         if (!isperm && msg)
         {
             sender.sendMessage(Color.Error + "You don't have permission to do that!" + ChatColor.RESET);
@@ -242,14 +242,14 @@ public boolean hasOnServer(CommandSender sender, String perm, boolean msg)
      */
     public boolean hasOrConsoleOnServer(CommandSender sender, String perm, boolean msg)
     {
-        boolean isperm = (hasPermOnServer(sender, perm) | (Statics.isBungeeConsole(sender)));
+        boolean isperm = hasPermOnServer(sender, perm) || new BungeeSender(sender).isConsole();
         if (!isperm && msg)
         {
             sender.sendMessage(Color.Error + "You don't have permission to do that!" + ChatColor.RESET);
         }
         return isperm;
     }
-    
+
     /**
      * Checks if a user (no console) has a specific permission on the current server and in the current world.
      *
@@ -286,7 +286,7 @@ public boolean hasOnServerInWorld(CommandSender sender, String perm, boolean msg
      */
     public boolean hasOrConsoleOnServerInWorld(CommandSender sender, String perm, boolean msg)
     {
-        boolean isperm = (hasPermOnServerInWorld(sender, perm) | (Statics.isBungeeConsole(sender)));
+        boolean isperm = hasPermOnServerInWorld(sender, perm) || new BungeeSender(sender).isConsole();
         if (!isperm && msg)
         {
             sender.sendMessage(Color.Error + "You don't have permission to do that!" + ChatColor.RESET);

diff --git a/src/main/java/net/alpenblock/bungeeperms/platform/bungee/BungeeSender.java b/src/main/java/net/alpenblock/bungeeperms/platform/bungee/BungeeSender.java
@@ -8,6 +8,7 @@
 import net.alpenblock.bungeeperms.platform.MessageEncoder;
 import net.alpenblock.bungeeperms.platform.Sender;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
@@ -49,7 +50,7 @@ public String getName()
     @Override
     public UUID getUUID()
     {
-        if (Statics.isBungeeConsole(sender))
+        if (isConsole())
         {
             return UUID.fromString("00000000-0000-0000-0000-000000000000");
         }
@@ -88,7 +89,7 @@ public String getWorld()
     @Override
     public boolean isConsole()
     {
-        return Statics.isBungeeConsole(sender);
+        return sender.getClass().getName().equals("net.md_5.bungee.command.ConsoleCommandSender");
     }
 
     @Override