From 61cbf1e1c6e8be8c4f686c6044a5c2aa26e08cfd Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Mon, 1 Nov 2021 20:48:48 +0300 Subject: [PATCH 1/2] Added "ticks-per-level" and "amplifier-per-level" config options for Famine enchantment --- .../ecoenchants/enchantments/ecoenchants/normal/Famine.java | 5 +++-- .../src/main/resources/enchants/normal/famine.yml | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java index 4946897a..7ec28ebf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -35,7 +36,7 @@ public class Famine extends EcoEnchant { return; } - victim.addPotionEffect(new PotionEffect(PotionEffectType.HUNGER, level * 40, level)); - victim.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_DIGGING, level * 40, level)); + victim.addPotionEffect(new PotionEffect(PotionEffectType.HUNGER, level * this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION+"ticks-per-level"), level)); + victim.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_DIGGING, level * 40, level*this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION+"amplifier-per-level")-1)); } } diff --git a/eco-core/core-plugin/src/main/resources/enchants/normal/famine.yml b/eco-core/core-plugin/src/main/resources/enchants/normal/famine.yml index 3196c493..4b4092e4 100644 --- a/eco-core/core-plugin/src/main/resources/enchants/normal/famine.yml +++ b/eco-core/core-plugin/src/main/resources/enchants/normal/famine.yml @@ -26,4 +26,6 @@ general-config: config: allow-not-fully-charged: false - chance-per-level: 1.5 \ No newline at end of file + chance-per-level: 1.5 + ticks-per-level: 40 + amplifier-per-levl: 1 \ No newline at end of file From 680b970c2e06b5b65406d784a222a3064a492739 Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Mon, 1 Nov 2021 20:53:05 +0300 Subject: [PATCH 2/2] Fixed Famine enchantment giving slow digging effect --- .../ecoenchants/enchantments/ecoenchants/normal/Famine.java | 1 - 1 file changed, 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java index 7ec28ebf..4106cecb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java @@ -37,6 +37,5 @@ public class Famine extends EcoEnchant { } victim.addPotionEffect(new PotionEffect(PotionEffectType.HUNGER, level * this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION+"ticks-per-level"), level)); - victim.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_DIGGING, level * 40, level*this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION+"amplifier-per-level")-1)); } }