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

refactor Quartzwood Crasher; Goro-Goro and Satoru

Browse source 
to use DealCombatDamageControlledTriggeredAbility
This commit is contained in:
xenohedron 2023-11-08 23:28:12 -05:00
parent 4a250c48a5
commit 5c83bbe970
3 changed files with 36 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/abilities/common/DealCombatDamageControlledTriggeredAbility.java
View file

@ -39,7 +39,8 @@ public class DealCombatDamageControlledTriggeredAbility extends TriggeredAbility
super(zone, effect, optional);
this.setTargetPointer = setTargetPointer;
this.filter = filter;
setTriggerPhrase("Whenever one or more " + filter.getMessage() + " you control deal combat damage to a player, ");
String filterMessage = (filter.getMessage().contains("you control") ? filter.getMessage() : filter.getMessage() + " you control");
setTriggerPhrase("Whenever one or more " + filterMessage + " deal combat damage to a player, ");
}
protected DealCombatDamageControlledTriggeredAbility(final DealCombatDamageControlledTriggeredAbility ability) {
@ -65,8 +66,8 @@ public class DealCombatDamageControlledTriggeredAbility extends TriggeredAbility
.filter(e -> {
Permanent permanent = game.getPermanentOrLKIBattlefield(e.getSourceId());
return permanent != null
&& filter.match(permanent, game)
&& permanent.isControlledBy(this.getControllerId());
&& permanent.isControlledBy(this.getControllerId())
&& filter.match(permanent, game);
})
.collect(Collectors.toList());
@ -87,4 +88,4 @@ public class DealCombatDamageControlledTriggeredAbility extends TriggeredAbility
return true;
}
}
}