Merge pull request #6929 from EliteTK/fix-invisible-elevator-doors

Fix #5417
This commit is contained in:
simibubi 2024-10-08 17:55:31 +02:00 committed by GitHub
commit 7c2a40e8c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1386,6 +1386,9 @@ public abstract class Contraption {
private void gatherBBsOffThread() { private void gatherBBsOffThread() {
getContraptionWorld(); getContraptionWorld();
if (simplifiedEntityColliderProvider != null) {
simplifiedEntityColliderProvider.cancel(false);
}
simplifiedEntityColliderProvider = CompletableFuture.supplyAsync(() -> { simplifiedEntityColliderProvider = CompletableFuture.supplyAsync(() -> {
VoxelShape combinedShape = Shapes.empty(); VoxelShape combinedShape = Shapes.empty();
for (Entry<BlockPos, StructureBlockInfo> entry : blocks.entrySet()) { for (Entry<BlockPos, StructureBlockInfo> entry : blocks.entrySet()) {
@ -1402,7 +1405,6 @@ public abstract class Contraption {
}) })
.thenAccept(r -> { .thenAccept(r -> {
simplifiedEntityColliders = Optional.of(r); simplifiedEntityColliders = Optional.of(r);
simplifiedEntityColliderProvider = null;
}); });
} }