Run level-completion check when challenges are completed by admins#408

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 1 commit into from
Jul 10, 2026
Merged

Run level-completion check when challenges are completed by admins #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
this.addon.getChallengesManager().setChallengeComplete(
targetUUID, this.getWorld(), challenge, user.getUniqueId());

// Try to complete the level if all challenges are done
this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

if (user.isPlayer())
{
Expand Down
105 changes: 105 additions & 0 deletions src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
}


/**
* This method attempts to complete a level for a user by validating all challenges
* in the level are complete. If the level is completable, it marks the level as complete
* and fires a LevelCompletedEvent.
*
* @param user User who completed the level.
* @param world World where level must be completed.
* @param challenge Challenge whose level should be checked.
* @return The completed ChallengeLevel if level was completed, null otherwise.
*/
@Nullable
public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
{
ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
if (level != null)
{
this.setLevelComplete(user, world, level);
}
return level;
}


/**
* This method attempts to complete a level for a user via admin action.
* Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
*
* @param user User who had the level completed by admin.
* @param world World where level must be completed.
* @param challenge Challenge whose level should be checked.
* @return The completed ChallengeLevel if level was completed, null otherwise.
*/
@Nullable
public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
{
ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
if (level != null)
{
this.setLevelCompleteAdmin(user, world, level);
}
return level;
}


/**
* Helper method that checks if a level is completable (all challenges done, not already
* completed, and not a free level).
*
* @param user User to check for.
* @param world World to check in.
* @param challenge Challenge whose level to check.
* @return The ChallengeLevel if completable, null otherwise.
*/
@Nullable
private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
{
String levelID = challenge.getLevel();
if (levelID.equals(ChallengesManager.FREE))
{
return null;
}

ChallengeLevel level = this.getLevel(challenge);
if (level == null)
{
return null;
}

if (this.isLevelCompleted(user, world, level))
{
return null;
}

if (!this.validateLevelCompletion(user, world, level))
{
return null;
}

return level;
}


/**
* Helper method to set a level as complete by admin and fire an admin event.
*
* @param user User who had the level completed.
* @param world World where level was completed.
* @param level Level to mark as complete.
*/
private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
{
String storageID = this.getDataUniqueID(user, Util.getWorld(world));

this.setLevelComplete(storageID, level.getUniqueId());
this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
data(USER_ID, user.getUniqueId().toString()).
data("level", level.getUniqueId()).build());

// Fire admin event that admin completes level
Bukkit.getPluginManager().callEvent(
new LevelCompletedEvent(level.getUniqueId(),
user.getUniqueId(),
true));
}


/**
* This method returns LevelStatus object for given challenge level.
* @param uniqueId UUID of user who need to be validated.
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
(status, valueSet) -> {
if (Boolean.TRUE.equals(status))
{
valueSet.forEach(challenge ->
valueSet.forEach(challenge -> {
manager.setChallengeComplete(player.getUniqueId(),
this.world,
challenge,
this.user.getUniqueId()));
this.user.getUniqueId());
// Try to complete the level if all challenges are done
manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
this.world,
challenge);
});
}

this.build();
Expand Down
82 changes: 38 additions & 44 deletions src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

// Check level completion for non-free challenges
if (!result.wasCompleted() &&
!this.challenge.getLevel().equals(ChallengesManager.FREE))
if (!result.wasCompleted())
{
ChallengeLevel level = this.manager.getLevel(this.challenge);
ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
if (level != null)
{
if (this.manager.validateLevelCompletion(this.user, this.world, level))
// Item rewards
for (ItemStack reward : level.getRewardItems())
{
// Item rewards
for (ItemStack reward : level.getRewardItems())
{
// Clone is necessary because otherwise it will chane reward itemstack
// amount.
this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
this.user.getWorld().dropItem(this.user.getLocation(), v));
}

// Money Reward
if (this.addon.isEconomyProvided())
{
this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
}
// Clone is necessary because otherwise it will chane reward itemstack
// amount.
this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
this.user.getWorld().dropItem(this.user.getLocation(), v));
}

// Experience Reward
this.user.getPlayer().giveExp(level.getRewardExperience());
// Money Reward
if (this.addon.isEconomyProvided())
{
this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
}

// Run commands
this.runCommands(level.getRewardCommands());
// Experience Reward
this.user.getPlayer().giveExp(level.getRewardExperience());

Utils.sendMessage(this.user,
this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
level.getFriendlyName());
// Run commands
this.runCommands(level.getRewardCommands());

if (this.addon.getChallengesSettings().isBroadcastMessages())
{
Bukkit.getOnlinePlayers().stream().
map(User::getInstance).forEach(user -> Utils.sendMessage(user,
this.world,
Constants.MESSAGES + "name-has-completed-level",
Constants.PARAMETER_NAME, this.user.getName(),
Constants.PARAMETER_VALUE, level.getFriendlyName()));
}
Utils.sendMessage(this.user,
this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
level.getFriendlyName());

this.manager.setLevelComplete(this.user, this.world, level);
if (this.addon.getChallengesSettings().isBroadcastMessages())
{
Bukkit.getOnlinePlayers().stream().
map(User::getInstance).forEach(user -> Utils.sendMessage(user,
this.world,
Constants.MESSAGES + "name-has-completed-level",
Constants.PARAMETER_NAME, this.user.getName(),
Constants.PARAMETER_VALUE, level.getFriendlyName()));
}

// sends title to player on level completion
if (this.addon.getChallengesSettings().isShowCompletionTitle())
{
this.user.getPlayer().sendTitle(
this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
}
// sends title to player on level completion
if (this.addon.getChallengesSettings().isShowCompletionTitle())
{
this.user.getPlayer().sendTitle(
this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
}
}
}
Expand Down
12 changes: 9 additions & 3 deletions src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
// Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning on line 786 in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation

SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times". 


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
List<Double> deposits = moneyCaptor.getAllValues();
assertEquals(100.0, deposits.get(0)); // first-time reward
assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
// First-time: giveExp(50), repeat: giveExp(10*4=40)
ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning on line 792 in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation

SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times". 


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
List<Integer> xps = xpCaptor.getAllValues();
assertEquals(50, xps.get(0));
assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
lvl.setFriendlyName("Novice");
lvl.setRewardExperience(200);
// Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
// getLevel(Challenge) used in build() for level completion check
// getLevel(Challenge) used in tryCompleteLevel()
when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
// Mock tryCompleteLevel to return the level (which triggers reward logic)
when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
when(inv.addItem(any())).thenReturn(new HashMap<>());
assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
verify(cm).setLevelComplete(any(), any(), eq(lvl));
// Verify that tryCompleteLevel was called to complete the level
verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
verify(player).giveExp(200);
}

Expand All@@ -830,9 +833,12 @@
when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
// Mock tryCompleteLevel to return null since level is already completed
when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
when(inv.addItem(any())).thenReturn(new HashMap<>());
assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
verify(cm, never()).setLevelComplete(any(), any(), any());
// Verify tryCompleteLevel was called but didn't complete the level (returned null)
verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
}

@Test
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Run level-completion check when challenges are completed by admins#408

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 1 commit into

from

Jul 10, 2026
 Merged


Run level-completion check when challenges are completed by admins
#408
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,8 @@ else if (!args.get(1).isEmpty())
 this.addon.getChallengesManager().setChallengeComplete(
 targetUUID, this.getWorld(), challenge, user.getUniqueId());

 // Try to complete the level if all challenges are done
 this.addon.getChallengesManager().tryCompleteLevelAdmin(target, this.getWorld(), challenge);

 if (user.isPlayer())
 {
Expand Down

105 changes: 105 additions & 0 deletions
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1774,6 +1774,111 @@ public boolean validateLevelCompletion(User user, World world, ChallengeLevel le
 }


 /**
 * This method attempts to complete a level for a user by validating all challenges
 * in the level are complete. If the level is completable, it marks the level as complete
 * and fires a LevelCompletedEvent.
 *
 * @param user User who completed the level.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevel(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelComplete(user, world, level);
 }
 return level;
 }


 /**
 * This method attempts to complete a level for a user via admin action.
 * Similar to tryCompleteLevel but fires an admin LevelCompletedEvent.
 *
 * @param user User who had the level completed by admin.
 * @param world World where level must be completed.
 * @param challenge Challenge whose level should be checked.
 * @return The completed ChallengeLevel if level was completed, null otherwise.
 */
 @Nullable
 public ChallengeLevel tryCompleteLevelAdmin(User user, World world, Challenge challenge)
 {
 ChallengeLevel level = this.getCompletableLevel(user, world, challenge);
 if (level != null)
 {
 this.setLevelCompleteAdmin(user, world, level);
 }
 return level;
 }


 /**
 * Helper method that checks if a level is completable (all challenges done, not already
 * completed, and not a free level).
 *
 * @param user User to check for.
 * @param world World to check in.
 * @param challenge Challenge whose level to check.
 * @return The ChallengeLevel if completable, null otherwise.
 */
 @Nullable
 private ChallengeLevel getCompletableLevel(User user, World world, Challenge challenge)
 {
 String levelID = challenge.getLevel();
 if (levelID.equals(ChallengesManager.FREE))
 {
 return null;
 }

 ChallengeLevel level = this.getLevel(challenge);
 if (level == null)
 {
 return null;
 }

 if (this.isLevelCompleted(user, world, level))
 {
 return null;
 }

 if (!this.validateLevelCompletion(user, world, level))
 {
 return null;
 }

 return level;
 }


 /**
 * Helper method to set a level as complete by admin and fire an admin event.
 *
 * @param user User who had the level completed.
 * @param world World where level was completed.
 * @param level Level to mark as complete.
 */
 private void setLevelCompleteAdmin(User user, World world, ChallengeLevel level)
 {
 String storageID = this.getDataUniqueID(user, Util.getWorld(world));

 this.setLevelComplete(storageID, level.getUniqueId());
 this.addLogEntry(storageID, new LogEntry.Builder("COMPLETE_LEVEL").
 data(USER_ID, user.getUniqueId().toString()).
 data("level", level.getUniqueId()).build());

 // Fire admin event that admin completes level
 Bukkit.getPluginManager().callEvent(
 new LevelCompletedEvent(level.getUniqueId(),
 user.getUniqueId(),
 true));
 }


 /**
 * This method returns LevelStatus object for given challenge level.
 * @param uniqueId UUID of user who need to be validated.
Expand Down

9 changes: 7 additions & 2 deletions
src/main/java/world/bentobox/challenges/panel/admin/ListUsersPanel.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -222,11 +222,16 @@ protected PanelItem createElementButton(Player player)
 (status, valueSet) -> {
 if (Boolean.TRUE.equals(status))
 {
 valueSet.forEach(challenge ->
 valueSet.forEach(challenge -> {
 manager.setChallengeComplete(player.getUniqueId(),
 this.world,
 challenge,
 this.user.getUniqueId()));
 this.user.getUniqueId());
 // Try to complete the level if all challenges are done
 manager.tryCompleteLevelAdmin(User.getInstance(player.getUniqueId()),
 this.world,
 challenge);
 });
 }

 this.build();
Expand Down

82 changes: 38 additions & 44 deletions
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,60 +364,54 @@ ChallengeResult build(int maxTimes)
 this.manager.setChallengeComplete(this.user, this.world, this.challenge, result.getFactor());

 // Check level completion for non-free challenges
 if (!result.wasCompleted() &&
 !this.challenge.getLevel().equals(ChallengesManager.FREE))
 if (!result.wasCompleted())
 {
 ChallengeLevel level = this.manager.getLevel(this.challenge);
 ChallengeLevel level = this.manager.tryCompleteLevel(this.user, this.world, this.challenge);

 if (level != null && !this.manager.isLevelCompleted(this.user, this.world, level))
 if (level != null)
 {
 if (this.manager.validateLevelCompletion(this.user, this.world, level))
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Item rewards
 for (ItemStack reward : level.getRewardItems())
 {
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }
 // Clone is necessary because otherwise it will chane reward itemstack
 // amount.
 this.user.getInventory().addItem(reward.clone()).forEach((k, v) ->
 this.user.getWorld().dropItem(this.user.getLocation(), v));
 }

 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());
 // Money Reward
 if (this.addon.isEconomyProvided())
 {
 this.addon.getEconomyProvider().deposit(this.user, level.getRewardMoney());
 }

// Run commands
this.runCommands(level.getRewardCommands());
 // Experience Reward
 this.user.getPlayer().giveExp(level.getRewardExperience());

 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());
 // Run commands
 this.runCommands(level.getRewardCommands());

 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }
 Utils.sendMessage(this.user,
 this.world, Constants.MESSAGES + "you-completed-level", Constants.PARAMETER_VALUE,
 level.getFriendlyName());

 this.manager.setLevelComplete(this.user, this.world, level);
 if (this.addon.getChallengesSettings().isBroadcastMessages())
 {
 Bukkit.getOnlinePlayers().stream().
 map(User::getInstance).forEach(user -> Utils.sendMessage(user,
 this.world,
 Constants.MESSAGES + "name-has-completed-level",
 Constants.PARAMETER_NAME, this.user.getName(),
 Constants.PARAMETER_VALUE, level.getFriendlyName()));
 }

 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 // sends title to player on level completion
 if (this.addon.getChallengesSettings().isShowCompletionTitle())
 {
 this.user.getPlayer().sendTitle(
 this.parseLevel(this.user.getTranslation("challenges.titles.level-title"), level),
 this.parseLevel(this.user.getTranslation("challenges.titles.level-subtitle"), level),
 10, this.addon.getChallengesSettings().getTitleShowtime(), 20);
 }
 }
 }
Expand Down

12 changes: 9 additions & 3 deletions
src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -783,13 +783,13 @@
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix, 5));
 // Factor = 5. First-time: deposit(100), repeat: deposit(25*4=100). Total: 2 deposit calls.
 ArgumentCaptor<Double> moneyCaptor = ArgumentCaptor.forClass(Double.class);
 verify(vault, org.mockito.Mockito.times(2)).deposit(eq(user), moneyCaptor.capture());

Check warning
on line 786
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPT&open=AZ9N3qI8OI8JwMZvbZPT&pullRequest=408
 List<Double> deposits = moneyCaptor.getAllValues();
 assertEquals(100.0, deposits.get(0)); // first-time reward
 assertEquals(100.0, deposits.get(1)); // repeat: 25 * 4
 // First-time: giveExp(50), repeat: giveExp(10*4=40)
 ArgumentCaptor<Integer> xpCaptor = ArgumentCaptor.forClass(Integer.class);
 verify(player, org.mockito.Mockito.times(2)).giveExp(xpCaptor.capture());

Check warning
on line 792
in src/test/java/world/bentobox/challenges/tasks/TryToCompleteTest.java

View check run for this annotation
SonarQubeCloud/ SonarCloud Code Analysis

Use a static import for "times".


See more on https://sonarcloud.io/project/issues?id=BentoBoxWorld_Challenges&issues=AZ9N3qI8OI8JwMZvbZPU&open=AZ9N3qI8OI8JwMZvbZPU&pullRequest=408
 List<Integer> xps = xpCaptor.getAllValues();
 assertEquals(50, xps.get(0));
 assertEquals(40, xps.get(1));
Expand All@@ -809,14 +809,17 @@
 lvl.setFriendlyName("Novice");
 lvl.setRewardExperience(200);
 // Stub both overloads: getLevel(String) used in checkIfCanCompleteChallenge,
 // getLevel(Challenge) used in build() for level completion check
 // getLevel(Challenge) used in tryCompleteLevel()
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(false);
 when(cm.validateLevelCompletion(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return the level (which triggers reward logic)
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(lvl);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm).setLevelComplete(any(), any(), eq(lvl));
 // Verify that tryCompleteLevel was called to complete the level
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 verify(player).giveExp(200);
 }

Expand All@@ -830,9 +833,12 @@
 when(cm.getLevel(GAME_MODE_NAME + "_novice")).thenReturn(lvl);
 when(cm.getLevel(any(Challenge.class))).thenReturn(lvl);
 when(cm.isLevelCompleted(any(), any(), any())).thenReturn(true);
 // Mock tryCompleteLevel to return null since level is already completed
 when(cm.tryCompleteLevel(any(), any(), any())).thenReturn(null);
 when(inv.addItem(any())).thenReturn(new HashMap<>());
 assertTrue(TryToComplete.complete(addon, user, challenge, world, topLabel, permissionPrefix));
 verify(cm, never()).setLevelComplete(any(), any(), any());
 // Verify tryCompleteLevel was called but didn't complete the level (returned null)
 verify(cm).tryCompleteLevel(any(), any(), eq(challenge));
 }

 @Test
Expand Down
Loading