Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-01-31 20:42:29 +00:00
parent 161ec4151b
commit 99ececedb4
23 changed files with 113 additions and 138 deletions

View File

@@ -1,4 +1,4 @@
From 748c2f52c6590bca633e18a98674b3a684acfd0c Mon Sep 17 00:00:00 2001
From 827a1584998eff24da02f7369d56ed9b7cd1e5fe 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 83b0da0..b60ca66 100644
index dd02f8b..1792828 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1135,7 +1135,7 @@ public final class CraftServer implements Server {
@@ -1134,7 +1134,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {
@@ -19,5 +19,5 @@ index 83b0da0..b60ca66 100644
public OfflinePlayer getOfflinePlayer(String name, boolean search) {
--
1.8.3.2
1.8.4.msysgit.0