Improved forcedToPay handling

This commit is contained in:
L_J 2018-06-03 20:25:30 +02:00 committed by GitHub
parent 7cc313bc43
commit 6972aab50e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 76 deletions

View file

@ -1,30 +1,3 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.w;
import java.util.UUID;
@ -127,10 +100,6 @@ class WordOfCommandEffect extends OneShotEffect {
// and only if mana they produce is spent to activate other mana abilities of lands he or she controls and/or play that card
ManaPool manaPool = targetPlayer.getManaPool();
boolean autoPayment = manaPool.isAutoPayment();
boolean autoPaymentRestricted = manaPool.isAutoPaymentRestricted();
manaPool.setAutoPayment(true);
manaPool.setAutoPaymentRestricted(true);
manaPool.setForcedToPay(true);
int bookmark = game.bookmarkState();
@ -140,13 +109,9 @@ class WordOfCommandEffect extends OneShotEffect {
game.informPlayers(targetPlayer.getLogName() + " didn't play " + card.getLogName());
}
manaPool.setForcedToPay(false); // duplicate in case of a a new mana pool existing - probably not necessary, but just in case
manaPool.setAutoPayment(autoPayment);
manaPool.setAutoPaymentRestricted(autoPaymentRestricted);
manaPool.setForcedToPay(false); // duplicate in case of a new mana pool existing - probably not necessary, but just in case
manaPool = targetPlayer.getManaPool(); // a rollback creates a new mana pool for the player, so it's necessary to find it again
manaPool.setForcedToPay(false);
manaPool.setAutoPayment(autoPayment);
manaPool.setAutoPaymentRestricted(autoPaymentRestricted);
game.removeBookmark(bookmark);
targetPlayer.resetStoredBookmark(game);