From a82cc9609b863d5f00c2b6385c501bc0e0187ed8 Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 22 May 2013 22:13:40 -0400 Subject: [PATCH] Cleaning up a bit. --- .../nossr50/datatypes/player/McMMOPlayer.java | 70 +++++++------------ 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index c8c45e270..c6b784666 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -7,7 +7,6 @@ import java.util.Set; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.config.Config; @@ -54,7 +53,7 @@ public class McMMOPlayer { * we make sure that all class inheriting from SkillManager are instanced. * Which solution is better, I let you decide. - bm01 */ - private Map skillManagers = new HashMap(); + private final Map skillManagers = new HashMap(); private Party party; private Party invite; @@ -76,11 +75,11 @@ public class McMMOPlayer { private int lastSalvageClick; private boolean godMode; - private Map abilityMode = new HashMap(); - private Map abilityInformed = new HashMap(); + private final Map abilityMode = new HashMap(); + private final Map abilityInformed = new HashMap(); - private Map toolMode = new HashMap(); - private Map toolATS = new HashMap(); + private final Map toolMode = new HashMap(); + private final Map toolATS = new HashMap(); private int recentlyHurt; private int respawnATS; @@ -202,10 +201,10 @@ public class McMMOPlayer { * Set the mode of an ability. * * @param ability The ability to check - * @param bool True if the ability is active, false otherwise + * @param isActive True if the ability is active, false otherwise */ - public void setAbilityMode(AbilityType ability, boolean bool) { - abilityMode.put(ability, bool); + public void setAbilityMode(AbilityType ability, boolean isActive) { + abilityMode.put(ability, isActive); } /** @@ -222,10 +221,10 @@ public class McMMOPlayer { * Set the informed state of an ability. * * @param ability The ability to check - * @param bool True if the ability is informed, false otherwise + * @param isInformed True if the ability is informed, false otherwise */ - public void setAbilityInformed(AbilityType ability, boolean bool) { - abilityInformed.put(ability, bool); + public void setAbilityInformed(AbilityType ability, boolean isInformed) { + abilityInformed.put(ability, isInformed); } /** @@ -263,10 +262,10 @@ public class McMMOPlayer { * Set the current prep mode of a tool. * * @param tool Tool to set the mode for - * @param bool true if the tool should be prepped, false otherwise + * @param isPrepared true if the tool should be prepped, false otherwise */ - public void setToolPreparationMode(ToolType tool, boolean bool) { - toolMode.put(tool, bool); + public void setToolPreparationMode(ToolType tool, boolean isPrepared) { + toolMode.put(tool, isPrepared); } /** @@ -332,7 +331,7 @@ public class McMMOPlayer { } public void actualizeTeleportCommenceLocation(Player player) { - setTeleportCommenceLocation(player.getLocation()); + teleportCommence = player.getLocation(); } /* @@ -500,6 +499,10 @@ public class McMMOPlayer { * @param xp Experience amount to add */ public void applyXpGain(SkillType skillType, float xp) { + if (!Permissions.skillEnabled(player, skillType)) { + return; + } + if (skillType.isChildSkill()) { Set parentSkills = FamilyTree.getParents(skillType); @@ -510,10 +513,6 @@ public class McMMOPlayer { return; } - if (!Permissions.skillEnabled(player, skillType)) { - return; - } - McMMOPlayerXpGainEvent event = new McMMOPlayerXpGainEvent(player, skillType, xp); mcMMO.p.getServer().getPluginManager().callEvent(event); @@ -529,7 +528,7 @@ public class McMMOPlayer { spoutHud.setLastGained(skillType); } - isUsingUnarmed = skillType == SkillType.UNARMED; + isUsingUnarmed = (skillType == SkillType.UNARMED); SkillUtils.xpCheckSkill(skillType, player, profile); } @@ -562,11 +561,7 @@ public class McMMOPlayer { } public boolean hasPartyInvite() { - if (invite != null) { - return true; - } - - return false; + return (invite != null); } public void setParty(Party party) { @@ -578,11 +573,7 @@ public class McMMOPlayer { } public boolean inParty() { - if (party != null) { - return true; - } - - return false; + return (party != null); } public void removeParty() { @@ -610,11 +601,7 @@ public class McMMOPlayer { } public boolean hasPtpRequest() { - if (ptpRequest != null) { - return true; - } - - return false; + return (ptpRequest != null); } public void removePtpRequest() { @@ -646,11 +633,7 @@ public class McMMOPlayer { } public void setItemShareModifier(int modifier) { - if (modifier < 10) { - modifier = 10; - } - - itemShareModifier = modifier; + itemShareModifier = Math.max(10, modifier); } /* @@ -693,15 +676,14 @@ public class McMMOPlayer { * @return Modified experience */ private float modifyXpGain(SkillType skillType, float xp) { - if (player.getGameMode() == GameMode.CREATIVE || (skillType.getMaxLevel() < profile.getSkillLevel(skillType) + 1) || (Config.getInstance().getPowerLevelCap() < getPowerLevel() + 1)) { + if (player.getGameMode() == GameMode.CREATIVE || (skillType.getMaxLevel() <= profile.getSkillLevel(skillType)) || (Config.getInstance().getPowerLevelCap() <= getPowerLevel())) { return 0; } xp = (float) (xp / skillType.getXpModifier() * Config.getInstance().getExperienceGainsGlobalMultiplier()); if (Config.getInstance().getToolModsEnabled()) { - ItemStack item = player.getItemInHand(); - CustomTool tool = ModUtils.getToolFromItemStack(item); + CustomTool tool = ModUtils.getToolFromItemStack(player.getItemInHand()); if (tool != null) { xp *= tool.getXpMultiplier();