[CI-SKIP] Rebuild patches for last merge

Spigot-Server-Patches/0410-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch

@@ -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>
 Date: Sun, 14 Jul 2019 21:05:03 -0500
-Subject: [PATCH] If the Bukkit generator already has a spawn, use it
- immediately instead of spending time generating one that we won't use
+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 959fc99b..672be1e6 100644
+index 451ad4f32..ad4e65e48 100644
 --- a/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) {
              this.worldData.setSpawn(BlockPosition.ZERO.up());
          } else {
@@ -22,7 +23,7 @@ index 959fc99b..672be1e6 100644
              // CraftBukkit start
              if (this.generator != null) {
                  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