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

Fixed NPE with startup relating to SmeltingCommand.

Browse Source
This commit is contained in:
GJ 2013-01-23 19:10:12 -05:00
parent a968019799
commit 1337c45f1d
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -912,9 +912,23 @@ public class PlayerProfile {
*/
public int getSkillLevel(SkillType skillType) {
if (skillType.isChildSkill()) {
return getChildSkillLevel(skillType);
}
return skills.get(skillType);
}
public int getChildSkillLevel(SkillType skillType) {
switch (skillType) {
case SMELTING:
return ((getSkillLevel(SkillType.MINING) / 4) + (getSkillLevel(SkillType.REPAIR) / 4)); //TODO: Make this cleaner somehow
default:
return 0;
}
}
public int getSkillXpLevel(SkillType skillType) {
return skillsXp.get(skillType);
}

7
src/main/java/com/gmail/nossr50/skills/SkillManager.java
View File

@ -19,13 +19,6 @@ public abstract class SkillManager {
this.skillLevel = profile.getSkillLevel(skill);
this.activationChance = Misc.calculateActivationChance(Permissions.lucky(player, skill));
}
public SkillManager(Player player, SkillType child, SkillType parent1, SkillType parent2) {
this.player = player;
this.profile = Users.getProfile(player);
this.skillLevel = (profile.getSkillLevel(parent1) / 4) + (profile.getSkillLevel(parent2) / 4); //TODO: Make this cleaner somehow
this.activationChance = Misc.calculateActivationChance(Permissions.lucky(player, child));
}
public Player getPlayer() {
return player;

1
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingCommand.java
View File

@ -20,7 +20,6 @@ public class SmeltingCommand extends SkillCommand {
public SmeltingCommand() {
super(SkillType.SMELTING);
this.skillValue = (profile.getSkillLevel(SkillType.MINING) / 4) + (profile.getSkillLevel(SkillType.REPAIR) / 4); //TODO: Make this cleaner somehow
}
@Override