diff --git a/Spigot-Server-Patches/0043-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0043-Check-online-mode-before-converting-and-renaming-pla.patch
new file mode 100644
index 0000000..4e18a37
--- /dev/null
+++ b/Spigot-Server-Patches/0043-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -0,0 +1,22 @@
+From c5fdb8aa93f070a26da634ae211991f57bbb33fa Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Thu, 5 Mar 2015 15:30:06 -0600
+Subject: [PATCH] Check online mode before converting and renaming player data
+
+
+diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+index b187aed..4eefefc 100644
+--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
++++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+@@ -202,7 +202,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
+             File file = new File(this.playerDir, entityhuman.getUniqueID().toString() + ".dat");
+             // Spigot Start
+             boolean usingWrongFile = false;
+-            if ( !file.exists() )
++            if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // PaperSpigot - Check online mode first
+             {
+                 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
+                 if ( file.exists() )
+-- 
+1.9.5.msysgit.0
+