mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-26 23:26:45 +01:00
Fixed NPE with startup relating to SmeltingCommand.
This commit is contained in:
parent
a968019799
commit
1337c45f1d
@ -912,9 +912,23 @@ public class PlayerProfile {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
public int getSkillLevel(SkillType skillType) {
|
public int getSkillLevel(SkillType skillType) {
|
||||||
|
if (skillType.isChildSkill()) {
|
||||||
|
return getChildSkillLevel(skillType);
|
||||||
|
}
|
||||||
|
|
||||||
return skills.get(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) {
|
public int getSkillXpLevel(SkillType skillType) {
|
||||||
return skillsXp.get(skillType);
|
return skillsXp.get(skillType);
|
||||||
}
|
}
|
||||||
|
@ -20,13 +20,6 @@ public abstract class SkillManager {
|
|||||||
this.activationChance = Misc.calculateActivationChance(Permissions.lucky(player, 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() {
|
public Player getPlayer() {
|
||||||
return player;
|
return player;
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,6 @@ public class SmeltingCommand extends SkillCommand {
|
|||||||
|
|
||||||
public SmeltingCommand() {
|
public SmeltingCommand() {
|
||||||
super(SkillType.SMELTING);
|
super(SkillType.SMELTING);
|
||||||
this.skillValue = (profile.getSkillLevel(SkillType.MINING) / 4) + (profile.getSkillLevel(SkillType.REPAIR) / 4); //TODO: Make this cleaner somehow
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user