Skip to content

Commit 1e035f3

Browse files
Only attempt to find spawn position if there isn't a fixed spawn position set (#11682)
1 parent 27e4ddc commit 1e035f3

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: MrPowerGamerBR <git@mrpowergamerbr.com>
3+
Date: Thu, 28 Nov 2024 15:20:25 -0300
4+
Subject: [PATCH] Only attempt to find spawn position if there isn't a fixed
5+
spawn position set
6+
7+
8+
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
9+
index c26e3a239441376f2694782d4f07943538677c71..4acdef7a20b0625fc348e5592edd64868b73dd82 100644
10+
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
11+
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
12+
@@ -816,7 +816,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
13+
worldProperties.setSpawn(BlockPos.ZERO.above(80), 0.0F);
14+
} else {
15+
ServerChunkCache chunkproviderserver = world.getChunkSource();
16+
- ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition());
17+
+ // ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition()); // Paper - Move down, only attempt to find spawn position if there isn't a fixed spawn position set
18+
// CraftBukkit start
19+
if (world.generator != null) {
20+
Random rand = new Random(world.getSeed());
21+
@@ -832,6 +832,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
22+
}
23+
}
24+
// CraftBukkit end
25+
+ ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition()); // Paper - Only attempt to find spawn position if there isn't a fixed spawn position set
26+
int i = chunkproviderserver.getGenerator().getSpawnHeight(world);
27+
28+
if (i < world.getMinY()) {

0 commit comments

Comments
 (0)