Fix block entity initialization issues

CaffeineMC · Jan 14, 2025 · 7d0fdab · 7d0fdab
1 parent 55742f4
commit 7d0fdab
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...um/mixin/minimal_nonvanilla/world/block_entity_ticking/support_cache/LevelChunkMixin.java b/...um/mixin/minimal_nonvanilla/world/block_entity_ticking/support_cache/LevelChunkMixin.java
@@ -36,7 +36,15 @@ public abstract class LevelChunkMixin {
             )
     )
     private BlockEntity createBlockEntityWithCachedStateFix(EntityBlock blockEntityProvider, BlockPos pos, BlockState state) {
-        return blockEntityProvider.newBlockEntity(pos, this.getBlockState(pos));
+        // Modded EntityBlock objects are not always the same as state.getBlock(), use their object if it is valid.
+        BlockState blockState = this.getBlockState(pos);
+        if (state == blockState) {
+            return blockEntityProvider.newBlockEntity(pos, state);
+        } else if (blockState.hasBlockEntity()) { // Create our block entity of correct type if applicable
+            return ((EntityBlock) blockState.getBlock()).newBlockEntity(pos, blockState);
+        } else {
+            return null;
+        }
     }
 
     @Inject(