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

Fixed anvil bug

Browse Source
This commit is contained in:
Auxilor 2021-08-14 19:04:21 +01:00
parent f63f0dded8
commit 45e468bc90
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java
View File

@ -2,11 +2,13 @@ package com.willfp.ecoenchants.enchantments.support.merging.anvil;
import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent; import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.core.fast.FastItemStack;
import com.willfp.eco.core.proxy.ProxyConstants; import com.willfp.eco.core.proxy.ProxyConstants;
import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.NumberUtils;
import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy; import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy; import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -148,8 +150,15 @@ public class AnvilListeners extends PluginDependent<EcoPlugin> implements Listen
return; return;
} }
/*
This is a weird anti-dupe bodge. Don't look into it.
*/
ItemStack l = event.getInventory().getItem(0);
Map<Enchantment, Integer> leftEnchants = l == null ? new HashMap<>() : FastItemStack.wrap(l).getEnchantmentsOnItem(true);
Map<Enchantment, Integer> outEnchants = item == null ? new HashMap<>() : FastItemStack.wrap(item).getEnchantmentsOnItem(true);
if (event.getInventory().getItem(1) == null if (event.getInventory().getItem(1) == null
&& !Objects.equals(event.getInventory().getItem(0), item)) { && !leftEnchants.equals(outEnchants)) {
return; return;
} }