Browse Source

Only activate bleed if the target survives the initial strike

nossr50 6 years ago
parent
commit
96b46d31cf

+ 0 - 1
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)
     public static void sendPlayerInformation(Player player, NotificationType notificationType, String key)
     {
     {
-
         ChatMessageType destination = AdvancedConfig.getInstance().doesNotificationUseActionBar(notificationType) ? ChatMessageType.ACTION_BAR : ChatMessageType.SYSTEM;
         ChatMessageType destination = AdvancedConfig.getInstance().doesNotificationUseActionBar(notificationType) ? ChatMessageType.ACTION_BAR : ChatMessageType.SYSTEM;
 
 
         TextComponent message = TextComponentFactory.getNotificationTextComponentFromLocale(key, notificationType);
         TextComponent message = TextComponentFactory.getNotificationTextComponentFromLocale(key, notificationType);

+ 5 - 2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -54,8 +54,11 @@ public final class CombatUtils {
             mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS);
             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()) {
         if (swordsManager.canUseSerratedStrike()) {