Cleanup args passed

Author: Owen1212055

paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -245,7 +245,7 @@
          if (profiledDuration != null) {
              profiledDuration.finish(true);
          }
-@@ -391,31 +_,133 @@
+@@ -391,31 +_,137 @@
          }
      }
 
@@ -366,9 +366,9 @@
 +            );
 +        }
 +        this.addLevel(serverLevel);
-+        this.initWorld(serverLevel, serverLevelData, worldOptions, null, 0.0F, 0.0F);
++        this.initWorld(serverLevel, serverLevelData, worldOptions, null);
 +    }
-+    public void initWorld(ServerLevel serverLevel, net.minecraft.world.level.storage.PrimaryLevelData serverLevelData, WorldOptions worldOptions, io.papermc.paper.math.@Nullable Position forcedPosition, float forcedPitch, float forcedYaw) {
++    public void initWorld(ServerLevel serverLevel, net.minecraft.world.level.storage.PrimaryLevelData serverLevelData, WorldOptions worldOptions, org.bukkit.@Nullable WorldCreator worldCreator) {
 +        final boolean isDebugWorld = this.worldData.isDebugWorld();
 +        if (serverLevel.generator != null) {
 +            serverLevel.getWorld().getPopulators().addAll(serverLevel.generator.getDefaultPopulators(serverLevel.getWorld()));
@@ -380,10 +380,14 @@
              try {
 -                setInitialSpawn(serverLevel, serverLevelData, worldOptions.generateBonusChest(), isDebugWorld, this.levelLoadListener);
 +                // Paper start - Allow zeroing spawn location
-+                if (forcedPosition == null) {
++                if (worldCreator == null || worldCreator.forcedSpawnPosition() == null) {
 +                    setInitialSpawn(serverLevel, serverLevelData, worldOptions.generateBonusChest(), isDebugWorld, serverLevel.levelLoadListener); // Paper - per world level load listener & rework world loading process
 +                } else {
-+                    serverLevelData.setSpawn(LevelData.RespawnData.of(serverLevel.dimension(), io.papermc.paper.util.MCUtil.toBlockPos(forcedPosition), forcedYaw, forcedPitch));
++                    serverLevelData.setSpawn(LevelData.RespawnData.of(serverLevel.dimension(),
++                        io.papermc.paper.util.MCUtil.toBlockPos(worldCreator.forcedSpawnPosition()),
++                        java.util.Objects.requireNonNullElse(worldCreator.forcedSpawnYaw(), 0.0F),
++                        java.util.Objects.requireNonNullElse(worldCreator.forcedSpawnPitch(), 0.0F)
++                    ));
 +                }
 +                // Paper end - Allow zeroing spawn location
                  serverLevelData.setInitialized(true);

paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -1313,7 +1313,7 @@ public World createWorld(WorldCreator creator) {
         }
 
         this.console.addLevel(serverLevel); // Paper - Put world into worldlist before initing the world; move up
-        this.console.initWorld(serverLevel, primaryLevelData, primaryLevelData.worldGenOptions(), creator.forcedSpawnPosition(), java.util.Objects.requireNonNullElse(creator.forcedSpawnPitch(), 0.0F), java.util.Objects.requireNonNullElse(creator.forcedSpawnYaw(), 0.0F));
+        this.console.initWorld(serverLevel, primaryLevelData, primaryLevelData.worldGenOptions(), creator);
 
         serverLevel.setSpawnSettings(true);
         // Paper - Put world into worldlist before initing the world; move up