Skip to content

Fix previous merge, revert to using trackEntity again #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
froobynooby merged 1 commit into from
Jun 7, 2026
Merged

Fix previous merge, revert to using trackEntity again #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...r/minecraft-patches/features/0005-Throttle-spawn-attempts-after-consistent-failures.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Throttle spawn attempts after consistent failures


diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
index 427573fc142c107d3fcc2be9000316221039ba4c..b8da67ea3be09335b80d8ce39c55aa7e3ab03ec1 100644
index 427573fc142c107d3fcc2be9000316221039ba4c..546b0b709afa877de53fd830b61ae1fb8ded81f1 100644
--- a/net/minecraft/world/level/NaturalSpawner.java
+++ b/net/minecraft/world/level/NaturalSpawner.java
@@ -166,6 +166,11 @@ public final class NaturalSpawner {
Expand All @@ -20,7 +20,7 @@ index 427573fc142c107d3fcc2be9000316221039ba4c..b8da67ea3be09335b80d8ce39c55aa7e
// Paper start - Optional per player mob spawns
final boolean canSpawn;
int maxSpawns = Integer.MAX_VALUE;
@@ -194,6 +199,15 @@ public final class NaturalSpawner {
@@ -194,8 +199,17 @@ public final class NaturalSpawner {
canSpawn = state.canSpawnForCategoryLocal(mobCategory, chunk.getPos());
}
if (canSpawn) {
Expand All @@ -34,8 +34,11 @@ index 427573fc142c107d3fcc2be9000316221039ba4c..b8da67ea3be09335b80d8ce39c55aa7e
+ };
+ // Nabulus end
spawnCategoryForChunk(mobCategory, level, chunk, state::canSpawn, state::afterSpawn,
maxSpawns, level.paperConfig().entities.spawning.perPlayerMobSpawns ? level.getChunkSource().chunkMap::updatePlayerMobTypeMap : null);
- maxSpawns, level.paperConfig().entities.spawning.perPlayerMobSpawns ? level.getChunkSource().chunkMap::updatePlayerMobTypeMap : null);
+ maxSpawns, trackEntity);
// Paper end - Optional per player mob spawns
}
}
@@ -627,6 +641,7 @@ public final class NaturalSpawner {
private @Nullable BlockPos lastCheckedPos;
private @Nullable EntityType<?> lastCheckedType;
Expand Down
Loading