56 lines
2.9 KiB
Diff
56 lines
2.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
|
index 5193271bc257248e0d2bc9d9a477e999a97deada..eb88d830fb45a6b8c990e8bdc1943d80f63c8b93 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
|
@@ -670,8 +670,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- @Override
|
||
|
|
- public int getHeight(Heightmap.Types heightmap, int x, int z) {
|
||
|
|
+ public final int getHighestBlockY(final Heightmap.Types heightmap, final int x, final int z) { return this.getHeight(heightmap, x, z); } // Paper - OBFHELPER
|
||
|
|
+ @Override public int getHeight(Heightmap.Types heightmap, int x, int z) { // Paper - OBFHELPER
|
||
|
|
int k;
|
||
|
|
|
||
|
|
if (x >= -30000000 && z >= -30000000 && x < 30000000 && z < 30000000) {
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
index 7b5abccac9793811bd56340c8f9d23806e832365..a4231e1c3d468355c0b55ac9d2c239f1b4c54594 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -325,6 +325,29 @@ public class CraftWorld implements World {
|
||
|
|
return getHighestBlockYAt(x, z, org.bukkit.HeightMap.MOTION_BLOCKING);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // 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(net.minecraft.world.level.levelgen.Heightmap.Types.WORLD_SURFACE, x, z);
|
||
|
|
+ case SOLID:
|
||
|
|
+ return this.world.getHighestBlockY(net.minecraft.world.level.levelgen.Heightmap.Types.OCEAN_FLOOR, x, z);
|
||
|
|
+ case SOLID_OR_LIQUID:
|
||
|
|
+ return this.world.getHighestBlockY(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING, x, z);
|
||
|
|
+ case SOLID_OR_LIQUID_NO_LEAVES:
|
||
|
|
+ return this.world.getHighestBlockY(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z);
|
||
|
|
+ default:
|
||
|
|
+ throw new UnsupportedOperationException();
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
@Override
|
||
|
|
public Location getSpawnLocation() {
|
||
|
|
BlockPos spawn = world.getSpawn();
|