Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
MC_XiaoHei
2024-07-13 08:50:55 +08:00
parent 2e587430cd
commit ab8b5f9f0b
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,6 +3,6 @@ version=1.21-R0.1-SNAPSHOT
mcVersion=1.21
org.gradle.jvmargs=-Xmx2G
paperRef=70ff1ec0793d2176915e8da3e3ef100093d5bedf
paperRef=5a503d7db42eee8d287b7ed32db22a369e9e3146
preVersion=true
updatingMinecraft=true

14
patches/server/0003-Delete-Timings.patch
View File

@@ -1045,7 +1045,7 @@ index 6df79aab2f0a75bbe347dc92e9ed5d62ceec7983..61cc6f42be6115f3b634b57d6fb1ee9f
}
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d700bd03b 100644
index 36fbbf45ae064a345bf4aafbb9ac527197326eb9..f5f52d4ae8965cacf0d79c863aa64cd92447c6fc 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -357,9 +357,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -1058,7 +1058,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
}
@Override
@@ -387,26 +385,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -394,26 +392,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@Override
public void tick(BooleanSupplier shouldKeepTicking, boolean tickChunks) {
this.level.getProfiler().push("purge");
@@ -1085,7 +1085,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
this.level.getProfiler().pop();
this.clearCache();
}
@@ -424,7 +416,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -431,7 +423,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
gameprofilerfiller.push("filteringLoadedChunks");
List<ServerChunkCache.ChunkAndHolder> list = Lists.newArrayListWithCapacity(this.chunkMap.size());
Iterator iterator = this.chunkMap.getChunks().iterator();
@@ -1093,7 +1093,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
while (iterator.hasNext()) {
ChunkHolder playerchunk = (ChunkHolder) iterator.next();
@@ -437,7 +428,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -444,7 +435,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
if (this.level.tickRateManager().runsNormally()) {
gameprofilerfiller.popPush("naturalSpawnCount");
@@ -1101,7 +1101,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
int k = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - Optional per player mob spawns
int naturalSpawnChunkCount = k;
@@ -462,7 +452,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -469,7 +459,6 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
}
// Paper end - Optional per player mob spawns
@@ -1109,7 +1109,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
this.lastSpawnState = spawnercreature_d;
gameprofilerfiller.popPush("spawnAndTick");
@@ -503,21 +492,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -510,21 +499,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
}
}
}
@@ -1132,7 +1132,7 @@ index 64ed296cfbe7e5d27286b8cee70454fd1d99ebb0..48991b885c7cad9c201887b222acad7d
gameprofilerfiller.pop();
gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9456047974db6de9ed38265d5d1ab822225c484f..2b1c86198a9d5c520bd7a9e325da15854214d933 100644
index 4e5fc39f3839d4d626925bcef1c83415376195f4..dc9ef854191eea94bf34e972fbcc430379cf0c20 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@

8
patches/server/0096-Force-peaceful-mode-switch.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Force peaceful mode switch
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 48991b885c7cad9c201887b222acad7d700bd03b..86ef1073c47ce430cd94befa8119dcac6a9a72b9 100644
index f5f52d4ae8965cacf0d79c863aa64cd92447c6fc..978169b6907db6e513f840c60ef4242b47620f5c 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -129,6 +129,12 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -21,7 +21,7 @@ index 48991b885c7cad9c201887b222acad7d700bd03b..86ef1073c47ce430cd94befa8119dcac
public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, int simulationDistance, boolean dsync, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory) {
this.level = world;
this.mainThreadProcessor = new ServerChunkCache.MainThreadExecutor(world);
@@ -417,6 +423,21 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -424,6 +430,21 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
List<ServerChunkCache.ChunkAndHolder> list = Lists.newArrayListWithCapacity(this.chunkMap.size());
Iterator iterator = this.chunkMap.getChunks().iterator();
@@ -43,7 +43,7 @@ index 48991b885c7cad9c201887b222acad7d700bd03b..86ef1073c47ce430cd94befa8119dcac
while (iterator.hasNext()) {
ChunkHolder playerchunk = (ChunkHolder) iterator.next();
LevelChunk chunk = playerchunk.getTickingChunk();
@@ -457,6 +478,15 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -464,6 +485,15 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
gameprofilerfiller.popPush("spawnAndTick");
boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
@@ -59,7 +59,7 @@ index 48991b885c7cad9c201887b222acad7d700bd03b..86ef1073c47ce430cd94befa8119dcac
Util.shuffle(list, this.level.random);
// Paper start - PlayerNaturallySpawnCreaturesEvent
int chunkRange = level.spigotConfig.mobSpawnRange;
@@ -479,7 +509,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -486,7 +516,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
if (this.level.isNaturalSpawningAllowed(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(chunkcoordintpair)) {
chunk1.incrementInhabitedTime(j);
if (flag && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(chunkcoordintpair, true)) { // Spigot

12
patches/server/0113-Linear-region-file-format.patch
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 b35bc56ca35e7ada015e011ab4c3136b4803e48c..ce53dd3066bf8cf8812dbdcb660397ba7e9764d0 100644
index a04666cc380118c03b6b23df140323659e38c065..0ce1157599acfe8181839955ae76697b4ac6474d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,6 +30,10 @@ dependencies {
@@ -64,7 +64,7 @@ index c833f78d083b8f661087471c35bc90f65af1b525..8a00fd8c05df53ac99f214254e4dd9bd
synchronized (cache) {
regionFile = ((ChunkSystemRegionFileStorage)(Object)cache).moonrise$getRegionFileIfLoaded(chunkX, chunkZ);
diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
index 0382b6597a130d746f8954a93a756a9d1ac81d50..256d0541394e24a039f1f670e3d894ac039e212d 100644
index cb39c629af1827078f35904a373d35a63fea17ff..4f8ec87adc72f096caeb4bb437c5f43b136fb4fc 100644
--- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
@@ -76,7 +76,7 @@ public class WorldUpgrader {
@@ -76,7 +76,7 @@ index 0382b6597a130d746f8954a93a756a9d1ac81d50..256d0541394e24a039f1f670e3d894ac
final DimensionDataStorage overworldDataStorage;
public WorldUpgrader(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, RegistryAccess dynamicRegistryManager, boolean eraseCache, boolean recreateRegionFiles) {
@@ -394,7 +394,7 @@ public class WorldUpgrader {
@@ -400,7 +400,7 @@ public class WorldUpgrader {
private static List<WorldUpgrader.FileToUpgrade> getAllChunkPositions(RegionStorageInfo key, Path regionDirectory) {
File[] afile = regionDirectory.toFile().listFiles((file, s) -> {
@@ -85,7 +85,7 @@ index 0382b6597a130d746f8954a93a756a9d1ac81d50..256d0541394e24a039f1f670e3d894ac
});
if (afile == null) {
@@ -414,7 +414,7 @@ public class WorldUpgrader {
@@ -420,7 +420,7 @@ public class WorldUpgrader {
List<ChunkPos> list1 = Lists.newArrayList();
try {
@@ -94,7 +94,7 @@ index 0382b6597a130d746f8954a93a756a9d1ac81d50..256d0541394e24a039f1f670e3d894ac
try {
for (int i1 = 0; i1 < 32; ++i1) {
@@ -477,7 +477,7 @@ public class WorldUpgrader {
@@ -483,7 +483,7 @@ public class WorldUpgrader {
protected abstract boolean tryProcessOnePosition(T storage, ChunkPos chunkPos, ResourceKey<Level> worldKey);
@@ -103,7 +103,7 @@ index 0382b6597a130d746f8954a93a756a9d1ac81d50..256d0541394e24a039f1f670e3d894ac
if (WorldUpgrader.this.recreateRegionFiles) {
if (this.previousWriteFuture != null) {
this.previousWriteFuture.join();
@@ -502,7 +502,7 @@ public class WorldUpgrader {
@@ -508,7 +508,7 @@ public class WorldUpgrader {
}
}