Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-03 02:21:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Auxilor 2021-10-19 13:41:00 +01:00
commit 6c294fbed5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneListeners.java
View File

@ -6,7 +6,6 @@ import com.willfp.eco.util.NumberUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchant;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.ExperienceOrb;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -16,12 +15,9 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.GrindstoneInventory; import org.bukkit.inventory.GrindstoneInventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements Listener { public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements Listener {
@ -61,6 +57,7 @@ public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements L
} }
this.getPlugin().getScheduler().runLater(() -> { this.getPlugin().getScheduler().runLater(() -> {
if (inventory.getItem(2) != null || event.isCancelled()) return;
Set<Enchantment> enchants = new HashSet<>(); Set<Enchantment> enchants = new HashSet<>();
if (top != null) { if (top != null) {
enchants.addAll(top.getEnchantments().keySet()); enchants.addAll(top.getEnchantments().keySet());
@ -80,4 +77,5 @@ public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements L
} }
}, 1); }, 1);
} }
} }