Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-01-13 03:10:36 +01:00
Code Issues Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Xephi 2015-11-30 19:10:50 +01:00
commit 3b1c8cd2e4
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/fr/xephi/authme/converter/vAuthFileReader.java
View File

@ -42,8 +42,8 @@ public class vAuthFileReader {
String name = line.split(": ")[0]; String name = line.split(": ")[0];
String password = line.split(": ")[1]; String password = line.split(": ")[1];
PlayerAuth auth; PlayerAuth auth;
if (isUUIDinstance(password)) { if (isUuidInstance(password)) {
String playerName; String pname;
try { try {
playerName = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName(); playerName = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName();
} catch (Exception | NoSuchMethodError e) { } catch (Exception | NoSuchMethodError e) {
@ -64,17 +64,8 @@ public class vAuthFileReader {
} }
/** private static boolean isUuidInstance(String s) {
* Method isUUIDinstance. return s.length() > 8 && s.charAt(8) == '-';
*
* @param s String
*
* @return boolean
*/
private boolean isUUIDinstance(String s) {
if (String.valueOf(s.charAt(8)).equalsIgnoreCase("-"))
return true;
return true;
} }
/** /**