mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-26 07:06:45 +01:00
Fixing Double Drops for Herbalism (Update your configs) see changelog for instructions
This commit is contained in:
parent
df1497924c
commit
ce6553d857
@ -7,6 +7,13 @@ Key:
|
|||||||
! Change
|
! Change
|
||||||
- Removal
|
- Removal
|
||||||
|
|
||||||
|
Version 2.1.22
|
||||||
|
Less aggressive spam click protection on Fishing
|
||||||
|
Added all missing flowers to Double Drop tables for Herbalism
|
||||||
|
Fixed Double Drop entries for all farming crops for Herbalism
|
||||||
|
NOTE: You'll need to add these entries to your config.yml manually, or wait for the upcoming config update where this will be fixed for you automatically.
|
||||||
|
NOTE: Here's what your Double_Drop entries in Config.yml for Herbalism should look like: https://paste.gg/p/anonymous/8d8db4ac69bd495fa48a7f5190484c5e
|
||||||
|
|
||||||
Version 2.1.21
|
Version 2.1.21
|
||||||
Improved anti-farm/anti-grinding mechanics for Rolling
|
Improved anti-farm/anti-grinding mechanics for Rolling
|
||||||
When you gain XP from Rolling there is a cooldown period (60~ seconds) for gaining XP again
|
When you gain XP from Rolling there is a cooldown period (60~ seconds) for gaining XP again
|
||||||
|
2
pom.xml
2
pom.xml
@ -2,7 +2,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.gmail.nossr50.mcMMO</groupId>
|
<groupId>com.gmail.nossr50.mcMMO</groupId>
|
||||||
<artifactId>mcMMO</artifactId>
|
<artifactId>mcMMO</artifactId>
|
||||||
<version>2.1.21</version>
|
<version>2.1.22-SNAPSHOT</version>
|
||||||
<name>mcMMO</name>
|
<name>mcMMO</name>
|
||||||
<url>https://github.com/mcMMO-Dev/mcMMO</url>
|
<url>https://github.com/mcMMO-Dev/mcMMO</url>
|
||||||
<scm>
|
<scm>
|
||||||
|
@ -44,7 +44,7 @@ import org.bukkit.util.Vector;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class FishingManager extends SkillManager {
|
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;
|
public static final int OVERFISH_LIMIT = 4;
|
||||||
private final long FISHING_COOLDOWN_SECONDS = 1000L;
|
private final long FISHING_COOLDOWN_SECONDS = 1000L;
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ public class FishingManager extends SkillManager {
|
|||||||
{
|
{
|
||||||
long currentTime = System.currentTimeMillis();
|
long currentTime = System.currentTimeMillis();
|
||||||
//Only track spam casting if the fishing hook is fresh
|
//Only track spam casting if the fishing hook is fresh
|
||||||
if(currentTime > fishHookSpawnTimestamp + 500)
|
if(currentTime > fishHookSpawnTimestamp + 1000)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)
|
if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)
|
||||||
|
@ -262,8 +262,14 @@ public class RepairManager extends SkillManager {
|
|||||||
private short repairCalculate(short durability, int repairAmount) {
|
private short repairCalculate(short durability, int repairAmount) {
|
||||||
Player player = getPlayer();
|
Player player = getPlayer();
|
||||||
|
|
||||||
if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY) && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.REPAIR_REPAIR_MASTERY)) {
|
if (Permissions.isSubSkillEnabled(player, SubSkillType.REPAIR_REPAIR_MASTERY)
|
||||||
double bonus = repairAmount * Math.min((((Repair.repairMasteryMaxBonus / Repair.repairMasteryMaxBonusLevel) * getSkillLevel()) / 100.0D), Repair.repairMasteryMaxBonus / 100.0D);
|
&& 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;
|
repairAmount += bonus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -428,22 +428,34 @@ Skills:
|
|||||||
###
|
###
|
||||||
Double_Drops:
|
Double_Drops:
|
||||||
Herbalism:
|
Herbalism:
|
||||||
Beetroots_Ripe: true
|
Beetroots: true
|
||||||
Brown_Mushroom: true
|
Brown_Mushroom: true
|
||||||
Cactus: true
|
Cactus: true
|
||||||
Carrots_Ripe: true
|
Carrots: true
|
||||||
Cocoa_Ripe: true
|
Cocoa: true
|
||||||
Wheat_Ripe: true
|
Wheat: true
|
||||||
Melon: true
|
Melon: true
|
||||||
Nether_Wart_Ripe: true
|
Nether_Wart: true
|
||||||
Potatoes_Ripe: true
|
Potatoes: true
|
||||||
Pumpkin: true
|
Pumpkin: true
|
||||||
Red_Mushroom: true
|
Red_Mushroom: true
|
||||||
Red_Tulip: true
|
|
||||||
Sugar_Cane: true
|
Sugar_Cane: true
|
||||||
Vine: true
|
Vine: true
|
||||||
Lily_Pad: true
|
Lily_Pad: true
|
||||||
|
Red_Tulip: true
|
||||||
|
White_Tulip: true
|
||||||
|
Pink_Tulip: true
|
||||||
|
Orange_Tulip: true
|
||||||
Dandelion: 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:
|
Mining:
|
||||||
Coal_Ore: true
|
Coal_Ore: true
|
||||||
Diamond_Ore: true
|
Diamond_Ore: true
|
||||||
|
Loading…
Reference in New Issue
Block a user