Rebuild a patch for upstream changes
This commit is contained in:
parent
f5e295d087
commit
b537fcb6cd
@ -1,4 +1,4 @@
|
|||||||
From e01dd7af6587f3df8a610524d8c91d281547c74a Mon Sep 17 00:00:00 2001
|
From 44f7767ad24c505b3433c914d3d9bb7a2af305b1 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 8 Mar 2015 04:03:56 -0500
|
Date: Sun, 8 Mar 2015 04:03:56 -0500
|
||||||
Subject: [PATCH] Player lookup improvements
|
Subject: [PATCH] Player lookup improvements
|
||||||
@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should
|
|||||||
be consistent in performance regardless of how many players are online.
|
be consistent in performance regardless of how many players are online.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
index 048509b..8dfe5e2 100644
|
index ab1d9a5..617f26c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
@@ -49,6 +49,31 @@ public abstract class PlayerList {
|
@@ -49,6 +49,31 @@ public abstract class PlayerList {
|
||||||
@ -83,7 +83,7 @@ index 048509b..8dfe5e2 100644
|
|||||||
savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
|
savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
|
||||||
entityplayer.playerConnection.disconnect("You logged in from another location");
|
entityplayer.playerConnection.disconnect("You logged in from another location");
|
||||||
}
|
}
|
||||||
@@ -1010,6 +1042,7 @@ public abstract class PlayerList {
|
@@ -1020,6 +1052,7 @@ public abstract class PlayerList {
|
||||||
}
|
}
|
||||||
|
|
||||||
public EntityPlayer getPlayer(String s) {
|
public EntityPlayer getPlayer(String s) {
|
||||||
|
Loading…
Reference in New Issue
Block a user