43 lines
2.1 KiB
Diff
43 lines
2.1 KiB
Diff
|
From e8e94040d7e6d683ec0d6374059a77fb40f2a743 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paul Sauve <paul@burngames.net>
|
||
|
|
Date: Sun, 14 Jul 2019 21:05:03 -0500
|
||
|
|
Subject: [PATCH] If the Bukkit generator already has a spawn, use it
|
||
|
|
immediately instead of spending time generating one that we won't use
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
index 959fc99b..672be1e6 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||
|
|
@@ -659,12 +659,6 @@ public class WorldServer extends World {
|
||
|
|
} else if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
|
||
|
|
this.worldData.setSpawn(BlockPosition.ZERO.up());
|
||
|
|
} else {
|
||
|
|
- WorldChunkManager worldchunkmanager = this.chunkProvider.getChunkGenerator().getWorldChunkManager();
|
||
|
|
- List<BiomeBase> list = worldchunkmanager.a();
|
||
|
|
- Random random = new Random(this.getSeed());
|
||
|
|
- BlockPosition blockposition = worldchunkmanager.a(0, 0, 256, list, random);
|
||
|
|
- ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
||
|
|
-
|
||
|
|
// CraftBukkit start
|
||
|
|
if (this.generator != null) {
|
||
|
|
Random rand = new Random(this.getSeed());
|
||
|
|
@@ -681,6 +675,14 @@ public class WorldServer extends World {
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
|
||
|
|
+ // Paper start - this is useless if craftbukkit returns early
|
||
|
|
+ WorldChunkManager worldchunkmanager = this.chunkProvider.getChunkGenerator().getWorldChunkManager();
|
||
|
|
+ List<BiomeBase> list = worldchunkmanager.a();
|
||
|
|
+ Random random = new Random(this.getSeed());
|
||
|
|
+ BlockPosition blockposition = worldchunkmanager.a(0, 0, 256, list, random);
|
||
|
|
+ ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
if (blockposition == null) {
|
||
|
|
WorldServer.LOGGER.warn("Unable to find spawn biome");
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|