9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-26 18:39:08 +00:00

Update Paper

This commit is contained in:
violetc
2024-04-12 22:56:33 +08:00
parent 30ab09eca6
commit 335f748050
25 changed files with 99 additions and 100 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Linear region file format
This patch is Powered by LinearPurpur(https://github.com/StupidCraft/LinearPurpur)
diff --git a/build.gradle.kts b/build.gradle.kts
index 9a0b18e534a2fde5ecd7477838e26ed1f0141631..bda3880bbd1406d88a6d32f89f302d9eb2eea988 100644
index 77d6f5eeeb9918a70e0003e97671778303c33ce9..f3f70a48d758ccbbf1210681c24f0b3a838fb66b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,6 +36,10 @@ dependencies {
@@ -18,7 +18,7 @@ index 9a0b18e534a2fde5ecd7477838e26ed1f0141631..bda3880bbd1406d88a6d32f89f302d9e
+ implementation("org.lz4:lz4-java:1.8.0")
+ // Leaves end - Linear format
implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
implementation("org.ow2.asm:asm-commons:9.5")
implementation("org.ow2.asm:asm-commons:9.7")
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
new file mode 100644
@@ -91,7 +91,7 @@ index 2934f0cf0ef09c84739312b00186c2ef0019a165..ad909f888c8eb6fa8d4ebeeebdc538ae
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 3d682670ae0ae6da7492633d2688dc31086e3665..246dc8c02e096c385931edc4ff0765d61ced7877 100644
index 86207dd0f1f666588535d03f5576fbe4e2267eeb..3b58923acdf8f2b3663c9cd321f1638d448c5da0 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -854,13 +854,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -505,10 +505,10 @@ index fe312b1aef579cb4bf81bdd967cf72ff880d7505..756c69066ad5336c8faffd22dd48f2ec
regionfile.flush();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 171162e99da711f6887adcc6c2bad32035488318..ebbf27a1d4ec91b6c9ffa0f60e187cb8a17037a7 100644
index 88ab671678da7617d8e22176d64b69101e7f4a33..946d1c4457337b98a8d8cb865c7474cf7874ac36 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -573,7 +573,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -574,7 +574,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
world.getChunk(x, z); // make sure we're at ticket level 32 or lower
return true;
}