Bump version to 4.4.1 for release

* Fix session timestamps being erroneously updated
* Fix vehicle possibly not being re-mounted

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.4.0</version>
+    <version>4.4.1</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>

assembly/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>4.4.0</version>
+    <version>4.4.1</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>

internal/v1_19_R3/pom.xml

@@ -23,7 +23,7 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.4.0</version>
+    <version>4.4.1</version>
   </parent>
 
   <artifactId>openinvadapter1_19_R3</artifactId>

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

@@ -16,15 +16,21 @@
 
 package com.lishid.openinv.internal.v1_19_R3;
 
-import java.io.File;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
 import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
 
 public class OpenPlayer extends CraftPlayer {
 
@@ -52,13 +58,9 @@ public class OpenPlayer extends CraftPlayer {
             setExtraData(playerData);
 
             if (!isOnline()) {
-                // Special case: save old vehicle data
+                // Preserve certain data when offline.
                 CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
+                revertSpecialValues(playerData, oldData);
             }
 
             File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
@@ -71,4 +73,71 @@ public class OpenPlayer extends CraftPlayer {
         }
     }
 
+    private void revertSpecialValues(@NotNull CompoundTag newData, @Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return;
+        }
+
+        // Prevent vehicle deletion.
+        if (oldData.contains("RootVehicle", Tag.TAG_COMPOUND)) {
+            // See net.minecraft.server.players.PlayerList#save(ServerPlayer)
+            // See net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+            try {
+                Tag attach = oldData.get("Attach");
+                if (attach != null) {
+                    newData.putUUID("Attach", NbtUtils.loadUUID(attach));
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Likely will not re-mount successfully, but at least the mount will not be deleted.
+            }
+            newData.put("Entity", oldData.getCompound("Entity"));
+            newData.put("RootVehicle", oldData.getCompound("RootVehicle"));
+        }
+
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // Container being null means the server implementation doesn't store this data.
+        if (oldContainer == null || newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
 }

internal/v1_20_R1/pom.xml

@@ -23,7 +23,7 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.4.0</version>
+    <version>4.4.1</version>
   </parent>
 
   <artifactId>openinvadapter1_20_R1</artifactId>

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

@@ -17,14 +17,20 @@
 package com.lishid.openinv.internal.v1_20_R1;
 
 import com.mojang.logging.LogUtils;
-import java.io.File;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
 
 public class OpenPlayer extends CraftPlayer {
 
@@ -52,13 +58,9 @@ public class OpenPlayer extends CraftPlayer {
             setExtraData(playerData);
 
             if (!isOnline()) {
-                // Special case: save old vehicle data
+                // Preserve certain data when offline.
                 CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
+                revertSpecialValues(playerData, oldData);
             }
 
             File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
@@ -71,4 +73,71 @@ public class OpenPlayer extends CraftPlayer {
         }
     }
 
+    private void revertSpecialValues(@NotNull CompoundTag newData, @Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return;
+        }
+
+        // Prevent vehicle deletion.
+        if (oldData.contains("RootVehicle", Tag.TAG_COMPOUND)) {
+            // See net.minecraft.server.players.PlayerList#save(ServerPlayer)
+            // See net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+            try {
+                Tag attach = oldData.get("Attach");
+                if (attach != null) {
+                    newData.putUUID("Attach", NbtUtils.loadUUID(attach));
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Likely will not re-mount successfully, but at least the mount will not be deleted.
+            }
+            newData.put("Entity", oldData.getCompound("Entity"));
+            newData.put("RootVehicle", oldData.getCompound("RootVehicle"));
+        }
+
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // Container being null means the server implementation doesn't store this data.
+        if (oldContainer == null || newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
 }

internal/v1_20_R2/pom.xml

@@ -23,7 +23,7 @@
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
     <relativePath>../../pom.xml</relativePath>
-    <version>4.4.0</version>
+    <version>4.4.1</version>
   </parent>
 
   <artifactId>openinvadapter1_20_R2</artifactId>

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

@@ -17,14 +17,20 @@
 package com.lishid.openinv.internal.v1_20_R2;
 
 import com.mojang.logging.LogUtils;
-import java.io.File;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
 
 public class OpenPlayer extends CraftPlayer {
 
@@ -34,11 +40,7 @@ public class OpenPlayer extends CraftPlayer {
 
     @Override
     public void loadData() {
-        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
-        if (loaded != null) {
-            getHandle().readAdditionalSaveData(loaded);
-        }
+        PlayerDataManager.loadData(getHandle());
     }
 
     @Override
@@ -52,13 +54,9 @@ public class OpenPlayer extends CraftPlayer {
             setExtraData(playerData);
 
             if (!isOnline()) {
-                // Special case: save old vehicle data
+                // Preserve certain data when offline.
                 CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
+                revertSpecialValues(playerData, oldData);
             }
 
             File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
@@ -71,4 +69,71 @@ public class OpenPlayer extends CraftPlayer {
         }
     }
 
+    private void revertSpecialValues(@NotNull CompoundTag newData, @Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return;
+        }
+
+        // Prevent vehicle deletion.
+        if (oldData.contains("RootVehicle", Tag.TAG_COMPOUND)) {
+            // See net.minecraft.server.players.PlayerList#save(ServerPlayer)
+            // See net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+            try {
+                Tag attach = oldData.get("Attach");
+                if (attach != null) {
+                    newData.putUUID("Attach", NbtUtils.loadUUID(attach));
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Likely will not re-mount successfully, but at least the mount will not be deleted.
+            }
+            newData.put("Entity", oldData.getCompound("Entity"));
+            newData.put("RootVehicle", oldData.getCompound("RootVehicle"));
+        }
+
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // Container being null means the server implementation doesn't store this data.
+        if (oldContainer == null || newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
 }

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

@@ -21,7 +21,9 @@ import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
+import com.mojang.serialization.Dynamic;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
@@ -33,31 +35,47 @@ import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_20_R2.event.CraftEventFactory;
 import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Field;
+import java.util.UUID;
 import java.util.logging.Logger;
 
 public class PlayerDataManager implements IPlayerDataManager {
 
+    private static boolean paper;
+
+    static {
+        try {
+            Class.forName("io.papermc.paper.configuration.Configuration");
+            paper = true;
+        } catch (ClassNotFoundException ignored) {
+            paper = false;
+        }
+    }
+
     private @Nullable Field bukkitEntity;
 
     public PlayerDataManager() {
         try {
             bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
         } catch (NoSuchFieldException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            Logger logger = JavaPlugin.getPlugin(OpenInv.class).getLogger();
+            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
             logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
             bukkitEntity = null;
         }
@@ -77,7 +95,7 @@ public class PlayerDataManager implements IPlayerDataManager {
 
         if (nmsPlayer == null) {
             // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
         }
 
         return nmsPlayer;
@@ -90,11 +108,6 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        // Create a profile and entity to load the player data
-        // See net.minecraft.server.players.PlayerList#canPlayerLogin
-        // and net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
         MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
         ServerLevel worldServer = server.getLevel(Level.OVERWORLD);
 
@@ -102,6 +115,30 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
+        // Create a new ServerPlayer.
+        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
+
+        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
+        entity.getAdvancements().stopListening();
+
+        // Try to load the player's data.
+        if (loadData(entity)) {
+            // If data is loaded successfully, return the Bukkit entity.
+            return entity.getBukkitEntity();
+        }
+
+        return null;
+    }
+
+    private @NotNull ServerPlayer createNewPlayer(
+        @NotNull MinecraftServer server,
+        @NotNull ServerLevel worldServer,
+        @NotNull final OfflinePlayer offline) {
+        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+        GameProfile profile = new GameProfile(offline.getUniqueId(),
+            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
         ClientInformation dummyInfo = new ClientInformation(
             "en_us",
             1, // Reduce distance just in case.
@@ -115,37 +152,66 @@ public class PlayerDataManager implements IPlayerDataManager {
 
         ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
 
-        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
-        entity.getAdvancements().stopListening();
-
         try {
             injectPlayer(entity);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
         }
 
-        // Load data. This also reads basic data into the player.
+        return entity;
+    }
+
+    static boolean loadData(@NotNull ServerPlayer player) {
         // See CraftPlayer#loadData
-        CompoundTag loadedData = server.getPlayerList().playerIo.load(entity);
+        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player);
 
         if (loadedData == null) {
             // Exceptions with loading are logged by Mojang.
-            return null;
+            return false;
         }
 
+        // Read basic data into the player.
+        player.load(loadedData);
         // Also read "extra" data.
-        entity.readAdditionalSaveData(loadedData);
+        player.readAdditionalSaveData(loadedData);
 
-        if (entity.level() == null) {
-            // Paper: Move player to spawn
-            entity.spawnIn(null);
+        if (paper) {
+            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
+            parseWorld(player, loadedData);
         }
 
-        // Return the Bukkit entity.
-        return entity.getBukkitEntity();
+        return true;
     }
 
-    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    private static void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
+        // See PlayerList#placeNewPlayer
+        World bukkitWorld;
+        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
+            // Modern Bukkit world.
+            bukkitWorld = org.bukkit.Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
+        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
+            // Legacy Bukkit world.
+            bukkitWorld = org.bukkit.Bukkit.getServer().getWorld(loadedData.getString("world"));
+        } else {
+            // Vanilla player data.
+            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
+                .resultOrPartial(JavaPlugin.getPlugin(OpenInv.class).getLogger()::warning)
+                .map(player.server::getLevel)
+                // If ServerLevel exists, set, otherwise move to spawn.
+                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+            return;
+        }
+        if (bukkitWorld == null) {
+            player.spawnIn(null);
+            return;
+        }
+        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
+    }
+
+    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
         if (bukkitEntity == null) {
             return;
         }
@@ -155,9 +221,8 @@ public class PlayerDataManager implements IPlayerDataManager {
         bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
     }
 
-    @NotNull
     @Override
-    public Player inject(@NotNull Player player) {
+    public @NotNull Player inject(@NotNull Player player) {
         try {
             ServerPlayer nmsPlayer = getHandle(player);
             if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
@@ -166,14 +231,16 @@ public class PlayerDataManager implements IPlayerDataManager {
             injectPlayer(nmsPlayer);
             return nmsPlayer.getBukkitEntity();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
             return player;
         }
     }
 
-    @Nullable
     @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
 
         ServerPlayer nmsPlayer = getHandle(player);
 

plugin/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <artifactId>openinvparent</artifactId>
     <groupId>com.lishid</groupId>
-    <version>4.4.0</version>
+    <version>4.4.1</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>

pom.xml

@@ -21,7 +21,7 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInv</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.4.0</version>
+  <version>4.4.1</version>
 
   <packaging>pom</packaging>
 
@@ -85,13 +85,13 @@
         <artifactId>openinvapi</artifactId>
         <groupId>com.lishid</groupId>
         <scope>compile</scope>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
       </dependency>
       <dependency>
         <artifactId>openinvplugincore</artifactId>
         <groupId>com.lishid</groupId>
         <scope>compile</scope>
-        <version>4.4.0</version>
+        <version>4.4.1</version>
         <exclusions>
           <exclusion>
             <groupId>com.lishid</groupId>
@@ -112,7 +112,7 @@
             -->
           <artifactId>maven-dependency-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.6.0</version>
+          <version>3.6.1</version>
         </plugin>
 
         <plugin>