github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed Issue #1660

Browse source
This commit is contained in:
fwannmacher 2016-07-26 19:32:20 -03:00 committed by fwann
parent 3caf66e4b6
commit ec0e8181d5
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java
View file

@ -76,7 +76,9 @@ public class DealsDamageToAPlayerAllTriggeredAbility extends TriggeredAbilityImp
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (!onlyCombat || ((DamagedPlayerEvent) event).isCombatDamage()) { if (!onlyCombat || ((DamagedPlayerEvent) event).isCombatDamage()) {
Permanent permanent = game.getPermanent(event.getSourceId()); Permanent permanent = game.getPermanent(event.getSourceId());
if (permanent != null && filter.match(permanent, sourceId, controllerId, game)) { if (permanent != null) {
controllerId = permanent.getControllerId();
if (filter.match(permanent, sourceId, controllerId, game)) {
if (!setTargetPointer.equals(SetTargetPointer.NONE)) { if (!setTargetPointer.equals(SetTargetPointer.NONE)) {
for (Effect effect : this.getEffects()) { for (Effect effect : this.getEffects()) {
effect.setValue("damage", event.getAmount()); effect.setValue("damage", event.getAmount());
@ -94,6 +96,7 @@ public class DealsDamageToAPlayerAllTriggeredAbility extends TriggeredAbilityImp
return true; return true;
} }
} }
}
return false; return false;
} }