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

Fixed xp dupe bug with vanilla curse enchantments

Browse Source
This commit is contained in:
_OfTeN_ 2021-11-07 15:40:52 +03:00
parent 679c5ff3c3
commit c6bd5c894c
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import com.sk89q.worldguard.blacklist.target.ItemMatcher;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.StringUtils;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import org.bukkit.Location;
import org.bukkit.enchantments.Enchantment;
@ -20,9 +21,7 @@ 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;
import java.util.*;
public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements Listener {
/**
@ -60,8 +59,20 @@ public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements L
return;
}
List<Enchantment> removed = new ArrayList<>();
if (top != null) {
removed.addAll(top.getEnchantments().keySet());
}
if (bottom != null) {
removed.addAll(bottom.getEnchantments().keySet());
}
Map<Enchantment, Integer> toKeep = GrindstoneMerge.doMerge(top, bottom);
removed.removeAll(toKeep.keySet());
this.getPlugin().getScheduler().runLater(() -> {
if (inventory.getItem(2) != null || event.isCancelled()) {
return;
@ -78,14 +89,15 @@ public class GrindstoneListeners extends PluginDependent<EcoPlugin> implements L
out.setItemMeta(outMeta);
}
if (!toKeep.isEmpty()) {
if (!removed.isEmpty()) {
Location loc = player.getLocation().clone().add(
NumberUtils.randFloat(-1, 1),
NumberUtils.randFloat(-1, 1),
NumberUtils.randFloat(-1, 1)
);
ExperienceOrb orb = (ExperienceOrb) loc.getWorld().spawnEntity(loc, EntityType.EXPERIENCE_ORB);
orb.setExperience(toKeep.size() * 15);
orb.setExperience(removed.size() * 15);
}
}, 1);
}