From 589142aeb515d296ac261a12a963755c1d17ba7a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 12 Jan 2020 09:25:51 +0400 Subject: [PATCH] Real fix to prev commit --- .../src/mage/player/human/HumanPlayer.java | 3 +-- .../cards/continuous/TappedForManaFromMultipleEffects.java | 6 ++---- 2 files changed, 3 insertions(+), 6 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 f511fb1c4fd..5a4bef8c750 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 @@ -1,6 +1,5 @@ package mage.player.human; -import jdk.nashorn.internal.objects.NativeError; import mage.MageObject; import mage.abilities.*; import mage.abilities.costs.VariableCost; @@ -2399,7 +2398,7 @@ public class HumanPlayer extends PlayerImpl { private boolean gameInCheckPlayableState(Game game, boolean ignoreWarning) { if (game.inCheckPlayableState()) { if (!ignoreWarning) { - logger.warn("Player interaction in checkPlayableState./n" + NativeError.printStackTrace(this)); + logger.warn("Player interaction in checkPlayableState", new Throwable()); } return true; } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java index 4804ee85925..aadc36ce6a3 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/TappedForManaFromMultipleEffects.java @@ -53,10 +53,8 @@ public class TappedForManaFromMultipleEffects extends CardTestPlayerBase { // cast nyx 2 castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nyxbloom Ancient"); - // real choice must be called one time only (from playManaAbility) after fix, see above to-do - // TODO: TAPPED_FOR_MANA replace event called from checkTappedForManaReplacement and start to choose replace events, if logs enabled then it cause the error - // use case 1 (human game only): do not ignore check playable logs in chooseReplacementEffect for HumanPlayer - you will get rollback error on second Nyxbloom Ancient cast - // use case 2 (that test): comment one 1-2 choices to fail in 1-2 calls + // TODO: TAPPED_FOR_MANA replace event called from checkTappedForManaReplacement and start to choose replace events (is that problem?) + // use case (that test): comment one 1-2 choices to fail in 1-2 calls setChoice(playerA, "Nyxbloom Ancient: If you tap a permanent"); // getPlayable... checkTappedForManaReplacement... chooseReplacementEffect setChoice(playerA, "Nyxbloom Ancient: If you tap a permanent"); // playManaAbility... resolve... checkToFirePossibleEvents... chooseReplacementEffect