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

SpellAbility fixed some changes

Browse Source
This commit is contained in:
Hanmac
2018-03-07 07:04:00 +01:00
parent 65d65c9e5f
commit b88365e475
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -1495,10 +1495,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
return true;
}
SpellAbility p = getParent();
if (p != null) {
return p.isTargeting(o);
}
return false;
return p != null && p.isTargeting(o);
}
// Takes one argument like Permanent.Blue+withFlying
@@ -1519,7 +1516,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
}
}
else if (incR[0].equals("Activated")) {
if (!(this instanceof AbilityActivated) && !(root instanceof AbilityActivated)) {
if (!(root instanceof AbilityActivated)) {
return false;
}
}