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

Do not draw targeting arc stack->player if player avatar isn't showing. Fixes IllegalComponentStateExceptions.

Browse Source
This commit is contained in:
Hellfish
2015-03-14 09:56:47 +00:00
parent 1b3fe1d996
commit a73b67dc04
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
View File

@@ -17,10 +17,10 @@
*/ */
package forge.screens.match; package forge.screens.match;
import java.awt.Point;
import java.awt.Graphics2D;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.awt.geom.Area; import java.awt.geom.Area;
@@ -175,7 +175,10 @@ public class TargetingOverlay {
addArc(endpoints.get(c.getId()), itemLocOnScreen, activator.isOpponentOf(c.getController())); addArc(endpoints.get(c.getId()), itemLocOnScreen, activator.isOpponentOf(c.getController()));
} }
for (PlayerView p : instance.getTargetPlayers()) { for (PlayerView p : instance.getTargetPlayers()) {
addArc(getPlayerTargetingArrowPoint(p, locOnScreen), itemLocOnScreen, activator.isOpponentOf(p)); Point point = getPlayerTargetingArrowPoint(p, locOnScreen);
if(point != null) {
addArc(point, itemLocOnScreen, activator.isOpponentOf(p));
}
} }
instance = instance.getSubInstance(); instance = instance.getSubInstance();
} }
@@ -185,6 +188,10 @@ public class TargetingOverlay {
private Point getPlayerTargetingArrowPoint(final PlayerView p, final Point locOnScreen) { private Point getPlayerTargetingArrowPoint(final PlayerView p, final Point locOnScreen) {
final JPanel avatarArea = matchUI.getFieldViewFor(p).getAvatarArea(); final JPanel avatarArea = matchUI.getFieldViewFor(p).getAvatarArea();
if(!avatarArea.isShowing()) {
return null;
}
final Point point = avatarArea.getLocationOnScreen(); final Point point = avatarArea.getLocationOnScreen();
point.x += avatarArea.getWidth() / 2 - locOnScreen.x; point.x += avatarArea.getWidth() / 2 - locOnScreen.x;
point.y += avatarArea.getHeight() / 2 - locOnScreen.y; point.y += avatarArea.getHeight() / 2 - locOnScreen.y;