EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 19:54:44 +02:00
Code Issues Projects Releases Wiki Activity

Get rid of all the deprecated instances of Users.getProfile()

Browse Source
This commit is contained in:
GJ
2013-02-04 08:09:24 -05:00
parent 74c367c069
commit 44b862c0bb
19 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java
View File

@ -453,7 +453,7 @@ public final class CombatTools {
Player defender = (Player) target;
if (System.currentTimeMillis() >= Users.getProfile(defender).getRespawnATS() + 5) {
if (System.currentTimeMillis() >= Users.getPlayer(defender).getProfile().getRespawnATS() + 5) {
baseXP = 20 * configInstance.getPlayerVersusPlayerXP();
}
}
@ -569,7 +569,7 @@ public final class CombatTools {
if (entity instanceof Player) {
Player defender = (Player) entity;
if (!defender.getWorld().getPVP() || defender == player || PartyManager.inSameParty(player, defender) || Users.getProfile(defender).getGodMode()) {
if (!defender.getWorld().getPVP() || defender == player || PartyManager.inSameParty(player, defender) || Users.getPlayer(defender).getProfile().getGodMode()) {
return false;
}

6
src/main/java/com/gmail/nossr50/skills/utilities/SkillTools.java
View File

@ -27,7 +27,7 @@ public class SkillTools {
public static boolean abilitiesEnabled = Config.getInstance().getAbilitiesEnabled();
public static void handleFoodSkills(Player player, SkillType skill, FoodLevelChangeEvent event, int baseLevel, int maxLevel, int rankChange) {
int skillLevel = Users.getProfile(player).getSkillLevel(skill);
int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(skill);
int currentFoodLevel = player.getFoodLevel();
int newFoodLevel = event.getFoodLevel();
int foodChange = newFoodLevel - currentFoodLevel;
@ -130,7 +130,7 @@ public class SkillTools {
return;
}
PlayerProfile profile = Users.getProfile(player);
PlayerProfile profile = Users.getPlayer(player).getProfile();
AbilityType ability = skill.getAbility();
ToolType tool = skill.getTool();
ItemStack inHand = player.getItemInHand();
@ -421,7 +421,7 @@ public class SkillTools {
* @param type The skill the ability is based on
*/
public static void abilityCheck(Player player, SkillType type) {
PlayerProfile profile = Users.getProfile(player);
PlayerProfile profile = Users.getPlayer(player).getProfile();
ToolType tool = type.getTool();
AbilityType ability = type.getAbility();

2
src/main/java/com/gmail/nossr50/skills/utilities/SkillType.java
View File

@ -141,7 +141,7 @@ public enum SkillType {
* @return the player's skill level
*/
public int getSkillLevel(Player player) {
return Users.getProfile(player).getSkillLevel(this);
return Users.getPlayer(player).getProfile().getSkillLevel(this);
}
// TODO: This is a little "hacky", we probably need to add something to distinguish child skills in the enum, or to use another enum for them