From 8cf2514edb80d49c76292d9b99c8df3230697750 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 17 Mar 2013 16:10:48 +0100 Subject: [PATCH] [minor] formating --- .../src/mage/player/human/HumanPlayer.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 17da56c958c..6a5d52f81f0 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -78,13 +78,12 @@ public class HumanPlayer extends PlayerImpl { protected static FilterCreatureForCombat filterCreatureForCombat = new FilterCreatureForCombat(); protected static FilterAttackingCreature filterAttack = new FilterAttackingCreature(); protected static FilterBlockingCreature filterBlock = new FilterBlockingCreature(); - protected static Choice replacementEffectChoice = new ChoiceImpl(true); - private static Map staticOptions = new HashMap(); + protected static final Choice replacementEffectChoice = new ChoiceImpl(true); + private static final Map staticOptions = new HashMap(); private static final Logger log = Logger.getLogger(HumanPlayer.class); static { - //filter.add(new ControllerPredicate(TargetController.YOU)); replacementEffectChoice.setMessage("Choose replacement effect"); staticOptions.put("UI.right.btn.text", "Done"); } @@ -416,10 +415,9 @@ public class HumanPlayer extends PlayerImpl { } else if (response.getUUID() != null) { MageObject object = game.getObject(response.getUUID()); if (object != null) { - LinkedHashMap useableAbilities = null; Zone zone = game.getState().getZone(object.getId()); if (zone != null) { - useableAbilities = getUseableActivatedAbilities(object, zone, game); + LinkedHashMap useableAbilities = getUseableActivatedAbilities(object, zone, game); if (useableAbilities != null && useableAbilities.size() > 0) { activateAbility(useableAbilities, game); } @@ -492,11 +490,12 @@ public class HumanPlayer extends PlayerImpl { protected void playManaAbilities(ManaCost unpaid, Game game) { updateGameStatePriority("playManaAbilities", game); MageObject object = game.getObject(response.getUUID()); - if (object == null) return; - LinkedHashMap useableAbilities = null; + if (object == null) { + return; + } Zone zone = game.getState().getZone(object.getId()); if (zone != null) { - useableAbilities = getUseableManaAbilities(object, zone, game); + LinkedHashMap useableAbilities = getUseableManaAbilities(object, zone, game); if (useableAbilities != null && useableAbilities.size() > 0) { useableAbilities = ManaUtil.tryToAutoPay(unpaid, useableAbilities); activateAbility(useableAbilities, game); @@ -546,6 +545,14 @@ public class HumanPlayer extends PlayerImpl { game.getCombat().removeAttacker(attacker.getId(), game); } + /** + * Selects a defender for an attacker and adds the attacker to combat + * + * @param defenders - list of possible defender + * @param attackerId - UUID of attacker + * @param game + * @return + */ protected boolean selectDefender(Set defenders, UUID attackerId, Game game) { if (defenders.size() == 1) { declareAttacker(attackerId, defenders.iterator().next(), game); @@ -631,7 +638,7 @@ public class HumanPlayer extends PlayerImpl { game.fireSelectTargetEvent(playerId, "Select attacker to block", target.possibleTargets(null, playerId, game), target.isRequired(), null); waitForResponse(); if (response.getBoolean() != null) { - return; + // do nothing } else if (response.getUUID() != null) { declareBlocker(blockerId, response.getUUID(), game); }