Upstream Merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-10-24 21:23:24 +11:00
parent dbe0e9acde
commit 9658a61088
19 changed files with 90 additions and 88 deletions

View File

@@ -1,4 +1,4 @@
From e7b329f9c5dc0009be2358d1548b8018997dbd87 Mon Sep 17 00:00:00 2001
From 478d31c33b0dd712754a68077ebe0bffa294c882 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players
@@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 84ff542..c127f2a 100644
index 06a4ef6..a1fdc79 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1098,7 +1098,7 @@ public final class CraftServer implements Server {
@@ -1105,7 +1105,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {
@@ -19,5 +19,5 @@ index 84ff542..c127f2a 100644
public OfflinePlayer getOfflinePlayer(String name, boolean search) {
--
1.8.1.2
1.8.3.2