Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #353 from Glitchfinder/master

Browse Source 
Reimplementing Skill Level and Power Level caps.
This commit is contained in:
Glitchfinder 2012-12-26 19:56:44 -08:00
commit bd1850db69
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -345,7 +345,10 @@ public class Config extends ConfigLoader {
public int getLevelCapTaming() { return config.getInt("Skills.Taming.Level_Cap", 0); } public int getLevelCapTaming() { return config.getInt("Skills.Taming.Level_Cap", 0); }
public int getLevelCapUnarmed() { return config.getInt("Skills.Unarmed.Level_Cap", 0); } public int getLevelCapUnarmed() { return config.getInt("Skills.Unarmed.Level_Cap", 0); }
public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); } public int getLevelCapWoodcutting() { return config.getInt("Skills.Woodcutting.Level_Cap", 0); }
public int getPowerLevelCap() { return config.getInt("General.Power_Level_Cap", 0); } public int getPowerLevelCap() {
int cap = config.getInt("General.Power_Level_Cap", 0);
return ((cap == 0) ? Integer.MAX_VALUE : cap);
}
/* PVP & PVE Settings */ /* PVP & PVE Settings */
public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); } public boolean getAcrobaticsPVP() { return config.getBoolean("Skills.Acrobatics.Enabled_For_PVP", true); }

3
src/main/java/com/gmail/nossr50/util/Skills.java
View File

@ -533,6 +533,9 @@ public class Skills {
if(Users.getPlayer(player) == null) if(Users.getPlayer(player) == null)
return; return;
if((type.getMaxLevel() < profile.getSkillLevel(type) + 1) || (Misc.getPowerLevelCap() < Users.getPlayer(player).getPowerLevel() + 1))
return;
Users.getPlayer(player).addXP(type, xp); Users.getPlayer(player).addXP(type, xp);
xpCheckSkill(type, player, profile); xpCheckSkill(type, player, profile);
} }