Fix block entities not setting level before calling clearRemoved

robotgryphon · robotgryphon · commit fcee3524805b · 2025-01-05T11:14:26.000-05:00
diff --git a/levels/src/main/java/dev/compactmods/gander/level/block/VirtualBlockAndFluidStorage.java b/levels/src/main/java/dev/compactmods/gander/level/block/VirtualBlockAndFluidStorage.java
@@ -102,8 +102,8 @@ public void setBlockEntity(BlockEntity blockEntity) {
         removeBlockEntity(blockEntity.getBlockPos()); // remove current block entity
 
         if(blockEntity.getBlockState().hasBlockEntity()) {
-            blockEntity.clearRemoved();
             blockEntity.setLevel(owningLevel);
+            blockEntity.clearRemoved();
             blockEntities.put(blockEntity.getBlockPos().asLong(), blockEntity);
         }
 	}

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ public void setBlockEntity(BlockEntity blockEntity) {`
`102`	`102`	`removeBlockEntity(blockEntity.getBlockPos()); // remove current block entity`
`103`	`103`
`104`	`104`	`if(blockEntity.getBlockState().hasBlockEntity()) {`
`105`		`- blockEntity.clearRemoved();`
`106`	`105`	`blockEntity.setLevel(owningLevel);`
	`106`	`+ blockEntity.clearRemoved();`
`107`	`107`	`blockEntities.put(blockEntity.getBlockPos().asLong(), blockEntity);`
`108`	`108`	`}`
`109`	`109`	`}`