From 895a308bf749c6a03f29ca435012e711879482e7 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 13 Jun 2021 14:44:51 +0100 Subject: [PATCH] Fixed Feather Talisman still giving damage effect if no damage was dealt --- .../talismans/talismans/talismans/FeatherTalisman.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java index 37e1448..4946c89 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java @@ -20,6 +20,12 @@ public class FeatherTalisman extends Talisman { return; } - event.setDamage(event.getDamage() * this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "multiplier")); + double damage = event.getDamage() * this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "multiplier"); + if (damage < 0.5) { + event.setCancelled(true); + return; + } + + event.setDamage(damage); } }