external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
STX cards + Abundant Harvest

See merge request core-developers/forge!4285
This commit is contained in:
Michael Kamensky
2021-03-27 15:54:25 +00:00
parent b2ff43bd9b 23c8c5da19
commit 36e395e3a3
11 changed files with 78 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/player/PlayerProperty.java
View File

@@ -225,9 +225,11 @@ public class PlayerProperty {
if (source.getChosenPlayer() == null || !source.getChosenPlayer().equals(player)) {
return false;
}
} else if (property.startsWith("LifeEquals_")) {
int life = AbilityUtils.calculateAmount(source, property.substring(11), null);
if (player.getLife() != life) {
} else if (property.startsWith("life")) {
int life = player.getLife();
int amount = AbilityUtils.calculateAmount(source, property.substring(6), spellAbility);
if (!Expressions.compare(life, property, amount)) {
return false;
}
} else if (property.equals("IsPoisoned")) {