mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-02-11 04:45:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add null-safety check on usage of BlockEntity.loadStatic (#6224)

Browse source
This commit is contained in:
Jay Turner 2024-03-22 13:38:56 +00:00 committed by GitHub
parent 6802a1316b
commit efb3cf490d
Failed to generate hash of commit
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
View file

@ -298,12 +298,14 @@ public class BlockHelper {
if (data != null) { if (data != null) {
if (existingBlockEntity instanceof IMergeableBE mergeable) { if (existingBlockEntity instanceof IMergeableBE mergeable) {
BlockEntity loaded = BlockEntity.loadStatic(target, state, data); BlockEntity loaded = BlockEntity.loadStatic(target, state, data);
if (loaded != null) {
if (existingBlockEntity.getType() if (existingBlockEntity.getType()
.equals(loaded.getType())) { .equals(loaded.getType())) {
mergeable.accept(loaded); mergeable.accept(loaded);
return; return;
} }
} }
}
BlockEntity blockEntity = world.getBlockEntity(target); BlockEntity blockEntity = world.getBlockEntity(target);
if (blockEntity != null) { if (blockEntity != null) {
data.putInt("x", target.getX()); data.putInt("x", target.getX());