Fix recursive deadlock in CraftWorld.isChunkGenerated #34
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes a recursive deadlock in
CraftWorld.isChunkGeneratedthat occurs when plugins (like Chunky) call the method from multiple threads simultaneously during chunk pre-generation.Problem
The original implementation used
managedBlockto process tasks while waiting for chunk data. WhenmanagedBlockprocessed tasks, it could execute otherisChunkGeneratedcalls, which would also callmanagedBlock, creating:Solution
ThreadLocal<Boolean>flag to track when we're already insideisChunkGeneratedfuture.join()withoutmanagedBlockto avoid recursive task processingfalse(conservative answer) without blockingmanagedBlocknormally to process chunk loadBehavior Change
Recursive calls to
isChunkGeneratednow returnfalsewhen the chunk isn't immediately available in memory, rather than blocking. This is a conservative answer that:Testing
isChunkGeneratedusages in codebase - no breaking changes identified