Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e0ba395d Add missing plugin ticket comparator fixes #13130
PaperMC/Paper@21b49306 Fix diff in FlowingFluid#canPassThroughWall
PaperMC/Paper@dcd7847d Improve server tick loop
PaperMC/Paper@a4a7461c Rebase fixups
PaperMC/Paper@dc66e8cf Return Server#getTPS over minute intervals instead of seconds
This commit is contained in:
granny
2025-10-04 20:05:27 -07:00
parent ddc2e054b8
commit 9e2508fc7f
7 changed files with 53 additions and 93 deletions

View File

@@ -18,10 +18,10 @@ index aa87e93ade4c25a575e7861fef45b70c3e4e3aeb..c92ffd8b2fe4945ccd552eb54154b7be
public boolean isClientAuthoritative() {
return false;
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 9dffc51f3651169e81e1617bce4562faf35c12f6..5f86c3024a857d5ec3ac39a4ef1d2a77b452c2bb 100644
index adfe166ed59ac976f15cd7ad550f002a8e41cf07..ae9182e3588b757105e5d131ddaad25a48676dc0 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1683,6 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1775,6 +1775,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
serverLevel.updateLagCompensationTick(); // Paper - lag compensation
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = serverLevel.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
@@ -62,7 +62,7 @@ index 5477fd9bc0a30b0d566d982b86b737cb6392b030..8c0cdb6aaf2f546b90d7d6b0d9dfc1c0
private void updatePlayerAttributes() {
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8813b9d09b0ffaf235516cada788df92a7730eaa..c643f0546613e8f4783d1e0830f7267570de7ea7 100644
index f2765b2481305f971da5e3695f465245f398c548..ade5df8bc5ef8414f8b51d63f354d59488a58ce8 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2862,6 +2862,8 @@ public class ServerGamePacketListenerImpl
@@ -2127,7 +2127,7 @@ index 9ad94aca22a100dddaded5833763f9acd2a0ce56..96c98f032b1b3aec32aba38244ee8b45
protected void addAdditionalSaveData(ValueOutput output) {
super.addAdditionalSaveData(output);
diff --git a/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java b/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java
index f9c3a33a7c5efc30a97f1ce74b94f5e6213298fe..20d2f081fa2576ea946489d3e717b389092abaef 100644
index 620312b916e18aeba74b05631a93ea772dd7c14a..256b1d964c3069d2dd67e0a1cabd78aed5ee339a 100644
--- a/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java
+++ b/net/minecraft/world/entity/animal/coppergolem/CopperGolem.java
@@ -109,6 +109,28 @@ public class CopperGolem extends AbstractGolem implements ContainerUser, Shearab