External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 22:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Heroic - Fixed that heroic only triggered for one mode if a modal spell with heroic targets in differnt modes was used (e.g. Dromoka's Command).

Browse source
This commit is contained in:
LevelX2 2015-05-30 12:44:33 +02:00
parent 907b029bdb
commit bb478fa9d5
2 changed files with 89 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/mage/abilities/keyword/HeroicAbility.java
View file

@ -83,17 +83,19 @@ public class HeroicAbility extends TriggeredAbilityImpl {
private boolean checkSpell(Spell spell, Game game) {
if (spell != null) {
SpellAbility sa = spell.getSpellAbility();
for (Target target : sa.getTargets()) {
if (!target.isNotTarget() && target.getTargets().contains(this.getSourceId())) {
return true;
}
}
for (Effect effect : sa.getEffects()) {
for (UUID targetId : effect.getTargetPointer().getTargets(game, sa)) {
if (targetId.equals(this.getSourceId())) {
for(UUID modeId :sa.getModes().getSelectedModes()) {
for (Target target : sa.getModes().get(modeId).getTargets()) {
if (!target.isNotTarget() && target.getTargets().contains(this.getSourceId())) {
return true;
}
}
for (Effect effect : sa.getModes().get(modeId).getEffects()) {
for (UUID targetId : effect.getTargetPointer().getTargets(game, sa)) {
if (targetId.equals(this.getSourceId())) {
return true;
}
}
}
}
}
return false;