From 6d4ae7bac878d16cb1abb540fbb662a38feb98d1 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 13 Mar 2021 22:07:43 +0000 Subject: [PATCH] Made boss hunter work with ecobosses --- .../enchantments/ecoenchants/normal/BossHunter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java index 78431fa3..a22f6e86 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java @@ -3,26 +3,30 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; +import org.bukkit.NamespacedKey; import org.bukkit.entity.Arrow; import org.bukkit.entity.Boss; import org.bukkit.entity.ElderGuardian; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.persistence.PersistentDataType; import org.jetbrains.annotations.NotNull; +@SuppressWarnings("deprecation") public class BossHunter extends EcoEnchant { public BossHunter() { super( "boss_hunter", EnchantmentType.NORMAL ); } + @Override public void onArrowDamage(@NotNull final LivingEntity attacker, @NotNull final LivingEntity victim, @NotNull final Arrow arrow, final int level, @NotNull final EntityDamageByEntityEvent event) { - if (!(victim instanceof Boss || victim instanceof ElderGuardian)) { + if (!(victim instanceof Boss || victim instanceof ElderGuardian) && !victim.getPersistentDataContainer().has(new NamespacedKey("ecobosses", "boss"), PersistentDataType.STRING)) { return; }