Merge branch 'conditions' into 'master'

Fix ConditionLifeTotal

See merge request core-developers/forge!4192
This commit is contained in:
Michael Kamensky
2021-03-13 17:26:53 +00:00

View File

@@ -374,12 +374,12 @@ public class SpellAbilityCondition extends SpellAbilityVariables {
if (this.getLifeTotal() != null) { if (this.getLifeTotal() != null) {
int life = 1; int life = 1;
if (this.getLifeTotal().equals("You")) {
life = activator.getLife();
}
if (this.getLifeTotal().equals("OpponentSmallest")) { if (this.getLifeTotal().equals("OpponentSmallest")) {
life = activator.getOpponentsSmallestLifeTotal(); life = activator.getOpponentsSmallestLifeTotal();
} }
else {
life = AbilityUtils.getDefinedPlayers(host, this.getLifeTotal(), sa).getFirst().getLife();
}
int right = 1; int right = 1;
final String rightString = this.getLifeAmount().substring(2); final String rightString = this.getLifeAmount().substring(2);