From 30b4cfe44e77e33fdfbbc1a0222dc4837a9d0b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Vis=C3=A9e?= Date: Sat, 21 Nov 2015 19:18:56 +0100 Subject: [PATCH 1/3] Added notice to legacy permissions instance in main class --- src/main/java/fr/xephi/authme/AuthMe.java | 2 +- src/main/java/fr/xephi/authme/DataManager.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 69112ea2..c253ca5b 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -96,7 +96,7 @@ public class AuthMe extends JavaPlugin { public boolean delayedAntiBot = true; // Hooks TODO: move into modules - public Permission vaultGroupManagement; + public Permission vaultGroupManagement; // TODO: Remove this instance, and replace every usage with permissions manager! public Essentials ess; public MultiverseCore multiverse; public CombatTagPlus combatTagPlus; diff --git a/src/main/java/fr/xephi/authme/DataManager.java b/src/main/java/fr/xephi/authme/DataManager.java index c808ebc5..edc96eee 100644 --- a/src/main/java/fr/xephi/authme/DataManager.java +++ b/src/main/java/fr/xephi/authme/DataManager.java @@ -177,8 +177,7 @@ public class DataManager { * @param cleared List * @param permission Permission */ - public synchronized void purgePermissions(List cleared, - Permission permission) { + public synchronized void purgePermissions(List cleared, Permission permission) { int i = 0; for (String name : cleared) { try { From a176aba35049b0f073bd35e669a8257823642b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Vis=C3=A9e?= Date: Sat, 21 Nov 2015 19:22:23 +0100 Subject: [PATCH 2/3] Fixed horrible typo, implemented dynamic plugin name --- src/main/java/fr/xephi/authme/settings/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index a8da9f5e..e9b719bb 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -651,7 +651,7 @@ public final class Settings extends YamlConfiguration { BufferedWriter w = new BufferedWriter(fw); w.write("Welcome {PLAYER} on {SERVER} server"); w.newLine(); - w.write("This server use AuthMe protection!"); + w.write("This server uses " + AuthMe.PLUGIN_NAME + " protection!"); w.close(); } catch (IOException e) { e.printStackTrace(); From 579b7e7b974ce29eafcd0b2e512f5f33be2d9003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Vis=C3=A9e?= Date: Sat, 21 Nov 2015 19:24:25 +0100 Subject: [PATCH 3/3] Improved some grammar and variable names --- .../fr/xephi/authme/settings/Settings.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index e9b719bb..94f032d8 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -545,14 +545,14 @@ public final class Settings extends YamlConfiguration { try { return DataSource.DataSourceType.valueOf(configFile.getString(key, "sqlite").toUpperCase()); } catch (IllegalArgumentException ex) { - ConsoleLogger.showError("Unknown database backend; defaulting to sqlite database"); + ConsoleLogger.showError("Unknown database backend; defaulting to SQLite database"); return DataSource.DataSourceType.SQLITE; } } /** * Config option for setting and check restricted user by username;ip , - * return false if ip and name doesnt amtch with player that join the + * return false if ip and name doesn't match with player that join the * server, so player has a restricted access * @param name String * @param ip String @@ -560,21 +560,21 @@ public final class Settings extends YamlConfiguration { * @return boolean */ public static boolean getRestrictedIp(String name, String ip) { - Iterator iter = getRestrictedIp.iterator(); - boolean trueonce = false; - boolean namefound = false; - while (iter.hasNext()) { - String[] args = iter.next().split(";"); - String testname = args[0]; - String testip = args[1]; - if (testname.equalsIgnoreCase(name)) { - namefound = true; - if (testip.equalsIgnoreCase(ip)) { - trueonce = true; + Iterator iterator = getRestrictedIp.iterator(); + boolean trueOnce = false; + boolean nameFound = false; + while(iterator.hasNext()) { + String[] args = iterator.next().split(";"); + String testName = args[0]; + String testIp = args[1]; + if (testName.equalsIgnoreCase(name)) { + nameFound = true; + if (testIp.equalsIgnoreCase(ip)) { + trueOnce = true; } } } - return !namefound || trueonce; + return !nameFound || trueOnce; } /**