From af8d946882dbf7043362c94141723c0cfaef4fa8 Mon Sep 17 00:00:00 2001 From: Kapitowa Date: Fri, 6 May 2022 11:58:38 +0300 Subject: [PATCH] Fix exp multiplier for grindstone, when use item with Intellect or Wisdom on mainhand --- .../ecoenchants/enchantments/ecoenchants/normal/Wisdom.java | 5 +++++ .../enchantments/ecoenchants/special/Intellect.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java index b41a0ed0..562b7ab1 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java @@ -7,6 +7,7 @@ import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.inventory.InventoryType; import org.jetbrains.annotations.NotNull; public class Wisdom extends EcoEnchant { @@ -32,6 +33,10 @@ public class Wisdom extends EcoEnchant { return; } + if (player.getOpenInventory().getTopInventory().getType() == InventoryType.GRINDSTONE) { + return; + } + int level = EnchantChecks.getMainhandLevel(player, this); event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point"))))); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java index 2f3282b7..2e2d7cd7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java @@ -7,6 +7,7 @@ import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.inventory.InventoryType; import org.jetbrains.annotations.NotNull; public class Intellect extends EcoEnchant { @@ -38,6 +39,10 @@ public class Intellect extends EcoEnchant { return; } + if (player.getOpenInventory().getTopInventory().getType() == InventoryType.GRINDSTONE) { + return; + } + event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "bonus-per-point"))))); } }