Update Upstream

Spigot-Server-Patches/Add-Heightmap-API.patch

@@ -20,7 +20,7 @@ index 1bec5beab4..9f4cf3f1b3 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e672ae2e4..d8ea548383 100644
+index 016ed471bb..0cbca6870a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
@@ -50,7 +50,7 @@ index 5e672ae2e4..d8ea548383 100644
 +    }
 +    // Paper end
 +
+     @Override
      public Location getSpawnLocation() {
          BlockPosition spawn = world.getSpawn();
-         return new Location(this, spawn.getX(), spawn.getY(), spawn.getZ());
 --