mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 02:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve particle handling and block state retrieval

Browse Source
This commit is contained in:
Christian Bergschneider
2025-10-07 23:32:30 +02:00
parent 234ff3e49c
commit 1b6ebeb05f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockState.java
View File

@@ -13,6 +13,7 @@ import com.dfsek.terra.api.block.state.properties.Property;
public class MinestomBlockState implements BlockState { public class MinestomBlockState implements BlockState {
private final Block block; private final Block block;
public static final MinestomBlockState AIR = new MinestomBlockState(Block.AIR);
public MinestomBlockState(Block block) { public MinestomBlockState(Block block) {
if(block == null) { if(block == null) {

8
platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/CachedChunk.java
View File

@@ -32,7 +32,9 @@ public class CachedChunk implements ProtoChunk {
public void setBlock(int x, int y, int z, @NotNull BlockState blockState) { public void setBlock(int x, int y, int z, @NotNull BlockState blockState) {
Block block = (Block) blockState.getHandle(); Block block = (Block) blockState.getHandle();
if(block == null) return; if(block == null) return;
blocks[getIndex(x, y, z)] = block; int index = getIndex(x, y, z);
if (index > blocks.length || index < 0) return;
blocks[index] = block;
} }
private int getIndex(int x, int y, int z) { private int getIndex(int x, int y, int z) {
@@ -42,7 +44,9 @@ public class CachedChunk implements ProtoChunk {
@Override @Override
public @NotNull BlockState getBlock(int x, int y, int z) { public @NotNull BlockState getBlock(int x, int y, int z) {
return new MinestomBlockState(blocks[getIndex(x, y, z)]); int index = getIndex(x, y, z);
if (index > blocks.length || index < 0) return MinestomBlockState.AIR;
return new MinestomBlockState(blocks[index]);
} }
@Override @Override

3
platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/BiomeParticleConfigTemplate.java
View File

@@ -35,7 +35,8 @@ public class BiomeParticleConfigTemplate implements ObjectTemplate<BiomeEffects.
String[] parts = particle.split("\\{"); String[] parts = particle.split("\\{");
Particle parsedParticle = Particle.fromKey(parts[0]); Particle parsedParticle = Particle.fromKey(parts[0]);
if (parts.length > 1) { if (parts.length > 1) {
LoggerFactory.getLogger(BiomeParticleConfigTemplate.class).warn("Particle {} has additional data, which will be ignored.", particle); LoggerFactory.getLogger(BiomeParticleConfigTemplate.class).warn("Particle {} has additional data, particle will be ignored.", particle);
return null;
} }
return new BiomeEffects.Particle( return new BiomeEffects.Particle(