External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixes to handling of triggered abilities of tokens.

Browse source
This commit is contained in:
LevelX2 2015-07-12 19:50:20 +02:00
parent 55966f3056
commit c53c09a59b
6 changed files with 102 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ReefWormTest.java
View file

@ -34,9 +34,9 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
/**
* Checks that a dies triggered ability of a Token works
*
* @author LevelX2
*/
public class ReefWormTest extends CardTestPlayerBase {
@Test
@ -50,16 +50,18 @@ public class ReefWormTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Reef Worm", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Reef Worm");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Fish");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Whale");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", "Whale");
castSpell(1, PhaseStep.BEGIN_COMBAT, playerA, "Lightning Bolt", "Fish");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Whale");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "Lightning Bolt", "Whale");
setStopAt(1, PhaseStep.BEGIN_COMBAT);
setStopAt(1, PhaseStep.END_TURN);
execute();
assertLife(playerA, 20);
assertLife(playerB, 20);
assertGraveyardCount(playerA, "Lightning Bolt", 4);
assertPermanentCount(playerB, "Fish", 0);
assertPermanentCount(playerB, "Whale", 0);
assertPermanentCount(playerB, "Kraken", 1);

13
Mage/src/mage/abilities/TriggeredAbilities.java
View file

@ -160,6 +160,19 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
sources.clear();
}
public void removeAbilitiesOfNonExistingSources(Game game) {
// e.g. Token that had triggered abilities
List<String> keysToRemove = new ArrayList<>();
for (Entry<String, TriggeredAbility> entry : this.entrySet()) {
if (game.getObject(entry.getValue().getSourceId()) == null) {
keysToRemove.add(entry.getKey());
}
}
for (String key : keysToRemove) {
remove(key);
}
}
public TriggeredAbilities copy() {
return new TriggeredAbilities(this);
}

14
Mage/src/mage/abilities/common/DiesTriggeredAbility.java
View file

@ -25,16 +25,16 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.common;
import mage.constants.Zone;
import mage.MageObject;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
/**
*
@ -58,7 +58,7 @@ public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility {
public boolean isInUseableZone(Game game, MageObject source, GameEvent event) {
// check it was previously on battlefield
Permanent before = ((ZoneChangeEvent) event).getTarget();
if (!this.hasSourceObjectAbility(game, before, event)) {
if (!(before instanceof PermanentToken) && !this.hasSourceObjectAbility(game, before, event)) {
return false;
}
// check now it is in graveyard
@ -66,6 +66,14 @@ public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility {
return before != null && after != null && Zone.GRAVEYARD.match(after);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
if (super.checkEventType(event, game)) {
return ((ZoneChangeEvent) event).getFromZone().equals(Zone.BATTLEFIELD) && ((ZoneChangeEvent) event).getToZone().equals(Zone.GRAVEYARD);
}
return event.getType() == GameEvent.EventType.ZONE_CHANGE;
}
@Override
public DiesTriggeredAbility copy() {
return new DiesTriggeredAbility(this);

5
Mage/src/mage/game/permanent/PermanentToken.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.game.permanent;
import java.util.UUID;
@ -95,8 +94,7 @@ public class PermanentToken extends PermanentImpl {
game.rememberLKI(objectId, Zone.BATTLEFIELD, this);
if (game.getPlayer(controllerId).removeFromBattlefield(this, game)) {
game.setZone(objectId, zone); // needed for triggered dies abilities
game.addSimultaneousEvent(new ZoneChangeEvent(this, this.getControllerId(), Zone.BATTLEFIELD, zone)); // causes maybe a problem with Dies trigger of Tokens
// game.getState().removeTriggersOfSourceId(this.getId());// if token is gone endless triggered abilities have to be removed
game.addSimultaneousEvent(new ZoneChangeEvent(this, this.getControllerId(), Zone.BATTLEFIELD, zone));
return true;
}
}
@ -142,5 +140,4 @@ public class PermanentToken extends PermanentImpl {
}
}
}

8
Mage/src/mage/game/turn/Phase.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.game.turn;
import java.io.Serializable;
@ -57,7 +56,8 @@ public abstract class Phase implements Serializable {
public abstract Phase copy();
public Phase() {}
public Phase() {
}
public Phase(final Phase phase) {
this.type = phase.type;
@ -184,6 +184,7 @@ public abstract class Phase implements Serializable {
public void endPhase(Game game, UUID activePlayerId) {
game.fireEvent(new GameEvent(postEvent, null, null, activePlayerId));
game.getState().getTriggers().removeAbilitiesOfNonExistingSources(game); // e.g. tokens that left the battlefield
}
public void prePriority(Game game, UUID activePlayerId) {
@ -225,8 +226,7 @@ public abstract class Phase implements Serializable {
if (wasPaused) {
currentStep.resumeBeginStep(game, activePlayerId);
resuming = false;
}
else {
} else {
prePriority(game, activePlayerId);
}
case PRIORITY:

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

@ -116,7 +116,6 @@ 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;
@ -813,9 +812,6 @@ public abstract class PlayerImpl implements Player, Serializable {
pairedCard.clearPairedCard();
}
}
if (permanent instanceof PermanentToken) {
game.getState().getTriggers().removeAbilitiesOfSource(permanent.getId());
}
return true;
}