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

- Prevent a NPE on cloning a flipped card, ensure that the original image is loaded after cloning if the card is not flipped.

Browse Source
This commit is contained in:
Agetian
2018-12-12 20:19:15 +03:00
parent 741da3bcc1
commit 5db2dd74b8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
View File

@@ -116,7 +116,7 @@ public class CloneEffect extends SpellAbilityEffect {
final String newName = sa.getParamOrDefault("NewName", null); final String newName = sa.getParamOrDefault("NewName", null);
final String originalName = tgtCard.getName(); final String originalName = tgtCard.getName();
final boolean copyingSelf = (tgtCard == cardToCopy); final boolean copyingSelf = (tgtCard == cardToCopy);
final boolean isTransformed = cardToCopy.getCurrentStateName() == CardStateName.Transformed || cardToCopy.getCurrentStateName() == CardStateName.Meld; final boolean isTransformed = cardToCopy.getCurrentStateName() == CardStateName.Transformed || cardToCopy.getCurrentStateName() == CardStateName.Meld || cardToCopy.getCurrentStateName() == CardStateName.Flipped;
final CardStateName origState = isTransformed || cardToCopy.isFaceDown() ? CardStateName.Original : cardToCopy.getCurrentStateName(); final CardStateName origState = isTransformed || cardToCopy.isFaceDown() ? CardStateName.Original : cardToCopy.getCurrentStateName();
if (!copyingSelf) { if (!copyingSelf) {
@@ -188,7 +188,12 @@ public class CloneEffect extends SpellAbilityEffect {
//game.getTriggerHandler().registerActiveTrigger(tgtCard, false); //game.getTriggerHandler().registerActiveTrigger(tgtCard, false);
//keep the Clone card image for the cloned card //keep the Clone card image for the cloned card
tgtCard.setImageKey(imageFileName); if (cardToCopy.isFlipCard() && tgtCard.getCurrentStateName() != CardStateName.Flipped) {
//for a flip card that isn't flipped, load the original image
tgtCard.setImageKey(cardToCopy.getImageKey(CardStateName.Original));
} else {
tgtCard.setImageKey(imageFileName);
}
tgtCard.updateStateForView(); tgtCard.updateStateForView();