Apply more patches

PaperMC · Oct 26, 2024 · 20507b4 · 20507b4
1 parent 98af0e0
commit 20507b4
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 83 deletions.
diff --git a/...00-Entity-load-save-limit-per-chunk.patch → ...44-Entity-load-save-limit-per-chunk.patch b/...00-Entity-load-save-limit-per-chunk.patch → ...44-Entity-load-save-limit-per-chunk.patch
@@ -9,15 +9,15 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
-index 997b05167c19472acb98edac32d4548cc65efa8e..5c7f2471a0b15ac2e714527296ad2aa7291999eb 100644
+index 5ed6599d1f9a2edf8c904f3602b06d26d857600c..b3c993a790fc3fab6a408c731deb297f74c959ce 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
 +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
-@@ -100,7 +100,18 @@ public final class ChunkEntitySlices {
+@@ -104,7 +104,18 @@ public final class ChunkEntitySlices {
          }
 
          final ListTag entitiesTag = new ListTag();
 +        final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper - Entity load/save limit per chunk
-         for (final Entity entity : entities) {
+         for (final Entity entity : PlatformHooks.get().modifySavedEntities(world, chunkPos.x, chunkPos.z, entities)) {
 +            // Paper start - Entity load/save limit per chunk
 +            final EntityType<?> entityType = entity.getType();
 +            final int saveLimit = world.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
@@ -32,17 +32,17 @@ index 997b05167c19472acb98edac32d4548cc65efa8e..5c7f2471a0b15ac2e714527296ad2aa7
              if (entity.save(compoundTag)) {
                  entitiesTag.add(compoundTag);
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 842b0cec0397d7ae5166617627340ffac0e35db1..cb61462d4691a055a4b25f7b953609d8a154fdfe 100644
+index e56050bef4a5aaa0fca17192dab4cf5e6a55fbae..3a8af3c6164da68eac0faeb436b8d9d8159fd4bd 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -649,9 +649,20 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -715,9 +715,20 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          final Spliterator<? extends Tag> spliterator = entityNbtList.spliterator();
 
          return StreamSupport.stream(new Spliterator<Entity>() {
 +            final java.util.Map<EntityType<?>, Integer> loadedEntityCounts = new java.util.HashMap<>(); // Paper - Entity load/save limit per chunk
              public boolean tryAdvance(Consumer<? super Entity> consumer) {
                  return spliterator.tryAdvance((nbtbase) -> {
-                     EntityType.loadEntityRecursive((CompoundTag) nbtbase, world, (entity) -> {
+                     EntityType.loadEntityRecursive((CompoundTag) nbtbase, world, reason, (entity) -> {
 +                        // Paper start - Entity load/save limit per chunk
 +                        final EntityType<?> entityType = entity.getType();
 +                        final int saveLimit = world.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
@@ -57,10 +57,10 @@ index 842b0cec0397d7ae5166617627340ffac0e35db1..cb61462d4691a055a4b25f7b953609d8
                          return entity;
                      });
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 503ac0374e0c9f9993ad37bb8bd8cf1570d3615a..d4a505ef4af9ded02aeb1a817bcbe5b1a912a5b3 100644
+index 16ca1c8672e5f0a27f8a30498c754a81cdec5191..356d010506fd21f3c752e4aa86c46c1106fdde3b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -92,7 +92,18 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
+@@ -93,7 +93,18 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
              }
          } else {
              ListTag listTag = new ListTag();