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

Handle all our donor perks in one class.

Browse Source
This commit is contained in:
GJ
2013-02-18 11:41:44 -05:00
parent 671be42472
commit 083a89c1a3
13 changed files with 115 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
View File

@ -18,6 +18,7 @@ import com.gmail.nossr50.config.TreasuresConfig;
import com.gmail.nossr50.datatypes.McMMOPlayer;
import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.skills.utilities.PerksUtils;
import com.gmail.nossr50.skills.utilities.SkillTools;
import com.gmail.nossr50.skills.utilities.SkillType;
import com.gmail.nossr50.util.ItemChecks;
@ -160,7 +161,7 @@ public final class Fishing {
FishingTreasure treasure = rewards.get(Misc.getRandom().nextInt(rewards.size()));
ItemStack treasureDrop = treasure.getDrop();
int activationChance = SkillTools.calculateActivationChance(Permissions.luckyFishing(player));
int activationChance = PerksUtils.handleLuckyPerks(Permissions.luckyFishing(player));
if (Misc.getRandom().nextDouble() * activationChance > treasure.getDropChance()) {
return null;
@ -189,7 +190,7 @@ public final class Fishing {
return false;
}
int activationChance = SkillTools.calculateActivationChance(Permissions.luckyFishing(player));
int activationChance = PerksUtils.handleLuckyPerks(Permissions.luckyFishing(player));
if (storm) {
activationChance = (int) (activationChance * 0.909);

4
src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java
View File

@ -18,7 +18,7 @@ import org.bukkit.potion.PotionType;
import com.gmail.nossr50.skills.fishing.Fishing.Tier;
import com.gmail.nossr50.skills.utilities.CombatTools;
import com.gmail.nossr50.skills.utilities.SkillTools;
import com.gmail.nossr50.skills.utilities.PerksUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
@ -33,7 +33,7 @@ public final class ShakeMob {
* @param skillLevel Fishing level of the player
*/
public static void process(Player player, LivingEntity mob, int skillLevel) {
int activationChance = SkillTools.calculateActivationChance(Permissions.luckyFishing(player));
int activationChance = PerksUtils.handleLuckyPerks(Permissions.luckyFishing(player));
if (getShakeProbability(skillLevel) <= Misc.getRandom().nextInt(activationChance)) {
return;