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

adjusted splid cards transformation place

Browse Source
This commit is contained in:
Maxmtg
2013-06-29 21:49:20 +00:00
parent d892f396fb
commit 8e1b3185fe
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,17 +146,16 @@ public class GameAction {
Card copied = null; Card copied = null;
Card lastKnownInfo = null; Card lastKnownInfo = null;
if (c.isSplitCard() && !zoneTo.is(ZoneType.Stack)) {
c.setState(CardCharacteristicName.Original);
}
// Don't copy Tokens, copy only cards leaving the battlefield // Don't copy Tokens, copy only cards leaving the battlefield
if (c.isToken() || suppress || zoneTo.is(ZoneType.Battlefield) || zoneFrom == null if (c.isToken() || suppress || zoneTo.is(ZoneType.Battlefield) || zoneFrom == null
|| !zoneFrom.is(ZoneType.Battlefield)) { || !zoneFrom.is(ZoneType.Battlefield)) {
lastKnownInfo = c; lastKnownInfo = c;
copied = c; copied = c;
} else { } else {
if (c.isSplitCard() && !zoneTo.is(ZoneType.Stack)) {
c.setState(CardCharacteristicName.Original);
}
lastKnownInfo = CardUtil.getLKICopy(c); lastKnownInfo = CardUtil.getLKICopy(c);
if (c.isCloned()) { if (c.isCloned()) {
@@ -366,11 +365,6 @@ public class GameAction {
// FThreads.assertExecutedByEdt(false); // This code must never be executed from EDT, // FThreads.assertExecutedByEdt(false); // This code must never be executed from EDT,
// use FThreads.invokeInNewThread to run code in a pooled thread // use FThreads.invokeInNewThread to run code in a pooled thread
// if a split card is moved, convert it back to its full form before moving (unless moving to stack)
if (c.isSplitCard() && !zoneTo.is(ZoneType.Stack)) {
c.setState(CardCharacteristicName.Original);
}
return moveTo(zoneTo, c, null); return moveTo(zoneTo, c, null);
} }