EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Don't overwrite online player names from uuid cache

Browse Source
This commit is contained in:
Jesse Boyd 2017-09-06 19:49:57 +10:00
parent 24b3b60983
commit 20d7a0eea2
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
View File

@ -76,11 +76,14 @@ public abstract class UUIDHandlerImplementation {
if (uuid == null || name == null) { if (uuid == null || name == null) {
continue; continue;
} }
if (this.uuidMap.inverse().containsKey(uuid)) { StringWrapper oldName = this.uuidMap.inverse().get(uuid);
if (oldName != null) {
if (this.uuidMap.containsKey(name)) { if (this.uuidMap.containsKey(name)) {
continue; continue;
} }
rename(uuid, name); if (getPlayer(uuid) == null) {
rename(uuid, name);
}
continue; continue;
} }
this.uuidMap.put(name, uuid); this.uuidMap.put(name, uuid);
@ -167,7 +170,6 @@ public abstract class UUIDHandlerImplementation {
} else { } else {
StringWrapper oName = this.uuidMap.inverse().get(offline); StringWrapper oName = this.uuidMap.inverse().get(offline);
if (!oName.equals(name)) { if (!oName.equals(name)) {
System.out.println("Remove " + name);
this.uuidMap.remove (name); this.uuidMap.remove (name);
this.uuidMap.put(name, uuid); this.uuidMap.put(name, uuid);
} }
@ -176,11 +178,15 @@ public abstract class UUIDHandlerImplementation {
} }
} catch (Exception ignored) { } catch (Exception ignored) {
BiMap<UUID, StringWrapper> inverse = this.uuidMap.inverse(); BiMap<UUID, StringWrapper> inverse = this.uuidMap.inverse();
if (inverse.containsKey(uuid)) { StringWrapper oldName = inverse.get(uuid);
if (oldName != null) {
if (this.uuidMap.containsKey(name)) { if (this.uuidMap.containsKey(name)) {
return false; return false;
} }
rename(uuid, name); PlotPlayer player = getPlayer(uuid);
if (player == null || player.getName().equalsIgnoreCase(name.value)) {
rename(uuid, name);
}
return false; return false;
} }
this.uuidMap.put(name, uuid); this.uuidMap.put(name, uuid);