[1.21.4] Revert Registries to Frozen on Disconnect when a connection is present #1934
+11
−14
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.
Closes #1932
Moves the call to
RegistryManager#revertToFrozen
toMinecraft#disconnect
to handle every case of the vanilla client disconnecting from some server instance. As we don't want to revert the registries until after all potential usecases are handled, the logic is cached before the connection is released and ran at the end of the method. There is no need to include the memory connection check as this is called regardless of the type of channel used, as evidenced by its prior use inServerLifecycleHooks#handleServerStopped
.The test provided in the issue was used to verify the logic.