From fc9ee65a32622d03a91db39364b6f106cf88335b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 20 Sep 2022 01:28:22 +0100 Subject: Make WorldCreator#keepSpawnLoaded return the WorldCreator (Fixes #8321) (#8371) * Make WorldCreator#keepSpawnLoaded return the WorldCreator (Fixes #8321) Thought that I fixed this before push/merge, apparently not, hence, fix the return type and add mitigation for this. * Fix patch/build * Rebuild patches --- patches/api/0380-WorldCreator-keepSpawnLoaded.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'patches/api/0380-WorldCreator-keepSpawnLoaded.patch') diff --git a/patches/api/0380-WorldCreator-keepSpawnLoaded.patch b/patches/api/0380-WorldCreator-keepSpawnLoaded.patch index 239a61f5a0..c148a391f4 100644 --- a/patches/api/0380-WorldCreator-keepSpawnLoaded.patch +++ b/patches/api/0380-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java -index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..355f9f27d29c65efebf099a72c37892a309edef1 100644 +index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..dc92ce261b9e67979da3f82cb75292ff980ad87e 100644 --- a/src/main/java/org/bukkit/WorldCreator.java +++ b/src/main/java/org/bukkit/WorldCreator.java @@ -22,6 +22,7 @@ public class WorldCreator { @@ -16,7 +16,7 @@ index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..355f9f27d29c65efebf099a72c37892a /** * Creates an empty WorldCreationOptions for the given world name -@@ -573,4 +574,29 @@ public class WorldCreator { +@@ -573,4 +574,32 @@ public class WorldCreator { return result; } @@ -38,10 +38,13 @@ index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..355f9f27d29c65efebf099a72c37892a + * configuration, otherwise, will act as an override towards this setting + * + * @param keepSpawnLoaded the new value ++ * @return This object, for chaining + */ -+ public void keepSpawnLoaded(@NotNull net.kyori.adventure.util.TriState keepSpawnLoaded) { ++ @NotNull ++ public WorldCreator keepSpawnLoaded(@NotNull net.kyori.adventure.util.TriState keepSpawnLoaded) { + java.util.Objects.requireNonNull(keepSpawnLoaded, "keepSpawnLoaded"); + this.keepSpawnLoaded = keepSpawnLoaded; ++ return this; + } + + // Paper end -- cgit v1.2.3