Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@651fa124 Fix cancelled EnderDragonShootFireballEvent playing sound (#12977)
PaperMC/Paper@2456ff26 [ci/skip] Update javadoc for tinted leaves particle (#12962)
PaperMC/Paper@a743e6b1 [ci/skip] Clarify tab completion ordering in event jd (#12965)
PaperMC/Paper@a22447a5 Added getWorldPath to World API (#12952)
PaperMC/Paper@b200237c Fix clone return for Paper PlayerProfile (#12984)
This commit is contained in:
Dreeam-qwq
2025-08-16 00:16:16 +00:00
parent 6381a5e7c3
commit c288810527
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
leaf-server/paper-patches/features/0008-Purpur-Server-Paper-Changes.patch
View File

@@ -634,10 +634,10 @@ index 18a087e82383d0776504293bba513e247f4bc881..09054336441cbcce99d1fd82276c5f8c
+ // Purpur end - Lagging threshold
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index aa0a61d7f3128543b698647663fa4a9af2a8255a..405b0164a67fe75ec6c5aee4d7302f53df9556f8 100644
index ee7a4169003b23766b5d2e6edf9221375d80d83c..61121d2efd0df2fcafdc4c272e1cd1b986f42e24 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2375,6 +2375,50 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2376,6 +2376,50 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
}

4
leaf-server/paper-patches/features/0046-Async-structure-locate-api.patch
View File

@@ -9,10 +9,10 @@ Added some asynchronous structure locate methods in World,
requires async-locator to be enabled in Leaf config, or else it will fall back to sync methods.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 405b0164a67fe75ec6c5aee4d7302f53df9556f8..adb2324949484bc543bab25a79ed6d2c39bcba42 100644
index 61121d2efd0df2fcafdc4c272e1cd1b986f42e24..8c597b54491521f759e2983329a522ba065c647f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2300,6 +2300,45 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2301,6 +2301,45 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value()), CraftLocation.toBukkit(found.getFirst(), this));
}

18
leaf-server/paper-patches/features/0049-SparklyPaper-Parallel-world-ticking.patch
View File

@@ -251,10 +251,10 @@ index a4aa2615823d77920ff55b8aa0bcc27a54b8c3e1..e1bf7dfdb3be8f92ef2cb86d7f15a613
+ // SparklyPaper end - parallel world ticking
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca10d4f9367 100644
index 8c597b54491521f759e2983329a522ba065c647f..10a1f9cf6a558037be7b91e7dfa102a4a5f3c104 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -479,7 +479,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -480,7 +480,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@@ -268,7 +268,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
if (!this.isChunkLoaded(x, z)) {
return true;
}
@@ -496,6 +501,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -497,6 +502,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean refreshChunk(int x, int z) {
@@ -277,7 +277,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z));
if (playerChunk == null) return false;
@@ -546,7 +553,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -547,7 +554,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@@ -291,7 +291,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
warnUnsafeChunk("loading a faraway chunk", x, z); // Paper
ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
@@ -774,6 +786,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -775,6 +787,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) {
@@ -300,7 +300,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
this.world.captureTreeGeneration = true;
this.world.captureBlockStates = true;
boolean grownTree = this.generateTree(loc, type);
@@ -889,6 +903,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -890,6 +904,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source, Consumer<net.minecraft.world.level.ServerExplosion> configurator) {
// Paper end - expand explosion API
@@ -309,7 +309,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
net.minecraft.world.level.Level.ExplosionInteraction explosionType;
if (!breakBlocks) {
explosionType = net.minecraft.world.level.Level.ExplosionInteraction.NONE; // Don't break blocks
@@ -980,6 +996,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -981,6 +997,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -318,7 +318,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
warnUnsafeChunk("getting a faraway chunk", x >> 4, z >> 4); // Paper
// Transient load for this tick
return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
@@ -1010,6 +1028,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1011,6 +1029,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void setBiome(int x, int y, int z, Holder<net.minecraft.world.level.biome.Biome> bb) {
BlockPos pos = new BlockPos(x, 0, z);
@@ -327,7 +327,7 @@ index adb2324949484bc543bab25a79ed6d2c39bcba42..43efa9ce8262a0118328c555a146dca1
if (this.world.hasChunkAt(pos)) {
net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkAt(pos);
@@ -2357,6 +2377,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2358,6 +2378,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) {