Paper/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch

From 1afa27377464445772cddb3095fa446755b7a5d4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 00:03:55 -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 97bac7d257..a0254d8e51 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData {
             File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat");
             // Spigot Start
             boolean usingWrongFile = false;
-            if ( !file.exists() )
+            if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first
             {
                 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                 if ( file.exists() )
-- 
2.25.1
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current 2020-04-02 23:07:06 +02:00			`From 1afa27377464445772cddb3095fa446755b7a5d4 Mon Sep 17 00:00:00 2001`
Check online mode before converting and renaming player data 2015-03-05 22:30:48 +01:00			`From: Zach Brown <zach.brown@destroystokyo.com>`
Paper 1.9 2016-03-01 00:09:49 +01:00			`Date: Wed, 2 Mar 2016 00:03:55 -0600`
Check online mode before converting and renaming player data 2015-03-05 22:30:48 +01:00			`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`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current 2020-04-02 23:07:06 +02:00			`index 97bac7d257..a0254d8e51 100644`
Check online mode before converting and renaming player data 2015-03-05 22:30:48 +01:00			`--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java`
			`+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java`
A bit more work for 1.14 2019-04-24 04:34:11 +02:00			`@@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData {`
			`File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat");`
Check online mode before converting and renaming player data 2015-03-05 22:30:48 +01:00			`// Spigot Start`
			`boolean usingWrongFile = false;`
			`- if ( !file.exists() )`
Paper 1.9 2016-03-01 00:09:49 +01:00			`+ if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first`
Check online mode before converting and renaming player data 2015-03-05 22:30:48 +01:00			`{`
			`file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");`
			`if ( file.exists() )`
			`--`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current 2020-04-02 23:07:06 +02:00			`2.25.1`
Check online mode before converting and renaming player data 2015-03-05 22:30:48 +01:00