Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e01ddf4 Fixup porting issue in vanillaBiomeProvider impl (#11185)
PaperMC/Paper@509ea2f Fix horse armor desync (#11341)
PaperMC/Paper@2f0891e Fix InventoryOpenEvent cancellation (#11304)
PaperMC/Paper@227c94a Fix inventory desync when placing blocks with spawn protection (#11090)
This commit is contained in:
granny
2024-08-31 20:37:16 -07:00
parent 5c0d2f785a
commit 49db8494f1
14 changed files with 37 additions and 37 deletions

View File

@@ -17,7 +17,7 @@ index 9f86a0397c0b64cb31dad245e2dc84d0fadd42d7..a66e2d78722847dec4e9d4aba8e6968e
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 a54b89a9be5e9712e991a03ed33c4051656de513..552c4baba3d4562afdc1b253f6949371b654edac 100644
index d1d1ceabdf6b0bd254fefd64e2504f0865e0c9b2..996bfac666762096fe322e54c2134bab0c08c950 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -304,6 +304,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -44,7 +44,7 @@ index a54b89a9be5e9712e991a03ed33c4051656de513..552c4baba3d4562afdc1b253f6949371
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3088,5 +3091,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3092,5 +3095,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}