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

Updating permissions for consistency.

Browse Source
This commit is contained in:
Glitchfinder
2013-01-06 17:52:31 -08:00
parent d444e088c4
commit 974862a60a
48 changed files with 782 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java
View File

@ -61,7 +61,7 @@ public class Excavation {
xp = Config.getInstance().getExcavationBaseXP();
}
if (Permissions.getInstance().excavationTreasures(player)) {
if (Permissions.excavationTreasures(player)) {
switch (type) {
case DIRT:
treasures = TreasuresConfig.getInstance().excavationFromDirt;
@ -99,7 +99,7 @@ public class Excavation {
if (skillLevel >= treasure.getDropLevel()) {
int randomChance = 100;
if (player.hasPermission("mcmmo.perks.lucky.excavation")) {
if (Permissions.luckyExcavation(player)) {
randomChance = (int) (randomChance * 0.75);
}

12
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -107,13 +107,13 @@ public class Fishing {
}
if (Config.getInstance().getFishingDropsEnabled() && rewards.size() > 0
&& Permissions.getInstance().fishingTreasures(player)) {
&& Permissions.fishingTreasures(player)) {
FishingTreasure treasure = rewards.get(random.nextInt(rewards
.size()));
int randomChance = 100;
if (player.hasPermission("mcmmo.perks.lucky.fishing")) {
if (Permissions.luckyFishing(player)) {
randomChance = (int) (randomChance * 0.75);
}
@ -167,12 +167,12 @@ public class Fishing {
if (ItemChecks.isEnchantable(fishingResults)) {
int randomChance = 100;
if (player.hasPermission("mcmmo.perks.lucky.fishing")) {
if (Permissions.luckyFishing(player)) {
randomChance = (int) (randomChance * 0.75);
}
if (random.nextInt(randomChance) <= ENCHANTMENT_CHANCE
&& Permissions.getInstance().fishingMagic(player)) {
&& Permissions.fishingMagic(player)) {
for (Enchantment newEnchant : Enchantment.values()) {
if (newEnchant.canEnchantItem(fishingResults)) {
Map<Enchantment, Integer> resultEnchantments = fishingResults
@ -226,7 +226,7 @@ public class Fishing {
public static void shakeMob(PlayerFishEvent event) {
int randomChance = 100;
if (event.getPlayer().hasPermission("mcmmo.perks.lucky.fishing")) {
if (Permissions.luckyFishing(event.getPlayer())) {
randomChance = (int) (randomChance * 1.25);
}
@ -236,7 +236,7 @@ public class Fishing {
int dropChance = getShakeChance(lootTier);
if (event.getPlayer().hasPermission("mcmmo.perks.lucky.fishing")) {
if (Permissions.luckyFishing(player)) {
dropChance = (int) (dropChance * 1.25); // With lucky perk on max
// level tier, its 100%
}

18
src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
View File

@ -103,7 +103,7 @@ public class Herbalism {
int randomChance = 1000;
if (player.hasPermission("mcmmo.perks.lucky.herbalism")) {
if (Permissions.luckyHerbalism(player)) {
randomChance = (int) (randomChance * 0.75);
}
@ -136,7 +136,7 @@ public class Herbalism {
mat = Material.WHEAT;
xp = Config.getInstance().getHerbalismXPWheat();
if (Permissions.getInstance().greenThumbWheat(player)) {
if (Permissions.greenThumbWheat(player)) {
greenThumbWheat(block, player, event, plugin);
}
}
@ -154,7 +154,7 @@ public class Herbalism {
mat = Material.NETHER_STALK;
xp = Config.getInstance().getHerbalismXPNetherWart();
if (Permissions.getInstance().greenThumbNetherwart(player)) {
if (Permissions.greenThumbNetherwart(player)) {
greenThumbWheat(block, player, event, plugin);
}
}
@ -211,7 +211,7 @@ public class Herbalism {
xp = Config.getInstance().getHerbalismXPCocoa();
if (Permissions.getInstance().greenThumbCocoa(player)) {
if (Permissions.greenThumbCocoa(player)) {
greenThumbWheat(block, player, event, plugin);
}
}
@ -223,7 +223,7 @@ public class Herbalism {
xp = Config.getInstance().getHerbalismXPCarrot();
if (Permissions.getInstance().greenThumbCarrots(player)) {
if (Permissions.greenThumbCarrots(player)) {
greenThumbWheat(block, player, event, plugin);
}
}
@ -234,7 +234,7 @@ public class Herbalism {
mat = Material.POTATO;
xp = Config.getInstance().getHerbalismXPPotato();
if (Permissions.getInstance().greenThumbPotatoes(player)) {
if (Permissions.greenThumbPotatoes(player)) {
greenThumbWheat(block, player, event, plugin);
}
}
@ -254,7 +254,7 @@ public class Herbalism {
return;
}
if (Permissions.getInstance().herbalismDoubleDrops(player)) {
if (Permissions.herbalismDoubleDrops(player)) {
ItemStack is = null;
if (customPlant) {
@ -431,7 +431,7 @@ public class Herbalism {
int randomChance = 1500;
if (player.hasPermission("mcmmo.perks.lucky.herbalism")) {
if (Permissions.luckyHerbalism(player)) {
randomChance = (int) (randomChance * 0.75);
}
@ -491,7 +491,7 @@ public class Herbalism {
int randomChance = 1500;
if (player.hasPermission("mcmmo.perks.lucky.herbalism")) {
if (Permissions.luckyHerbalism(player)) {
randomChance = (int) (randomChance * 0.75);
}

4
src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

@ -336,11 +336,11 @@ public class Mining {
int randomChance = 100;
int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillCheck);
if (player.hasPermission("mcmmo.perks.lucky.mining")) {
if (Permissions.luckyMining(player)) {
randomChance = (int) (randomChance * 0.75);
}
if (chance > random.nextInt(randomChance) && Permissions.getInstance().miningDoubleDrops(player)) {
if (chance > random.nextInt(randomChance) && Permissions.miningDoubleDrops(player)) {
if (player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
silkTouchDrops(block);
}

6
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java
View File

@ -220,7 +220,7 @@ public class WoodCutting {
}
}
if (Permissions.getInstance().woodcutting(player)) {
if (Permissions.woodcutting(player)) {
Skills.xpProcessing(player, profile, SkillType.WOODCUTTING, xp);
}
}
@ -353,11 +353,11 @@ public class WoodCutting {
int randomChance = 100;
int chance = (int) (((double) MAX_CHANCE / (double) MAX_BONUS_LEVEL) * skillLevel);
if (player.hasPermission("mcmmo.perks.lucky.woodcutting")) {
if (Permissions.luckyWoodcutting(player)) {
randomChance = (int) (randomChance * 0.75);
}
if (chance > random.nextInt(randomChance) && Permissions.getInstance().woodcuttingDoubleDrops(player)) {
if (chance > random.nextInt(randomChance) && Permissions.woodcuttingDoubleDrops(player)) {
Config configInstance = Config.getInstance();
ItemStack item;
Location location;