Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-28 06:20:20 +01:00
Code Issues Projects Releases Wiki Activity

Use UUIDs in CraftPlayer equals and hashCode methods. Fixes BUKKIT-5634

Browse Source
This commit is contained in:
Daniel Naylor 2014-05-26 20:33:10 +01:00 committed by Travis Watkins
parent 38fbe60d46
commit 0a45c3ebf7
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/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -222,18 +222,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return false;
}
OfflinePlayer other = (OfflinePlayer) obj;
if ((this.getName() == null) || (other.getName() == null)) {
if ((this.getUniqueId() == null) || (other.getUniqueId() == null)) {
return false;
}
boolean nameEquals = this.getName().equalsIgnoreCase(other.getName());
boolean uuidEquals = this.getUniqueId().equals(other.getUniqueId());
boolean idEquals = true;
if (other instanceof CraftPlayer) {
idEquals = this.getEntityId() == ((CraftPlayer) other).getEntityId();
}
return nameEquals && idEquals;
return uuidEquals && idEquals;
}
@Override
@ -947,7 +947,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public int hashCode() {
if (hash == 0 || hash == 485) {
hash = 97 * 5 + (this.getName() != null ? this.getName().toLowerCase().hashCode() : 0);
hash = 97 * 5 + (this.getUniqueId() != null ? this.getUniqueId().hashCode() : 0);
}
return hash;
}