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

AbilityManaPart: add valid check for the SA itself

Browse Source 
split later into extra check for SA and Host
This commit is contained in:
Hanmac
2018-04-12 07:16:31 +02:00
parent 333ba13869
commit f7bed9089c
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ForgeScript.java
View File

@@ -168,6 +168,10 @@ public class ForgeScript {
if (!sa.isFlashBackAbility()) { if (!sa.isFlashBackAbility()) {
return false; return false;
} }
} else if (property.equals("Kicked")) {
if (!sa.isKicked()) {
return false;
}
} else if (property.equals("Aftermath")) { } else if (property.equals("Aftermath")) {
if (!sa.isAftermath()) { if (!sa.isAftermath()) {
return false; return false;

4
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -337,6 +337,10 @@ public class AbilityManaPart implements java.io.Serializable {
} }
} }
if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) {
return true;
}
if (sa.isAbility()) { if (sa.isAbility()) {
if (restriction.startsWith("Activated")) { if (restriction.startsWith("Activated")) {
restriction = TextUtil.fastReplace(restriction, "Activated", "Card"); restriction = TextUtil.fastReplace(restriction, "Activated", "Card");