Fix inventory lost when returning to original island#42
Merged
tastybento merged 5 commits intomasterfrom Mar 31, 2026
Merged
Conversation
Players who own multiple islands now get separate inventories per island, preventing cross-island resource cheating. Inventories switch when entering an owned island's protection zone, teleporting between owned islands, or respawning on a different owned island after death. Island inventories stay consistent across Overworld/Nether/End dimensions. Controlled by the new options.islands config toggle (default: true). No behavior change for games without concurrent island ownership. Also fixes pre-existing @AfterEach (JUnit 5) annotations in tests that should have been @after (JUnit 4), and fixes advancements being stored under raw world name instead of the normalized storage key. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Replace the single islands boolean with a nested config that lets admins control which aspects are switched per-island independently. Each option (inventory, health, food, advancements, gamemode, experience, ender-chest, statistics) can be toggled separately under options.islands. Options default to matching the original behavior (inventory and ender-chest on, rest off). The world-level option must also be enabled for the island sub-option to take effect. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Add per-island inventory switching (#40)
Replace JUnit 4 + mockito-inline with JUnit 5 + MockBukkit + mockito- junit-jupiter. Switch from spigot-api to paper-api (required by MockBukkit). Add byte-buddy explicit version for broader Java support. Delete custom ServerMocks utility, replaced by MockBukkit.mock(). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…econd island When a player transitions from single-island to multi-island mode, their currentKey is a world-only key (e.g., "oneblock_world"). Previously, when entering a new island, storeInventory saved to this world-only key, and the backward-compat migration in getInventory incorrectly gave that data to the new island instead of preserving it for the original island. Add Store.upgradeWorldKeyToIsland() which proactively upgrades the currentKey to an island-specific key before any save/load occurs. Called from PlayerListener.onIslandEnter when a world-only key is detected, this ensures storeInventory saves to the correct island-specific key and prevents the migration from misassigning data. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
|
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
1 participant
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
Store.upgradeWorldKeyToIsland()called fromPlayerListener.onIslandEnterto handle the key transitionPlayerListenerTest plan
testUpgradeWorldKeyToIslandtest verifies key upgrade clears world data and updates currentKeytestFullScenarioSingleToMultipleIslandstest covers the full bug scenario end-to-end🤖 Generated with Claude Code