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

Fixing Double Drops for Herbalism (Update your configs) see changelog for instructions

Browse Source
This commit is contained in:
nossr50
2019-03-23 13:34:14 -07:00
parent df1497924c
commit ce6553d857
5 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ import org.bukkit.util.Vector;
import java.util.*;
public class FishingManager extends SkillManager {
public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 200;
public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 100;
public static final int OVERFISH_LIMIT = 4;
private final long FISHING_COOLDOWN_SECONDS = 1000L;
@ -74,7 +74,7 @@ public class FishingManager extends SkillManager {
{
long currentTime = System.currentTimeMillis();
//Only track spam casting if the fishing hook is fresh
if(currentTime > fishHookSpawnTimestamp + 500)
if(currentTime > fishHookSpawnTimestamp + 1000)
return;
if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)

10
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@ -262,8 +262,14 @@ public class RepairManager extends SkillManager {
private short repairCalculate(short durability, int repairAmount) {
Player player = getPlayer();
if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY) && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_REPAIR_MASTERY)) {
double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY)
&& RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_REPAIR_MASTERY)) {
double maxBonusCalc = Repair.repairMasteryMaxBonus / 100.0D;
double skillLevelBonusCalc = (Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * (getSkillLevel() / 100.0D);
double bonus = repairAmount * Math.min(skillLevelBonusCalc, maxBonusCalc);
repairAmount += bonus;
}

26
src/main/resources/config.yml
View File

@ -428,22 +428,34 @@ Skills:
###
Double_Drops:
Herbalism:
Beetroots_Ripe: true
Beetroots: true
Brown_Mushroom: true
Cactus: true
Carrots_Ripe: true
Cocoa_Ripe: true
Wheat_Ripe: true
Carrots: true
Cocoa: true
Wheat: true
Melon: true
Nether_Wart_Ripe: true
Potatoes_Ripe: true
Nether_Wart: true
Potatoes: true
Pumpkin: true
Red_Mushroom: true
Red_Tulip: true
Sugar_Cane: true
Vine: true
Lily_Pad: true
Red_Tulip: true
White_Tulip: true
Pink_Tulip: true
Orange_Tulip: true
Dandelion: true
Poppy: true
Blue_Orchid: true
Allium: true
Azure_Bluet: true
Oxeye_Daisy: true
Sunflower: true
Lilac: true
Rose_Bush: true
Peony: true
Mining:
Coal_Ore: true
Diamond_Ore: true