Skip to content

Only attempt to find spawn position if there isn't a fixed spawn position set #11682

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
lynxplay merged 2 commits into from
Dec 1, 2024
Merged

Only attempt to find spawn position if there isn't a fixed spawn position set #11682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d39ebfa
Only attempt to find spawn position if there isn't a fixed spawn posi…
MrPowerGamerBR Nov 28, 2024
0f7b18d
Fix incorrect comment
MrPowerGamerBR Nov 28, 2024
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
28 changes: 28 additions & 0 deletions patches/server/1073-Only-attempt-to-find-spawn-position-if-there-isn-t-a.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 c26e3a239441376f2694782d4f07943538677c71..4acdef7a20b0625fc348e5592edd64868b73dd82 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()) {
Loading