mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
74 lines
3.7 KiB
Diff
74 lines
3.7 KiB
Diff
From 8aa14967562e8d35bdfdd38aad520e80b4ceb08b 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index d200c4c94..54e44cba3 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -71,6 +71,7 @@ public abstract class PlayerList {
|
|
|
|
// CraftBukkit start
|
|
private CraftServer cserver;
|
|
+ private final Map<String,EntityPlayer> playersByName = new java.util.HashMap<>();
|
|
|
|
public PlayerList(MinecraftServer minecraftserver) {
|
|
this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
|
|
@@ -332,6 +333,7 @@ public abstract class PlayerList {
|
|
|
|
public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
|
|
this.players.add(entityplayer);
|
|
+ this.playersByName.put(entityplayer.getName().toLowerCase(java.util.Locale.ROOT), entityplayer); // Spigot
|
|
this.j.put(entityplayer.getUniqueID(), entityplayer);
|
|
// this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
|
|
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
|
|
@@ -428,6 +430,7 @@ public abstract class PlayerList {
|
|
worldserver.getPlayerChunkMap().removePlayer(entityplayer);
|
|
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.j.get(uuid);
|
|
@@ -585,6 +588,7 @@ public abstract class PlayerList {
|
|
// entityplayer.getWorldServer().getTracker().untrackEntity(entityplayer); // CraftBukkit
|
|
entityplayer.getWorldServer().getPlayerChunkMap().removePlayer(entityplayer);
|
|
this.players.remove(entityplayer);
|
|
+ this.playersByName.remove(entityplayer.getName().toLowerCase(java.util.Locale.ROOT)); // Spigot
|
|
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
|
|
BlockPosition blockposition = entityplayer.getBed();
|
|
boolean flag1 = entityplayer.isRespawnForced();
|
|
@@ -688,6 +692,7 @@ public abstract class PlayerList {
|
|
worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
|
|
worldserver.addEntity(entityplayer1);
|
|
this.players.add(entityplayer1);
|
|
+ this.playersByName.put(entityplayer1.getName().toLowerCase(java.util.Locale.ROOT), entityplayer1); // Spigot
|
|
this.j.put(entityplayer1.getUniqueID(), entityplayer1);
|
|
}
|
|
// entityplayer1.syncInventory();
|
|
@@ -1141,19 +1146,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, DimensionManager dimensionmanager, Packet<?> packet) {
|
|
--
|
|
2.19.1
|
|
|