Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed Multiple Servers Skill Tree Bug

Browse Source
This commit is contained in:
Ka0rX 2023-03-19 13:33:13 +01:00
parent 57fe9f1f1b
commit ae9c396c25
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -183,11 +183,11 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
skillTree.setupNodeStates(this); skillTree.setupNodeStates(this);
// Stat triggers setup // Stat triggers setup
if (!areStatsLoaded()) {
for (SkillTree skillTree : MMOCore.plugin.skillTreeManager.getAll()) for (SkillTree skillTree : MMOCore.plugin.skillTreeManager.getAll())
for (SkillTreeNode node : skillTree.getNodes()) for (SkillTreeNode node : skillTree.getNodes())
node.getExperienceTable().claimStatTriggers(this, node); node.getExperienceTable().claimStatTriggers(this, node);
}
} }
public int getPointSpent(SkillTree skillTree) { public int getPointSpent(SkillTree skillTree) {
@ -232,14 +232,17 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
return nodeLevelsString.entrySet(); return nodeLevelsString.entrySet();
} }
public boolean areStatsLoaded() { public void resetTriggerStats() {
// Used to see if the triggers need to be applied for (StatInstance instance : mmoData.getStatMap().getInstances()) {
for (StatInstance instance : mmoData.getStatMap().getInstances()) Iterator<StatModifier> iter = instance.getModifiers().iterator();
for (StatModifier modifier : instance.getModifiers()) while (iter.hasNext()) {
StatModifier modifier = iter.next();
if (modifier.getKey().startsWith(StatTrigger.TRIGGER_PREFIX)) if (modifier.getKey().startsWith(StatTrigger.TRIGGER_PREFIX))
return true; modifier.unregister(mmoData);
return false;
} }
}
}
public Map<SkillTreeNode, Integer> getNodeLevels() { public Map<SkillTreeNode, Integer> getNodeLevels() {
return new HashMap<>(nodeLevels); return new HashMap<>(nodeLevels);

3
MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java
View File

@ -101,7 +101,6 @@ public class PlayerProfessions {
for (Entry<String, JsonElement> entry : obj.getAsJsonObject("timesClaimed").entrySet()) for (Entry<String, JsonElement> entry : obj.getAsJsonObject("timesClaimed").entrySet())
playerData.getItemClaims().put("profession." + entry.getKey(), entry.getValue().getAsInt()); playerData.getItemClaims().put("profession." + entry.getKey(), entry.getValue().getAsInt());
if (!playerData.areStatsLoaded()) {
for (Profession profession : MMOCore.plugin.professionManager.getAll()) { for (Profession profession : MMOCore.plugin.professionManager.getAll()) {
if (profession.hasExperienceTable()) if (profession.hasExperienceTable())
profession.getExperienceTable().claimStatTriggers(playerData, profession); profession.getExperienceTable().claimStatTriggers(playerData, profession);
@ -111,8 +110,6 @@ public class PlayerProfessions {
} }
}
public PlayerData getPlayerData() { public PlayerData getPlayerData() {
return playerData; return playerData;
} }

3
MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MMOCoreDataSynchronizer.java
View File

@ -37,6 +37,9 @@ public class MMOCoreDataSynchronizer extends DataSynchronizer {
@Override @Override
public void loadData(ResultSet result) throws SQLException { public void loadData(ResultSet result) throws SQLException {
//Reset stats linked to triggers
data.resetTriggerStats();
// Initialize custom resources // Initialize custom resources
data.setMana(result.getFloat("mana")); data.setMana(result.getFloat("mana"));

3
MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java
View File

@ -33,6 +33,9 @@ public class YAMLPlayerDataManager extends PlayerDataManager {
public void loadData(PlayerData data) { public void loadData(PlayerData data) {
FileConfiguration config = new ConfigFile(data.getUniqueId()).getConfig(); FileConfiguration config = new ConfigFile(data.getUniqueId()).getConfig();
//Reset stats linked to triggers.
data.resetTriggerStats();
data.setClassPoints(config.getInt("class-points", getDefaultData().getClassPoints())); data.setClassPoints(config.getInt("class-points", getDefaultData().getClassPoints()));
data.setSkillPoints(config.getInt("skill-points", getDefaultData().getSkillPoints())); data.setSkillPoints(config.getInt("skill-points", getDefaultData().getSkillPoints()));
data.setSkillReallocationPoints(config.getInt("skill-reallocation-points", getDefaultData().getSkillReallocationPoints())); data.setSkillReallocationPoints(config.getInt("skill-reallocation-points", getDefaultData().getSkillReallocationPoints()));