Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f613437 Fix CraftPlayerProfile#setId regression (#9822)
PaperMC/Paper@3e9d2ac Don't call options events on login (#9834)
PaperMC/Paper@e4d184f Replace bukkit Consumers with java consumers (#9836)
PaperMC/Paper@3e1c5e3 Add BlockData setter for FallingBlock (#9829)
PaperMC/Paper@852c1c2 Add additional tags to ItemMeta obfuscation filtering (#9665)
This commit is contained in:
granny
2023-10-14 18:33:56 -07:00
parent ad03187fab
commit ff126d3257
12 changed files with 35 additions and 35 deletions

View File

@@ -18,7 +18,7 @@ index 9caab6541a224dc8f729a7d720eccda7bd83ed53..2fd376789bb24b14101e289733631a9a
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 12ed724a4d8824a388ef74ac90313d13fda5352c..8d6adc26ee59c1e7e9403731032f5dc11be80b9d 100644
index 41bd87096ab195c56695c5c5e46dc3c75e5a9078..6b5bcc87e96619877737fc8200075bdb99d59230 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 12ed724a4d8824a388ef74ac90313d13fda5352c..8d6adc26ee59c1e7e9403731032f5dc1
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2806,5 +2809,13 @@ public class ServerPlayer extends Player {
@@ -2811,5 +2814,13 @@ public class ServerPlayer extends Player {
public void compassBar(boolean compassBar) {
this.compassBar = compassBar;
}