Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 15:07:36 +02:00
Code Issues Projects Releases Wiki Activity

Move getBlock to Instance only

Browse Source
This commit is contained in:
iamceph 2021-01-26 09:51:19 +01:00
parent 564d549f81
commit ded8a4b4f8
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/instance/Chunk.java
View File

@ -132,16 +132,6 @@ public abstract class Chunk implements Viewable, DataContainer {
*/
public abstract void tick(long time, @NotNull Instance instance);
/**
* Gets Block type from given coordinates.
*
* @param x x coordinate
* @param y y coordinate
* @param z z coordinate
* @return Block at given position.
*/
public abstract Block getBlock(int x, int y, int z);
/**
* Gets the block state id at a position.
*

5
src/main/java/net/minestom/server/instance/DynamicChunk.java
View File

@ -156,11 +156,6 @@ public class DynamicChunk extends Chunk {
}
}
@Override
public Block getBlock(int x, int y, int z) {
return Block.fromStateId(getBlockStateId(x, y, z));
}
@Override
public short getBlockStateId(int x, int y, int z) {
return getBlockAt(blockPalette, x, y, z);

6
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -626,11 +626,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
* @return Block at given position.
*/
public Block getBlock(int x, int y, int z) {
final Chunk chunk = getChunkAt(x, z);
Check.notNull(chunk, "The chunk at " + x + ":" + z + " is not loaded");
synchronized (chunk) {
return chunk.getBlock(x, y, z);
}
return Block.fromStateId(getBlockStateId(x, y, z));
}
/**