From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Sauve Date: Sun, 14 Jul 2019 21:05:03 -0500 Subject: [PATCH] Do less work if we have a custom Bukkit generator 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/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index cae3c20eba546dcf42d035e9a5998302df350d4b..7ef0c9c8edf1202d0e20a505b18f9d36bdc20139 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -691,12 +691,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { - return biomebase.getMobSettings().playerSpawnFriendly(); - }, random); - ChunkPos chunkcoordintpair = blockposition == null ? new ChunkPos(0, 0) : new ChunkPos(blockposition); + // Paper start - moved down // CraftBukkit start if (world.generator != null) { Random rand = new Random(world.getSeed()); @@ -712,6 +707,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { + return biomebase.getMobSettings().playerSpawnFriendly(); + }, random); + ChunkPos chunkcoordintpair = blockposition == null ? new ChunkPos(0, 0) : new ChunkPos(blockposition); + // Paper end if (blockposition == null) { MinecraftServer.LOGGER.warn("Unable to find spawn biome");