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

Merge pull request #3824 from kevlahnota/newmaster2

Browse Source 
prevent NPE
This commit is contained in:
kevlahnota
2023-09-27 18:45:36 +08:00
committed by GitHub
parent 2049132d88 2a78ab1259
commit 68a2bd40ab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1432,11 +1432,11 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
GameEntity affected, final String question) { GameEntity affected, final String question) {
if (GuiBase.getInterface().isLibgdxPort()) { if (GuiBase.getInterface().isLibgdxPort()) {
CardView cardView; CardView cardView;
SpellAbilityView spellAbilityView = effectSA.getView(); SpellAbilityView spellAbilityView = effectSA == null ? null : effectSA.getView();
if (spellAbilityView != null) //updated view if (spellAbilityView != null) //updated view
cardView = spellAbilityView.getHostCard(); cardView = spellAbilityView.getHostCard();
else //fallback else //fallback
cardView = effectSA.getCardView(); cardView = effectSA == null ? null : effectSA.getCardView();
return this.getGui().confirm(cardView, question.replaceAll("\n", " ")); return this.getGui().confirm(cardView, question.replaceAll("\n", " "));
} else { } else {
final InputConfirm inp = new InputConfirm(this, question, effectSA); final InputConfirm inp = new InputConfirm(this, question, effectSA);