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

Fix crash in tempShowCard

Browse Source 
Fix crash that can occur from calling canPlay too early
This commit is contained in:
drdev
2014-10-06 05:20:48 +00:00
parent 6eef6ab9ad
commit 2cedade957
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -247,6 +247,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
if (subAbility != null) {
subAbility.setActivatingPlayer(player);
}
view.updateCanPlay(this);
}
public Player getTargetingPlayer() {

5
forge-game/src/main/java/forge/game/spellability/SpellAbilityView.java
View File

@@ -10,11 +10,6 @@ public class SpellAbilityView extends TrackableObject<SpellAbilityProp> {
super(sa.getId(), SpellAbilityProp.class);
updateHostCard(sa);
updateDescription(sa);
//only update remaining properties if within Game context
if (sa.getHostCard().getGame() == null) { return; }
updateCanPlay(sa);
updatePromptIfOnlyPossibleAbility(sa);
}

4
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -164,7 +164,9 @@ public class PlayerControllerHuman extends PlayerController {
}
}
private void tempShowCard(Card c) {
CardView cv = MatchUtil.cards.get(c.getId());
if (c == null) { return; }
CardView cv = gameView.getCardView(c, false);
if (!cv.mayBeShown()) {
cv.setMayBeShown(true);
tempShownCards.add(c);