From 96b46d31cfcc6a87911cd85c1886b94d4550d100 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 23 Jan 2019 16:21:34 -0800 Subject: [PATCH] Only activate bleed if the target survives the initial strike --- .../com/gmail/nossr50/util/player/NotificationManager.java | 1 - .../java/com/gmail/nossr50/util/skills/CombatUtils.java | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java index d1a597522..3558bf5e7 100644 --- a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java +++ b/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java @@ -28,7 +28,6 @@ public class NotificationManager { */ public static void sendPlayerInformation(Player player, NotificationType notificationType, String key) { - ChatMessageType destination = AdvancedConfig.getInstance().doesNotificationUseActionBar(notificationType) ? ChatMessageType.ACTION_BAR : ChatMessageType.SYSTEM; TextComponent message = TextComponentFactory.getNotificationTextComponentFromLocale(key, notificationType); diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index a2ac091f1..7241e8d99 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -54,8 +54,11 @@ public final class CombatUtils { mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS); } - if (swordsManager.canUseRupture()) { - swordsManager.ruptureCheck(target); + if(target.getHealth() - event.getFinalDamage() >= 1) + { + if (swordsManager.canUseRupture()) { + swordsManager.ruptureCheck(target); + } } if (swordsManager.canUseSerratedStrike()) {