Skip to content

Make XP formula caches safe for concurrent access #5348

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

Open
cyrne1-7208 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −19
Open

Make XP formula caches safe for concurrent access #5348

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
25 changes: 6 additions & 19 deletions src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,32 @@
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.LogUtils;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.VisibleForTesting;

public class FormulaManager {
private static final File formulaFile = new File(mcMMO.getFlatFileDirectory() + "formula.yml");

// Experience needed to reach a level, cached values to improve conversion speed
private Map<Integer, Integer> experienceNeededRetroLinear;
private Map<Integer, Integer> experienceNeededStandardLinear;
private Map<Integer, Integer> experienceNeededRetroExponential;
private Map<Integer, Integer> experienceNeededStandardExponential;
private final ConcurrentMap<Integer, Integer> experienceNeededRetroLinear = new ConcurrentHashMap<>();
private final ConcurrentMap<Integer, Integer> experienceNeededStandardLinear = new ConcurrentHashMap<>();
private final ConcurrentMap<Integer, Integer> experienceNeededRetroExponential = new ConcurrentHashMap<>();
private final ConcurrentMap<Integer, Integer> experienceNeededStandardExponential = new ConcurrentHashMap<>();

private FormulaType previousFormula;

public FormulaManager() {
/* Setting for Classic Mode (Scales a lot of stuff up by * 10) */
initExperienceNeededMaps();
loadFormula();
}

@VisibleForTesting
public FormulaManager(FormulaType previousFormulaType) {
/* Setting for Classic Mode (Scales a lot of stuff up by * 10) */
initExperienceNeededMaps();
this.previousFormula = previousFormulaType;
}

/**
* Initialize maps used for XP to next level
*/
private void initExperienceNeededMaps() {
experienceNeededRetroLinear = new HashMap<>();
experienceNeededRetroExponential = new HashMap<>();
experienceNeededStandardLinear = new HashMap<>();
experienceNeededStandardExponential = new HashMap<>();
}

/**
* Get the formula type that was used before converting
*
Expand Down
Loading