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

Zone: do not add Tokens to the cardList if its not the Battlefield

Browse Source 
that does fix The Great Aurora
This commit is contained in:
Hanmac
2016-06-08 17:11:11 +00:00
parent 2ed6d5d9e4
commit beadafd2d9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/zone/Zone.java
View File

@@ -91,13 +91,16 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
if (zoneType != ZoneType.Battlefield) {
c.setTapped(false);
}
c.setZone(this);
if (index == null) {
cardList.add(c);
}
else {
cardList.add(index.intValue(), c);
// Do not add Tokens to other zones than the battlefield.
if (zoneType == ZoneType.Battlefield || !c.isToken()) {
c.setZone(this);
if (index == null) {
cardList.add(c);
} else {
cardList.add(index.intValue(), c);
}
}
onChanged();
game.fireEvent(new GameEventZone(zoneType, getPlayer(), EventValueChangeType.Added, c));