diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java index 76ce324..2a92a2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java @@ -25,11 +25,6 @@ public class CDestructable extends CWidget { this.pathingInstanceDeath = pathingInstanceDeath; } - @Override - public float getMaxLife() { - return destType.getMaxLife(); - } - @Override public float getFlyHeight() { return 0; @@ -89,7 +84,7 @@ public class CDestructable extends CWidget { @Override public float getMaxLife() { - return this.destType.getLife(); + return this.destType.getMaxLife(); } public void setInvulnerable(final boolean invulnerable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 66909b0..fa383d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -1225,11 +1225,6 @@ public class CUnit extends CWidget { setPointAndCheckUnstuck(structure.getX(), structure.getY(), simulation); } - @Override - public float getMaxLife() { - return unitType.getMaxLife(); - } - @Override public void setLife(final CSimulation simulation, final float life) { final boolean wasDead = isDead(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java index a74b519..428d9c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java @@ -64,8 +64,6 @@ public abstract class CWidget implements AbilityTarget { return this.life <= 0; } - public abstract float getMaxLife(); - public abstract boolean canBeTargetedBy(CSimulation simulation, CUnit source, final EnumSet targetsAllowed);