From ebe02c310af1ce1955896a898b6c880a39de075a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 20 Aug 2021 15:50:06 +0400 Subject: [PATCH] Merge fix --- Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java index 418613b5b8a..08d9f33d140 100644 --- a/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/ActivatedAbilityImpl.java @@ -216,14 +216,15 @@ public abstract class ActivatedAbilityImpl extends AbilityImpl implements Activa // targets and costs check if (!costs.canPay(this, this, playerId, game) - || canChooseTarget(game, playerId)) { + || !canChooseTarget(game, playerId)) { return ActivationStatus.getFalse(); } // all fine, can be activated // TODO: WTF, must be rework to remove data change in canActivate call // (it can be called from any place by any player or card). - // So add game.inCheckPlayableState() here? + // game.inCheckPlayableState() can't be a help here cause some cards checking activating status, + // activatorId must be removed this.activatorId = playerId; return new ActivationStatus(true, approvingObject); }