Merge 2.1.44

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -629,6 +629,10 @@ public final class CombatUtils {
         if (entity instanceof Player) {
             Player defender = (Player) entity;
 
+            //TODO: NPC Interaction?
+            if(UserManager.getPlayer(defender) == null)
+                return true;
+
             if (!defender.getWorld().getPVP() || defender == player || UserManager.getPlayer(defender).getGodMode()) {
                 return false;
             }

src/main/java/com/gmail/nossr50/util/skills/RankUtils.java

@@ -172,6 +172,9 @@ public class RankUtils {
         //Get our rank map
         HashMap<Integer, Integer> rankMap = subSkillRanks.get(skillName);
 
+        if(UserManager.getPlayer(player) == null)
+            return 0;
+
         //Skill level of parent skill
         int currentSkillLevel = UserManager.getPlayer(player).getSkillLevel(subSkillType.getParentSkill());
 
@@ -216,6 +219,9 @@ public class RankUtils {
         //Get our rank map
         HashMap<Integer, Integer> rankMap = subSkillRanks.get(skillName);
 
+        if(UserManager.getPlayer(player) == null)
+            return 0;
+
         //Skill level of parent skill
         int currentSkillLevel = UserManager.getPlayer(player).getSkillLevel(abstractSubSkill.getPrimarySkill());
 

src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -160,6 +160,11 @@ public class SkillUtils {
             }
 
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
+            //Not Loaded
+            if(mcMMOPlayer == null)
+                return;
+
             PrimarySkillType skill = mcMMOPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER) ? PrimarySkillType.MINING : PrimarySkillType.EXCAVATION;
 
             int abilityLengthVar = AdvancedConfig.getInstance().getAbilityLength();