Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-02 07:36:51 +11:00
parent 0656fd7a23
commit 9a876418c1
8 changed files with 33 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
From 870c6576bc2ca87279d6032b2caf5b9c99589fc7 Mon Sep 17 00:00:00 2001
From 9c61bb156390398f037c340ed15b7419a90f02c0 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 5f5174b..33cadfe 100644
index 13c1bbe..11f018b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1132,7 +1132,7 @@ public final class CraftServer implements Server {
@@ -1131,7 +1131,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {