Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-03 18:45:50 +10:00
parent 5ed5fdbdc3
commit 19214d1353
15 changed files with 57 additions and 53 deletions

View File

@@ -1,4 +1,4 @@
From 59f61694395558bf97da4192abea0b02099f0414 Mon Sep 17 00:00:00 2001
From 11737192759a711cb1692aadb207692b3f003f91 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 3addae3..a1fe1f2 100644
index e65c752..389f80e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1090,7 +1090,7 @@ public final class CraftServer implements Server {
@@ -1094,7 +1094,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {