diff --git a/CraftBukkit-Patches/0055-Do-Not-Search-for-Offline-Players.patch b/CraftBukkit-Patches/0055-Do-Not-Search-for-Offline-Players.patch
new file mode 100644
index 0000000000..3951324017
--- /dev/null
+++ b/CraftBukkit-Patches/0055-Do-Not-Search-for-Offline-Players.patch
@@ -0,0 +1,23 @@
+From 14dc11b978008fb383a01a8065b2b2c156b92f0a 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
+
+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 b6fe332..76659bc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1108,7 +1108,7 @@ public final class CraftServer implements Server {
+     }
+ 
+     public OfflinePlayer getOfflinePlayer(String name) {
+-        return getOfflinePlayer(name, true);
++        return getOfflinePlayer(name, false); // Spigot
+     }
+ 
+     public OfflinePlayer getOfflinePlayer(String name, boolean search) {
+-- 
+1.8.1.2
+