Skip to content

Commit 59156c2

Browse files
committed
Correctly offset world init tickets by spawn selection position
This should fix rare instances where the spawn is selected very far from 0.
1 parent e176dd7 commit 59156c2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8215,7 +8215,7 @@ index 4535858701b2bb232b9d2feb2af6551526232ddc..4a7de2ed6eabe919f0c33de49ed7fab7
82158215
}
82168216
}
82178217
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
8218-
index 9243bb11e3f968d0bf0eb2e3dc9295c0232bc15d..812629d9b5e763cd98766d6a72e31d5d114e35bf 100644
8218+
index 9243bb11e3f968d0bf0eb2e3dc9295c0232bc15d..f63a2ee9445d6738fde1db21753aa13ced03efd1 100644
82198219
--- a/net/minecraft/server/MinecraftServer.java
82208220
+++ b/net/minecraft/server/MinecraftServer.java
82218221
@@ -184,7 +184,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -8373,7 +8373,7 @@ index 9243bb11e3f968d0bf0eb2e3dc9295c0232bc15d..812629d9b5e763cd98766d6a72e31d5d
83738373
+ serverLevel.randomSpawnSelection = new ChunkPos(serverLevel.getChunkSource().randomState().sampler().findSpawnPosition());
83748374
+ for (int currX = -loadRegionRadius; currX <= loadRegionRadius; ++currX) {
83758375
+ for (int currZ = -loadRegionRadius; currZ <= loadRegionRadius; ++currZ) {
8376-
+ ChunkPos pos = new ChunkPos(currX, currZ);
8376+
+ ChunkPos pos = new ChunkPos(currX + serverLevel.randomSpawnSelection.x, currZ + serverLevel.randomSpawnSelection.z);
83778377
+ serverLevel.moonrise$getChunkTaskScheduler().chunkHolderManager.addTicketAtLevel(
83788378
+ net.minecraft.server.level.TicketType.UNKNOWN, pos, ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkHolderManager.MAX_TICKET_LEVEL, null
83798379
+ );

0 commit comments

Comments
 (0)