From e55ba7d6c1ee6d6cf1fdfbfc32fdd6fb880727cf Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Mon, 18 Oct 2021 19:57:51 +0300 Subject: [PATCH] Fixed grindstone dupe bug --- .../support/merging/grindstone/GrindstoneListeners.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java index 30bf41f5..cc3ef010 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java @@ -6,7 +6,6 @@ import com.willfp.eco.util.NumberUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import org.bukkit.Location; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Player; @@ -16,12 +15,9 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.GrindstoneInventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.EnchantmentStorageMeta; -import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import java.util.HashSet; -import java.util.Map; import java.util.Set; public class GrindstoneListeners extends PluginDependent implements Listener { @@ -60,7 +56,8 @@ public class GrindstoneListeners extends PluginDependent implements L return; } - this.getPlugin().getScheduler().runLater(() -> { + this.getPlugin().getScheduler().runLater(() -> { + if (inventory.getItem(2) != null || event.isCancelled()) return; Set enchants = new HashSet<>(); if (top != null) { enchants.addAll(top.getEnchantments().keySet()); @@ -80,4 +77,5 @@ public class GrindstoneListeners extends PluginDependent implements L } }, 1); } + }