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

*Added an "Inbound Token" list to Player. Tokens go there before they're put onto the battlefield to let their ETB Replacements be run.

Browse Source
This commit is contained in:
Hellfish
2013-05-12 08:51:20 +00:00
parent 07f7a1b9bc
commit 63fe69dbca
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,6 +169,9 @@ public class GameAction {
} }
if (!suppress) { if (!suppress) {
if(zoneFrom == null)
copied.getOwner().addInboundToken(copied);
HashMap<String, Object> repParams = new HashMap<String, Object>(); HashMap<String, Object> repParams = new HashMap<String, Object>();
repParams.put("Event", "Moved"); repParams.put("Event", "Moved");
repParams.put("Affected", copied); repParams.put("Affected", copied);
@@ -183,6 +186,8 @@ public class GameAction {
return c; return c;
} }
} }
copied.getOwner().removeInboundToken(copied);
if (c.wasSuspendCast()) { if (c.wasSuspendCast()) {
copied = GameAction.addSuspendTriggers(c); copied = GameAction.addSuspendTriggers(c);

16
src/main/java/forge/game/player/Player.java
View File

@@ -135,6 +135,11 @@ public class Player extends GameEntity implements Comparable<Player> {
/** The slowtrip list. */ /** The slowtrip list. */
private List<Card> slowtripList = new ArrayList<Card>(); private List<Card> slowtripList = new ArrayList<Card>();
/** A list of tokens not in play, but on their way.
* This list is kept in order to not break ETB-replacement
* on tokens. */
private List<Card> inboundTokens = new ArrayList<Card>();
/** The keywords. */ /** The keywords. */
private ArrayList<String> keywords = new ArrayList<String>(); private ArrayList<String> keywords = new ArrayList<String>();
@@ -1517,6 +1522,7 @@ public class Player extends GameEntity implements Comparable<Player> {
public final List<Card> getAllCards() { public final List<Card> getAllCards() {
List<Card> allExcStack = this.getCardsIn(Player.ALL_ZONES); List<Card> allExcStack = this.getCardsIn(Player.ALL_ZONES);
allExcStack.addAll(getCardsIn(ZoneType.Stack)); allExcStack.addAll(getCardsIn(ZoneType.Stack));
allExcStack.addAll(inboundTokens);
return allExcStack; return allExcStack;
} }
@@ -3095,6 +3101,16 @@ public class Player extends GameEntity implements Comparable<Player> {
return false; return false;
} }
public void addInboundToken(Card c)
{
inboundTokens.add(c);
}
public void removeInboundToken(Card c)
{
inboundTokens.remove(c);
}
/** /**
* TODO: Write javadoc for this type. * TODO: Write javadoc for this type.