fix arrows drawing out of bounds

misha-colbourne · Nov 16, 2024 · 5597d0b · 5597d0b
1 parent 95e3304
commit 5597d0b
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -466,22 +466,35 @@ void drawArcs(Graphics g) {
         final GameView game = MatchController.instance.getGameView();
         try {
             for (PlayerView p : game.getPlayers()) {
-                if (p != null && playerPanelsList.contains(getPlayerPanel(p))) {
+                if (p == null)
+                    continue;
+                VPlayerPanel playerPanel = getPlayerPanel(p);
+                if (playerPanel != null && playerPanelsList.contains(playerPanel)) {
                     playerViewSet.add(p);
                     if (p.getBattlefield() != null) {
                         for (CardView c : p.getBattlefield()) {
-                            endpoints.put(c.getId(), CardAreaPanel.get(c).getTargetingArrowOrigin());
+                            CardAreaPanel panel = CardAreaPanel.get(c);
+                            Vector2 origin = panel.getTargetingArrowOrigin();
+                            //outside left bounds
+                            if (origin.x < playerPanel.getField().getLeft())
+                                continue;
+                            //outside right bounds
+                            if (origin.x > playerPanel.getField().getRight())
+                                continue;
+                            endpoints.put(c.getId(), origin);
                             cardsonBattlefield.add(c);
                         }
                     }
                 }
             }
+            if (endpoints.isEmpty())
+                return;
             //draw arrows for combat
             final CombatView combat = game.getCombat();
             for (CardView c : cardsonBattlefield) {
                 TargetingOverlay.assembleArrows(g, c, endpoints, combat, playerViewSet);
             }
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }