Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-22 15:05:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fixed two minor bugs"

Browse Source 
This reverts commit 9b3763bb
This commit is contained in:
Auxilor 2021-06-23 15:50:50 +01:00
parent a934251dce
commit 1adec8c753
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java
View File

@ -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);
}
}

20
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java
View File

@ -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);
}
}