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

Draft: flitting_guerrilla.txt (#2874)

Browse Source 
* flitting_guerrilla.txt + support
This commit is contained in:
Northmoc
2023-04-10 06:06:27 -04:00
committed by GitHub
parent 5dc5bc3bfb
commit 7dd991ab93
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -1961,7 +1961,8 @@ public class CardProperty {
} else if (property.startsWith("Triggered")) {
if (spellAbility instanceof SpellAbility) {
final String key = property.substring(9);
Object o = ((SpellAbility)spellAbility).getTriggeringObject(AbilityKey.fromString(key));
SpellAbility sa = (SpellAbility) spellAbility;
Object o = sa.getRootAbility().getTriggeringObject(AbilityKey.fromString(key));
boolean found = false;
if (o != null) {
if (o instanceof CardCollection) {
@@ -1979,7 +1980,8 @@ public class CardProperty {
} else if (property.startsWith("NotTriggered")) {
final String key = property.substring("NotTriggered".length());
if (spellAbility instanceof SpellAbility) {
if (card.equals(((SpellAbility)spellAbility).getTriggeringObject(AbilityKey.fromString(key)))) {
SpellAbility sa = (SpellAbility) spellAbility;
if (card.equals(sa.getRootAbility().getTriggeringObject(AbilityKey.fromString(key)))) {
return false;
}
} else {