mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-28 03:34:43 +02:00
Updating permissions for consistency.
This commit is contained in:
Glitchfinder
@ -40,7 +40,6 @@ import com.gmail.nossr50.skills.unarmed.UnarmedManager;
|
||||
|
||||
public class Combat {
|
||||
private static Config configInstance = Config.getInstance();
|
||||
private static Permissions permInstance = Permissions.getInstance();
|
||||
|
||||
/**
|
||||
* Apply combat modifiers and process and XP gain.
|
||||
@ -86,7 +85,7 @@ public class Combat {
|
||||
|
||||
startGainXp(attacker, attackerProfile, target, SkillType.SWORDS);
|
||||
}
|
||||
else if (ItemChecks.isAxe(itemInHand) && permInstance.axes(attacker)) {
|
||||
else if (ItemChecks.isAxe(itemInHand) && Permissions.axes(attacker)) {
|
||||
if (targetIsPlayer || targetIsTamedPet) {
|
||||
if (!configInstance.getAxesPVP()) {
|
||||
return;
|
||||
@ -98,25 +97,25 @@ public class Combat {
|
||||
|
||||
Skills.abilityCheck(attacker, SkillType.AXES);
|
||||
|
||||
if (permInstance.axeBonus(attacker)) {
|
||||
if (Permissions.axeBonus(attacker)) {
|
||||
Axes.axesBonus(attacker, event);
|
||||
}
|
||||
|
||||
if (permInstance.criticalHit(attacker)) {
|
||||
if (Permissions.criticalHit(attacker)) {
|
||||
Axes.axeCriticalCheck(attacker, event);
|
||||
}
|
||||
|
||||
if (permInstance.impact(attacker)) {
|
||||
if (Permissions.impact(attacker)) {
|
||||
Axes.impact(attacker, target, event);
|
||||
}
|
||||
|
||||
if (attackerProfile.getAbilityMode(AbilityType.SKULL_SPLIITER) && permInstance.skullSplitter(attacker)) {
|
||||
if (attackerProfile.getAbilityMode(AbilityType.SKULL_SPLIITER) && Permissions.skullSplitter(attacker)) {
|
||||
applyAbilityAoE(attacker, target, event.getDamage() / 2, SkillType.AXES);
|
||||
}
|
||||
|
||||
startGainXp(attacker, attackerProfile, target, SkillType.AXES);
|
||||
}
|
||||
else if (itemInHand.getType() == Material.AIR && permInstance.unarmed(attacker)) {
|
||||
else if (itemInHand.getType() == Material.AIR && Permissions.unarmed(attacker)) {
|
||||
if (targetIsPlayer || targetIsTamedPet) {
|
||||
if (!configInstance.getUnarmedPVP()) {
|
||||
return;
|
||||
@ -132,7 +131,7 @@ public class Combat {
|
||||
|
||||
unarmedManager.bonusDamage(event);
|
||||
|
||||
if (attackerProfile.getAbilityMode(AbilityType.BERSERK) && permInstance.berserk(attacker)) {
|
||||
if (attackerProfile.getAbilityMode(AbilityType.BERSERK) && Permissions.berserk(attacker)) {
|
||||
event.setDamage((int) (event.getDamage() * 1.5));
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ public class Item {
|
||||
Block block = player.getLocation().getBlock();
|
||||
int amount = inHand.getAmount();
|
||||
|
||||
if (Permissions.getInstance().chimaeraWing(player) && inHand.getTypeId() == Config.getInstance().getChimaeraItemId()) {
|
||||
if (Permissions.chimaeraWing(player) && inHand.getTypeId() == Config.getInstance().getChimaeraItemId()) {
|
||||
if (Skills.cooldownOver(profile.getRecentlyHurt(), 60, player) && amount >= Config.getInstance().getChimaeraCost()) {
|
||||
player.setItemInHand(new ItemStack(Config.getInstance().getChimaeraItemId(), amount - Config.getInstance().getChimaeraCost()));
|
||||
|
||||
|
||||
@ -1,219 +1,332 @@
|
||||
package com.gmail.nossr50.util;
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class Permissions {
|
||||
private static volatile Permissions instance;
|
||||
|
||||
public boolean permission(Player player, String perm) {
|
||||
return player.hasPermission(perm);
|
||||
public static boolean hasPermission(CommandSender sender, String perm)
|
||||
{
|
||||
if(sender.hasPermission(perm))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static Permissions getInstance() {
|
||||
if (instance == null) {
|
||||
instance = new Permissions();
|
||||
}
|
||||
public static boolean hasPermission(Player sender, String perm)
|
||||
{
|
||||
if(sender.hasPermission(perm))
|
||||
return true;
|
||||
|
||||
return instance;
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* GENERIC PERMISSIONS
|
||||
*/
|
||||
|
||||
public boolean motd(Player player) {
|
||||
return player.hasPermission("mcmmo.motd");
|
||||
public static boolean motd(Player player) {
|
||||
return hasPermission(player, "mcmmo.motd");
|
||||
}
|
||||
|
||||
public boolean admin(Player player) {
|
||||
return player.hasPermission("mcmmo.admin");
|
||||
public static boolean admin(Player player) {
|
||||
return hasPermission(player, "mcmmo.admin");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.BYPASS.*
|
||||
*/
|
||||
public boolean hardcoremodeBypass(Player player) {
|
||||
return player.hasPermission("mcmmo.bypass.hardcoremode");
|
||||
public static boolean hardcoremodeBypass(Player player) {
|
||||
return hasPermission(player, "mcmmo.bypass.hardcoremode");
|
||||
}
|
||||
|
||||
public boolean arcaneBypass(Player player) {
|
||||
return player.hasPermission("mcmmo.bypass.arcanebypass");
|
||||
public static boolean arcaneBypass(Player player) {
|
||||
return hasPermission(player, "mcmmo.bypass.arcanebypass");
|
||||
}
|
||||
|
||||
public boolean inspectDistanceBypass(Player player) {
|
||||
return player.hasPermission("mcmmo.bypass.inspect.distance");
|
||||
public static boolean inspectDistanceBypass(Player player) {
|
||||
return hasPermission(player, "mcmmo.bypass.inspect.distance");
|
||||
}
|
||||
|
||||
public boolean inspectOfflineBypass(Player player) {
|
||||
return player.hasPermission("mcmmo.bypass.inspect.offline");
|
||||
public static boolean inspectOfflineBypass(Player player) {
|
||||
return hasPermission(player, "mcmmo.bypass.inspect.offline");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.TOOLS.*
|
||||
*/
|
||||
|
||||
public boolean mcrefresh(Player player) {
|
||||
return player.hasPermission("mcmmo.tools.mcrefresh");
|
||||
public static boolean mcrefresh(Player player) {
|
||||
return hasPermission(player, "mcmmo.tools.mcrefresh");
|
||||
}
|
||||
|
||||
public boolean mcremove(Player player) {
|
||||
return player.hasPermission("mcmmo.tools.mcremove");
|
||||
public static boolean mcremove(Player player) {
|
||||
return hasPermission(player, "mcmmo.tools.mcremove");
|
||||
}
|
||||
|
||||
public boolean mmoedit(Player player) {
|
||||
return player.hasPermission("mcmmo.tools.mmoedit");
|
||||
public static boolean mmoedit(Player player) {
|
||||
return hasPermission(player, "mcmmo.tools.mmoedit");
|
||||
}
|
||||
|
||||
public boolean mcgod(Player player) {
|
||||
return player.hasPermission("mcmmo.tools.mcgod");
|
||||
public static boolean mcgod(Player player) {
|
||||
return hasPermission(player, "mcmmo.tools.mcgod");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.PERKS.LUCKY*
|
||||
*/
|
||||
|
||||
public static boolean luckyAcrobatics(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.acrobatics");
|
||||
}
|
||||
|
||||
public static boolean luckyArchery(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.archery");
|
||||
}
|
||||
|
||||
public static boolean luckyAxes(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.axes");
|
||||
}
|
||||
|
||||
public static boolean luckyExcavation(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.excavation");
|
||||
}
|
||||
|
||||
public static boolean luckyFishing(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.fishing");
|
||||
}
|
||||
|
||||
public static boolean luckyHerbalism(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.herbalism");
|
||||
}
|
||||
|
||||
public static boolean luckyMining(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.mining");
|
||||
}
|
||||
|
||||
public static boolean luckyRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.repair");
|
||||
}
|
||||
|
||||
public static boolean luckySwords(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.swords");
|
||||
}
|
||||
|
||||
public static boolean luckyTaming(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.taming");
|
||||
}
|
||||
|
||||
public static boolean luckyUnarmed(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.unarmed");
|
||||
}
|
||||
|
||||
public static boolean luckyWoodcutting(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.lucky.woodcutting");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.PERKS.XP*
|
||||
*/
|
||||
|
||||
public static boolean xpQuadruple(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.xp.quadruple");
|
||||
}
|
||||
|
||||
public static boolean xpTriple(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.xp.triple");
|
||||
}
|
||||
|
||||
public static boolean xpDoubleAndOneHalf(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.xp.150percentboost");
|
||||
}
|
||||
|
||||
public static boolean xpDouble(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.xp.double");
|
||||
}
|
||||
|
||||
public static boolean xpOneAndOneHalf(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.xp.50percentboost");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.PERKS.COOLDOWNS*
|
||||
*/
|
||||
|
||||
public static boolean cooldownsHalved(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.cooldowns.halved");
|
||||
}
|
||||
|
||||
public static boolean cooldownsThirded(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.cooldowns.thirded");
|
||||
}
|
||||
|
||||
public static boolean cooldownsQuartered(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.cooldowns.quartered");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.PERKS.ACTIVATIONTIME*
|
||||
*/
|
||||
|
||||
public static boolean activationTwelve(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.activationtime.twelveseconds");
|
||||
}
|
||||
|
||||
public static boolean activationEight(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.activationtime.eightseconds");
|
||||
}
|
||||
|
||||
public static boolean activationFour(Player player) {
|
||||
return hasPermission(player, "mcmmo.perks.activationtime.fourseconds");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.TAMING.*
|
||||
*/
|
||||
|
||||
public boolean fastFoodService(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.fastfoodservice");
|
||||
public static boolean fastFoodService(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.fastfoodservice");
|
||||
}
|
||||
|
||||
public boolean sharpenedClaws(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.sharpenedclaws");
|
||||
public static boolean sharpenedClaws(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.sharpenedclaws");
|
||||
}
|
||||
|
||||
public boolean gore(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.gore");
|
||||
public static boolean gore(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.gore");
|
||||
}
|
||||
|
||||
public boolean callOfTheWild(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.callofthewild");
|
||||
public static boolean callOfTheWild(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.callofthewild");
|
||||
}
|
||||
|
||||
public boolean environmentallyAware(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.environmentallyaware");
|
||||
public static boolean environmentallyAware(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.environmentallyaware");
|
||||
}
|
||||
|
||||
public boolean thickFur(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.thickfur");
|
||||
public static boolean thickFur(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.thickfur");
|
||||
}
|
||||
|
||||
public boolean shockProof(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.shockproof");
|
||||
public static boolean shockProof(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.shockproof");
|
||||
}
|
||||
|
||||
public boolean beastLore(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.taming.beastlore");
|
||||
public static boolean beastLore(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.taming.beastlore");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.FISHING.*
|
||||
*/
|
||||
|
||||
public boolean shakeMob(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.fishing.shakemob");
|
||||
public static boolean shakeMob(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.fishing.shakemob");
|
||||
}
|
||||
|
||||
public boolean fishingTreasures(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.fishing.treasures");
|
||||
public static boolean fishingTreasures(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.fishing.treasures");
|
||||
}
|
||||
|
||||
public boolean fishingMagic(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.fishing.magic");
|
||||
public static boolean fishingMagic(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.fishing.magic");
|
||||
}
|
||||
|
||||
public boolean fishermansDiet(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.fishing.fishermansdiet");
|
||||
public static boolean fishermansDiet(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.fishing.fishermansdiet");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.MINING.*
|
||||
*/
|
||||
|
||||
public boolean superBreaker(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.mining.superbreaker");
|
||||
public static boolean superBreaker(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.mining.superbreaker");
|
||||
}
|
||||
|
||||
public boolean miningDoubleDrops(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.mining.doubledrops");
|
||||
public static boolean miningDoubleDrops(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.mining.doubledrops");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.WOODCUTTING.*
|
||||
*/
|
||||
|
||||
public boolean treeFeller(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.woodcutting.treefeller");
|
||||
public static boolean treeFeller(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.woodcutting.treefeller");
|
||||
}
|
||||
|
||||
public boolean leafBlower(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.woodcutting.leafblower");
|
||||
public static boolean leafBlower(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.woodcutting.leafblower");
|
||||
}
|
||||
|
||||
public boolean woodcuttingDoubleDrops(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.woodcutting.doubledrops");
|
||||
public static boolean woodcuttingDoubleDrops(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.woodcutting.doubledrops");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.REPAIR.*
|
||||
*/
|
||||
|
||||
public boolean repairBonus(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.repairbonus");
|
||||
public static boolean repairBonus(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.repairbonus");
|
||||
}
|
||||
|
||||
public boolean repairMastery(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.repairmastery");
|
||||
public static boolean repairMastery(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.repairmastery");
|
||||
}
|
||||
|
||||
public boolean arcaneForging(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.arcaneforging");
|
||||
public static boolean arcaneForging(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.arcaneforging");
|
||||
}
|
||||
|
||||
public boolean woodRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.woodrepair");
|
||||
public static boolean woodRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.woodrepair");
|
||||
}
|
||||
|
||||
public boolean stoneRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.stonerepair");
|
||||
public static boolean stoneRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.stonerepair");
|
||||
}
|
||||
|
||||
public boolean leatherRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.leatherrepair");
|
||||
public static boolean leatherRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.leatherrepair");
|
||||
}
|
||||
|
||||
public boolean ironRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.ironrepair");
|
||||
public static boolean ironRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.ironrepair");
|
||||
}
|
||||
|
||||
public boolean goldRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.goldrepair");
|
||||
public static boolean goldRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.goldrepair");
|
||||
}
|
||||
|
||||
public boolean diamondRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.diamondrepair");
|
||||
public static boolean diamondRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.diamondrepair");
|
||||
}
|
||||
|
||||
public boolean armorRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.armorrepair");
|
||||
public static boolean armorRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.armorrepair");
|
||||
}
|
||||
|
||||
public boolean toolRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.toolrepair");
|
||||
public static boolean toolRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.toolrepair");
|
||||
}
|
||||
|
||||
public boolean otherMaterialRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.othermaterialrepair");
|
||||
public static boolean otherMaterialRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.othermaterialrepair");
|
||||
}
|
||||
|
||||
public boolean otherRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.otherrepair");
|
||||
public static boolean otherRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.otherrepair");
|
||||
}
|
||||
|
||||
public boolean stringRepair(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.stringrepair");
|
||||
public static boolean stringRepair(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.stringrepair");
|
||||
}
|
||||
|
||||
public boolean salvage(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.repair.salvage");
|
||||
public static boolean salvage(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.repair.salvage");
|
||||
}
|
||||
|
||||
|
||||
@ -221,196 +334,196 @@ public class Permissions {
|
||||
* MCMMO.ABILITY.UNARMED.*
|
||||
*/
|
||||
|
||||
public boolean unarmedBonus(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.unarmed.bonusdamage");
|
||||
public static boolean unarmedBonus(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.unarmed.bonusdamage");
|
||||
}
|
||||
|
||||
public boolean disarm(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.unarmed.disarm");
|
||||
public static boolean disarm(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.unarmed.disarm");
|
||||
}
|
||||
|
||||
public boolean berserk(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.unarmed.berserk");
|
||||
public static boolean berserk(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.unarmed.berserk");
|
||||
}
|
||||
|
||||
public boolean deflect(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.unarmed.deflect");
|
||||
public static boolean deflect(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.unarmed.deflect");
|
||||
}
|
||||
|
||||
public boolean ironGrip(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.unarmed.irongrip");
|
||||
public static boolean ironGrip(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.unarmed.irongrip");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.ARCHERY.*
|
||||
*/
|
||||
|
||||
public boolean trackArrows(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.archery.trackarrows");
|
||||
public static boolean trackArrows(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.archery.trackarrows");
|
||||
}
|
||||
|
||||
public boolean daze(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.archery.daze");
|
||||
public static boolean daze(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.archery.daze");
|
||||
}
|
||||
|
||||
public boolean archeryBonus(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.archery.bonusdamage");
|
||||
public static boolean archeryBonus(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.archery.bonusdamage");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.HERBALISM.*
|
||||
*/
|
||||
|
||||
public boolean herbalismDoubleDrops(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.doubledrops");
|
||||
public static boolean herbalismDoubleDrops(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.doubledrops");
|
||||
}
|
||||
|
||||
public boolean greenTerra(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenterra");
|
||||
public static boolean greenTerra(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenterra");
|
||||
}
|
||||
|
||||
public boolean greenThumbBlocks(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenthumbblocks");
|
||||
public static boolean greenThumbBlocks(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenthumbblocks");
|
||||
}
|
||||
|
||||
public boolean greenThumbCarrots(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenthumbcarrots");
|
||||
public static boolean greenThumbCarrots(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenthumbcarrots");
|
||||
}
|
||||
|
||||
public boolean greenThumbCocoa(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenthumbcocoa");
|
||||
public static boolean greenThumbCocoa(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenthumbcocoa");
|
||||
}
|
||||
|
||||
public boolean greenThumbNetherwart(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenthumbnetherwart");
|
||||
public static boolean greenThumbNetherwart(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenthumbnetherwart");
|
||||
}
|
||||
|
||||
public boolean greenThumbPotatoes(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenthumbpotatoes");
|
||||
public static boolean greenThumbPotatoes(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenthumbpotatoes");
|
||||
}
|
||||
|
||||
public boolean greenThumbWheat(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.greenthumbwheat");
|
||||
public static boolean greenThumbWheat(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.greenthumbwheat");
|
||||
}
|
||||
|
||||
public boolean farmersDiet(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.herbalism.farmersdiet");
|
||||
public static boolean farmersDiet(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.herbalism.farmersdiet");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.EXCAVATION.*
|
||||
*/
|
||||
|
||||
public boolean gigaDrillBreaker(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.excavation.gigadrillbreaker");
|
||||
public static boolean gigaDrillBreaker(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.excavation.gigadrillbreaker");
|
||||
}
|
||||
|
||||
public boolean excavationTreasures(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.excavation.treasures");
|
||||
public static boolean excavationTreasures(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.excavation.treasures");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.SWORDS.*
|
||||
*/
|
||||
|
||||
public boolean swordsBleed(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.swords.bleed");
|
||||
public static boolean swordsBleed(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.swords.bleed");
|
||||
}
|
||||
|
||||
public boolean serratedStrikes(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.swords.serratedstrikes");
|
||||
public static boolean serratedStrikes(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.swords.serratedstrikes");
|
||||
}
|
||||
|
||||
public boolean counterAttack(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.swords.counterattack");
|
||||
public static boolean counterAttack(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.swords.counterattack");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.AXES.*
|
||||
*/
|
||||
|
||||
public boolean skullSplitter(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.axes.skullsplitter");
|
||||
public static boolean skullSplitter(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.axes.skullsplitter");
|
||||
}
|
||||
|
||||
public boolean axeBonus(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.axes.bonusdamage");
|
||||
public static boolean axeBonus(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.axes.bonusdamage");
|
||||
}
|
||||
|
||||
public boolean criticalHit(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.axes.criticalhit");
|
||||
public static boolean criticalHit(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.axes.criticalhit");
|
||||
}
|
||||
|
||||
public boolean impact(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.axes.impact");
|
||||
public static boolean impact(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.axes.impact");
|
||||
}
|
||||
|
||||
public boolean greaterImpact(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.axes.greaterimpact");
|
||||
public static boolean greaterImpact(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.axes.greaterimpact");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.ACROBATICS.*
|
||||
*/
|
||||
|
||||
public boolean roll(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.acrobatics.roll");
|
||||
public static boolean roll(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.acrobatics.roll");
|
||||
}
|
||||
|
||||
public boolean gracefulRoll(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.acrobatics.gracefulroll");
|
||||
public static boolean gracefulRoll(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.acrobatics.gracefulroll");
|
||||
}
|
||||
|
||||
public boolean dodge(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.acrobatics.dodge");
|
||||
public static boolean dodge(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.acrobatics.dodge");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ABILITY.BLASTMINING.*
|
||||
*/
|
||||
|
||||
public boolean biggerBombs(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.blastmining.biggerbombs");
|
||||
public static boolean biggerBombs(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.blastmining.biggerbombs");
|
||||
}
|
||||
|
||||
public boolean demolitionsExpertise(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.blastmining.demolitionsexpertise");
|
||||
public static boolean demolitionsExpertise(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.blastmining.demolitionsexpertise");
|
||||
}
|
||||
|
||||
public boolean blastMining(Player player) {
|
||||
return player.hasPermission("mcmmo.ability.blastmining.detonate");
|
||||
public static boolean blastMining(Player player) {
|
||||
return hasPermission(player, "mcmmo.ability.blastmining.detonate");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.ITEM.*
|
||||
*/
|
||||
|
||||
public boolean chimaeraWing(Player player) {
|
||||
return player.hasPermission("mcmmo.item.chimaerawing");
|
||||
public static boolean chimaeraWing(Player player) {
|
||||
return hasPermission(player, "mcmmo.item.chimaerawing");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.COMMANDS.*
|
||||
*/
|
||||
|
||||
public boolean mcAbility(Player player) {
|
||||
return player.hasPermission("mcmmo.commands.ability");
|
||||
public static boolean mcAbility(Player player) {
|
||||
return hasPermission(player, "mcmmo.commands.ability");
|
||||
}
|
||||
|
||||
public boolean partyTeleport(Player player) {
|
||||
return player.hasPermission("mcmmo.commands.ptp");
|
||||
public static boolean partyTeleport(Player player) {
|
||||
return hasPermission(player, "mcmmo.commands.ptp");
|
||||
}
|
||||
|
||||
public boolean inspect(Player player) {
|
||||
return player.hasPermission("mcmmo.commands.inspect");
|
||||
public static boolean inspect(Player player) {
|
||||
return hasPermission(player, "mcmmo.commands.inspect");
|
||||
}
|
||||
|
||||
public boolean party(Player player) {
|
||||
return player.hasPermission("mcmmo.commands.party");
|
||||
public static boolean party(Player player) {
|
||||
return hasPermission(player, "mcmmo.commands.party");
|
||||
}
|
||||
|
||||
public boolean skillReset(Player player) {
|
||||
return player.hasPermission("mcmmo.skillreset");
|
||||
public static boolean skillReset(Player player) {
|
||||
return hasPermission(player, "mcmmo.skillreset");
|
||||
}
|
||||
|
||||
|
||||
@ -418,67 +531,67 @@ public class Permissions {
|
||||
* MCMMO.CHAT.*
|
||||
*/
|
||||
|
||||
public boolean partyChat(Player player) {
|
||||
return player.hasPermission("mcmmo.chat.partychat");
|
||||
public static boolean partyChat(Player player) {
|
||||
return hasPermission(player, "mcmmo.chat.partychat");
|
||||
}
|
||||
|
||||
public boolean partyLock(Player player) {
|
||||
return player.hasPermission("mcmmo.chat.partylock");
|
||||
public static boolean partyLock(Player player) {
|
||||
return hasPermission(player, "mcmmo.chat.partylock");
|
||||
}
|
||||
|
||||
public boolean adminChat(Player player) {
|
||||
return player.hasPermission("mcmmo.chat.adminchat");
|
||||
public static boolean adminChat(Player player) {
|
||||
return hasPermission(player, "mcmmo.chat.adminchat");
|
||||
}
|
||||
|
||||
/*
|
||||
* MCMMO.SKILLS.*
|
||||
*/
|
||||
|
||||
public boolean taming(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.taming");
|
||||
public static boolean taming(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.taming");
|
||||
}
|
||||
|
||||
public boolean mining(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.mining");
|
||||
public static boolean mining(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.mining");
|
||||
}
|
||||
|
||||
public boolean fishing(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.fishing");
|
||||
public static boolean fishing(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.fishing");
|
||||
}
|
||||
|
||||
public boolean woodcutting(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.woodcutting");
|
||||
public static boolean woodcutting(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.woodcutting");
|
||||
}
|
||||
|
||||
public boolean repair(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.repair");
|
||||
public static boolean repair(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.repair");
|
||||
}
|
||||
|
||||
public boolean unarmed(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.unarmed");
|
||||
public static boolean unarmed(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.unarmed");
|
||||
}
|
||||
|
||||
public boolean archery(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.archery");
|
||||
public static boolean archery(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.archery");
|
||||
}
|
||||
|
||||
public boolean herbalism(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.herbalism");
|
||||
public static boolean herbalism(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.herbalism");
|
||||
}
|
||||
|
||||
public boolean excavation(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.excavation");
|
||||
public static boolean excavation(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.excavation");
|
||||
}
|
||||
|
||||
public boolean swords(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.swords");
|
||||
public static boolean swords(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.swords");
|
||||
}
|
||||
|
||||
public boolean axes(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.axes");
|
||||
public static boolean axes(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.axes");
|
||||
}
|
||||
|
||||
public boolean acrobatics(Player player) {
|
||||
return player.hasPermission("mcmmo.skills.acrobatics");
|
||||
public static boolean acrobatics(Player player) {
|
||||
return hasPermission(player, "mcmmo.skills.acrobatics");
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,13 +46,13 @@ public class Skills {
|
||||
int adjustedCooldown = cooldown;
|
||||
|
||||
//Reduced Cooldown Donor Perks
|
||||
if (player.hasPermission("mcmmo.perks.cooldowns.halved")) {
|
||||
if (Permissions.cooldownsHalved(player)) {
|
||||
adjustedCooldown = (int) (adjustedCooldown * 0.5);
|
||||
}
|
||||
else if (player.hasPermission("mcmmo.perks.cooldowns.thirded")) {
|
||||
else if (Permissions.cooldownsThirded(player)) {
|
||||
adjustedCooldown = (int) (adjustedCooldown * 0.66);
|
||||
}
|
||||
else if (player.hasPermission("mcmmo.perks.cooldowns.quartered")) {
|
||||
else if (Permissions.cooldownsQuartered(player)) {
|
||||
adjustedCooldown = (int) (adjustedCooldown * 0.75);
|
||||
}
|
||||
|
||||
@ -75,13 +75,13 @@ public class Skills {
|
||||
int adjustedCooldown = cooldown;
|
||||
|
||||
//Reduced Cooldown Donor Perks
|
||||
if (player.hasPermission("mcmmo.perks.cooldowns.halved")) {
|
||||
if (Permissions.cooldownsHalved(player)) {
|
||||
adjustedCooldown = (int) (adjustedCooldown * 0.5);
|
||||
}
|
||||
else if (player.hasPermission("mcmmo.perks.cooldowns.thirded")) {
|
||||
else if (Permissions.cooldownsThirded(player)) {
|
||||
adjustedCooldown = (int) (adjustedCooldown * 0.66);
|
||||
}
|
||||
else if (player.hasPermission("mcmmo.perks.cooldowns.quartered")) {
|
||||
else if (Permissions.cooldownsQuartered(player)) {
|
||||
adjustedCooldown = (int) (adjustedCooldown * 0.75);
|
||||
}
|
||||
|
||||
@ -343,11 +343,11 @@ public class Skills {
|
||||
* @return true if the player has combat skills, false otherwise
|
||||
*/
|
||||
public static boolean hasCombatSkills(Player player) {
|
||||
if (Permissions.getInstance().axes(player)
|
||||
|| Permissions.getInstance().archery(player)
|
||||
|| Permissions.getInstance().swords(player)
|
||||
|| Permissions.getInstance().taming(player)
|
||||
|| Permissions.getInstance().unarmed(player)) {
|
||||
if (Permissions.axes(player)
|
||||
|| Permissions.archery(player)
|
||||
|| Permissions.swords(player)
|
||||
|| Permissions.taming(player)
|
||||
|| Permissions.unarmed(player)) {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
@ -362,11 +362,11 @@ public class Skills {
|
||||
* @return true if the player has gathering skills, false otherwise
|
||||
*/
|
||||
public static boolean hasGatheringSkills(Player player) {
|
||||
if (Permissions.getInstance().excavation(player)
|
||||
|| Permissions.getInstance().fishing(player)
|
||||
|| Permissions.getInstance().herbalism(player)
|
||||
|| Permissions.getInstance().mining(player)
|
||||
|| Permissions.getInstance().woodcutting(player)) {
|
||||
if (Permissions.excavation(player)
|
||||
|| Permissions.fishing(player)
|
||||
|| Permissions.herbalism(player)
|
||||
|| Permissions.mining(player)
|
||||
|| Permissions.woodcutting(player)) {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
@ -381,7 +381,7 @@ public class Skills {
|
||||
* @return true if the player has misc skills, false otherwise
|
||||
*/
|
||||
public static boolean hasMiscSkills(Player player) {
|
||||
if (Permissions.getInstance().acrobatics(player) || Permissions.getInstance().repair(player)) {
|
||||
if (Permissions.acrobatics(player) || Permissions.repair(player)) {
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
@ -440,13 +440,13 @@ public class Skills {
|
||||
|
||||
int ticks = 2 + (profile.getSkillLevel(type) / abilityLengthIncreaseLevel);
|
||||
|
||||
if (player.hasPermission("mcmmo.perks.activationtime.twelveseconds")) {
|
||||
if (Permissions.activationTwelve(player)) {
|
||||
ticks = ticks + 12;
|
||||
}
|
||||
else if (player.hasPermission("mcmmo.perks.activationtime.eightseconds")) {
|
||||
else if (Permissions.activationEight(player)) {
|
||||
ticks = ticks + 8;
|
||||
}
|
||||
else if (player.hasPermission("mcmmo.perks.activationtime.fourseconds")) {
|
||||
else if (Permissions.activationFour(player)) {
|
||||
ticks = ticks + 4;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user