Upstream: Add more expansive UUID based operations

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-03-30 09:09:24 +11:00
parent 36fa69bb23
commit 968a96a1d3
10 changed files with 44 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
From e767a7a0499b068d6195f5b6585b062a45d57fed Mon Sep 17 00:00:00 2001
From 5058580880735b725b4412d85fb942e0287c5a0b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 15 Mar 2014 14:34:03 +1100
Subject: [PATCH] Optimize Player Lookup
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Player Lookup
Optimize player lookup and various player operations. We mainly do this by keeping a map instead of iterating through all players. We also speed up the duplicate login check and a few other checks by simply checking for one matching player.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 385dc0a..4a651b6 100644
index 0d6ffef..c4698d4 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -56,6 +56,25 @@ public abstract class PlayerList {
@@ -103,10 +103,10 @@ index 385dc0a..4a651b6 100644
public List a(ChunkCoordinates chunkcoordinates, int i, int j, int k, int l, int i1, int j1, Map map, String s, String s1, World world) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
index 36bcfef..55df803 100644
index 24b0066..7fbbcec 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -101,14 +101,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -116,14 +116,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
}
public Player getPlayer() {
@@ -126,10 +126,10 @@ index 36bcfef..55df803 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a388ec7..c7f1c95 100644
index 6912fab..4c089ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -503,6 +503,13 @@ public final class CraftServer implements Server {
@@ -502,6 +502,13 @@ public final class CraftServer implements Server {
public Player getPlayer(final String name) {
Validate.notNull(name, "Name cannot be null");
@@ -143,7 +143,7 @@ index a388ec7..c7f1c95 100644
Player[] players = getOnlinePlayers();
Player found = null;
@@ -524,15 +531,10 @@ public final class CraftServer implements Server {
@@ -523,15 +530,10 @@ public final class CraftServer implements Server {
public Player getPlayerExact(String name) {
Validate.notNull(name, "Name cannot be null");
@@ -162,7 +162,7 @@ index a388ec7..c7f1c95 100644
+ // Spigot End
}
public int broadcastMessage(String message) {
// TODO: In 1.7.6+ this should use the server's UUID->EntityPlayer map
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5d7e77f..bee7abe 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -183,5 +183,5 @@ index 5d7e77f..bee7abe 100644
public InetSocketAddress getAddress() {
--
1.8.5.2.msysgit.0
1.8.3.2