From 174ad3b29c71f183c3b3b2f3b9e5ce6eca73f92e Mon Sep 17 00:00:00 2001 From: Xephi Date: Mon, 30 Nov 2015 19:21:15 +0100 Subject: [PATCH] Fix Conflict --- .../java/fr/xephi/authme/converter/vAuthFileReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java b/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java index 9cc306ce2..bca9af2cf 100644 --- a/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java +++ b/src/main/java/fr/xephi/authme/converter/vAuthFileReader.java @@ -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); }