9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00

Updated Upstream (Paper/Purpur/Leaves)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@03efecf0 Do not fire PlayerDropItemEvent for /give command
PaperMC/Paper@3527ccdf feat: expose updateDemand and restock on Villager (#12608)
PaperMC/Paper@320f25cb fix sponge-absorb deleting chest content (#12647)
PaperMC/Paper@95565e0f Add missing attribute serialization updater
PaperMC/Paper@519e4224 Fix infinite loop in RegionFile IO

Purpur Changes:
PurpurMC/Purpur@eb0ba67d Updated Upstream (Paper)
PurpurMC/Purpur@7c6502dc Updated Upstream (Paper)
PurpurMC/Purpur@aa289e2c Updated Upstream (Paper)

Leaves Changes:
LeavesMC/Leaves@f09fbb24 1.21.5 (#470)
LeavesMC/Leaves@f1cc3ef9 Fix version fetch
LeavesMC/Leaves@73bd42af Remove fast resume, mojang added it
LeavesMC/Leaves@59856751 Configurable trading with the void
LeavesMC/Leaves@9d32c5bd Fix protocols (#534)
This commit is contained in:
Dreeam
2025-06-11 06:00:32 +08:00
parent ca56147d0f
commit 915f755b01
11 changed files with 46 additions and 46 deletions

View File

@@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Mon, 9 Jun 2025 02:46:34 -0700
Subject: [PATCH] Paper: Fix infinite loop in RegionFile IO
Removed since Leaf 1.21.5/Paper 1.21.4, added on Paper
Original license: GPLv3
Original project: https://github.com/PaperMC/Paper
https://github.com/PaperMC/Paper/commit/519e4224b1ba73a99c58c8fc53aab003eb6af37a
If an exception is thrown during decompress then the read process
would be started again, which of course would eventually throw in
the decompress process.
diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
index 709df35246fb328cda21679b53d44d9f96206cb3..8c2520cdea0a67eae6fa57ccb4cae660bdea5da9 100644
--- a/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java
@@ -1143,7 +1143,7 @@ public final class MoonriseRegionFileIO {
LOGGER.error("Failed to decompress chunk data for task: " + this.toString(), thr);
}
- if (compoundTag == null) {
+ if (throwable == null && compoundTag == null) { // Paper - Fix infinite loop in RegionFile IO
// need to re-try from the start
this.scheduleReadIO();
return;