github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 11:05:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed a problem that triggered abilities of created tokens were not removed properly if the token left has left the battlefield.

Browse source
This commit is contained in:
LevelX2 2015-07-12 11:08:33 +02:00
parent 6f2a7f8c73
commit 4094fe5ecf
3 changed files with 82 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/magicorigins/PriestOfTheBloodRite.java
View file

@ -56,7 +56,7 @@ public class PriestOfTheBloodRite extends CardImpl {
// When Priest of the Blood Rite enters the battlefield, put a 5/5 black Demon creature token with flying onto the battlefield.
this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new DemonToken())));
// At the beginning of your upkeep, you lose 2 life.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(2), TargetController.YOU, false));
}
@ -77,6 +77,7 @@ class DemonToken extends Token {
super("Demon", "5/5 black Demon creature token with flying");
cardType.add(CardType.CREATURE);
subtype.add("Demon");
setOriginalExpansionSetCode("ORI");
color.setBlack(true);
power = new MageInt(5);
@ -84,4 +85,4 @@ class DemonToken extends Token {
addAbility(FlyingAbility.getInstance());
}
}
}

75
Mage.Tests/src/test/java/org/mage/test/cards/copy/FlameshadowConjuringTest.java Normal file
View file

@ -0,0 +1,75 @@
/*
* 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.copy;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class FlameshadowConjuringTest extends CardTestPlayerBase {
/**
* My opponent ran into an issue with Priest of the Blood Rite being copied
* with Flameshadow Conjuring. His copy was made and removed correctly at
* the end of the turn, but the "lose two life a turn" trigger still
* happened twice.
*
* TODO: Seems like there are too much triggered abilities in
* TriggeredAbilities as the TriggeredAbilities get removed from
* PlayerImpl.removeFromBattlefield()
*/
@Test
public void testCopyAndItsEffectsRemoved() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
// Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, put a token onto the battlefield that's a copy of that creature.
// That token gains haste. Exile it at the beginning of the next end step.
addCard(Zone.BATTLEFIELD, playerA, "Flameshadow Conjuring", 1);
// When Priest of the Blood Rite enters the battlefield, put a 5/5 black Demon creature token with flying onto the battlefield.
// At the beginning of your upkeep, you lose 2 life.
addCard(Zone.HAND, playerA, "Priest of the Blood Rite", 1); // {3}{B}{B}
setChoice(playerB, "Yes");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Priest of the Blood Rite");
setStopAt(3, PhaseStep.UPKEEP);
execute();
assertPermanentCount(playerA, "Priest of the Blood Rite", 1);
assertPermanentCount(playerA, "Demon", 2);
assertLife(playerB, 20);
assertLife(playerA, 18);
}
}

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

@ -116,6 +116,7 @@ import mage.game.events.ZoneChangeGroupEvent;
import mage.game.match.MatchPlayer;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentCard;
import mage.game.permanent.PermanentToken;
import mage.game.stack.Spell;
import mage.game.stack.StackAbility;
import mage.game.stack.StackObject;
@ -812,6 +813,9 @@ public abstract class PlayerImpl implements Player, Serializable {
pairedCard.clearPairedCard();
}
}
if (permanent instanceof PermanentToken) {
game.getState().getTriggers().removeAbilitiesOfSource(permanent.getId());
}
return true;
}