github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed a problem that ability controller of replacement effects for cards entering the battlefield were not changed early enough (e.g. causing problem if putting Canopy Vista of opponent with Oblivion Sower onto th ebattlefield).

Browse source
This commit is contained in:
LevelX2 2015-10-27 17:55:38 +01:00
parent 9e8fab1068
commit 5c31b03c00
6 changed files with 83 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/battleforzendikar/CanopyVista.java
View file

@ -47,9 +47,9 @@ import mage.filter.predicate.mageobject.SupertypePredicate;
* @author fireshoes
*/
public class CanopyVista extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate("Basic"));
}

2
Mage.Sets/src/mage/sets/battleforzendikar/OblivionSower.java
View file

@ -111,7 +111,7 @@ class OblivionSowerEffect extends OneShotEffect {
+ targetPlayer.getName() + " to put into play under your control");
TargetCard targetCards = new TargetCard(0, exiledLands.size(), Zone.EXILED, filterToPlay);
if (controller.chooseTarget(outcome, exiledLands, targetCards, source, game)) {
controller.moveCards(new CardsImpl(targetCards.getTargets()), null, Zone.BATTLEFIELD, source, game);
controller.moveCards(new CardsImpl(targetCards.getTargets()), Zone.BATTLEFIELD, source, game);
}
}
return true;

74
Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/OblivionSowerTest.java Normal file
View file

@ -0,0 +1,74 @@
/*
* 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 org.mage.test.cards.abilities.oneshot.exile;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class OblivionSowerTest extends CardTestPlayerBase {
/**
* When putting lands into play from an opponent's exile zone using Oblivion
* Sower, the BFZ dual lands behave exactly the opposite way of how they
* should: if you control less than two basics, they enter the battlefield
* untapped, and if you control more, they enter tapped.
*/
@Test
public void testPlayLandsFromExile() {
addCard(Zone.BATTLEFIELD, playerA, "Plains", 6);
// When you cast Oblivion Sower, target opponent exiles the top four cards of his or her library, then you may put any number of land cards that player owns from exile onto the battlefield under your control.
addCard(Zone.HAND, playerA, "Oblivion Sower"); // Creature - 5/8
// Canopy Vista enters the battlefield tapped unless you control two or more basic lands.
addCard(Zone.LIBRARY, playerB, "Canopy Vista", 3);
addCard(Zone.LIBRARY, playerB, "Silvercoat Lion", 1);
skipInitShuffling();
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Oblivion Sower");
addTarget(playerA, "Canopy Vista^Canopy Vista^Canopy Vista");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertHandCount(playerA, "Oblivion Sower", 0);
assertPermanentCount(playerA, "Oblivion Sower", 1);
assertExileCount("Silvercoat Lion", 1);
assertPermanentCount(playerA, "Canopy Vista", 3);
assertTappedCount("Canopy Vista", false, 3);
}
}

2
Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java
View file

@ -821,7 +821,7 @@ public class TestPlayer implements Player {
boolean targetFound = false;
for (String targetName : targetList) {
for (Card card : cards.getCards(game)) {
if (card.getName().equals(targetName)) {
if (card.getName().equals(targetName) && !target.getTargets().contains(card.getId())) {
target.add(card.getId(), game);
targetFound = true;
break;

2
Mage/src/mage/cards/repository/CardRepository.java
View file

@ -63,7 +63,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 42;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 40;
private static final long CARD_CONTENT_VERSION = 41;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;

6
Mage/src/mage/players/PlayerImpl.java
View file

@ -3076,9 +3076,13 @@ public abstract class PlayerImpl implements Player, Serializable {
game.setScopeRelevant(true);
for (Permanent permanent : permanents) {
fromZone = game.getState().getZone(permanent.getId());
// make sure the controller of all continuous effects of this card are switched to the current controller
game.getContinuousEffects().setController(permanent.getId(), permanent.getControllerId());
if (permanent.entersBattlefield(source.getSourceId(), game, fromZone, true)) {
permanentsEntered.add(permanent);
} else {
// revert controller to owner if permanent does not enter
game.getContinuousEffects().setController(permanent.getId(), permanent.getOwnerId());
game.getPermanentsEntering().remove(permanent.getId());
}
}
@ -3087,8 +3091,6 @@ public abstract class PlayerImpl implements Player, Serializable {
fromZone = game.getState().getZone(permanent.getId());
if (((Card) permanent).removeFromZone(game, fromZone, source.getSourceId())) {
permanent.updateZoneChangeCounter(game);
// make sure the controller of all continuous effects of this card are switched to the current controller
game.getContinuousEffects().setController(permanent.getId(), permanent.getControllerId());
game.addPermanent(permanent);
permanent.setZone(Zone.BATTLEFIELD, game);
game.getPermanentsEntering().remove(permanent.getId());