Merge branch 'ver/1.18' into ver/purpur-1.18

pufferfish-gg · Jan 4, 2022 · c9f7366 · c9f7366
2 parents da41b64 + 88df7fe
commit c9f7366
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/patches/server/0008-Optimize-mob-spawning.patch b/patches/server/0008-Optimize-mob-spawning.patch
@@ -81,7 +81,7 @@ index 7aa2cd8362c7dbfd22d1b75418c3dbb35ac4a4e1..00ccb0aa9cbedaf44500057091dd665c
          this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
          this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 9a07ccbd12675e501a9aebf89ab85adf6fb658ba..47c1f6b40c77f9458287983cba3a94de2e8fbb50 100644
+index 9a07ccbd12675e501a9aebf89ab85adf6fb658ba..cdf68a2eafb2794250ac94b6203ae6ed0c585e5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -77,6 +77,9 @@ public class ServerChunkCache extends ChunkSource {
@@ -158,7 +158,7 @@ index 9a07ccbd12675e501a9aebf89ab85adf6fb658ba..47c1f6b40c77f9458287983cba3a94de
 +                            level.entityTickList.entities.iterator(io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.ITERATOR_FLAG_SEE_ADDITIONS);
 +                    gg.pufferfish.pufferfish.util.IterableWrapper<Entity> wrappedIterator =
 +                            new gg.pufferfish.pufferfish.util.IterableWrapper<>(objectiterator);
-+                    lastSpawnState = NaturalSpawner.createState(mapped, wrappedIterator, this::getFullChunk, new LocalMobCapCalculator(this.chunkMap), true);
++                    lastSpawnState = NaturalSpawner.createState(mapped, wrappedIterator, this::getFullChunk, null, true);
 +                    objectiterator.finishedIterating();
 +                    _pufferfish_spawnCountsReady.set(true);
 +                });