Adventure changes for Java 17 and Component support for resourcepack prompt

1 files changed, 3 insertions, 3 deletions

diff --git a/patches/server/0820-Add-player-health-update-API.patch b/patches/server/0820-Add-player-health-update-API.patch
index ca1dc0afce..60d79df5d3 100644
--- a/patches/server/0820-Add-player-health-update-API.patch
+++ b/patches/server/0820-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 03888e95445147ed462233c0115d7e90411c192c..741a03430199cc28b64e2f7ab7167c1d7b7110bc 100644
+index f2cbfcb069e882ca117d1538e0e69c846bcffd85..cbb24244ec09ab25c7ff8da8bd3ee5a1ef4ae1cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1998,9 +1998,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2013,9 +2013,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().maxHealthCache = getMaxHealth();
      }
  
@@ -22,7 +22,7 @@ index 03888e95445147ed462233c0115d7e90411c192c..741a03430199cc28b64e2f7ab7167c1d
          if (this.getHandle().queueHealthUpdatePacket) {
              this.getHandle().queuedHealthUpdatePacket = packet;
          } else {
-@@ -2008,7 +2010,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2023,7 +2025,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          // Paper end
      }