From abbbb5dafd24f548ca120409f92877fe64161a5f Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 13 Jul 2019 12:48:26 +0400 Subject: [PATCH] * London mulligan - fixed wrong cards number in logs; --- .../java/mage/game/mulligan/LondonMulligan.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java b/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java index 5c9e85a4d69..4304c5da67f 100644 --- a/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java +++ b/Mage/src/main/java/mage/game/mulligan/LondonMulligan.java @@ -91,6 +91,7 @@ public class LondonMulligan extends Mulligan { } } openingHandSizes.put(playerId, openingHandSizes.get(playerId) - deduction); + int newHandSize = openingHandSizes.get(player.getId()); if (deduction == 0) { game.fireInformEvent(new StringBuilder(player.getLogName()) .append(" mulligans for free.") @@ -99,14 +100,13 @@ public class LondonMulligan extends Mulligan { game.fireInformEvent(new StringBuilder(player.getLogName()) .append(" mulligans") .append(" down to ") - .append((numCards - deduction)) - .append(numCards - deduction == 1 ? " card" : " cards").toString()); + .append(newHandSize) + .append(newHandSize == 1 ? " card" : " cards").toString()); } player.drawCards(numCards, game); - int handSize = openingHandSizes.get(player.getId()); - if (player.getHand().size() > handSize) { - int cardsToDiscard = player.getHand().size() - handSize; + if (player.getHand().size() > newHandSize) { + int cardsToDiscard = player.getHand().size() - newHandSize; Cards cards = new CardsImpl(); cards.addAll(player.getHand()); TargetCard target = new TargetCard(cardsToDiscard, cardsToDiscard, Zone.HAND, @@ -118,7 +118,8 @@ public class LondonMulligan extends Mulligan { } @Override - public void endMulligan(Game game, UUID playerId) {} + public void endMulligan(Game game, UUID playerId) { + } @Override public LondonMulligan copy() {