From 05814dca155e593bac3262429c5d8d5b99e566f7 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 6 Apr 2023 07:35:53 +0800 Subject: [PATCH] try to fix NPE --- .../src/forge/screens/match/views/VStack.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index f457faa80c4..071489f54f2 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -74,10 +74,13 @@ public class VStack extends FDropDown { final Set zones = new HashSet<>(); playersWithValidTargets = new HashMap<>(); - for (final CardView c : activeStackInstance.getTargetCards()) { - if (c.getZone() != null) { - zones.add(c.getZone()); - playersWithValidTargets.put(c.getController(), c); + FCollectionView targetCards = activeStackInstance.getTargetCards(); + if (targetCards != null) { + for (final CardView c : targetCards) { + if (c.getZone() != null) { + zones.add(c.getZone()); + playersWithValidTargets.put(c.getController(), c); + } } } if (zones.isEmpty() || playersWithValidTargets.isEmpty()) { return; }