From 0512558c60d3e1cf8d3991a58d935160e7e18ece Mon Sep 17 00:00:00 2001 From: L_J Date: Sat, 19 May 2018 05:22:50 +0000 Subject: [PATCH] Some combat fixes --- Mage/src/main/java/mage/players/PlayerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index a2be32c19e4..bdb8a60a3e1 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -2353,7 +2353,12 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void declareBlocker(UUID defenderId, UUID blockerId, UUID attackerId, Game game) { - if (isHuman()) { + declareBlocker(defenderId, blockerId, attackerId, game, true); + } + + @Override + public void declareBlocker(UUID defenderId, UUID blockerId, UUID attackerId, Game game, boolean allowUndo) { + if (isHuman() && allowUndo) { setStoredBookmark(game.bookmarkState()); } Permanent blocker = game.getPermanent(blockerId);