external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Changed a method name a little.

Browse Source
This commit is contained in:
Agetian
2015-05-22 17:34:26 +00:00
parent 25f0e03808
commit e915b68a7e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -305,7 +305,7 @@ public class GameAction {
} }
if (zoneFrom.is(ZoneType.Graveyard)) { if (zoneFrom.is(ZoneType.Graveyard)) {
// fizzle all "damage done" triggers for cards returning to battlefield from graveyard // fizzle all "damage done" triggers for cards returning to battlefield from graveyard
game.getStack().fizzleTriggersTargeting(copied, TriggerType.DamageDone); game.getStack().fizzleTriggersOnStackTargeting(copied, TriggerType.DamageDone);
} }
} else if (zoneTo.is(ZoneType.Graveyard) || zoneTo.is(ZoneType.Hand) || zoneTo.is(ZoneType.Library)) { } else if (zoneTo.is(ZoneType.Graveyard) || zoneTo.is(ZoneType.Hand) || zoneTo.is(ZoneType.Library)) {
copied.setTimestamp(game.getNextTimestamp()); copied.setTimestamp(game.getNextTimestamp());

2
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -681,7 +681,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
game.fireEvent(new GameEventSpellRemovedFromStack(si.getSpellAbility(true))); game.fireEvent(new GameEventSpellRemovedFromStack(si.getSpellAbility(true)));
} }
public void fizzleTriggersTargeting(Card c, TriggerType t) { public void fizzleTriggersOnStackTargeting(Card c, TriggerType t) {
for (SpellAbilityStackInstance si : stack) { for (SpellAbilityStackInstance si : stack) {
SpellAbility sa = si.getSpellAbility(false); SpellAbility sa = si.getSpellAbility(false);
if (sa.getTriggeringObjects().containsKey("Target") && sa.getTriggeringObjects().get("Target").equals(c)) { if (sa.getTriggeringObjects().containsKey("Target") && sa.getTriggeringObjects().get("Target").equals(c)) {