diff options
Diffstat (limited to 'patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch')
-rw-r--r-- | patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch b/patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch new file mode 100644 index 0000000000..43aea85654 --- /dev/null +++ b/patches/server/1072-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrPowerGamerBR <[email protected]> +Date: Thu, 28 Nov 2024 15:20:25 -0300 +Subject: [PATCH] Only attempt to find spawn position if there isn't a fixed + spawn position set + + +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 780582ebaa8deb0c0b0c8de17de5abcebafa4bd3..4158473fd553a16fec23bcbcf9a278d413120600 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -816,7 +816,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa + worldProperties.setSpawn(BlockPos.ZERO.above(80), 0.0F); + } else { + ServerChunkCache chunkproviderserver = world.getChunkSource(); +- ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition()); ++ // 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 + // CraftBukkit start + if (world.generator != null) { + Random rand = new Random(world.getSeed()); +@@ -832,6 +832,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa + } + } + // CraftBukkit end ++ ChunkPos chunkcoordintpair = new ChunkPos(chunkproviderserver.randomState().sampler().findSpawnPosition()); // Paper - Only attempt to find spawn position if there isn't a fixed spawn position set + int i = chunkproviderserver.getGenerator().getSpawnHeight(world); + + if (i < world.getMinY()) { |