From 78708354e1a8191e3fba69bdbb15b2b96b195214 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Fri, 19 Aug 2016 18:40:47 +0700 Subject: [PATCH] - Set group to empty if permissions manager has no group support. - edited comment for config node "permission.EnablePermissionCheck" --- .../fr/xephi/authme/cache/backup/PlayerDataStorage.java | 5 ++++- src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java | 7 +++---- .../xephi/authme/settings/properties/PluginSettings.java | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java b/src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java index 2287c58e..73c96e21 100644 --- a/src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java +++ b/src/main/java/fr/xephi/authme/cache/backup/PlayerDataStorage.java @@ -87,7 +87,10 @@ public class PlayerDataStorage { public void saveData(Player player) { String id = Utils.getUUIDorName(player); Location location = spawnLoader.getPlayerLocationOrSpawn(player); - String group = permissionsManager.getPrimaryGroup(player); + String group = ""; + if (permissionsManager.hasGroupSupport()) { + group = permissionsManager.getPrimaryGroup(player); + } boolean operator = player.isOp(); boolean canFly = player.getAllowFlight(); float walkSpeed = player.getWalkSpeed(); diff --git a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java index dd805282..a49408b0 100644 --- a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java +++ b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java @@ -156,10 +156,9 @@ public class LimboCache { } private void restoreGroup(Player player, String group) { - if (!settings.getProperty(PluginSettings.ENABLE_PERMISSION_CHECK) - || !permissionsManager.hasGroupSupport() || StringUtils.isEmpty(group)) { - return; + if (!StringUtils.isEmpty(group) && permissionsManager.hasGroupSupport() + && settings.getProperty(PluginSettings.ENABLE_PERMISSION_CHECK)) { + permissionsManager.setGroup(player, group); } - permissionsManager.setGroup(player, group); } } diff --git a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java index fd853921..1a58e0ed 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java @@ -45,8 +45,8 @@ public class PluginSettings implements SettingsClass { newProperty("settings.messagesLanguage", "en"); @Comment({ - "Take care with this option; if you don't want", - "to use Vault and group switching of AuthMe", + "Take care with this option; if you want", + "to use group switching of AuthMe", "for unloggedIn players, set this setting to true.", "Default is false." })