Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@523efa41 Flatten currentTick incr into file patches
PaperMC/Paper@4dcd8377 Add CommandSourceStack to UnknownCommandEvent (#13083)
PaperMC/Paper@ffd5158a Update 1.21.9 reobf mappings data (#13135)
PaperMC/Paper@b4b1f11f [ci/skip] Add docs for virtual createMerchant in MerchantInventoryViewBuilder#merchant (#13125)
PaperMC/Paper@b3d21583 Disable javadoc.io links
PaperMC/Paper@84831638 Yield millis from Bukkit#getAverageTickTime
PaperMC/Paper@914fb084 Fix Entity#updateFluidHeightAndDoFluidPushing inconsistency with Vanilla
PaperMC/Paper@e9fa3a73 Use correct queue when blocking on futures
This commit is contained in:
granny
2025-10-06 21:41:13 -07:00
parent 58f89c991e
commit a99ba03624
5 changed files with 10 additions and 10 deletions

View File

@@ -158,7 +158,7 @@
// Paper start - optimise collisions
public boolean updateFluidHeightAndDoFluidPushing(final TagKey<Fluid> fluid, final double flowScale) {
if (this.touchingUnloadedChunk()) {
@@ -5171,7 +_,7 @@
@@ -5161,7 +_,7 @@
}
public float maxUpStep() {