From fa7c8be10f2f92dce645274e6327b10589d26a31 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sun, 2 Aug 2015 00:40:00 +0200 Subject: [PATCH 1/3] Try to fix lowercase issue --- src/main/java/fr/xephi/authme/api/API.java | 1 + src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/api/API.java b/src/main/java/fr/xephi/authme/api/API.java index a5e8d190..477494a2 100644 --- a/src/main/java/fr/xephi/authme/api/API.java +++ b/src/main/java/fr/xephi/authme/api/API.java @@ -21,6 +21,7 @@ public class API { public static final String newline = System.getProperty("line.separator"); public static AuthMe instance; + @Deprecated public API(AuthMe instance) { API.instance = instance; } diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java index 9aa30311..a854a689 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java @@ -101,7 +101,7 @@ public class AsyncronousJoin { final Location spawnLoc = plugin.getSpawnLocation(player); if (database.isAuthAvailable(name)) { PlayerAuth auth = database.getAuth(name); - if (auth.getRealName() != null && !auth.getRealName().equals("Player") && !auth.getRealName().equals(player.getName())) { + if (auth.getRealName() != null && !auth.getRealName().isEmpty() && !auth.getRealName().equalsIgnoreCase("Player") && !auth.getRealName().equals(player.getName())) { final GameMode gM = AuthMePlayerListener.gameMode.get(name); sched.scheduleSyncDelayedTask(plugin, new Runnable() { From 9be5d3518f56f159b7d0ca693d0f43fa87cc62f7 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sun, 2 Aug 2015 00:56:50 +0200 Subject: [PATCH 2/3] Flatfile don't support lowercase --- src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java index a854a689..163b4f47 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java @@ -99,7 +99,7 @@ public class AsyncronousJoin { } } final Location spawnLoc = plugin.getSpawnLocation(player); - if (database.isAuthAvailable(name)) { + if (database.getType() != DataSource.DataSourceType.FILE && database.isAuthAvailable(name)) { PlayerAuth auth = database.getAuth(name); if (auth.getRealName() != null && !auth.getRealName().isEmpty() && !auth.getRealName().equalsIgnoreCase("Player") && !auth.getRealName().equals(player.getName())) { final GameMode gM = AuthMePlayerListener.gameMode.get(name); From d10e5b081bb77935d7d6d1a0d084a49e0144d7a8 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sun, 2 Aug 2015 01:14:39 +0200 Subject: [PATCH 3/3] Omfg ... --- src/main/java/fr/xephi/authme/datasource/FlatFile.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/fr/xephi/authme/datasource/FlatFile.java b/src/main/java/fr/xephi/authme/datasource/FlatFile.java index 198b1cd5..2b54e4df 100644 --- a/src/main/java/fr/xephi/authme/datasource/FlatFile.java +++ b/src/main/java/fr/xephi/authme/datasource/FlatFile.java @@ -714,16 +714,22 @@ public class FlatFile implements DataSource { switch (args.length) { case 2: auths.add(new PlayerAuth(args[0], args[1], "192.168.0.1", 0, "your@email.com", args[0])); + break; case 3: auths.add(new PlayerAuth(args[0], args[1], args[2], 0, "your@email.com", args[0])); + break; case 4: auths.add(new PlayerAuth(args[0], args[1], args[2], Long.parseLong(args[3]), "your@email.com", args[0])); + break; case 7: auths.add(new PlayerAuth(args[0], args[1], args[2], Long.parseLong(args[3]), Double.parseDouble(args[4]), Double.parseDouble(args[5]), Double.parseDouble(args[6]), "unavailableworld", "your@email.com", args[0])); + break; case 8: auths.add(new PlayerAuth(args[0], args[1], args[2], Long.parseLong(args[3]), Double.parseDouble(args[4]), Double.parseDouble(args[5]), Double.parseDouble(args[6]), args[7], "your@email.com", args[0])); + break; case 9: auths.add(new PlayerAuth(args[0], args[1], args[2], Long.parseLong(args[3]), Double.parseDouble(args[4]), Double.parseDouble(args[5]), Double.parseDouble(args[6]), args[7], args[8], args[0])); + break; } } } catch (FileNotFoundException ex) {