From 0e6acdff362bc0f4f097628165ffd6b7360b8216 Mon Sep 17 00:00:00 2001
From: Adam <Jikoo.Games@gmail.com>
Date: Thu, 16 Mar 2023 16:30:43 -0400
Subject: [PATCH] Update to 1.19.4 (#130)

* Improve data load/save slightly
* Fix longstanding issue with opening players in deleted worlds on Paper
---
 .../openinv/internal/v1_18_R2/OpenPlayer.java |  7 ++--
 .../internal/v1_18_R2/PlayerDataManager.java  | 28 +++++++++----
 .../openinv/internal/v1_19_R2/OpenPlayer.java |  4 +-
 .../internal/v1_19_R2/PlayerDataManager.java  | 31 ++++++++++----
 internal/{v1_19_R1 => v1_19_R3}/pom.xml       |  8 ++--
 .../v1_19_R3}/AnySilentContainer.java         |  6 +--
 .../internal/v1_19_R3}/OpenPlayer.java        | 12 +++---
 .../internal/v1_19_R3}/PlayerDataManager.java | 40 ++++++++++++-------
 .../internal/v1_19_R3}/SpecialEnderChest.java |  8 ++--
 .../v1_19_R3}/SpecialPlayerInventory.java     | 11 ++---
 .../com/lishid/openinv/InternalAccessor.java  |  3 +-
 pom.xml                                       |  4 +-
 12 files changed, 100 insertions(+), 62 deletions(-)
 rename internal/{v1_19_R1 => v1_19_R3}/pom.xml (92%)
 rename internal/{v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1 => v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3}/AnySilentContainer.java (97%)
 rename internal/{v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1 => v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3}/OpenPlayer.java (89%)
 rename internal/{v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1 => v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3}/PlayerDataManager.java (88%)
 rename internal/{v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1 => v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3}/SpecialEnderChest.java (97%)
 rename internal/{v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1 => v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3}/SpecialPlayerInventory.java (98%)

diff --git a/internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/OpenPlayer.java b/internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/OpenPlayer.java
index 4fdcfc0..10929eb 100644
--- a/internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/OpenPlayer.java
+++ b/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);
         }
     }
 
diff --git a/internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/PlayerDataManager.java b/internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/PlayerDataManager.java
index 127e39c..ae02e79 100644
--- a/internal/v1_18_R2/src/main/java/com/lishid/openinv/internal/v1_18_R2/PlayerDataManager.java
+++ b/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 {
diff --git a/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_R2/OpenPlayer.java b/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_R2/OpenPlayer.java
index 4dab334..721c7fc 100644
--- a/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_R2/OpenPlayer.java
+++ b/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_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);
         }
     }
 
diff --git a/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_R2/PlayerDataManager.java b/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_R2/PlayerDataManager.java
index 4cc6939..423411a 100644
--- a/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_R2/PlayerDataManager.java
+++ b/internal/v1_19_R2/src/main/java/com/lishid/openinv/internal/v1_19_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.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
@@ -100,20 +101,34 @@ public class PlayerDataManager implements IPlayerDataManager {
 
         ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
 
+        // 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();
         }
 
-        // 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 {
diff --git a/internal/v1_19_R1/pom.xml b/internal/v1_19_R3/pom.xml
similarity index 92%
rename from internal/v1_19_R1/pom.xml
rename to internal/v1_19_R3/pom.xml
index df50f14..66769d9 100644
--- a/internal/v1_19_R1/pom.xml
+++ b/internal/v1_19_R3/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ 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
@@ -26,13 +26,13 @@
     <version>4.3.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>openinvadapter1_19_R1</artifactId>
-  <name>OpenInvAdapter1_19_R1</name>
+  <artifactId>openinvadapter1_19_R3</artifactId>
+  <name>OpenInvAdapter1_19_R3</name>
 
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <spigot.version>1.19.1-R0.1-SNAPSHOT</spigot.version>
+    <spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
   </properties>
 
   <dependencies>
diff --git a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/AnySilentContainer.java b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/AnySilentContainer.java
similarity index 97%
rename from internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/AnySilentContainer.java
rename to internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/AnySilentContainer.java
index 9d4be84..93e8d03 100644
--- a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/AnySilentContainer.java
+++ b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/AnySilentContainer.java
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_19_R1;
+package com.lishid.openinv.internal.v1_19_R3;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentContainer;
@@ -54,7 +54,7 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
 import org.bukkit.block.ShulkerBox;
-import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -66,8 +66,6 @@ public class AnySilentContainer implements IAnySilentContainer {
     public AnySilentContainer() {
         try {
             try {
-                // IDE warns about field not existing, but SpecialSource does not remap strings used in reflection.
-                // The warning is not suppressed as a reminder that it must manually be checked on updates.
                 this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b");
                 this.serverPlayerGameModeGameType.setAccessible(true);
             } catch (NoSuchFieldException e) {
diff --git a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/OpenPlayer.java b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/OpenPlayer.java
similarity index 89%
rename from internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/OpenPlayer.java
rename to internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/OpenPlayer.java
index bc1781a..33a360e 100644
--- a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/OpenPlayer.java
+++ b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/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
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_19_R1;
+package com.lishid.openinv.internal.v1_19_R3;
 
 import java.io.File;
 import net.minecraft.Util;
@@ -23,8 +23,8 @@ import net.minecraft.nbt.NbtIo;
 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_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
 
 public class OpenPlayer extends CraftPlayer {
 
@@ -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);
         }
     }
 
@@ -67,7 +67,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);
         }
     }
 
diff --git a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/PlayerDataManager.java b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/PlayerDataManager.java
similarity index 88%
rename from internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/PlayerDataManager.java
rename to internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/PlayerDataManager.java
index 3534485..a0fe46d 100644
--- a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/PlayerDataManager.java
+++ b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/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
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_19_R1;
+package com.lishid.openinv.internal.v1_19_R3;
 
 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IPlayerDataManager;
@@ -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.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
@@ -35,10 +36,10 @@ import net.minecraft.world.level.Level;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_19_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftContainer;
+import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R3.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
@@ -98,7 +99,7 @@ public class PlayerDataManager implements IPlayerDataManager {
             return null;
         }
 
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, null);
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
 
         // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
         entity.getAdvancements().stopListening();
@@ -109,14 +110,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 {
diff --git a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/SpecialEnderChest.java b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/SpecialEnderChest.java
similarity index 97%
rename from internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/SpecialEnderChest.java
rename to internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/SpecialEnderChest.java
index d46583f..0d52f2d 100644
--- a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/SpecialEnderChest.java
+++ b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/SpecialEnderChest.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
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_19_R1;
+package com.lishid.openinv.internal.v1_19_R3;
 
 import com.lishid.openinv.internal.ISpecialEnderChest;
 import java.util.List;
@@ -33,8 +33,8 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
diff --git a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/SpecialPlayerInventory.java b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/SpecialPlayerInventory.java
similarity index 98%
rename from internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/SpecialPlayerInventory.java
rename to internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/SpecialPlayerInventory.java
index cc5ecbd..52cfec1 100644
--- a/internal/v1_19_R1/src/main/java/com/lishid/openinv/internal/v1_19_R1/SpecialPlayerInventory.java
+++ b/internal/v1_19_R3/src/main/java/com/lishid/openinv/internal/v1_19_R3/SpecialPlayerInventory.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
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lishid.openinv.internal.v1_19_R1;
+package com.lishid.openinv.internal.v1_19_R3;
 
 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
@@ -33,6 +33,7 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.tags.DamageTypeTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.Container;
 import net.minecraft.world.ContainerHelper;
@@ -46,8 +47,8 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_19_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
@@ -719,7 +720,7 @@ public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerI
 
             for (int index : armorIndices) {
                 ItemStack itemstack = this.armor.get(index);
-                if ((!damagesource.isFire() || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
+                if ((!damagesource.is(DamageTypeTags.IS_FIRE) || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) {
                     itemstack.hurtAndBreak((int) damage, this.player, localPlayer -> localPlayer.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, index)));
                 }
             }
diff --git a/plugin/src/main/java/com/lishid/openinv/InternalAccessor.java b/plugin/src/main/java/com/lishid/openinv/InternalAccessor.java
index d1dbf4a..cb78de5 100644
--- a/plugin/src/main/java/com/lishid/openinv/InternalAccessor.java
+++ b/plugin/src/main/java/com/lishid/openinv/InternalAccessor.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
@@ -64,6 +64,7 @@ class InternalAccessor {
             case "v1_8_R3", "v1_15_R1", "v1_16_R2" -> "https://github.com/lishid/OpenInv/releases/tag/4.1.5";
             case "v1_16_R3" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.1.8";
             case "v1_17_R1", "v1_18_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.1.10";
+            case "v1_19_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.2.2";
             default -> "https://github.com/Jikoo/OpenInv/releases";
         };
     }
diff --git a/pom.xml b/pom.xml
index 4bad510..a0e55c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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
@@ -40,8 +40,8 @@
         <module>api</module>
         <module>plugin</module>
         <module>internal/v1_18_R2</module>
-        <module>internal/v1_19_R1</module>
         <module>internal/v1_19_R2</module>
+        <module>internal/v1_19_R3</module>
         <module>assembly</module>
       </modules>
     </profile>