Skip to content

Fix mobile NPE when cloning Adventure creatures with card images disabled #10349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MostCromulent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix mobile NPE when cloning Adventure creatures with card images disabled #10349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions forge-game/src/main/java/forge/game/card/CardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,12 @@ void updateState(Card c) {
if (c.isDoubleFaced() && isFaceDown()) //fixes facedown cards with backside...
alternateState = c.getState(CardStateName.Original);

// When a card is cloned as an Adventure creature, getAlternateState() returns null
// because it only checks original states. Fall back to the Secondary clone state.
if (alternateState == null && c.hasState(CardStateName.Secondary)) {
alternateState = c.getState(CardStateName.Secondary);
}

if (alternateState == null) {
set(TrackableProperty.AlternateState, null);
} else {
Expand Down
4 changes: 4 additions & 0 deletions forge-gui-mobile/src/forge/card/CardImageRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,10 @@ private static void setTextBox(Graphics g, CardView card, CardStateView state, C
if (cv == null || isFaceDown)
cv = card;
CardStateView csv = cv.getState(true);
if (csv == null) { // backup may not have adventure state (e.g. clone of adventure)
cv = card;
csv = cv.getState(true);
}
text = cv.getText(csv, needTranslation && csv != null ? CardTranslation.getTranslationTexts(csv) : null);

} else {
Expand Down