EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

More minor cleanup.

Browse Source
This commit is contained in:
GJ 2013-10-29 10:01:30 -04:00
parent 3be443c63c
commit a8d1376533
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.lang.Validate;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
@ -463,20 +464,19 @@ public class McMMOPlayer {
/** /**
* Begins an experience gain. The amount will be affected by skill modifiers, global rate, perks, and may be shared with the party * Begins an experience gain. The amount will be affected by skill modifiers, global rate, perks, and may be shared with the party
* *
* @param skillType Skill being used * @param skill Skill being used
* @param xp Experience amount to process * @param xp Experience amount to process
*/ */
public void beginXpGain(SkillType skillType, float xp) { public void beginXpGain(SkillType skill, float xp) {
if (xp == 0) { Validate.isTrue(xp > 0, "XP gained should be greater than zero.");
return;
}
if (skillType.isChildSkill()) { if (skill.isChildSkill()) {
Set<SkillType> parentSkills = FamilyTree.getParents(skillType); Set<SkillType> parentSkills = FamilyTree.getParents(skill);
float splitXp = xp / parentSkills.size();
for (SkillType parentSkill : parentSkills) { for (SkillType parentSkill : parentSkills) {
if (parentSkill.getPermissions(player)) { if (parentSkill.getPermissions(player)) {
beginXpGain(parentSkill, xp / parentSkills.size()); beginXpGain(parentSkill, splitXp);
} }
} }
@ -484,23 +484,21 @@ public class McMMOPlayer {
} }
// Return if the experience has been shared // Return if the experience has been shared
if (party != null && ShareHandler.handleXpShare(xp, this, skillType)) { if (party != null && ShareHandler.handleXpShare(xp, this, skill)) {
return; return;
} }
beginUnsharedXpGain(skillType, xp); beginUnsharedXpGain(skill, xp);
} }
/** /**
* Begins an experience gain. The amount will be affected by skill modifiers, global rate and perks * Begins an experience gain. The amount will be affected by skill modifiers, global rate and perks
* *
* @param skillType Skill being used * @param skill Skill being used
* @param xp Experience amount to process * @param xp Experience amount to process
*/ */
public void beginUnsharedXpGain(SkillType skillType, float xp) { public void beginUnsharedXpGain(SkillType skill, float xp) {
xp = modifyXpGain(skillType, xp); applyXpGain(skill, modifyXpGain(skill, xp));
applyXpGain(skillType, xp);
} }
/** /**