mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
46 lines
2.8 KiB
Diff
46 lines
2.8 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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 2fa1b86adf89bb9b2398806bf30b0a6e436a4577..731f6a83200b4f7608fe1f1f3f0e04d827913e72 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -811,12 +811,13 @@ 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.getChunkProvider().getChunkGenerator().getWorldChunkManager();
|
|
- List<BiomeBase> list = worldchunkmanager.a();
|
|
- Random random = new Random(this.getSeed());
|
|
- BlockPosition blockposition = worldchunkmanager.a(0, this.getSeaLevel(), 0, 256, list, random);
|
|
- ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
|
-
|
|
+// Paper start - moved down
|
|
+// WorldChunkManager worldchunkmanager = this.getChunkProvider().getChunkGenerator().getWorldChunkManager();
|
|
+// List<BiomeBase> list = worldchunkmanager.a();
|
|
+// Random random = new Random(this.getSeed());
|
|
+// BlockPosition blockposition = worldchunkmanager.a(0, this.getSeaLevel(), 0, 256, list, random);
|
|
+// ChunkCoordIntPair chunkcoordintpair = blockposition == null ? new ChunkCoordIntPair(0, 0) : new ChunkCoordIntPair(blockposition);
|
|
+// Paper end
|
|
// CraftBukkit start
|
|
if (this.generator != null) {
|
|
Random rand = new Random(this.getSeed());
|
|
@@ -833,6 +834,13 @@ public class WorldServer extends World {
|
|
}
|
|
// CraftBukkit end
|
|
|
|
+ // Paper start - this is useless if craftbukkit returns early
|
|
+ WorldChunkManager worldchunkmanager = this.getChunkProvider().getChunkGenerator().getWorldChunkManager();
|
|
+ List<BiomeBase> list = worldchunkmanager.a();
|
|
+ Random random = new Random(this.getSeed());
|
|
+ BlockPosition blockposition = worldchunkmanager.a(0, this.getSeaLevel(), 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");
|
|
}
|