From 7902cd87bb6a5abe099755104716e7bfcdefb2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Vis=C3=A9e?= Date: Sat, 21 Nov 2015 20:47:56 +0100 Subject: [PATCH] Added return statement for setGroup method, updated it's JavaDocs --- src/main/java/fr/xephi/authme/util/Utils.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java index 278cf41af..457bac0e2 100644 --- a/src/main/java/fr/xephi/authme/util/Utils.java +++ b/src/main/java/fr/xephi/authme/util/Utils.java @@ -121,11 +121,15 @@ public class Utils { } /** - * Method setGroup. - * @param player Player - * @param group GroupType + * Set the group of a player, by it's AuthMe group type. + * + * @param player The player. + * @param group The group type. + * + * @return True if succeed, false otherwise. + * False is also returned if groups aren't supported with the current permissions system. */ - public static void setGroup(Player player, GroupType group) { + public static boolean setGroup(Player player, GroupType group) { if(!Settings.isPermissionCheckEnabled) return; @@ -143,34 +147,33 @@ public class Utils { case UNREGISTERED: // Remove the other group type groups, set the current group permsMan.removeGroups(player, Arrays.asList(Settings.getRegisteredGroup, Settings.getUnloggedinGroup)); - permsMan.addGroup(player, Settings.unRegisteredGroup); - break; + return permsMan.addGroup(player, Settings.unRegisteredGroup); case REGISTERED: // Remove the other group type groups, set the current group permsMan.removeGroups(player, Arrays.asList(Settings.unRegisteredGroup, Settings.getUnloggedinGroup)); - permsMan.addGroup(player, Settings.getRegisteredGroup); - break; + return permsMan.addGroup(player, Settings.getRegisteredGroup); case NOTLOGGEDIN: // Remove the other group type groups, set the current group permsMan.removeGroups(player, Arrays.asList(Settings.unRegisteredGroup, Settings.getRegisteredGroup)); - permsMan.addGroup(player, Settings.getUnloggedinGroup); - break; + return permsMan.addGroup(player, Settings.getUnloggedinGroup); case LOGGEDIN: // Get the limbo player data LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(player.getName().toLowerCase()); if(limbo == null) - break; + return false; // Get the players group String realGroup = limbo.getGroup(); // Remove the other group types groups, set the real group permsMan.removeGroups(player, Arrays.asList(Settings.unRegisteredGroup, Settings.getRegisteredGroup, Settings.getUnloggedinGroup)); - permsMan.addGroup(player, realGroup); - break; + return permsMan.addGroup(player, realGroup); + + default: + return false; } }