diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 12ad07cd..7522519e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -194,6 +194,7 @@ public class EcoEnchants { public static final EcoEnchant MARKING = new Marking(); public static final EcoEnchant CORROSIVE = new Corrosive(); public static final EcoEnchant WOUND = new Wound(); + public static final EcoEnchant FINALITY = new Finality(); /** * Get all registered {@link EcoEnchant}s diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java new file mode 100644 index 00000000..13a4f9e6 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java @@ -0,0 +1,45 @@ +package com.willfp.ecoenchants.enchantments.ecoenchants.normal; + +import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; +import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.nms.Target; +import com.willfp.ecoenchants.util.HasEnchant; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Finality extends EcoEnchant { + public Finality() { + super( + new EcoEnchantBuilder("finality", EnchantmentType.NORMAL, Target.Applicable.BOW, 4.0) + ); + } + + // START OF LISTENERS + + @EventHandler + public void onHit(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Arrow)) + return; + if(!(((Arrow) event.getDamager()).getShooter() instanceof Player)) + return; + if (!(event.getEntity() instanceof LivingEntity)) + return; + + Player player = (Player) ((Arrow) event.getDamager()).getShooter(); + + LivingEntity victim = (LivingEntity) event.getEntity(); + + if (!HasEnchant.playerHeld(player, this)) return; + int level = HasEnchant.getPlayerLevel(player, this); + + double minhealth = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "minimum-health-per-level"); + if (!(((LivingEntity) event.getEntity()).getHealth() <= level * minhealth)) + return; + + event.setDamage(10000); // cba to do this properly + } +} diff --git a/Plugin/src/main/resources/enchants/normal/finality.yml b/Plugin/src/main/resources/enchants/normal/finality.yml new file mode 100644 index 00000000..6cf26c90 --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/finality.yml @@ -0,0 +1,23 @@ +# +# Finality EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Finality" + +description: Instantly kill entities on low health. + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + grindstoneable: true + conflicts: [] + maximum-level: 5 + +config: + minimum-health-per-level: 1 # Multiplied by level, eg: if 1, then Finality 5 kills any mobs below 2.5 hearts \ No newline at end of file diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml index 3d8ed488..52069dc0 100644 --- a/Plugin/src/main/resources/plugin.yml +++ b/Plugin/src/main/resources/plugin.yml @@ -213,6 +213,7 @@ permissions: ecoenchants.fromtable.marking: true ecoenchants.fromtable.corrosive: true ecoenchants.fromtable.wound: true + ecoenchants.fromtable.finality: true ecoenchants.updateannounce: description: Informs admins of a new update @@ -724,4 +725,7 @@ permissions: default: true ecoenchants.fromtable.wound: description: Allows getting wound from an enchanting table + default: true + ecoenchants.fromtable.finality: + description: Allows getting finality from an enchanting table default: true \ No newline at end of file