From d68ff964fbdf294fbb6be15c5b37459459175548 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 20 Jan 2017 00:34:45 +0100 Subject: [PATCH] =?UTF-8?q?*=20Gonti=E2=80=99s=20Machinations=20-=20Fixed?= =?UTF-8?q?=20that=20it=20triggered=20more=20than=20once=20per=20turn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mage.Sets/src/mage/cards/g/GontisMachinations.java | 1 + .../java/mage/abilities/costs/common/SacrificeTargetCost.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/g/GontisMachinations.java b/Mage.Sets/src/mage/cards/g/GontisMachinations.java index 4bdb584078e..927a5c8c14c 100644 --- a/Mage.Sets/src/mage/cards/g/GontisMachinations.java +++ b/Mage.Sets/src/mage/cards/g/GontisMachinations.java @@ -124,6 +124,7 @@ class GontisMachinationsFirstLostLifeThisTurnWatcher extends Watcher { public GontisMachinationsFirstLostLifeThisTurnWatcher(final GontisMachinationsFirstLostLifeThisTurnWatcher watcher) { super(watcher); + this.playersLostLife.putAll(watcher.playersLostLife); } @Override diff --git a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java index d94837b3c29..6ad4e64c25f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java @@ -53,7 +53,7 @@ public class SacrificeTargetCost extends CostImpl { target.setNotTarget(true); // sacrifice is never targeted this.text = "sacrifice " + ((target.getNumberOfTargets() != 1 || (target.getTargetName().startsWith("an") || target.getTargetName().startsWith("a "))) - ? "" : "a ") + target.getTargetName(); + ? "" : (target.getTargetName().startsWith("artifact") ? "an " : "a ")) + target.getTargetName(); target.setTargetName(target.getTargetName() + " (to sacrifice)"); } @@ -123,4 +123,4 @@ public class SacrificeTargetCost extends CostImpl { public List getPermanents() { return permanents; } -} \ No newline at end of file +}