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

fix arrows drawing out of bounds

Browse Source
This commit is contained in:
Anthony Calosa
2024-11-16 19:50:09 +08:00
parent 95e3304948
commit 5597d0bf31
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -466,22 +466,35 @@ public class MatchScreen extends FScreen {
final GameView game = MatchController.instance.getGameView(); final GameView game = MatchController.instance.getGameView();
try { try {
for (PlayerView p : game.getPlayers()) { 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); playerViewSet.add(p);
if (p.getBattlefield() != null) { if (p.getBattlefield() != null) {
for (CardView c : p.getBattlefield()) { 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); cardsonBattlefield.add(c);
} }
} }
} }
} }
if (endpoints.isEmpty())
return;
//draw arrows for combat //draw arrows for combat
final CombatView combat = game.getCombat(); final CombatView combat = game.getCombat();
for (CardView c : cardsonBattlefield) { for (CardView c : cardsonBattlefield) {
TargetingOverlay.assembleArrows(g, c, endpoints, combat, playerViewSet); TargetingOverlay.assembleArrows(g, c, endpoints, combat, playerViewSet);
} }
} catch (Exception e) { } catch (Exception ignored) {
} }
} }