Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-17 16:15:24 +01:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] Rebuild patches for last merge

Browse Source
This commit is contained in:
Zach Brown 2019-08-11 11:27:09 -05:00
parent 34e64781e8
commit 928abb41f8
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Spigot-Server-Patches/0408-If-the-Bukkit-generator-already-has-a-spawn-use-it-i.patch → Spigot-Server-Patches/0410-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
View File

@ -1,15 +1,16 @@
From e8e94040d7e6d683ec0d6374059a77fb40f2a743 Mon Sep 17 00:00:00 2001 From eb82ba85c2d5504bd270977a9708bd7fe621a1c7 Mon Sep 17 00:00:00 2001
From: Paul Sauve <paul@burngames.net> From: Paul Sauve <paul@burngames.net>
Date: Sun, 14 Jul 2019 21:05:03 -0500 Date: Sun, 14 Jul 2019 21:05:03 -0500
Subject: [PATCH] If the Bukkit generator already has a spawn, use it Subject: [PATCH] Do less work if we have a custom Bukkit generator
immediately instead of spending time generating one that we won't use
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 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 959fc99b..672be1e6 100644 index 451ad4f32..ad4e65e48 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/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 { @@ -663,12 +663,6 @@ public class WorldServer extends World {
} else if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) { } else if (this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
this.worldData.setSpawn(BlockPosition.ZERO.up()); this.worldData.setSpawn(BlockPosition.ZERO.up());
} else { } else {
@ -22,7 +23,7 @@ index 959fc99b..672be1e6 100644
// CraftBukkit start // CraftBukkit start
if (this.generator != null) { if (this.generator != null) {
Random rand = new Random(this.getSeed()); Random rand = new Random(this.getSeed());
@@ -681,6 +675,14 @@ public class WorldServer extends World { @@ -685,6 +679,14 @@ public class WorldServer extends World {
} }
// CraftBukkit end // CraftBukkit end