diff --git a/CraftBukkit-Patches/0125-Treat-Bungee-as-Online-Mode.patch b/CraftBukkit-Patches/0125-Treat-Bungee-as-Online-Mode.patch
new file mode 100644
index 000000000..bdde3237c
--- /dev/null
+++ b/CraftBukkit-Patches/0125-Treat-Bungee-as-Online-Mode.patch
@@ -0,0 +1,22 @@
+From 0629a40c6c0aaac51f24fca764a6447e0000c0cf Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Sat, 12 Apr 2014 21:23:58 +1000
+Subject: [PATCH] Treat Bungee as Online Mode
+
+
+diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+index 01dedf2..035e6cb 100644
+--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
++++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+@@ -56,7 +56,7 @@ public class NameReferencingFileConverter {
+     private static void a(MinecraftServer minecraftserver, Collection collection, ProfileLookupCallback profilelookupcallback) {
+         String[] astring = (String[]) Iterators.toArray(Iterators.filter(collection.iterator(), new PredicateEmptyList()), String.class);
+ 
+-        if (minecraftserver.getOnlineMode()) {
++        if (minecraftserver.getOnlineMode() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now.
+             minecraftserver.getGameProfileRepository().findProfilesByNames(astring, Agent.MINECRAFT, profilelookupcallback);
+         } else {
+             String[] astring1 = astring;
+-- 
+1.8.3.2
+