Fix restoring off-hand and cursor items after games - #116
Open
GerwinVerkerk wants to merge 1 commit into
Open
GerwinVerkerk wants to merge 1 commit into
GerwinVerkerk wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Describe your changes
Preserve the player's extra inventory contents and cursor item in the existing pre-game
PlayerDatasnapshot.PlayerInventory#getExtraContents()includes the off-hand slot on Paper. HungerGames previously cleared that slot when a game started but only restored storage and armor contents, causing off-hand items to disappear after leaving or finishing a game.This change:
This intentionally does not address the large-arena preparation issue or add durable crash recovery; those have different risk and review scope. A follow-up proposal for durable snapshots is described on issue #113. It also does not duplicate the world-border work in #115.
Verification
./gradlew clean build --no-daemongit diff --checkTarget Minecraft Versions: all currently supported versions
Requirements: none
Related Issues: #113
Checklist before requesting a review