Allow reading of oversized region files

2019-12-13 16:22:16 +00:00
parent ae68db1f0e
commit 058e4efb41
58 changed files with 361 additions and 92 deletions
--- a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0366-Add-Heightmap-API.patch
@@ -1,58 +0,0 @@
-From 2bd3daff08c36cebcfb7c1f1a7eb3718d771daa6 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Tue, 1 Jan 2019 02:22:01 -0800
-Subject: [PATCH] Add Heightmap API
-
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d39a8fbc..9889b0543 100644
--- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -589,8 +589,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-         }
-     }
- 
-    @Override
-    public int a(HeightMap.Type heightmap_type, int i, int j) {
-+    public final int getHighestBlockY(final HeightMap.Type heightmap, final int x, final int z) { return this.a(heightmap, x, z); } // Paper - OBFHELPER
-+    @Override public int a(HeightMap.Type heightmap_type, int i, int j) { // Paper - OBFHELPER
-         int k;
- 
-         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 578fe8d19..12362d560 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -340,6 +340,29 @@ public class CraftWorld implements World {
-         return world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(x, 0, z)).getY();
-     }
- 
-+    // Paper start - Implement heightmap api
-+    @Override
-+    public int getHighestBlockYAt(final int x, final int z, final com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
-+        this.getChunkAt(x >> 4, z >> 4); // heightmap will ret 0 on unloaded areas
-+
-+        switch (heightmap) {
-+            case LIGHT_BLOCKING:
-+                throw new UnsupportedOperationException(); // TODO
-+                //return this.world.getHighestBlockY(HeightMap.Type.LIGHT_BLOCKING, x, z);
-+            case ANY:
-+                return this.world.getHighestBlockY(HeightMap.Type.WORLD_SURFACE, x, z);
-+            case SOLID:
-+                return this.world.getHighestBlockY(HeightMap.Type.OCEAN_FLOOR, x, z);
-+            case SOLID_OR_LIQUID:
-+                return this.world.getHighestBlockY(HeightMap.Type.MOTION_BLOCKING, x, z);
-+            case SOLID_OR_LIQUID_NO_LEAVES:
-+                return this.world.getHighestBlockY(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, x, z);
-+            default:
-+                throw new UnsupportedOperationException();
-+        }
-+    }
-+    // Paper end
-+
-     @Override
-     public Location getSpawnLocation() {
-         BlockPosition spawn = world.getSpawn();
-- 
-2.24.0
-