Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-22 12:20:31 +02:00
Code Issues Projects Releases Wiki Activity

dealNoInvulnerabilityTickDamage actually hurts things now

Browse Source
This commit is contained in:
nossr50 2019-01-23 16:08:41 -08:00
parent 71a3eb6a93
commit c46b7ed3bc
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -39,6 +39,7 @@ Version 2.1.0
! (Skills) Sword's Bleed has been renamed to Rupture ! (Skills) Sword's Bleed has been renamed to Rupture
! (Skills) Sword's Serrated Strikes now uses your Rupture rank to determine the damage/ticks for its bleed effect. ! (Skills) Sword's Serrated Strikes now uses your Rupture rank to determine the damage/ticks for its bleed effect.
! (Skills) Sword's Rupture now ticks four times as fast ! (Skills) Sword's Rupture now ticks four times as fast
! (Skills) Sword's Rupture will now deal lethal damage
= (Skills) Fixed a bug where Rupture would apply an incorrect amount of bleed ticks = (Skills) Fixed a bug where Rupture would apply an incorrect amount of bleed ticks
! (Skills) Sword's Rupture now reaches its max proc chance at level 20 (200 in Retro) ! (Skills) Sword's Rupture now reaches its max proc chance at level 20 (200 in Retro)
! (Skills) Sword's Rupture now has a max chance to proc of 33% instead of 70% ! (Skills) Sword's Rupture now has a max chance to proc of 33% instead of 70%

9
src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
View File

@ -26,7 +26,7 @@ public class BleedTimerTask extends BukkitRunnable {
public void run() { public void run() {
for(LivingEntity target : bleedList.keySet()) for(LivingEntity target : bleedList.keySet())
{ {
mcMMO.p.getServer().broadcastMessage("Entity "+target.getName()+" has "+bleedList.get(target)+" ticks of bleed left"); //mcMMO.p.getServer().broadcastMessage("Entity "+target.getName()+" has "+bleedList.get(target)+" ticks of bleed left");
if (bleedList.get(target) <= 0 || !target.isValid()) { if (bleedList.get(target) <= 0 || !target.isValid()) {
remove(target); remove(target);
@ -35,9 +35,6 @@ public class BleedTimerTask extends BukkitRunnable {
double damage; double damage;
//Play Bleed Sound
SoundManager.worldSendSound(target.getWorld(), target.getLocation(), SoundType.BLEED);
if (target instanceof Player) { if (target instanceof Player) {
damage = AdvancedConfig.getInstance().getRuptureDamagePlayer(); damage = AdvancedConfig.getInstance().getRuptureDamagePlayer();
@ -61,7 +58,11 @@ public class BleedTimerTask extends BukkitRunnable {
MobHealthbarUtils.handleMobHealthbars(target, damage, mcMMO.p); //Update health bars MobHealthbarUtils.handleMobHealthbars(target, damage, mcMMO.p); //Update health bars
} }
CombatUtils.dealNoInvulnerabilityTickDamage(target, damage, attackerMap.get(target)); CombatUtils.dealNoInvulnerabilityTickDamage(target, damage, attackerMap.get(target));
//Play Bleed Sound
SoundManager.worldSendSound(target.getWorld(), target.getLocation(), SoundType.BLEED);
ParticleEffectUtils.playBleedEffect(target); ParticleEffectUtils.playBleedEffect(target);
lowerBleedDurationTicks(target); lowerBleedDurationTicks(target);
} }

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

@ -381,11 +381,10 @@ public final class CombatUtils {
return; return;
} }
//target.damage(callFakeDamageEvent(attacker, target, cause, damage));
double incDmg = callFakeDamageEvent(attacker, target, DamageCause.CUSTOM, damage); double incDmg = callFakeDamageEvent(attacker, target, DamageCause.CUSTOM, damage);
if(incDmg > 0) double newHealth = Math.max(0, target.getHealth() - incDmg);
target.setHealth(incDmg); target.setHealth(newHealth);
} }
/** /**