From 2a78ab12598340a6174b1efbc1127b010d93b0cb Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 27 Sep 2023 18:18:28 +0800 Subject: [PATCH] prevent NPE - mobileGUI confirm handles null cardview --- .../src/main/java/forge/player/PlayerControllerHuman.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 9a1dce2c8bf..df9d7c2baae 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1432,11 +1432,11 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont GameEntity affected, final String question) { if (GuiBase.getInterface().isLibgdxPort()) { CardView cardView; - SpellAbilityView spellAbilityView = effectSA.getView(); + SpellAbilityView spellAbilityView = effectSA == null ? null : effectSA.getView(); if (spellAbilityView != null) //updated view cardView = spellAbilityView.getHostCard(); else //fallback - cardView = effectSA.getCardView(); + cardView = effectSA == null ? null : effectSA.getCardView(); return this.getGui().confirm(cardView, question.replaceAll("\n", " ")); } else { final InputConfirm inp = new InputConfirm(this, question, effectSA);