From 10e5ae08e2345e37b0f4c39e9025002c47ada573 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Sun, 29 May 2016 23:15:00 +0700 Subject: [PATCH 1/2] remove write log for info message. In case we don't have better log writing method yet. --- src/main/java/fr/xephi/authme/ConsoleLogger.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/ConsoleLogger.java b/src/main/java/fr/xephi/authme/ConsoleLogger.java index ebec0291..1fab749f 100644 --- a/src/main/java/fr/xephi/authme/ConsoleLogger.java +++ b/src/main/java/fr/xephi/authme/ConsoleLogger.java @@ -49,9 +49,6 @@ public final class ConsoleLogger { */ public static void info(String message) { logger.info(message); - if (useLogging) { - writeLog(message); - } } public static void debug(String message) { From 428b27943bb163916afeb6ca7ad855de2bd68507 Mon Sep 17 00:00:00 2001 From: EbonJaguar Date: Sun, 29 May 2016 18:29:19 -0400 Subject: [PATCH 2/2] Add isPermissionsSystem method to PermissionsSystemType enum - fixes #612 --- .../authme/permission/PermissionsManager.java | 22 ++++++++++--------- .../permission/PermissionsSystemType.java | 10 +++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java index 14234e1f..1a5fd929 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java @@ -224,11 +224,12 @@ public class PermissionsManager implements PermissionsService { String pluginName = plugin.getName(); // Check if any known permissions system is enabling - if (pluginName.equals("PermissionsEx") || pluginName.equals("PermissionsBukkit") || - pluginName.equals("bPermissions") || pluginName.equals("GroupManager") || - pluginName.equals("zPermissions") || pluginName.equals("Vault")) { - ConsoleLogger.info(pluginName + " plugin enabled, dynamically updating permissions hooks!"); - setup(); + for (PermissionsSystemType permissionsSystemType : PermissionsSystemType.values()) { + if (permissionsSystemType.isPermissionSystem(pluginName)) { + ConsoleLogger.info(pluginName + " plugin enabled, dynamically updating permissions hooks!"); + setup(); + break; + } } } @@ -243,11 +244,12 @@ public class PermissionsManager implements PermissionsService { String pluginName = plugin.getName(); // Is the WorldGuard plugin disabled - if (pluginName.equals("PermissionsEx") || pluginName.equals("PermissionsBukkit") || - pluginName.equals("bPermissions") || pluginName.equals("GroupManager") || - pluginName.equals("zPermissions") || pluginName.equals("Vault")) { - ConsoleLogger.info(pluginName + " plugin disabled, updating hooks!"); - setup(); + for (PermissionsSystemType permissionsSystemType : PermissionsSystemType.values()) { + if (permissionsSystemType.isPermissionSystem(pluginName)) { + ConsoleLogger.info(pluginName + " plugin disabled, updating hooks!"); + setup(); + break; + } } } diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java b/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java index 2167fde6..a65ac50c 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java @@ -83,4 +83,14 @@ public enum PermissionsSystemType { public String toString() { return getName(); } + + /** + * Check if a given plugin is a permissions system. + * + * @param name The name of the plugin to check. + * @return If the plugin is a valid permissions system. + */ + public boolean isPermissionSystem(String name) { + return name.equals(pluginName); + } }