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

Fixed shockwave

Browse Source
This commit is contained in:
Auxilor 2021-01-16 13:14:30 +00:00
parent 348c4161ee
commit e1c0c28a00
2 changed files with 5 additions and 2 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/Shockwave.java
View File

@ -63,7 +63,7 @@ public class Shockwave extends EcoEnchant {
.filter(entity1 -> entity1 != player) .filter(entity1 -> entity1 != player)
.filter(entity1 -> !entity1.hasMetadata("shockwaved")) .filter(entity1 -> !entity1.hasMetadata("shockwaved"))
.forEach((mob -> { .forEach((mob -> {
((LivingEntity) mob).damage(finalDamage, player); ((LivingEntity) mob).damage(finalDamage, entity);
mob.setMetadata("shockwaved", this.getPlugin().getMetadataValueFactory().create(true)); mob.setMetadata("shockwaved", this.getPlugin().getMetadataValueFactory().create(true));
this.getPlugin().getScheduler().runLater(() -> mob.removeMetadata("shockwaved", this.getPlugin()), 10); this.getPlugin().getScheduler().runLater(() -> mob.removeMetadata("shockwaved", this.getPlugin()), 10);
} }

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

@ -88,7 +88,10 @@ public class Soulbound extends EcoEnchant {
assert meta != null; assert meta != null;
meta.getPersistentDataContainer().remove(this.getPlugin().getNamespacedKeyFactory().create("soulbound")); meta.getPersistentDataContainer().remove(this.getPlugin().getNamespacedKeyFactory().create("soulbound"));
soulboundItem.setItemMeta(meta); soulboundItem.setItemMeta(meta);
player.getInventory().addItem(soulboundItem);
if (!player.getInventory().contains(soulboundItem)) {
player.getInventory().addItem(soulboundItem);
}
} }
player.removeMetadata("soulbound-items", this.getPlugin()); player.removeMetadata("soulbound-items", this.getPlugin());