Browse Source

Fixed NPE with startup relating to SmeltingCommand.

GJ 12 years ago
parent
commit
1337c45f1d

+ 14 - 0
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java

@@ -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);
     }

+ 0 - 7
src/main/java/com/gmail/nossr50/skills/SkillManager.java

@@ -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;

+ 0 - 1
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingCommand.java

@@ -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