Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-07 10:57:52 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4455: ChunkData.getType returns legacy material

Browse Source
This commit is contained in:
md_5 2018-10-29 07:17:59 +11:00
parent 72c3617dfe
commit f3f2fe5795
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
View File

@ -67,7 +67,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
@Override @Override
public Material getType(int x, int y, int z) { public Material getType(int x, int y, int z) {
return getTypeAndData(x, y, z).getItemType(); return CraftMagicNumbers.getMaterial(getTypeId(x, y, z).getBlock());
} }
@Override @Override

2
src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java
View File

@ -13,7 +13,7 @@ public class ChunkDataTest extends AbstractTestingBase {
private boolean testSetBlock(CraftChunkData data, int x, int y, int z, BlockData type, BlockData expected) { private boolean testSetBlock(CraftChunkData data, int x, int y, int z, BlockData type, BlockData expected) {
data.setBlock(x, y, z, type); data.setBlock(x, y, z, type);
return expected.equals(data.getBlockData(x, y, z)); return expected.equals(data.getBlockData(x, y, z)) && expected.getMaterial().equals(data.getType(x, y, z));
} }
private void testSetRegion(CraftChunkData data, int minx, int miny, int minz, int maxx, int maxy, int maxz, BlockData type) { private void testSetRegion(CraftChunkData data, int minx, int miny, int minz, int maxx, int maxy, int maxz, BlockData type) {