EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-20 13:05:35 +02:00
Code Issues Projects Releases Wiki Activity

Fix issues with double damage, double death messages, and other damage oddities.

Browse Source 
Fixes #1450
This commit is contained in:
GJ
2013-09-12 11:52:34 -04:00
parent 44626c36a9
commit 58c7dcb705
5 changed files with 73 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java
View File

@@ -54,10 +54,10 @@ public class AxesManager extends SkillManager {
*
* @param target The {@link LivingEntity} being affected by the ability
*/
public void axeMastery(LivingEntity target) {
public double axeMastery(LivingEntity target) {
double axeBonus = Math.min(getSkillLevel() / (Axes.bonusDamageMaxBonusLevel / Axes.bonusDamageMaxBonus), Axes.bonusDamageMaxBonus);
CombatUtils.dealDamage(target, axeBonus, getPlayer(), mcMMOPlayer, SkillType.AXES);
return CombatUtils.callFakeDamageEvent(getPlayer(), target, axeBonus);
}
/**
@@ -66,9 +66,9 @@ public class AxesManager extends SkillManager {
* @param target The {@link LivingEntity} being affected by the ability
* @param damage The amount of damage initially dealt by the event
*/
public void criticalHit(LivingEntity target, double damage) {
public double criticalHit(LivingEntity target, double damage) {
if (!SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Axes.criticalHitMaxChance, Axes.criticalHitMaxBonusLevel)) {
return;
return 0;
}
Player player = getPlayer();
@@ -84,7 +84,7 @@ public class AxesManager extends SkillManager {
damage = (damage * Axes.criticalHitPVEModifier) - damage;
}
CombatUtils.dealDamage(target, damage, player, mcMMOPlayer, SkillType.AXES);
return CombatUtils.callFakeDamageEvent(player, target, damage);
}
/**
@@ -112,9 +112,9 @@ public class AxesManager extends SkillManager {
*
* @param target The {@link LivingEntity} being affected by the ability
*/
public void greaterImpact(LivingEntity target) {
public double greaterImpact(LivingEntity target) {
if (!(Axes.greaterImpactChance > Misc.getRandom().nextInt(getActivationChance()))) {
return;
return 0;
}
Player player = getPlayer();
@@ -134,7 +134,7 @@ public class AxesManager extends SkillManager {
}
}
CombatUtils.dealDamage(target, Axes.greaterImpactBonusDamage, player, mcMMOPlayer, SkillType.AXES);
return CombatUtils.callFakeDamageEvent(player, target, Axes.greaterImpactBonusDamage);
}
/**