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
This commit is contained in:
granny
2025-06-29 14:08:06 -07:00
parent d6c8559304
commit 9cd2f31887
4 changed files with 4 additions and 4 deletions

View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.7-R0.1-SNAPSHOT version = 1.21.7-R0.1-SNAPSHOT
mcVersion = 1.21.7-rc2 mcVersion = 1.21.7-rc2
paperCommit = ef647a83012adc91d30af24334e716ccc5b1b26c paperCommit = ab1b472c5663f4123632770db8ea509b9be49e20
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/Material.java --- a/src/main/java/org/bukkit/Material.java
+++ b/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(); return this.asItemType().getDefaultDataTypes();
} }
// Paper end - data component API // Paper end - data component API

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/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 @ApiStatus.Experimental
PlayerGameConnection getConnection(); PlayerGameConnection getConnection();

View File

@@ -222,7 +222,7 @@
packet.dispatch( packet.dispatch(
new ServerboundInteractPacket.Handler() { new ServerboundInteractPacket.Handler() {
private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit
@@ -3745,6 +_,12 @@ @@ -3747,6 +_,12 @@
readChannelIdentifier(data, startIndex, data.length, registerChannel); readChannelIdentifier(data, startIndex, data.length, registerChannel);
return; return;
} }