From 7c7cebc04860221839fb2469e5c60c2a3ffa31de Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 11 Dec 2016 22:58:35 +0100 Subject: [PATCH] * Saskia the Unyielding - Fixed that the damage source of the triggered ability was not the combat damage causing creature. --- Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java | 5 +++-- .../common/DealsDamageToAPlayerAllTriggeredAbility.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java b/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java index 7c0092b0045..d9c1e05561b 100644 --- a/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java +++ b/Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java @@ -107,8 +107,9 @@ class SaskiaTheUnyieldingEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null && player.canRespond()) { Integer damage = (Integer) this.getValue("damage"); - if (damage > 0) { - player.damage(damage, source.getSourceId(), game, false, true); + UUID sourceId = (UUID) this.getValue("sourceId"); + if (sourceId != null && damage > 0) { + player.damage(damage, sourceId, game, false, true); } } return true; diff --git a/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java index 6af6157d55a..4dcca733cda 100644 --- a/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealsDamageToAPlayerAllTriggeredAbility.java @@ -80,6 +80,7 @@ public class DealsDamageToAPlayerAllTriggeredAbility extends TriggeredAbilityImp if (filter.match(permanent, getSourceId(), getControllerId(), game)) { for (Effect effect : this.getEffects()) { effect.setValue("damage", event.getAmount()); + effect.setValue("sourceId", event.getSourceId()); switch (setTargetPointer) { case PLAYER: effect.setTargetPointer(new FixedTarget(permanent.getControllerId()));