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

Fixed perm stat bugs when changing class.

Browse Source
This commit is contained in:
Ka0rX 2022-12-20 18:40:26 +01:00
parent 82943e28d9
commit 88a3cc4282
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/SavedClassInformation.java
View File

@ -8,6 +8,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.Indyuce.mmocore.experience.Profession;
import net.Indyuce.mmocore.manager.data.PlayerDataManager; import net.Indyuce.mmocore.manager.data.PlayerDataManager;
import net.Indyuce.mmocore.skill.ClassSkill; import net.Indyuce.mmocore.skill.ClassSkill;
import net.Indyuce.mmocore.skill.RegisteredSkill; import net.Indyuce.mmocore.skill.RegisteredSkill;
@ -102,7 +103,7 @@ public class SavedClassInformation {
this(player.getLevel(), player.getExperience(), player.getSkillPoints(), player.getAttributePoints(), player.getAttributeReallocationPoints() this(player.getLevel(), player.getExperience(), player.getSkillPoints(), player.getAttributePoints(), player.getAttributeReallocationPoints()
, player.getSkillTreeReallocationPoints(), player.getSkillReallocationPoints(), , player.getSkillTreeReallocationPoints(), player.getSkillReallocationPoints(),
player.getAttributes().mapPoints(), player.mapSkillLevels(), player.getSkillTreePoints(), player.getNodeLevels(), player.getNodeTimesClaimed(), player.getBoundSkills(),player.getBoundPassiveSkills()); player.getAttributes().mapPoints(), player.mapSkillLevels(), player.getSkillTreePoints(), player.getNodeLevels(), player.getNodeTimesClaimed(), player.getBoundSkills(), player.getBoundPassiveSkills());
} }
public SavedClassInformation(PlayerDataManager.DefaultPlayerData data) { public SavedClassInformation(PlayerDataManager.DefaultPlayerData data) {
@ -111,7 +112,7 @@ public class SavedClassInformation {
public SavedClassInformation(int level, double experience, int skillPoints, int attributePoints, public SavedClassInformation(int level, double experience, int skillPoints, int attributePoints,
int attributeReallocationPoints, int skillTreeReallocationPoints, int skillReallocationPoints) { int attributeReallocationPoints, int skillTreeReallocationPoints, int skillReallocationPoints) {
this(level, experience, skillPoints, attributePoints, attributeReallocationPoints, skillTreeReallocationPoints, skillReallocationPoints, new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>(),new ArrayList<>(),new ArrayList<>()); this(level, experience, skillPoints, attributePoints, attributeReallocationPoints, skillTreeReallocationPoints, skillReallocationPoints, new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>(), new HashMap<>(), new ArrayList<>(), new ArrayList<>());
} }
public SavedClassInformation(int level, double experience, int skillPoints, int attributePoints, public SavedClassInformation(int level, double experience, int skillPoints, int attributePoints,
@ -133,7 +134,7 @@ public class SavedClassInformation {
this.skillTreePoints = skillTreePoints; this.skillTreePoints = skillTreePoints;
this.nodeLevels = nodeLevels; this.nodeLevels = nodeLevels;
this.nodeTimesClaimed = nodeTimesClaimed; this.nodeTimesClaimed = nodeTimesClaimed;
this.boundSkills=boundSkills; this.boundSkills = boundSkills;
} }
public int getLevel() { public int getLevel() {
@ -237,11 +238,12 @@ public class SavedClassInformation {
player.clearNodeLevels(); player.clearNodeLevels();
player.clearNodeStates(); player.clearNodeStates();
player.clearPointsSpent(); player.clearPointsSpent();
// We reset the experience table for each skill tree node to remove the perm stat. // We remove perm stats for nodes and class.
for (SkillTree skillTree : player.getProfess().getSkillTrees()) { for (SkillTree skillTree : player.getProfess().getSkillTrees()) {
for (SkillTreeNode node : skillTree.getNodes()) for (SkillTreeNode node : skillTree.getNodes())
node.getExperienceTable().reset(player, node); node.getExperienceTable().removePermStats(player, node);
} }
player.getProfess().getExperienceTable().removePermStats(player, player.getProfess());
while (player.hasPassiveSkillBound(0)) while (player.hasPassiveSkillBound(0))
player.unbindPassiveSkill(0); player.unbindPassiveSkill(0);
@ -289,7 +291,7 @@ public class SavedClassInformation {
for (SkillTree skillTree : profess.getSkillTrees()) for (SkillTree skillTree : profess.getSkillTrees())
for (SkillTreeNode node : skillTree.getNodes()) for (SkillTreeNode node : skillTree.getNodes())
node.getExperienceTable().claimStatTriggers(player, node); node.getExperienceTable().claimStatTriggers(player, node);
profess.getExperienceTable().claimStatTriggers(player,profess);
/* /*
* unload current class information and set the new profess once * unload current class information and set the new profess once
* everything is changed * everything is changed

12
MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/droptable/ExperienceTable.java
View File

@ -54,6 +54,18 @@ public class ExperienceTable {
} }
} }
/**
* Called when a player changes its class.
* Removes the perm stat but keeps the item claims in memory.
*/
public void removePermStats(PlayerData playerData, ExperienceObject object) {
for (ExperienceItem item : items) {
int timesClaimed = playerData.getClaims(object, this, item);
for (int i = 0; i < timesClaimed; i++)
item.removeStatTriggers(playerData);
}
}
/** /**
* Called when the progression is reset(e.g skill tree reallocation) * Called when the progression is reset(e.g skill tree reallocation)
*/ */