Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-24 11:15:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix Conflict

Browse Source
This commit is contained in:
Xephi 2015-11-30 19:21:15 +01:00
parent a262b26451
commit 174ad3b29c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,13 +45,13 @@ public class vAuthFileReader {
if (isUuidInstance(password)) {
String pname;
try {
playerName = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName();
pname = Bukkit.getOfflinePlayer(UUID.fromString(name)).getName();
} catch (Exception | NoSuchMethodError e) {
playerName = getName(UUID.fromString(name));
pname = getName(UUID.fromString(name));
}
if (playerName == null)
if (pname == null)
continue;
auth = new PlayerAuth(playerName.toLowerCase(), password, "127.0.0.1", System.currentTimeMillis(), "your@email.com", playerName);
auth = new PlayerAuth(pname.toLowerCase(), password, "127.0.0.1", System.currentTimeMillis(), "your@email.com", pname);
} else {
auth = new PlayerAuth(name.toLowerCase(), password, "127.0.0.1", System.currentTimeMillis(), "your@email.com", name);
}