From 9cd2f31887803e060533c9f99548269dd16c5499 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 29 Jun 2025 14:08:06 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f1136925 Fix missing event call
PaperMC/Paper@795dd147 Remove a bunch more experimental annotations (#12712)
PaperMC/Paper@ab1b472c Add back an experimental
---
 gradle.properties                                               | 2 +-
 .../files/src/main/java/org/bukkit/Material.java.patch          | 2 +-
 .../files/src/main/java/org/bukkit/entity/Player.java.patch     | 2 +-
 .../server/network/ServerGamePacketListenerImpl.java.patch      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ea05e73dd..4151905b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.7-R0.1-SNAPSHOT
 
 mcVersion = 1.21.7-rc2
-paperCommit = ef647a83012adc91d30af24334e716ccc5b1b26c
+paperCommit = ab1b472c5663f4123632770db8ea509b9be49e20
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
index 790b50108..278d96950 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3637,4 +_,40 @@
+@@ -3633,4 +_,40 @@
          return this.asItemType().getDefaultDataTypes();
      }
      // Paper end - data component API
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
index d2b5497b8..5cfc81d67 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3934,4 +_,123 @@
+@@ -3932,4 +_,123 @@
       */
      @ApiStatus.Experimental
      PlayerGameConnection getConnection();
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
index 4051d03b5..d7a211c12 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -222,7 +222,7 @@
                      packet.dispatch(
                          new ServerboundInteractPacket.Handler() {
                              private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit
-@@ -3745,6 +_,12 @@
+@@ -3747,6 +_,12 @@
                  readChannelIdentifier(data, startIndex, data.length, registerChannel);
                  return;
              }