mirror of
https://github.com/correl/mage.git
synced 2025-04-07 13:01:06 -09:00
Fixed a bug of PutTokenOntoBattlefieldCopyTargetEffect causing Myriad tests to fail.
This commit is contained in:
parent
d30736de38
commit
4522eda79c
3 changed files with 35 additions and 13 deletions
Mage.Tests/src/test/java/org/mage/test/multiplayer
Mage/src/main/java/mage/abilities
|
@ -157,7 +157,7 @@ public class MyriadTest extends CardTestMultiPlayerBase {
|
||||||
assertPermanentCount(playerD, "Man-o'-War", 1);
|
assertPermanentCount(playerD, "Man-o'-War", 1);
|
||||||
assertPermanentCount(playerC, "Silvercoat Lion", 0);
|
assertPermanentCount(playerC, "Silvercoat Lion", 0);
|
||||||
assertPermanentCount(playerC, "Pillarfield Ox", 0);
|
assertPermanentCount(playerC, "Pillarfield Ox", 0);
|
||||||
assertPermanentCount(playerC, "Grizzly Bears", 1);
|
assertPermanentCount(playerC, "Grizzly Bears", 1); // not in range
|
||||||
|
|
||||||
assertHandCount(playerC, "Silvercoat Lion", 2);
|
assertHandCount(playerC, "Silvercoat Lion", 2);
|
||||||
assertHandCount(playerC, "Pillarfield Ox", 1);
|
assertHandCount(playerC, "Pillarfield Ox", 1);
|
||||||
|
|
|
@ -107,9 +107,9 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
|
||||||
}
|
}
|
||||||
|
|
||||||
public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer) {
|
public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer) {
|
||||||
this(playerId, additionalCardType, gainsHaste, number, tapped, attacking, null, Integer.MIN_VALUE, Integer.MIN_VALUE, false);
|
this(playerId, additionalCardType, gainsHaste, number, tapped, attacking, attackedPlayer, Integer.MIN_VALUE, Integer.MIN_VALUE, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer, int power, int toughness, boolean gainsFlying) {
|
public PutTokenOntoBattlefieldCopyTargetEffect(UUID playerId, CardType additionalCardType, boolean gainsHaste, int number, boolean tapped, boolean attacking, UUID attackedPlayer, int power, int toughness, boolean gainsFlying) {
|
||||||
super(Outcome.PutCreatureInPlay);
|
super(Outcome.PutCreatureInPlay);
|
||||||
this.playerId = playerId;
|
this.playerId = playerId;
|
||||||
|
@ -119,11 +119,11 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
|
||||||
this.number = number;
|
this.number = number;
|
||||||
this.tapped = tapped;
|
this.tapped = tapped;
|
||||||
this.attacking = attacking;
|
this.attacking = attacking;
|
||||||
this.attackedPlayer = attackedPlayer;
|
this.attackedPlayer = attackedPlayer;
|
||||||
this.tokenPower = power;
|
this.tokenPower = power;
|
||||||
this.tokenToughness = toughness;
|
this.tokenToughness = toughness;
|
||||||
this.gainsFlying = gainsFlying;
|
this.gainsFlying = gainsFlying;
|
||||||
}
|
}
|
||||||
|
|
||||||
public PutTokenOntoBattlefieldCopyTargetEffect(final PutTokenOntoBattlefieldCopyTargetEffect effect) {
|
public PutTokenOntoBattlefieldCopyTargetEffect(final PutTokenOntoBattlefieldCopyTargetEffect effect) {
|
||||||
super(effect);
|
super(effect);
|
||||||
|
@ -179,10 +179,10 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
EmptyToken token = new EmptyToken();
|
EmptyToken token = new EmptyToken();
|
||||||
CardUtil.copyTo(token).from(copyFrom); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer)
|
CardUtil.copyTo(token).from(copyFrom); // needed so that entersBattlefied triggered abilities see the attributes (e.g. Master Biomancer)
|
||||||
applier.apply(game, token);
|
applier.apply(game, token);
|
||||||
|
|
||||||
if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) {
|
if (additionalCardType != null && !token.getCardType().contains(additionalCardType)) {
|
||||||
token.getCardType().add(additionalCardType);
|
token.getCardType().add(additionalCardType);
|
||||||
}
|
}
|
||||||
|
@ -194,14 +194,14 @@ public class PutTokenOntoBattlefieldCopyTargetEffect extends OneShotEffect {
|
||||||
}
|
}
|
||||||
if (tokenPower != Integer.MIN_VALUE) {
|
if (tokenPower != Integer.MIN_VALUE) {
|
||||||
token.setPower(tokenPower);
|
token.setPower(tokenPower);
|
||||||
}
|
}
|
||||||
if (tokenToughness != Integer.MIN_VALUE){
|
if (tokenToughness != Integer.MIN_VALUE) {
|
||||||
token.setToughness(tokenToughness);
|
token.setToughness(tokenToughness);
|
||||||
}
|
}
|
||||||
if (additionalSubType != null && !token.getSubtype().contains(additionalSubType)) {
|
if (additionalSubType != null && !token.getSubtype().contains(additionalSubType)) {
|
||||||
token.getSubtype().add(additionalSubType);
|
token.getSubtype().add(additionalSubType);
|
||||||
}
|
}
|
||||||
|
|
||||||
token.putOntoBattlefield(number, game, source.getSourceId(), playerId == null ? source.getControllerId() : playerId, tapped, attacking, attackedPlayer);
|
token.putOntoBattlefield(number, game, source.getSourceId(), playerId == null ? source.getControllerId() : playerId, tapped, attacking, attackedPlayer);
|
||||||
for (UUID tokenId : token.getLastAddedTokenIds()) { // by cards like Doubling Season multiple tokens can be added to the battlefield
|
for (UUID tokenId : token.getLastAddedTokenIds()) { // by cards like Doubling Season multiple tokens can be added to the battlefield
|
||||||
Permanent tokenPermanent = game.getPermanent(tokenId);
|
Permanent tokenPermanent = game.getPermanent(tokenId);
|
||||||
|
|
|
@ -1,7 +1,29 @@
|
||||||
/*
|
/*
|
||||||
* To change this license header, choose License Headers in Project Properties.
|
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
|
||||||
* To change this template file, choose Tools | Templates
|
*
|
||||||
* and open the template in the editor.
|
* 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.abilities.keyword;
|
package mage.abilities.keyword;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue