41 Zeilen
2.0 KiB
Diff
41 Zeilen
2.0 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/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
index fda8858375a08e0aac15ca00751df5a34ed6a0f2..5f93589106bcf29eabd4544951fa3ad36e00c5a6 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -341,6 +341,29 @@ public class CraftWorld implements World {
|
||
|
|
return this.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.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.WORLD_SURFACE, x, z);
|
||
|
|
+ case SOLID:
|
||
|
|
+ return this.world.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.OCEAN_FLOOR, x, z);
|
||
|
|
+ case SOLID_OR_LIQUID:
|
||
|
|
+ return this.world.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING, x, z);
|
||
|
|
+ case SOLID_OR_LIQUID_NO_LEAVES:
|
||
|
|
+ return this.world.getHeight(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 = this.world.getSharedSpawnPos();
|