From e765b7c989c65ba9580a3d0405648f1b8c40874b Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 29 Aug 2020 14:19:03 +0100 Subject: [PATCH] Added Defender --- .../ecoenchants/enchantments/EcoEnchants.java | 1 + .../ecoenchants/normal/Defender.java | 40 +++++++++++++++++++ .../resources/enchants/normal/defender.yml | 22 ++++++++++ Plugin/src/main/resources/plugin.yml | 4 ++ 4 files changed, 67 insertions(+) create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java create mode 100644 Plugin/src/main/resources/enchants/normal/defender.yml 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 3f8fdd29..f3dcd5e6 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -197,6 +197,7 @@ public class EcoEnchants { public static final EcoEnchant FINALITY = new Finality(); public static final EcoEnchant BLIND = new Blind(); public static final EcoEnchant SICKENING = new Sickening(); + public static final EcoEnchant DEFENDER = new Defender(); /** * Get all registered {@link EcoEnchant}s diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java new file mode 100644 index 00000000..5e26889c --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java @@ -0,0 +1,40 @@ +package com.willfp.ecoenchants.enchantments.ecoenchants.normal; + +import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; +import com.willfp.ecoenchants.nms.Target; +import com.willfp.ecoenchants.util.HasEnchant; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Player; +import org.bukkit.entity.Tameable; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class Defender extends EcoEnchant { + public Defender() { + super( + new EcoEnchantBuilder("defender", EnchantmentType.NORMAL, new Target.Applicable[]{Target.Applicable.SWORD, Target.Applicable.AXE}, 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 Tameable)) + return; + + Player player = (Player) ((Arrow) event.getDamager()).getShooter(); + Tameable entity = (Tameable) event.getEntity(); + if(entity.getOwner() == null) return; + if(!entity.getOwner().equals(player)) return; + + if (!HasEnchant.playerHeld(player, this)) return; + + event.setCancelled(true); + } +} diff --git a/Plugin/src/main/resources/enchants/normal/defender.yml b/Plugin/src/main/resources/enchants/normal/defender.yml new file mode 100644 index 00000000..9f5349b5 --- /dev/null +++ b/Plugin/src/main/resources/enchants/normal/defender.yml @@ -0,0 +1,22 @@ +# +# Defender EcoEnchant +# + +config-version: 4.0 # Don't edit this. + +name: "Defender" + +description: Prevents damaging your own pets. + +obtaining: + table: true + villager: true + loot: true + rarity: uncommon + +general-config: + grindstoneable: true + conflicts: [] + +config: + # No config available for this enchantment \ No newline at end of file diff --git a/Plugin/src/main/resources/plugin.yml b/Plugin/src/main/resources/plugin.yml index de157581..babead35 100644 --- a/Plugin/src/main/resources/plugin.yml +++ b/Plugin/src/main/resources/plugin.yml @@ -216,6 +216,7 @@ permissions: ecoenchants.fromtable.finality: true ecoenchants.fromtable.sickening: true ecoenchants.fromtable.blind: true + ecoenchants.fromtable.defender: true ecoenchants.updateannounce: description: Informs admins of a new update @@ -736,4 +737,7 @@ permissions: default: true ecoenchants.fromtable.sickening: description: Allows getting sickening from an enchanting table + default: true + ecoenchants.fromtable.defender: + description: Allows getting defender from an enchanting table default: true \ No newline at end of file