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

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce64015ea39b8 100644
index be4226b968e02fa88deb851ecb76130034e56695..d4a05d40cb15b6b73d12976d3b25d71215dc04ea 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2367,8 +2367,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -2371,8 +2371,68 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();
@@ -78,7 +78,7 @@ index 6cad742f0141ac0e4b4b5a1dd07874eb7588e70f..fe0bbaec0a47305da244bbca7b9ce640
return this.stats;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8345c9b767d9dabbaeb8bcc09cefd3a298759399..ba98e98a09e141d45bda8a663d5e4354e3afbc1e 100644
index cc801cbefbbb54b8f9fa29bb37c00eca8e7ae44b..41f57991c9b42ee71d480f7f04a9007ae6a1d2d4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -332,6 +332,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl