Skip to content

Commit cc98f49

Browse files
Taiyou06Dreeam-qwqhayanesuru
authored
backport 1.21.8 async mob spawn (#479)
* backport: 1.21.8 async mob spawn * Move into patch * fix * fix build --------- Co-authored-by: Dreeam <[email protected]> Co-authored-by: hayanesuru <[email protected]>
1 parent 3ae338d commit cc98f49

File tree

47 files changed

+256
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+256
-210
lines changed

leaf-server/minecraft-patches/features/0176-optimize-mob-spawning.patch

Lines changed: 248 additions & 12 deletions
Large diffs are not rendered by default.

leaf-server/minecraft-patches/features/0178-throttle-mob-spawning.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] throttle mob spawning
55

66

77
diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
8-
index 8f999b425bce52352a04ee3ca11b6854194dd665..48ab439560c6ba83d34163cc7402146e69e7c277 100644
8+
index 6e911df433013480c2688c086a7ff1de321001bc..7764fcca95cef9f0aa46683f41d3a6805507f80a 100644
99
--- a/net/minecraft/world/level/NaturalSpawner.java
1010
+++ b/net/minecraft/world/level/NaturalSpawner.java
11-
@@ -166,6 +166,17 @@ public final class NaturalSpawner {
11+
@@ -223,6 +223,17 @@ public final class NaturalSpawner {
1212
// Paper start - Optional per player mob spawns
1313
final boolean canSpawn;
1414
int maxSpawns = Integer.MAX_VALUE;

leaf-server/minecraft-patches/features/0188-Paw-optimization.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ index 4535858701b2bb232b9d2feb2af6551526232ddc..e65c62dbe4c1560ae153e4c4344e9194
100100
- // Paper end - detailed watchdog information
101101
}
102102
diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
103-
index 05df09d5f586c90f3169ddf1fa73a1d3fd734b73..fbcff9a0e4aa68375e7ebcc297ba4a7bf089c4f3 100644
103+
index f66f16332bd1af89a44b71bc015d52a2aeda09de..bb200d3f482c7f623a827d255a9633bb278637e9 100644
104104
--- a/net/minecraft/server/level/ServerChunkCache.java
105105
+++ b/net/minecraft/server/level/ServerChunkCache.java
106-
@@ -506,9 +506,10 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
106+
@@ -523,9 +523,10 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
107107
try {
108108
this.collectTickingChunks(list);
109109
// Paper start - chunk tick iteration optimisation

leaf-server/minecraft-patches/features/0189-optimize-random-tick.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] optimize random tick
55

66

77
diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
8-
index fbcff9a0e4aa68375e7ebcc297ba4a7bf089c4f3..e07fdd22e08cb4e30cf606c055e85b5946e8c046 100644
8+
index bb200d3f482c7f623a827d255a9633bb278637e9..7531e684e16bc038811fbf133caced9c7f5efe07 100644
99
--- a/net/minecraft/server/level/ServerChunkCache.java
1010
+++ b/net/minecraft/server/level/ServerChunkCache.java
11-
@@ -696,6 +696,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
11+
@@ -701,6 +701,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
1212
this.level.tickChunk(levelChunk, _int);
1313
}
1414
}

leaf-server/minecraft-patches/features/0190-count-all-chunks-for-ticking.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] count all chunks for ticking
55

66

77
diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
8-
index e07fdd22e08cb4e30cf606c055e85b5946e8c046..432c98b582ab40f893835a7a24ef9bbdacc49bd7 100644
8+
index 7531e684e16bc038811fbf133caced9c7f5efe07..10fb9cc994ddc8820bed23d722b49b9f33e5fc09 100644
99
--- a/net/minecraft/server/level/ServerChunkCache.java
1010
+++ b/net/minecraft/server/level/ServerChunkCache.java
11-
@@ -589,6 +589,14 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
11+
@@ -593,6 +593,14 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
1212
final int size = tickingChunks.size();
1313

1414
final ChunkMap chunkMap = this.chunkMap;

leaf-server/paper-patches/features/0004-Pufferfish-Optimize-mob-spawning.patch

Lines changed: 0 additions & 190 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)