Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-14 19:32:17 +01:00
Code Issues Projects Releases Wiki Activity

More understandable exception when a chunk is not loaded

Browse Source
This commit is contained in:
Felix Cravic 2020-07-18 23:32:12 +02:00
parent 90e3a9ac3e
commit 617d855c84
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,6 +363,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
public short getBlockId(int x, int y, int z) { public short getBlockId(int x, int y, int z) {
Chunk chunk = getChunkAt(x, z); Chunk chunk = getChunkAt(x, z);
Check.notNull(chunk, "The chunk at " + x + ": " + z + " is not loaded");
return chunk.getBlockId(x, y, z); return chunk.getBlockId(x, y, z);
} }
@ -376,6 +377,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
public CustomBlock getCustomBlock(int x, int y, int z) { public CustomBlock getCustomBlock(int x, int y, int z) {
Chunk chunk = getChunkAt(x, z); Chunk chunk = getChunkAt(x, z);
Check.notNull(chunk, "The chunk at " + x + ": " + z + " is not loaded");
return chunk.getCustomBlock(x, y, z); return chunk.getCustomBlock(x, y, z);
} }
@ -384,13 +386,14 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
} }
public void sendBlockAction(BlockPosition blockPosition, byte actionId, byte actionParam) { public void sendBlockAction(BlockPosition blockPosition, byte actionId, byte actionParam) {
short blockId = getBlockId(blockPosition); final short blockId = getBlockId(blockPosition);
final Block block = Block.fromId(blockId);
BlockActionPacket blockActionPacket = new BlockActionPacket(); BlockActionPacket blockActionPacket = new BlockActionPacket();
blockActionPacket.blockPosition = blockPosition; blockActionPacket.blockPosition = blockPosition;
blockActionPacket.actionId = actionId; blockActionPacket.actionId = actionId;
blockActionPacket.actionParam = actionParam; blockActionPacket.actionParam = actionParam;
blockActionPacket.blockId = blockId; // FIXME: block id and not block state? blockActionPacket.blockId = block.getBlockId();
Chunk chunk = getChunkAt(blockPosition); Chunk chunk = getChunkAt(blockPosition);
chunk.sendPacketToViewers(blockActionPacket); chunk.sendPacketToViewers(blockActionPacket);
@ -398,6 +401,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
public Data getBlockData(int x, int y, int z) { public Data getBlockData(int x, int y, int z) {
Chunk chunk = getChunkAt(x, z); Chunk chunk = getChunkAt(x, z);
Check.notNull(chunk, "The chunk at " + x + ": " + z + " is not loaded");
return chunk.getData(x, (byte) y, z); return chunk.getData(x, (byte) y, z);
} }