SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add getHeight method to ChunkData (#12311)

Browse Source
This commit is contained in:
Shane Bee
2025-03-23 16:33:34 -07:00
committed by GitHub
parent f225858235
commit 7819df10a4
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
View File

@ -8,12 +8,13 @@ import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess;
import org.bukkit.HeightMap;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftHeightMap;
import org.bukkit.craftbukkit.block.CraftBiome;
import org.bukkit.craftbukkit.block.CraftBlockType;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.generator.ChunkGenerator;
@ -180,4 +181,12 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
access.removeBlockEntity(blockPosition);
}
}
@Override
public int getHeight(final HeightMap heightMap, final int x, final int z) {
Preconditions.checkArgument(heightMap != null, "HeightMap cannot be null");
Preconditions.checkArgument(x >= 0 && x <= 15 && z >= 0 && z <= 15, "Cannot get height outside of a chunks bounds, must be between 0 and 15, got x: %s, z: %s", x, z);
return getHandle().getHeight(CraftHeightMap.toNMS(heightMap), x, z);
}
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
View File

@ -8,6 +8,7 @@ import net.minecraft.core.Registry;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.LevelChunkSection;
import org.bukkit.HeightMap;
import org.bukkit.Material;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
@ -200,4 +201,9 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
Set<BlockPos> getLights() {
return this.lights;
}
@Override
public int getHeight(HeightMap heightMap, final int x, final int z) {
throw new UnsupportedOperationException("Unsupported, in older chunk generator api");
}
}