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

MASSIVE Permissions overhaul. Added a handful of new permissions,

Browse Source 
renamed a few more. Changed Green Terra to handle blocks based on
perms rather than the config file.

For more details, read the diff.
This commit is contained in:
GJ
2013-02-19 00:56:25 -05:00
parent 2eab93292e
commit 701822c69f
73 changed files with 513 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -110,7 +110,7 @@ public class Repair {
for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
Enchantment enchantment = enchant.getKey();
int activationChance = PerksUtils.handleLuckyPerks(Permissions.luckyRepair(player));
int activationChance = PerksUtils.handleLuckyPerks(player, SkillType.REPAIR);
if (Misc.getRandom().nextInt(activationChance) <= getEnchantChance(rank)) {
int enchantLevel = enchant.getValue();
@ -237,9 +237,9 @@ public class Repair {
int chance = (int) ((SUPER_REPAIR_CHANCE_MAX / SUPER_REPAIR_MAX_BONUS_LEVEL) * skillLevel);
if (skillLevel >= SUPER_REPAIR_MAX_BONUS_LEVEL) chance = (int) SUPER_REPAIR_CHANCE_MAX;
int activationChance = PerksUtils.handleLuckyPerks(Permissions.luckyRepair(player));
int activationChance = PerksUtils.handleLuckyPerks(player, SkillType.REPAIR);
if (chance > Misc.getRandom().nextInt(activationChance) && Permissions.repairBonus(player)) {
if (chance > Misc.getRandom().nextInt(activationChance) && Permissions.superRepair(player)) {
player.sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
return true;
}

16
src/main/java/com/gmail/nossr50/skills/repair/RepairCommand.java
View File

@ -69,17 +69,17 @@ public class RepairCommand extends SkillCommand {
@Override
protected void permissionsCheck() {
canSuperRepair = Permissions.repairBonus(player);
canSuperRepair = Permissions.superRepair(player);
canMasterRepair = Permissions.repairMastery(player);
canArcaneForge = Permissions.arcaneForging(player);
canSalvage = Permissions.salvage(player);
canRepairDiamond = Permissions.diamondRepair(player);
canRepairGold = Permissions.goldRepair(player);
canRepairIron = Permissions.ironRepair(player);
canRepairStone = Permissions.stoneRepair(player);
canRepairString = Permissions.stringRepair(player);
canRepairLeather = Permissions.leatherRepair(player);
canRepairWood = Permissions.woodRepair(player);
canRepairDiamond = Permissions.repairDiamond(player);
canRepairGold = Permissions.repairGold(player);
canRepairIron = Permissions.repairIron(player);
canRepairStone = Permissions.repairStone(player);
canRepairString = Permissions.repairString(player);
canRepairLeather = Permissions.repairLeather(player);
canRepairWood = Permissions.repairWood(player);
arcaneBypass = Permissions.arcaneBypass(player);
}

6
src/main/java/com/gmail/nossr50/skills/repair/RepairItemType.java
View File

@ -18,13 +18,13 @@ public enum RepairItemType {
public boolean getPermissions(Player player) {
switch (this) {
case ARMOR:
return Permissions.armorRepair(player);
return Permissions.repairArmor(player);
case TOOL:
return Permissions.toolRepair(player);
return Permissions.repairTools(player);
case OTHER:
return Permissions.otherRepair(player);
return Permissions.repairOtherItems(player);
default:
return false;

16
src/main/java/com/gmail/nossr50/skills/repair/RepairMaterialType.java
View File

@ -23,28 +23,28 @@ public enum RepairMaterialType {
public boolean getPermissions(Player player) {
switch (this) {
case STRING:
return Permissions.stringRepair(player);
return Permissions.repairString(player);
case LEATHER:
return Permissions.leatherRepair(player);
return Permissions.repairLeather(player);
case WOOD:
return Permissions.woodRepair(player);
return Permissions.repairWood(player);
case STONE:
return Permissions.stoneRepair(player);
return Permissions.repairStone(player);
case IRON:
return Permissions.ironRepair(player);
return Permissions.repairIron(player);
case GOLD:
return Permissions.goldRepair(player);
return Permissions.repairGold(player);
case DIAMOND:
return Permissions.diamondRepair(player);
return Permissions.repairDiamond(player);
case OTHER:
return Permissions.otherMaterialRepair(player);
return Permissions.repairOtherMaterials(player);
default:
return false;