Upstream merge, nothing major.

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-21 19:13:39 +11:00
parent c14cb5a15b
commit 2c6428f4b1
13 changed files with 39 additions and 324 deletions

View File

@@ -1,4 +1,4 @@
From 14d76502e1a0bb93291be25cc0ae0b415504b76d Mon Sep 17 00:00:00 2001
From bdd39983c171f385d1df7048105b9685b49d27f5 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 13c1bbe..11f018b 100644
index 0ab3255..6a38465 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1131,7 +1131,7 @@ public final class CraftServer implements Server {
@@ -1133,7 +1133,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {