mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
ab347c4c96
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 42d5a714 SPIGOT-5899: Hoglins API similar to Piglins 2c1ee10e SPIGOT-5887: ClickType doesn't include off hand swaps 5ff7c7ce SPIGOT-5886: Missing BlockData CraftBukkit Changes:7560f5f5SPIGOT-5905: Fix hex colours not being allowed in MOTDd47c47eeSPIGOT-5889: Villager using composter should call EntityChangeBlockEvent2fe6b4a3SPIGOT-5899: Hoglins API similar to Piglinse09dbecaSPIGOT-5887: ClickType doesn't include off hand swaps23aac2a5SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously92cbf656SPIGOT-5884: Tab completions lost on reloadData / minecraft:reloadfb4e54adSPIGOT-5902: PlayerRespawnEvent places player at spawn before event is calledaa8f3d5aSPIGOT-5901: Structures are generated in all worlds based on the setting for the main worlda0c35937SPIGOT-5895: PlayerChangedWorldEvent#getFrom is incorrect89c0a5c3SPIGOT-5886: Missing BlockData Spigot Changes: 0287a20d SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously
40 lines
2.5 KiB
Diff
40 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paul Sauve <paul@burngames.net>
|
|
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 0633944364179ffb9b9fdd0400d82fd5b2ab3892..41c4b2df34faa95afdd2d35b0bac021d77c56884 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -512,11 +512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
} else if (flag1) {
|
|
iworlddataserver.setSpawn(BlockPosition.ZERO.up());
|
|
} else {
|
|
- WorldChunkManager worldchunkmanager = chunkgenerator.getWorldChunkManager();
|
|
- List<BiomeBase> list = worldchunkmanager.b();
|
|
- Random random = new Random(worldserver.getSeed());
|
|
- BlockPosition blockposition = worldchunkmanager.a(0, worldserver.getSeaLevel(), 0, 256, list, random);
|
|
- ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
|
+ // Paper start - moved down
|
|
// CraftBukkit start
|
|
if (worldserver.generator != null) {
|
|
Random rand = new Random(worldserver.getSeed());
|
|
@@ -532,6 +528,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
}
|
|
}
|
|
// CraftBukkit end
|
|
+ // Paper start - if the generator created a spawn for us, then there is no need for us to also create a spawn -
|
|
+ // only do it if the generator did not
|
|
+ WorldChunkManager worldchunkmanager = chunkgenerator.getWorldChunkManager();
|
|
+ List<BiomeBase> list = worldchunkmanager.b();
|
|
+ Random random = new Random(worldserver.getSeed());
|
|
+ BlockPosition blockposition = worldchunkmanager.a(0, worldserver.getSeaLevel(), 0, 256, list, random);
|
|
+ ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
|
+ // Paper end
|
|
|
|
if (blockposition == null) {
|
|
MinecraftServer.LOGGER.warn("Unable to find spawn biome");
|