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

CardUtil: getLKICopy should not update the View

Browse Source
This commit is contained in:
Hanmac
2017-02-05 10:11:33 +00:00
parent 83c05e35a5
commit 603b803b04
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -608,7 +608,13 @@ public class CardFactory {
* @param toState
* the {@link CardStateName} of {@code to} to copy to.
*/
public static void copyState(final Card from, final CardStateName fromState, final Card to, final CardStateName toState) {
public static void copyState(final Card from, final CardStateName fromState, final Card to,
final CardStateName toState) {
copyState(from, fromState, to, toState, true);
}
public static void copyState(final Card from, final CardStateName fromState, final Card to,
final CardStateName toState, boolean updateView) {
// copy characteristics not associated with a state
to.setBaseLoyalty(from.getBaseLoyalty());
to.setBasePowerString(from.getBasePowerString());
@@ -617,10 +623,9 @@ public class CardFactory {
// get CardCharacteristics for desired state
if (!to.getStates().contains(toState)) {
to.addAlternateState(toState, true);
to.addAlternateState(toState, updateView);
}
final CardState toCharacteristics = to.getState(toState),
fromCharacteristics = from.getState(fromState);
final CardState toCharacteristics = to.getState(toState), fromCharacteristics = from.getState(fromState);
toCharacteristics.copyFrom(from, fromCharacteristics);
}

2
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -275,7 +275,7 @@ public final class CardUtil {
// don't just copy the current state. copy all of them
// needed for Transformed to get the CMC correct
for (final CardStateName state : in.getStates()) {
CardFactory.copyState(in, state, newCopy, state);
CardFactory.copyState(in, state, newCopy, state, false);
}
// DO NOT UPDATE THE VIEW!
newCopy.setState(in.getCurrentStateName(), false);