Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 22:44:17 +01:00
Code Issues Projects Releases Wiki Activity

Made OfflinePlayer and Player share the same .equals and .hashcode

Browse Source
This commit is contained in:
Nathan Adams 2011-12-12 15:34:49 +00:00
parent 82965eb10f
commit 91ff0b059d
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
View File

@ -97,4 +97,26 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
return null; return null;
} }
@Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (!(obj instanceof OfflinePlayer)) {
return false;
}
OfflinePlayer other = (OfflinePlayer)obj;
if ((this.getName() == null) || (other.getName() == null)) {
return false;
}
return this.getName().equalsIgnoreCase(other.getName());
}
@Override
public int hashCode() {
int hash = 5;
hash = 97 * hash + (this.getName() != null ? this.getName().hashCode() : 0);
return hash;
}
} }

10
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -4,7 +4,6 @@ import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayer;
import net.minecraft.server.Packet131ItemData; import net.minecraft.server.Packet131ItemData;
import net.minecraft.server.Packet200Statistic; import net.minecraft.server.Packet200Statistic;
@ -24,6 +23,7 @@ import org.bukkit.Instrument;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Note; import org.bukkit.Note;
import org.bukkit.OfflinePlayer;
import org.bukkit.Statistic; import org.bukkit.Statistic;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -160,14 +160,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (obj == null) { if (obj == null) {
return false; return false;
} }
if (getClass() != obj.getClass()) { if (!(obj instanceof OfflinePlayer)) {
return false; return false;
} }
final CraftPlayer other = (CraftPlayer) obj; OfflinePlayer other = (OfflinePlayer)obj;
if ((this.getName() == null) ? (other.getName() != null) : !this.getName().equals(other.getName())) { if ((this.getName() == null) || (other.getName() == null)) {
return false; return false;
} }
return true; return this.getName().equalsIgnoreCase(other.getName());
} }
public void kickPlayer(String message) { public void kickPlayer(String message) {