EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-13 20:48:46 +01:00
Code Issues Projects Releases Wiki Activity

More work on gutting out the new skill system & reducing compiler errors

Browse Source
This commit is contained in:
nossr50
2021-03-17 14:35:24 -07:00
parent b20beed836
commit ef06546721
28 changed files with 697 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java
View File

@@ -18,8 +18,8 @@ public class FamilyTree {
private static @Nullable Set<RootSkill> smeltingParents;
private static @Nullable Set<RootSkill> salvageParents;
public static @NotNull Set<RootSkill> getParentSkills(@NotNull RootSkill rootSkill) throws UnknownSkillException {
if(PrimarySkillType.isChildSkill(rootSkill)) {
public static @NotNull Set<RootSkill> getParentSkills(@NotNull PrimarySkillType primarySkillType) throws UnknownSkillException {
if(PrimarySkillType.isChildSkill(primarySkillType)) {
if(smeltingParents == null || salvageParents == null) {
smeltingParents = new HashSet<>();
salvageParents = new HashSet<>();
@@ -31,12 +31,12 @@ public class FamilyTree {
salvageParents.add(PrimarySkillType.REPAIR);
}
if(rootSkill.equals(PrimarySkillType.SALVAGE)) {
if(primarySkillType.equals(PrimarySkillType.SALVAGE)) {
return salvageParents;
} else if (rootSkill.equals(PrimarySkillType.SMELTING)) {
} else if (primarySkillType.equals(PrimarySkillType.SMELTING)) {
return smeltingParents;
} else {
mcMMO.p.getLogger().severe("root skill argument is not a child skill! " + rootSkill.toString());
mcMMO.p.getLogger().severe("root skill argument is not a child skill! " + primarySkillType.toString());
throw new UnknownSkillException();
}