EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Only activate bleed if the target survives the initial strike

Browse Source
This commit is contained in:
nossr50 2019-01-23 16:21:34 -08:00
parent 4031674626
commit 96b46d31cf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/util/player/NotificationManager.java
View File

@ -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);

3
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -54,9 +54,12 @@ public final class CombatUtils {
mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS); mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS);
} }
if(target.getHealth() - event.getFinalDamage() >= 1)
{
if (swordsManager.canUseRupture()) { if (swordsManager.canUseRupture()) {
swordsManager.ruptureCheck(target); swordsManager.ruptureCheck(target);
} }
}
if (swordsManager.canUseSerratedStrike()) { if (swordsManager.canUseSerratedStrike()) {
swordsManager.serratedStrikes(target, initialDamage, modifiers); swordsManager.serratedStrikes(target, initialDamage, modifiers);