diff options
| author | md_5 <git@md-5.net> | 2018-10-29 07:17:59 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-10-29 07:17:59 +1100 |
| commit | f3f2fe5795ecaf5a93d7355a66a6fb6030d527f0 (patch) | |
| tree | 3a9bd03713a8de3c13a825d2d4e0cb0d30a2bca4 | |
| parent | 72c3617dfe8951e287d2a39baeaf89a0be1e942f (diff) | |
| download | craftbukkit-f3f2fe5795ecaf5a93d7355a66a6fb6030d527f0.tar craftbukkit-f3f2fe5795ecaf5a93d7355a66a6fb6030d527f0.tar.gz craftbukkit-f3f2fe5795ecaf5a93d7355a66a6fb6030d527f0.tar.lz craftbukkit-f3f2fe5795ecaf5a93d7355a66a6fb6030d527f0.tar.xz craftbukkit-f3f2fe5795ecaf5a93d7355a66a6fb6030d527f0.zip | |
SPIGOT-4455: ChunkData.getType returns legacy material
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java index c26f0ed1..550416be 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -67,7 +67,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { @Override public Material getType(int x, int y, int z) { - return getTypeAndData(x, y, z).getItemType(); + return CraftMagicNumbers.getMaterial(getTypeId(x, y, z).getBlock()); } @Override diff --git a/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java b/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java index 792e1fc6..c5194e38 100644 --- a/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java +++ b/src/test/java/org/bukkit/craftbukkit/generator/ChunkDataTest.java @@ -13,7 +13,7 @@ public class ChunkDataTest extends AbstractTestingBase { private boolean testSetBlock(CraftChunkData data, int x, int y, int z, BlockData type, BlockData expected) { 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) { |