mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 22:44:07 +01:00
Code Issues Packages Projects Releases 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
View File

@ -298,10 +298,12 @@ 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 (existingBlockEntity.getType() if (loaded != null) {
.equals(loaded.getType())) { if (existingBlockEntity.getType()
mergeable.accept(loaded); .equals(loaded.getType())) {
return; mergeable.accept(loaded);
return;
}
} }
} }
BlockEntity blockEntity = world.getBlockEntity(target); BlockEntity blockEntity = world.getBlockEntity(target);