Update to 1.19.4 (#130)

* Improve data load/save slightly
* Fix longstanding issue with opening players in deleted worlds on Paper

internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/OpenPlayer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ public class OpenPlayer extends CraftPlayer {
         // See CraftPlayer#loadData
         CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
         if (loaded != null) {
-            readExtraData(loaded);
+            getHandle().readAdditionalSaveData(loaded);
         }
     }
 
@@ -49,7 +49,6 @@ public class OpenPlayer extends CraftPlayer {
             PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
 
             CompoundTag playerData = player.saveWithoutId(new CompoundTag());
-            setExtraData(playerData);
 
             if (!isOnline()) {
                 // Special case: save old vehicle data
@@ -67,7 +66,7 @@ public class OpenPlayer extends CraftPlayer {
             File file2 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat_old");
             Util.safeReplaceFile(file1, file, file2);
         } catch (Exception e) {
-            LogManager.getLogger().warn("Failed to save player data for {}: {}", player.getName().getString(), e.getMessage());
+            LogManager.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
         }
     }
 

internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/PlayerDataManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2022 lishid. All rights reserved.
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
 import java.lang.reflect.Field;
 import java.util.logging.Logger;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
@@ -108,14 +109,25 @@ public class PlayerDataManager implements IPlayerDataManager {
             e.printStackTrace();
         }
 
-        // Get the bukkit entity
-        Player target = entity.getBukkitEntity();
-        if (target != null) {
-            // Load data
-            target.loadData();
+        // Load data. This also reads basic data into the player.
+        // See CraftPlayer#loadData
+        CompoundTag loadedData = server.getPlayerList().playerIo.load(entity);
+
+        if (loadedData == null) {
+            // Exceptions with loading are logged by Mojang.
+            return null;
         }
-        // Return the entity
-        return target;
+
+        // Also read "extra" data.
+        entity.readAdditionalSaveData(loadedData);
+
+        if (entity.level == null) {
+            // Paper: Move player to spawn
+            entity.spawnIn(null);
+        }
+
+        // Return the Bukkit entity.
+        return entity.getBukkitEntity();
     }
 
     void injectPlayer(ServerPlayer player) throws IllegalAccessException {