- Fixed tokens leaving the battlefield not unpairing.

This commit is contained in:
Sloth
2013-07-30 11:15:51 +00:00
parent 3cb2b09dd6
commit afa42a53cd

View File

@@ -269,13 +269,16 @@ public class GameAction {
copied.getCharacteristics().resetCardColor(); copied.getCharacteristics().resetCardColor();
} }
if (fromBattlefield && !c.isToken()) { if (fromBattlefield) {
copied.setSuspendCast(false); if (!c.isToken()) {
copied.setState(CardCharacteristicName.Original); copied.setSuspendCast(false);
copied.setState(CardCharacteristicName.Original);
}
// Soulbond unpairing // Soulbond unpairing
if (c.isPaired()) { if (c.isPaired()) {
c.getPairedWith().setPairedWith(null); c.getPairedWith().setPairedWith(null);
c.setPairedWith(null); if (!c.isToken())
c.setPairedWith(null);
} }
unattachCardLeavingBattlefield(copied); unattachCardLeavingBattlefield(copied);
} else if (zoneFrom.is(ZoneType.Exile) && !toBattlefield) { } else if (zoneFrom.is(ZoneType.Exile) && !toBattlefield) {