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

- Tokens can now enter the battlefield with counters on them.

Browse Source
This commit is contained in:
Sloth
2013-02-22 21:53:23 +00:00
parent 374e667654
commit d128c284a9
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/card/ability/effects/CountersPutEffect.java
View File

@@ -107,9 +107,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
counterAmount = max - tgtCard.getCounters(counterType); counterAmount = max - tgtCard.getCounters(counterType);
} }
final Zone zone = Singletons.getModel().getGame().getZoneOf(tgtCard); final Zone zone = Singletons.getModel().getGame().getZoneOf(tgtCard);
if (zone == null) { if (zone == null || zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Stack)) {
// Do nothing, token disappeared
} else if (zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Stack)) {
if (remember) { if (remember) {
final int value = tgtCard.getTotalCountersToAdd(counterType, counterAmount, true); final int value = tgtCard.getTotalCountersToAdd(counterType, counterAmount, true);
tgtCard.addCountersAddedBy(card, counterType, value); tgtCard.addCountersAddedBy(card, counterType, value);

6
src/main/java/forge/game/GameAction.java
View File

@@ -114,7 +114,7 @@ public class GameAction {
} }
return c; return c;
} }
if ((zoneFrom == null) && !c.isToken()) { if (zoneFrom == null && !c.isToken()) {
if (position == null) { if (position == null) {
zoneTo.add(c); zoneTo.add(c);
} }
@@ -127,9 +127,7 @@ public class GameAction {
} }
boolean suppress; boolean suppress;
if ((zoneFrom == null) && !c.isToken()) { if (c.isToken()) {
suppress = true;
} else if (c.isToken()) {
suppress = false; suppress = false;
} else { } else {
suppress = zoneFrom.equals(zoneTo); suppress = zoneFrom.equals(zoneTo);