diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java index b9f5471f..74119832 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java @@ -38,7 +38,7 @@ public class Cleave extends EcoEnchant { .filter(entity -> !entity.equals(attacker)) .forEach(entity -> { entity.setMetadata("cleaved", this.getPlugin().getMetadataValueFactory().create(true)); - ((LivingEntity) entity).damage(damage, attacker); + this.getPlugin().getScheduler().run(() -> ((LivingEntity) entity).damage(damage, attacker)); this.getPlugin().getScheduler().runLater(() -> entity.removeMetadata("cleaved", this.getPlugin()), 5); }); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java index 66e97350..e8f25885 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java @@ -20,7 +20,7 @@ public class Carve extends EcoEnchant { @NotNull final LivingEntity victim, final int level, @NotNull final EntityDamageByEntityEvent event) { - if (victim.hasMetadata("carved")) { + if (victim.hasMetadata("cleaved")) { return; } @@ -37,9 +37,9 @@ public class Carve extends EcoEnchant { .filter(entity -> entity instanceof LivingEntity) .filter(entity -> !entity.equals(attacker)) .forEach(entity -> { - entity.setMetadata("carved", this.getPlugin().getMetadataValueFactory().create(true)); - ((LivingEntity) entity).damage(damage, attacker); - this.getPlugin().getScheduler().runLater(() -> entity.removeMetadata("carved", this.getPlugin()), 20); + entity.setMetadata("cleaved", this.getPlugin().getMetadataValueFactory().create(true)); + this.getPlugin().getScheduler().run(() -> ((LivingEntity) entity).damage(damage, attacker)); + this.getPlugin().getScheduler().runLater(() -> entity.removeMetadata("cleaved", this.getPlugin()), 20); }); } }