mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
74 lines
3.8 KiB
Diff
74 lines
3.8 KiB
Diff
From 6d05e7062f8998be1fc840e9e4568e25fc289eca Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Mon, 13 Jul 2015 19:05:15 +1000
|
|
Subject: [PATCH] Use Map for getPlayer(String) lookup.
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
index 44bdb14d5..9c3bff412 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -146,6 +146,7 @@ public abstract class PlayerList {
|
|
|
|
// CraftBukkit start
|
|
private CraftServer cserver;
|
|
+ private final Map<String,EntityPlayer> playersByName = new java.util.HashMap<>();
|
|
|
|
public PlayerList(MinecraftServer minecraftserver, IRegistryCustom.Dimension iregistrycustom_dimension, WorldNBTStorage worldnbtstorage, int i) {
|
|
this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
|
|
@@ -261,6 +262,7 @@ public abstract class PlayerList {
|
|
|
|
playerconnection.b(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.getYRot(), entityplayer.getXRot());
|
|
this.players.add(entityplayer);
|
|
+ this.playersByName.put(entityplayer.getName().toLowerCase(java.util.Locale.ROOT), entityplayer); // Spigot
|
|
this.playersByUUID.put(entityplayer.getUniqueID(), entityplayer);
|
|
// this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer})); // CraftBukkit - replaced with loop below
|
|
|
|
@@ -514,6 +516,7 @@ public abstract class PlayerList {
|
|
worldserver.a(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
|
|
entityplayer.getAdvancementData().a();
|
|
this.players.remove(entityplayer);
|
|
+ this.playersByName.remove(entityplayer.getName().toLowerCase(java.util.Locale.ROOT)); // Spigot
|
|
this.server.getBossBattleCustomData().b(entityplayer);
|
|
UUID uuid = entityplayer.getUniqueID();
|
|
EntityPlayer entityplayer1 = (EntityPlayer) this.playersByUUID.get(uuid);
|
|
@@ -658,6 +661,7 @@ public abstract class PlayerList {
|
|
public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation) {
|
|
entityplayer.stopRiding(); // CraftBukkit
|
|
this.players.remove(entityplayer);
|
|
+ this.playersByName.remove(entityplayer.getName().toLowerCase(java.util.Locale.ROOT)); // Spigot
|
|
entityplayer.getWorldServer().a(entityplayer, Entity.RemovalReason.DISCARDED);
|
|
BlockPosition blockposition = entityplayer.getSpawn();
|
|
float f = entityplayer.getSpawnAngle();
|
|
@@ -775,6 +779,7 @@ public abstract class PlayerList {
|
|
if (!entityplayer.connection.isDisconnected()) {
|
|
worldserver1.addPlayerRespawn(entityplayer1);
|
|
this.players.add(entityplayer1);
|
|
+ this.playersByName.put(entityplayer1.getName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot
|
|
this.playersByUUID.put(entityplayer1.getUniqueID(), entityplayer1);
|
|
}
|
|
// entityplayer1.syncInventory();
|
|
@@ -979,19 +984,7 @@ public abstract class PlayerList {
|
|
|
|
@Nullable
|
|
public EntityPlayer getPlayer(String s) {
|
|
- Iterator iterator = this.players.iterator();
|
|
-
|
|
- EntityPlayer entityplayer;
|
|
-
|
|
- do {
|
|
- if (!iterator.hasNext()) {
|
|
- return null;
|
|
- }
|
|
-
|
|
- entityplayer = (EntityPlayer) iterator.next();
|
|
- } while (!entityplayer.getProfile().getName().equalsIgnoreCase(s));
|
|
-
|
|
- return entityplayer;
|
|
+ return this.playersByName.get(s.toLowerCase(java.util.Locale.ROOT)); // Spigot
|
|
}
|
|
|
|
public void sendPacketNearby(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, double d3, ResourceKey<World> resourcekey, Packet<?> packet) {
|
|
--
|
|
2.25.1
|
|
|