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

Fixed that a spell was still shown on the stack if triggered abilities from enters the battlefield event of the cast spell were put on the stack.

Browse source
This commit is contained in:
LevelX2 2014-08-24 09:11:34 +02:00
parent aad1a2da89
commit 28d3d72c5d
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Sets/src/mage/sets/stronghold/SacredGround.java
View file

@ -30,8 +30,8 @@ package mage.sets.stronghold;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.ActivatedAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.ReturnSourceFromGraveyardToBattlefieldEffect;
import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
@ -41,7 +41,7 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.game.stack.StackObject;
import mage.game.stack.Spell;
import mage.target.targetpointer.FixedTarget;
/**
@ -88,13 +88,17 @@ class SacredGroundTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (GameEvent.EventType.ZONE_CHANGE.equals(event.getType()) &&
game.getObject(event.getSourceId()) instanceof StackObject &&
game.getOpponents(this.getControllerId()).contains(game.getControllerId(event.getSourceId()))) {
ZoneChangeEvent zce = (ZoneChangeEvent) event;
if (Zone.BATTLEFIELD.equals(zce.getFromZone()) && Zone.GRAVEYARD.equals(zce.getToZone())) {
Permanent targetCard = zce.getTarget();
getEffects().get(0).setTargetPointer(new FixedTarget(targetCard.getId()));
return targetCard.getCardType().contains(CardType.LAND) && targetCard.getControllerId().equals(getControllerId());
Permanent targetPermanent = zce.getTarget();
if (targetPermanent.getCardType().contains(CardType.LAND) && targetPermanent.getControllerId().equals(getControllerId())) {
MageObject mageObject = game.getShortLivingLKI(event.getSourceId(), Zone.STACK);
if ((mageObject instanceof Spell) || (mageObject instanceof ActivatedAbility)) {
getEffects().get(0).setTargetPointer(new FixedTarget(targetPermanent.getId()));
return true;
}
}
}
}
return false;

3
Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
View file

@ -145,8 +145,7 @@ class MerfolkToken extends Token {
class CastedSpellsWithSpellTarget extends Watcher {
// <SourceId_TargetSpellId, controllerId>
private Map<String, UUID> casted = new HashMap<String, UUID>();
private final Map<String, UUID> casted = new HashMap<>();
public CastedSpellsWithSpellTarget() {
super("CastedSpellsWithSpellTarget", WatcherScope.GAME);

7
Mage/src/mage/game/GameImpl.java
View file

@ -1106,14 +1106,15 @@ public abstract class GameImpl implements Game, Serializable {
top = state.getStack().peek();
top.resolve(this);
} finally {
if (top != null) {
if (top != null) {
state.getStack().remove(top);
rememberLKI(top.getSourceId(), Zone.STACK, top);
if (!getTurn().isEndTurnRequested()) {
while (state.hasSimultaneousEvents()) {
state.handleSimultaneousEvent(this);
checkTriggered();
}
}
state.getStack().remove(top);
}
}
}
}