From 4836f381ef480c7a3e86ee3fc0d4d94a5e630b51 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 4 Feb 2018 01:28:21 +0100
Subject: [PATCH] * Sword of War and Peace - Fixed damage handling of triggered
effect.
---
Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
index e16ff50b53..27f568cd34 100644
--- a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
+++ b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
@@ -45,8 +45,8 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.AttachmentType;
import mage.constants.CardType;
-import mage.constants.SubType;
import mage.constants.Outcome;
+import mage.constants.SubType;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedPlayerEvent;
@@ -54,7 +54,7 @@ import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.players.Player;
-import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
/**
*
@@ -96,7 +96,6 @@ class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl {
public SwordOfWarAndPeaceAbility() {
super(Zone.BATTLEFIELD, new SwordOfWarAndPeaceDamageEffect());
this.addEffect(new GainLifeEffect(new CardsInControllerHandCount()));
- this.addTarget(new TargetPlayer(1, 1, true));
}
public SwordOfWarAndPeaceAbility(final SwordOfWarAndPeaceAbility ability) {
@@ -118,8 +117,7 @@ class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl {
DamagedPlayerEvent damageEvent = (DamagedPlayerEvent) event;
Permanent damageSource = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (damageEvent.isCombatDamage() && damageSource != null && damageSource.getAttachments().contains(this.getSourceId())) {
- getTargets().get(0).clearChosen();
- getTargets().get(0).add(event.getPlayerId(), game);
+ getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
return true;
}
return false;
@@ -144,9 +142,9 @@ class SwordOfWarAndPeaceDamageEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
- Player target = game.getPlayer(source.getFirstTarget());
- if (target != null) {
- target.damage(target.getHand().size(), source.getSourceId(), game, false, true);
+ Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source));
+ if (targetPlayer != null) {
+ targetPlayer.damage(targetPlayer.getHand().size(), source.getSourceId(), game, false, true);
}
return true;
}