diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java index 082ab354..2b6f30ae 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java @@ -28,8 +28,6 @@ public class Parasitic extends EcoEnchant { if (newHealth > attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { newHealth = attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); } - if (attacker.getHealth() > 0) { - attacker.setHealth(newHealth); - } + attacker.setHealth(newHealth); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java index a7abe665..89aa8f59 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java @@ -17,7 +17,6 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; -import org.bukkit.entity.Arrow; import java.util.ArrayList; import java.util.List; @@ -43,19 +42,18 @@ public class Soulbound extends EcoEnchant { return; } - if (!(event.getEntity() instanceof Arrow)) { - if (player.getKiller() != null) { - Player killer = player.getKiller(); - int reaperLevel = EnchantChecks.getMainhandLevel(killer, EcoEnchants.REAPER); - if (reaperLevel > 0) { - if (!(EcoEnchants.REAPER.getDisabledWorlds().contains(killer.getWorld()))) { - if (EnchantmentUtils.passedChance(EcoEnchants.REAPER, reaperLevel)) { - return; - } + if (player.getKiller() != null) { + Player killer = player.getKiller(); + int reaperLevel = EnchantChecks.getMainhandLevel(killer, EcoEnchants.REAPER); + if (reaperLevel > 0) { + if (!(EcoEnchants.REAPER.getDisabledWorlds().contains(killer.getWorld()))) { + if (EnchantmentUtils.passedChance(EcoEnchants.REAPER, reaperLevel)) { + return; } } } } + for (ItemStack itemStack : player.getInventory().getContents()) { if (itemStack == null) { continue; @@ -66,7 +64,7 @@ public class Soulbound extends EcoEnchant { } if (this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "on-books")) { - if (itemStack.getItemMeta() instanceof EnchantmentStorageMeta && (((EnchantmentStorageMeta) itemStack.getItemMeta()).getStoredEnchants().containsKey(this))) { + if (itemStack.getItemMeta() instanceof EnchantmentStorageMeta && (((EnchantmentStorageMeta) itemStack.getItemMeta()).getStoredEnchants().containsKey(this.getEnchantment()))) { soulboundItems.add(itemStack); } }