Merge develop into force-field-fling PR (conflict resolution)#2880
Merged
tastybento merged 2 commits intoforcefieldteleportfrom Mar 22, 2026
Merged
Merge develop into force-field-fling PR (conflict resolution)#2880tastybento merged 2 commits intoforcefieldteleportfrom
tastybento merged 2 commits intoforcefieldteleportfrom
Conversation
…ing feature Co-authored-by: tastybento <4407265+tastybento@users.noreply.github.com> Agent-Logs-Url: https://github.com/BentoBoxWorld/BentoBox/sessions/f62452d6-851e-44bf-8e7e-bdb22da91f10
Copilot
AI
changed the title
[WIP] Fix force field fling on teleport
Merge develop into force-field-fling PR (conflict resolution)
Mar 21, 2026
|
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.
Old PR branch was significantly behind
origin/develop, blocking merge. Resolved all conflicts introduced by develop's major changes while preserving the fling-on-teleport feature.Conflict resolutions
Settings.java— retainedflingback+teleportRemoveMobsfields; merged alongside develop's new fields (readyCommands,expelCommand,obsidianScoopingRadius/Cooldown, etc.)IslandsManager.java— keptflingOrKill()implementation; updated to new API (customName()over deprecatedgetCustomName()); added bothSoundandTagimportsen-US.yml— preserved "Fling back monsters" copy forREMOVE_MOBSflag; adopted develop's unquoted YAML stylePanelListenerManagerTest.java— added new interface method stubs required by updated inventory APIIslandsManagerTest.java— migrated to JUnit 5 + variable renames (im→islandsManager,s→settings);testClearAreaRemove()coversteleportRemoveMobs=true(entity removal),testClearArea()covers default fling pathNotable develop changes absorbed
getCustomName()→customName()⌨️ Start Copilot coding agent tasks without leaving your editor — available in VS Code, Visual Studio, JetBrains IDEs and Eclipse.