From 650ca1616a11b6d61576c9885b07f196b136c7a9 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 28 Aug 2014 13:16:25 +0200 Subject: [PATCH] Fixed failing Kiki-Jiki Mirror Breaker test. --- .../org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java | 4 ++-- Mage/src/mage/abilities/keyword/ExtortAbility.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java index 6fad9673f1b..ac9048c91a4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/KikiJikiMirrorBreakerTest.java @@ -56,7 +56,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { } @Test - public void testSimpleCopyExiledAtEnd() { + public void testSimpleCopySacrificeAtEnd() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5); addCard(Zone.BATTLEFIELD, playerA, "Kiki-Jiki, Mirror Breaker", 1); addCard(Zone.BATTLEFIELD, playerA, "Voice of Resurgence", 1); @@ -68,7 +68,7 @@ public class KikiJikiMirrorBreakerTest extends CardTestPlayerBase { assertLife(playerA, 20); assertLife(playerB, 20); - assertPermanentCount(playerA, "Elemental", 0); // because the copy was exiled + assertPermanentCount(playerA, "Elemental", 1); // because the copy was sacrificed assertPermanentCount(playerA, "Voice of Resurgence", 1); } diff --git a/Mage/src/mage/abilities/keyword/ExtortAbility.java b/Mage/src/mage/abilities/keyword/ExtortAbility.java index 78f84b33df5..64ba0ae9b72 100644 --- a/Mage/src/mage/abilities/keyword/ExtortAbility.java +++ b/Mage/src/mage/abilities/keyword/ExtortAbility.java @@ -109,9 +109,7 @@ class ExtortEffect extends OneShotEffect { if (loseLife > 0) { game.getPlayer(source.getControllerId()).gainLife(loseLife, game); } - if (permanent != null) { - game.informPlayers(new StringBuilder(permanent.getName()).append(" extorted opponents ").append(loseLife).append(" life").toString()); - } + game.informPlayers(new StringBuilder(permanent.getName()).append(" extorted opponents ").append(loseLife).append(" life").toString()); } } return true;