EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Bleed doesn't suck anymore.

Browse Source
This commit is contained in:
nossr50
2019-01-21 15:14:01 -08:00
parent 848cee18a9
commit 11c8374f6c
18 changed files with 137 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.datatypes.skills.XPGainReason;
import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
@ -375,6 +376,18 @@ public final class CombatUtils {
target.damage(callFakeDamageEvent(attacker, target, cause, damage));
}
public static void dealNoInvulnerabilityTickDamage(LivingEntity target, double damage, Entity attacker) {
if (target.isDead()) {
return;
}
//target.damage(callFakeDamageEvent(attacker, target, cause, damage));
double incDmg = callFakeDamageEvent(attacker, target, DamageCause.CUSTOM, damage);
if(incDmg > 0)
target.setHealth(incDmg);
}
/**
* Apply Area-of-Effect ability actions.
*
@ -405,7 +418,7 @@ public final class CombatUtils {
NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.SS.Struck");
}
BleedTimerTask.add(livingEntity, Swords.serratedStrikesBleedTicks);
BleedTimerTask.add(livingEntity, Swords.serratedStrikesBleedTicks, RankUtils.getRank(attacker, SubSkillType.SWORDS_RUPTURE));
break;
case AXES:

2
src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
View File

@ -93,6 +93,8 @@ public class SoundManager {
return Sound.ENTITY_ENDER_EYE_DEATH;
case TIRED:
return Sound.BLOCK_CONDUIT_AMBIENT;
case BLEED:
return Sound.ENTITY_ENDER_EYE_DEATH;
default:
return null;
}

1
src/main/java/com/gmail/nossr50/util/sounds/SoundType.java
View File

@ -14,6 +14,7 @@ public enum SoundType {
TOOL_READY,
ABILITY_ACTIVATED_GENERIC,
ABILITY_ACTIVATED_BERSERK,
BLEED,
TIRED;
public boolean usesCustomPitch()