Skip to content

Don't need to track processed criteria during share handling #652

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
benwoo1110 merged 1 commit into from
Dec 16, 2025
Merged

Don't need to track processed criteria during share handling #652

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
10 changes: 3 additions & 7 deletions src/main/java/org/mvplugins/multiverse/inventories/share/Sharables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
Expand Down Expand Up @@ -746,8 +747,7 @@ public void updateProfile(ProfileData profile, Player player) {
@Override
public boolean updatePlayer(Player player, ProfileData profile) {
List<String> advancements = profile.get(ADVANCEMENTS);
Set<String> processedCriteria = new HashSet<>();
Set<String> completedCriteria = (advancements != null) ? new HashSet<>(advancements) : new HashSet<>();
Set<String> completedCriteria = (advancements != null) ? new HashSet<>(advancements) : Collections.emptySet();

// Advancements may cause the player to level up, which we don't want to happen
int totalExperience = player.getTotalExperience();
Expand All @@ -761,17 +761,13 @@ public boolean updatePlayer(Player player, ProfileData profile) {
Bukkit.advancementIterator().forEachRemaining(advancement -> {
AdvancementProgress advancementProgress = player.getAdvancementProgress(advancement);
for (String criteria : advancement.getCriteria()) {
if (processedCriteria.contains(criteria)) {
continue;
} else if (completedCriteria.contains(criteria)) {
if (completedCriteria.contains(criteria)) {
advancementProgress.awardCriteria(criteria);
} else {
advancementProgress.revokeCriteria(criteria);
}
processedCriteria.add(criteria);
}
});

// Set back the level from before applying the advancements
player.setExp(exp);
player.setLevel(level);
Expand Down
Loading