mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-20 01:25:21 +01:00
49fdb18206
* Timings changes - Increment entity tick count only when an entity ticks - Remove chunk inhabited timer - Try finally entity timings * Add activated entity ticks Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
50 lines
2.8 KiB
Diff
50 lines
2.8 KiB
Diff
From 134bd0bfaa6b263d23a95138710d5817ed8a216f 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 659044ffe8..0b236f0903 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");
|
|
}
|
|
--
|
|
2.25.2
|
|
|