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

Fixed Cleave/Carve stack overflow

Browse Source
This commit is contained in:
Auxilor 2021-05-23 19:06:00 +01:00
parent b035c7e184
commit 4fff42d46d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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