Mirrors/WarsmashModEngine
1
0
Fork 0
mirror of https://github.com/Retera/WarsmashModEngine.git synced 2022-07-31 17:38:59 +02:00
Code Issues Projects Releases Wiki Activity

Update after merge

Browse Source
This commit is contained in:
Retera 2021-06-27 17:30:54 -04:00
parent 4c84c373b4
commit 83fc753a0c
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java
View File

@ -25,11 +25,6 @@ public class CDestructable extends CWidget {
this.pathingInstanceDeath = pathingInstanceDeath; this.pathingInstanceDeath = pathingInstanceDeath;
} }
@Override
public float getMaxLife() {
return destType.getMaxLife();
}
@Override @Override
public float getFlyHeight() { public float getFlyHeight() {
return 0; return 0;
@ -89,7 +84,7 @@ public class CDestructable extends CWidget {
@Override @Override
public float getMaxLife() { public float getMaxLife() {
return this.destType.getLife(); return this.destType.getMaxLife();
} }
public void setInvulnerable(final boolean invulnerable) { public void setInvulnerable(final boolean invulnerable) {

5
core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java
View File

@ -1225,11 +1225,6 @@ public class CUnit extends CWidget {
setPointAndCheckUnstuck(structure.getX(), structure.getY(), simulation); setPointAndCheckUnstuck(structure.getX(), structure.getY(), simulation);
} }
@Override
public float getMaxLife() {
return unitType.getMaxLife();
}
@Override @Override
public void setLife(final CSimulation simulation, final float life) { public void setLife(final CSimulation simulation, final float life) {
final boolean wasDead = isDead(); final boolean wasDead = isDead();

2
core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java
View File

@ -64,8 +64,6 @@ public abstract class CWidget implements AbilityTarget {
return this.life <= 0; return this.life <= 0;
} }
public abstract float getMaxLife();
public abstract boolean canBeTargetedBy(CSimulation simulation, CUnit source, public abstract boolean canBeTargetedBy(CSimulation simulation, CUnit source,
final EnumSet<CTargetType> targetsAllowed); final EnumSet<CTargetType> targetsAllowed);