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

Merge branch 'mimicvat' into 'master'

Browse Source 
Mimic Vat: Update trigger so it doesn't resolve when card moved

See merge request core-developers/forge!4741
This commit is contained in:
Michael Kamensky
2021-05-26 04:34:55 +00:00
parent 35aaafeba6 263faa9895
commit e3a2a98c2f
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -348,7 +348,6 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
}
list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard(), this);
final String rightString = presentCompare.substring(2);
int right = AbilityUtils.calculateAmount(getHostCard(), rightString, this);
final int left = list.size();

2
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -340,7 +340,7 @@ public abstract class Trigger extends TriggerReplacementBase {
}
}
if ( !meetsCommonRequirements(this.mapParams))
if (!meetsCommonRequirements(this.mapParams))
return false;
return true;