Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finite Checks and DBZ dodge in MUtil.setDamage

Browse Source
This commit is contained in:
Olof Larsson 2015-04-28 15:27:16 +02:00
parent e3a7319001
commit 0642d3a0d5
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/massivecraft/massivecore/util/MUtil.java
View File

@ -575,16 +575,28 @@ public class MUtil
// Or they may instantly die. For this reason we take inspiration from MCMMO who rolled their own setDamage function. // Or they may instantly die. For this reason we take inspiration from MCMMO who rolled their own setDamage function.
// This method sets the BASE damage modifier and scales all other modifiers proportionally. // This method sets the BASE damage modifier and scales all other modifiers proportionally.
public static void setDamage(EntityDamageEvent event, double damage) public static void setDamage(EntityDamageEvent event, double newDamage)
{ {
// Save Old Damage // Check New Damage
if ( ! Double.isFinite(newDamage)) throw new IllegalStateException("not finite newDamage: " + newDamage);
// Get Old Damage
final double oldDamage = event.getDamage(DamageModifier.BASE); final double oldDamage = event.getDamage(DamageModifier.BASE);
// No Change? // Check Old Damage
if (damage == oldDamage) return; if ( ! Double.isFinite(oldDamage)) throw new IllegalStateException("not finite oldDamage: " + oldDamage);
// So what factor are we essentially applying? // No Change?
final double factor = damage / oldDamage; if (newDamage == oldDamage) return;
// No Old Damage? (Avoid DBZ)
if (oldDamage == 0) return;
// Get Factor
final double factor = newDamage / oldDamage;
// Check Factor
if ( ! Double.isFinite(factor)) throw new IllegalStateException("not finite factor: " + factor + " damage: " + newDamage + " oldDamage: " + oldDamage);
// Now scale all damage modifiers! // Now scale all damage modifiers!
for (DamageModifier modifier : DamageModifier.values()) for (DamageModifier modifier : DamageModifier.values())
@ -596,7 +608,7 @@ public class MUtil
// We could have used the factor too but then we might suffer floating point degredation. // We could have used the factor too but then we might suffer floating point degredation.
if (modifier == DamageModifier.BASE) if (modifier == DamageModifier.BASE)
{ {
event.setDamage(modifier, damage); event.setDamage(modifier, newDamage);
continue; continue;
} }
@ -608,6 +620,9 @@ public class MUtil
// Same as above but scales directly. // Same as above but scales directly.
public static void scaleDamage(EntityDamageEvent event, double factor) public static void scaleDamage(EntityDamageEvent event, double factor)
{ {
// Clean Input
if ( ! Double.isFinite(factor)) throw new IllegalStateException("not finite factor: " + factor);
// No Change? // No Change?
if (factor == 1) return; if (factor == 1) return;