mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user