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

* Saskia the Unyielding - Fixed that the damage source of the triggered ability was not the combat damage causing creature.

Browse source
This commit is contained in:
LevelX2 2016-12-11 22:58:35 +01:00
parent 4b4aef8ed5
commit 7c7cebc048
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/s/SaskiaTheUnyielding.java
View file

@ -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;

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

@ -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()));