From fbb02760aa1429f720a0494be1451526b52e6859 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 31 Aug 2015 07:55:59 +0200 Subject: [PATCH] * Harsh Mercy - Fixed useless continue statement. --- Mage.Sets/src/mage/sets/onslaught/HarshMercy.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/onslaught/HarshMercy.java b/Mage.Sets/src/mage/sets/onslaught/HarshMercy.java index bd1478b37c..d0dce29fb3 100644 --- a/Mage.Sets/src/mage/sets/onslaught/HarshMercy.java +++ b/Mage.Sets/src/mage/sets/onslaught/HarshMercy.java @@ -94,14 +94,15 @@ class HarshMercyEffect extends OneShotEffect { MageObject sourceObject = game.getObject(source.getSourceId()); if (controller != null && sourceObject != null) { Set chosenTypes = new HashSet<>(); - for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game) ) { + PlayerIteration: + for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); Choice typeChoice = new ChoiceImpl(true); typeChoice.setMessage("Choose a creature type"); typeChoice.setChoices(CardRepository.instance.getCreatureTypes()); while (!player.choose(Outcome.DestroyPermanent, typeChoice, game)) { if (!player.canRespond()) { - continue; + continue PlayerIteration; } } String chosenType = typeChoice.getChoice(); @@ -115,9 +116,8 @@ class HarshMercyEffect extends OneShotEffect { for (String type : chosenTypes) { filter.add(Predicates.not(new SubtypePredicate(type))); } - - return (new DestroyAllEffect(filter, true)).apply(game, source); + return new DestroyAllEffect(filter, true).apply(game, source); } return false; }