Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-17 05:20:05 +01:00
Made OfflinePlayer and Player share the same .equals and .hashcode
Dieser Commit ist enthalten in:
Ursprung
82965eb10f
Commit
91ff0b059d
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -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) {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren