Fixed a NPE that could occur if Roll was disabled in coreskills.yml

This commit is contained in:
nossr50
2019-06-09 05:10:30 -07:00
parent a677450d50
commit 2be67bae19
3 changed files with 11 additions and 6 deletions

View File

@ -15,12 +15,7 @@ public class InteractionManager {
private static HashMap<String, AbstractSubSkill> subSkillNameMap; //Used for mmoinfo optimization
private static ArrayList<AbstractSubSkill> subSkillList;
/**
* Registers subskills with the Interaction registration
* @param abstractSubSkill the target subskill to register
*/
public static void registerSubSkill(AbstractSubSkill abstractSubSkill)
{
public static void initMaps() {
/* INIT MAPS */
if(interactRegister == null)
interactRegister = new HashMap<>();
@ -30,7 +25,14 @@ public class InteractionManager {
if(subSkillNameMap == null)
subSkillNameMap = new HashMap<>();
}
/**
* Registers subskills with the Interaction registration
* @param abstractSubSkill the target subskill to register
*/
public static void registerSubSkill(AbstractSubSkill abstractSubSkill)
{
//Store a unique copy of each subskill
if(!subSkillList.contains(abstractSubSkill))
subSkillList.add(abstractSubSkill);

View File

@ -216,6 +216,8 @@ public class mcMMO extends JavaPlugin {
Permissions.generateWorldTeleportPermissions();
}
InteractionManager.initMaps(); //Init maps before populating ranks
//Populate Ranked Skill Maps (DO THIS LAST)
RankUtils.populateRanks();
}