Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compound tags can be nullable when converting state to baseblock (#2914)

Browse Source
This commit is contained in:
Jordan 2024-09-15 16:00:17 +01:00 committed by GitHub
parent f820cb2fb4
commit 49b063a187
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java
View File

@ -263,8 +263,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
final BlockMaterial material = state.getMaterial(); final BlockMaterial material = state.getMaterial();
if (material.hasContainer()) { if (material.hasContainer()) {
final FaweCompoundTag tag = get.tile(x, y + yy, z); final FaweCompoundTag tag = get.tile(x, y + yy, z);
assert tag != null : "has container but is null"; return state.toBaseBlock(tag == null ? null : tag.linTag());
return state.toBaseBlock(tag.linTag());
} }
return state.toBaseBlock(); return state.toBaseBlock();
} }

3
worldedit-core/src/main/java/com/fastasyncworldedit/core/world/block/CompoundInput.java
View File

@ -17,8 +17,7 @@ public enum CompoundInput {
@Override @Override
public BaseBlock get(final BlockState state, final IBlocks blocks, final int x, final int y, final int z) { public BaseBlock get(final BlockState state, final IBlocks blocks, final int x, final int y, final int z) {
final FaweCompoundTag tile = blocks.tile(x, y, z); final FaweCompoundTag tile = blocks.tile(x, y, z);
assert tile != null : "container without tile entity"; return state.toBaseBlock(tile == null ? null : tile.linTag());
return state.toBaseBlock(tile.linTag());
} }
}; };

2
worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java
View File

@ -427,7 +427,7 @@ public class AbstractDelegateExtent implements Extent {
@Override @Override
public boolean tile(int x, int y, int z, FaweCompoundTag tile) throws WorldEditException { public boolean tile(int x, int y, int z, FaweCompoundTag tile) throws WorldEditException {
return setBlock(x, y, z, getBlock(x, y, z).toBaseBlock(tile.linTag())); return setBlock(x, y, z, getBlock(x, y, z).toBaseBlock(tile == null ? null : tile.linTag()));
} }
//FAWE end //FAWE end