From 9b955a185a11c350a77dd1350edeb42e669c9049 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 11 Sep 2014 17:01:43 +0200 Subject: [PATCH] * Time Vault - Fixed replacement handling (fixes #465). --- Mage.Sets/src/mage/sets/unlimitededition/TimeVault.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/unlimitededition/TimeVault.java b/Mage.Sets/src/mage/sets/unlimitededition/TimeVault.java index a93c88c56fc..bb02d22f961 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/TimeVault.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/TimeVault.java @@ -86,8 +86,7 @@ class TimeVaultReplacementEffect extends ReplacementEffectImpl { TimeVaultReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.Untap); - staticText = "If you would begin your turn while {this} is tapped, you may skip that turn instead. If you do, untap Time Vault."; - + staticText = "If you would begin your turn while {this} is tapped, you may skip that turn instead. If you do, untap Time Vault."; } TimeVaultReplacementEffect(final TimeVaultReplacementEffect effect) { @@ -101,7 +100,7 @@ class TimeVaultReplacementEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - if (event.getType() == EventType.BEGINNING_PHASE && source.getControllerId().equals(event.getPlayerId())) { + if (event.getType() == EventType.PLAY_TURN && source.getControllerId().equals(event.getPlayerId())) { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null && permanent.isTapped()) { return true; @@ -122,10 +121,10 @@ class TimeVaultReplacementEffect extends ReplacementEffectImpl { if (player != null && permanent != null) { if (player.chooseUse(Outcome.Untap, "Skip your turn to untap " + permanent.getName() + "?", game)) { permanent.untap(game); - game.endTurn(); + game.informPlayers(player.getName() + " skips his or her turn to untap " + permanent.getLogName()); return true; } } return false; } -} \ No newline at end of file +}