From 9d7faf9ed9fb92a67d82030d2d5948e682f62118 Mon Sep 17 00:00:00 2001 From: Shevchik Date: Sun, 24 Aug 2014 23:20:01 +0400 Subject: [PATCH] Fix database loading data for wrong player Fixes #2223 --- .../gmail/nossr50/database/FlatfileDatabaseManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java index 13284b993..e36bafe8c 100644 --- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java +++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java @@ -470,7 +470,12 @@ public final class FlatfileDatabaseManager implements DatabaseManager { // Find if the line contains the player we want. String[] character = line.split(":"); - if ((uuid != null && (!character[41].equalsIgnoreCase(uuid.toString()) && !character[41].equalsIgnoreCase("NULL"))) || (uuid == null && !character[0].equalsIgnoreCase(playerName))) { + // Compare names because we don't have a valid uuid for that player even if input uuid is not null + if (character[41].equalsIgnoreCase("NULL") && !character[0].equalsIgnoreCase(playerName)) { + continue; + } + // If input uuid is not null then we should compare uuids + else if ((uuid != null && !character[41].equalsIgnoreCase(uuid.toString())) || (!character[0].equalsIgnoreCase(playerName))) { continue; }