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

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

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

@ -150,7 +150,7 @@ public enum AbilityType {
return Permissions.berserk(player);
case BLAST_MINING:
return Permissions.blastMining(player);
return Permissions.remoteDetonation(player);
case GIGA_DRILL_BREAKER:
return Permissions.gigaDrillBreaker(player);

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

@ -87,7 +87,7 @@ public final class CombatTools {
return;
}
if (Permissions.swords(player)) {
if (Permissions.skillEnabled(player, SkillType.SWORDS)) {
McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
PlayerProfile profile = mcMMOPlayer.getProfile();
SwordsManager swordsManager = new SwordsManager(mcMMOPlayer);
@ -97,7 +97,7 @@ public final class CombatTools {
SkillTools.abilityCheck(player, SkillType.SWORDS);
}
if (Permissions.swordsBleed(player)) {
if (Permissions.bleed(player)) {
swordsManager.bleedCheck(target);
}
@ -118,7 +118,7 @@ public final class CombatTools {
return;
}
if (Permissions.axes(player)) {
if (Permissions.skillEnabled(player, SkillType.AXES)) {
McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
PlayerProfile profile = mcMMOPlayer.getProfile();
AxeManager axeManager = new AxeManager(mcMMOPlayer);
@ -127,15 +127,15 @@ public final class CombatTools {
SkillTools.abilityCheck(player, SkillType.AXES);
}
if (Permissions.axeBonus(player)) {
if (Permissions.bonusDamage(player, axeManager.getSkill())) {
axeManager.bonusDamage(event);
}
if (!target.isDead() && Permissions.criticalHit(player)) {
if (!target.isDead() && Permissions.criticalStrikes(player)) {
axeManager.criticalHitCheck(event, target);
}
if (!target.isDead() && Permissions.impact(player)) {
if (!target.isDead() && Permissions.armorImpact(player)) {
axeManager.impact(event, target);
}
@ -156,7 +156,7 @@ public final class CombatTools {
return;
}
if (Permissions.unarmed(player)) {
if (Permissions.skillEnabled(player, SkillType.UNARMED)) {
McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
PlayerProfile profile = mcMMOPlayer.getProfile();
UnarmedManager unarmedManager = new UnarmedManager(mcMMOPlayer);
@ -166,7 +166,7 @@ public final class CombatTools {
SkillTools.abilityCheck(player, SkillType.UNARMED);
}
if (Permissions.unarmedBonus(player)) {
if (Permissions.bonusDamage(player, unarmedManager.getSkill())) {
unarmedManager.bonusDamage(event);
}
@ -210,7 +210,7 @@ public final class CombatTools {
return;
}
if (Permissions.taming(master)) {
if (Permissions.skillEnabled(master, SkillType.TAMING)) {
McMMOPlayer mcMMOPlayer = Users.getPlayer(master);
TamingManager tamingManager = new TamingManager(mcMMOPlayer);
int skillLevel = tamingManager.getSkillLevel();
@ -303,13 +303,13 @@ public final class CombatTools {
return;
}
if (Permissions.archery(shooter)) {
if (Permissions.skillEnabled(shooter, SkillType.ARCHERY)) {
McMMOPlayer mcMMOPlayer = Users.getPlayer(shooter);
ArcheryManager archeryManager = new ArcheryManager(mcMMOPlayer);
archeryManager.skillShot(event);
if (target instanceof Player) {
if (Unarmed.pvpEnabled && ((Player) target).getItemInHand().getType() == Material.AIR && Permissions.deflect((Player) target)) {
if (Unarmed.pvpEnabled && ((Player) target).getItemInHand().getType() == Material.AIR && Permissions.arrowDeflect((Player) target)) {
UnarmedManager unarmedManager = new UnarmedManager(Users.getPlayer((Player) target));
unarmedManager.deflectCheck(event);
}
@ -320,7 +320,7 @@ public final class CombatTools {
}
}
if (!(shooter.getItemInHand().containsEnchantment(Enchantment.ARROW_INFINITE)) && Permissions.trackArrows(shooter)) {
if (!(shooter.getItemInHand().containsEnchantment(Enchantment.ARROW_INFINITE)) && Permissions.arrowRetrieval(shooter)) {
archeryManager.trackArrows(target);
}

26
src/main/java/com/gmail/nossr50/skills/utilities/PerksUtils.java
View File

@ -11,13 +11,13 @@ public final class PerksUtils {
private PerksUtils() {};
public static int handleCooldownPerks(Player player, int cooldown) {
if (Permissions.cooldownsHalved(player)) {
if (Permissions.halvedCooldowns(player)) {
cooldown *= 0.5;
}
else if (Permissions.cooldownsThirded(player)) {
else if (Permissions.thirdedCooldowns(player)) {
cooldown *= (1.0 / 3.0);
}
else if (Permissions.cooldownsQuartered(player)) {
else if (Permissions.quarteredCooldowns(player)) {
cooldown *= 0.75;
}
@ -25,13 +25,13 @@ public final class PerksUtils {
}
public static int handleActivationPerks(Player player, int ticks, int maxTicks) {
if (Permissions.activationTwelve(player)) {
if (Permissions.twelveSecondActivationBoost(player)) {
ticks += 12;
}
else if (Permissions.activationEight(player)) {
else if (Permissions.eightSecondActivationBoost(player)) {
ticks += 8;
}
else if (Permissions.activationFour(player)) {
else if (Permissions.fourSecondActivationBoost(player)) {
ticks += 4;
}
@ -43,19 +43,19 @@ public final class PerksUtils {
}
public static int handleXpPerks(Player player, int xp) {
if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
if (Permissions.quadrupleXp(player)) {
xp *= 4;
}
else if (player.hasPermission("mcmmo.perks.xp.triple")) {
else if (Permissions.tripleXp(player)) {
xp *= 3;
}
else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
else if (Permissions.doubleAndOneHalfXp(player)) {
xp *= 2.5;
}
else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
else if (Permissions.doubleXp(player)) {
xp *= 2;
}
else if (player.hasPermission("mcmmo.perks.xp.50percentboost")) {
else if (Permissions.oneAndOneHalfXp(player)) {
xp *= 1.5;
}
@ -68,8 +68,8 @@ public final class PerksUtils {
* @param isLucky true if the player has the appropriate "lucky" perk, false otherwise
* @return the activation chance
*/
public static int handleLuckyPerks(boolean isLucky) {
if (isLucky) {
public static int handleLuckyPerks(Player player, SkillType skill) {
if (Permissions.lucky(player, skill)) {
return LUCKY_SKILL_ACTIVATION_CHANCE;
}

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

@ -316,11 +316,11 @@ public class SkillTools {
* @return true if the player has combat skills, false otherwise
*/
public static boolean hasCombatSkills(Player player) {
if (Permissions.axes(player)
|| Permissions.archery(player)
|| Permissions.swords(player)
|| Permissions.taming(player)
|| Permissions.unarmed(player)) {
if (Permissions.skillEnabled(player, SkillType.AXES)
|| Permissions.skillEnabled(player, SkillType.ARCHERY)
|| Permissions.skillEnabled(player, SkillType.SWORDS)
|| Permissions.skillEnabled(player, SkillType.TAMING)
|| Permissions.skillEnabled(player, SkillType.UNARMED)) {
return true;
}
@ -334,11 +334,11 @@ public class SkillTools {
* @return true if the player has gathering skills, false otherwise
*/
public static boolean hasGatheringSkills(Player player) {
if (Permissions.excavation(player)
|| Permissions.fishing(player)
|| Permissions.herbalism(player)
|| Permissions.mining(player)
|| Permissions.woodcutting(player)) {
if (Permissions.skillEnabled(player, SkillType.EXCAVATION)
|| Permissions.skillEnabled(player, SkillType.FISHING)
|| Permissions.skillEnabled(player, SkillType.HERBALISM)
|| Permissions.skillEnabled(player, SkillType.MINING)
|| Permissions.skillEnabled(player, SkillType.WOODCUTTING)) {
return true;
}
@ -352,7 +352,9 @@ public class SkillTools {
* @return true if the player has misc skills, false otherwise
*/
public static boolean hasMiscSkills(Player player) {
if (Permissions.acrobatics(player) || Permissions.repair(player)) {
if (Permissions.skillEnabled(player, SkillType.ACROBATICS)
|| Permissions.skillEnabled(player, SkillType.SMELTING)
|| Permissions.skillEnabled(player, SkillType.REPAIR)) {
return true;
}