Skip to content

Prevent Boxed from resetting player progress on non-Boxed island resets #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tastybento merged 2 commits into from
May 29, 2026
Merged

Prevent Boxed from resetting player progress on non-Boxed island resets #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4395d01
Guard advancement reset handling to Boxed islands
Copilot May 29, 2026
f08440a
Pin MockBukkit to Maven Central 4.110.0 instead of jitpack snapshot
tastybento May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<!-- Non-minecraft related dependencies -->
<junit.version>5.10.2</junit.version>
<mockito.version>5.11.0</mockito.version>
<mock-bukkit.version>v1.21-SNAPSHOT</mock-bukkit.version>
<mock-bukkit.version>4.110.0</mock-bukkit.version>
<!-- More visible way how to change dependency versions -->
<paper.version>1.21.11-R0.1-SNAPSHOT</paper.version>
<bentobox.version>3.13.0</bentobox.version>
Expand Down Expand Up @@ -164,8 +164,8 @@
</dependency>
<!-- MockBukkit -->
<dependency>
<groupId>com.github.MockBukkit</groupId>
<artifactId>MockBukkit</artifactId>
<groupId>org.mockbukkit.mockbukkit</groupId>
<artifactId>mockbukkit-v1.21</artifactId>
<version>${mock-bukkit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ public void onTeamLeaveTime(TeamLeaveEvent e) {
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onFirstTime(IslandNewIslandEvent e) {
if (addon.getSettings().isIgnoreAdvancements()) return;
if (!addon.inWorld(e.getIsland().getWorld())) {
return;
}
User user = User.getInstance(e.getPlayerUUID());
if (user != null) {
clearAndSetAdv(user, addon.getSettings().isOnJoinResetAdvancements(), addon.getSettings().getOnJoinGrantAdvancements());
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/world/bentobox/boxed/listeners/AdvancementListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,18 @@
verify(e, never()).getPlayerUUID();
}

@Test
public void testOnFirstTimeNotInBoxedWorld() {

Check warning on line 336 in src/test/java/world/bentobox/boxed/listeners/AdvancementListenerTest.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this 'public' modifier. 


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Boxed&issues=AZ52CjrNEMqJBb_RLO66&open=AZ52CjrNEMqJBb_RLO66&pullRequest=125
IslandNewIslandEvent e = mock(IslandNewIslandEvent.class);
when(e.getIsland()).thenReturn(island);
when(island.getWorld()).thenReturn(world);
when(addon.inWorld(world)).thenReturn(false);

listener.onFirstTime(e);

verify(e, never()).getPlayerUUID();
}

// ---------- static helpers ----------

@Test
Expand Down
Loading