Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Resolved a possible arithmetic exception. Divided by zero.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-12-22 20:39:28 +01:00
parent 7adec10002
commit 1c34ded555
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java
View File

@@ -16,7 +16,12 @@ public class TraitHeroic extends AbstractTrait {
public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) { public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
int durability = ToolHelper.getCurrentDurability(tool); int durability = ToolHelper.getCurrentDurability(tool);
int durabilitymax = ToolHelper.getMaxDurability(tool); int durabilitymax = ToolHelper.getMaxDurability(tool);
float calc = newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability - 1)); float calc;
if ((durability * durabilitymax / (durabilitymax - durability - 1)) != 0) {
calc = newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability - 1));
} else {
calc = newDamage + (newDamage / 2) / ((durability * durabilitymax / (durabilitymax - durability - 1)) + 1);
}
if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) { if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) {
return super.damage(tool, player, target, damage, calc, isCritical); return super.damage(tool, player, target, damage, calc, isCritical);
} else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical); } else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical);