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

- NPE prevention in TargetingOverlay (not sure why getController would return null during an ongoing game in the first place though, might be worth investigating)

Browse Source
This commit is contained in:
Agetian
2014-09-19 14:19:51 +00:00
parent 4a37042149
commit 9a9ebb59bd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ public enum TargetingOverlay {
final CardView paired = c.getPairedWith(); final CardView paired = c.getPairedWith();
if (null != enchanting) { if (null != enchanting) {
if (!enchanting.getController().equals(c.getController())) { if (enchanting.getController() != null && !enchanting.getController().equals(c.getController())) {
arcsOther.add(new Point[] { arcsOther.add(new Point[] {
endpoints.get(enchanting.getId()), endpoints.get(enchanting.getId()),
endpoints.get(c.getId()) endpoints.get(c.getId())
@@ -169,7 +169,7 @@ public enum TargetingOverlay {
} }
} }
if (null != equipping) { if (null != equipping) {
if (!equipping.getController().equals(c.getController())) { if (equipping.getController() != null && !equipping.getController().equals(c.getController())) {
arcsOther.add(new Point[] { arcsOther.add(new Point[] {
endpoints.get(equipping.getId()), endpoints.get(equipping.getId()),
endpoints.get(c.getId()) endpoints.get(c.getId())
@@ -178,7 +178,7 @@ public enum TargetingOverlay {
} }
} }
if (null != fortifying) { if (null != fortifying) {
if (!fortifying.getController().equals(c.getController())) { if (fortifying.getController() != null && !fortifying.getController().equals(c.getController())) {
arcsOther.add(new Point[] { arcsOther.add(new Point[] {
endpoints.get(fortifying.getId()), endpoints.get(fortifying.getId()),
endpoints.get(c.getId()) endpoints.get(c.getId())
@@ -188,7 +188,7 @@ public enum TargetingOverlay {
} }
if (null != enchantedBy) { if (null != enchantedBy) {
for (final CardView enc : enchantedBy) { for (final CardView enc : enchantedBy) {
if (!enc.getController().equals(c.getController())) { if (enc.getController() != null && !enc.getController().equals(c.getController())) {
arcsOther.add(new Point[] { arcsOther.add(new Point[] {
endpoints.get(c.getId()), endpoints.get(c.getId()),
endpoints.get(enc.getId()) endpoints.get(enc.getId())
@@ -199,7 +199,7 @@ public enum TargetingOverlay {
} }
if (null != equippedBy) { if (null != equippedBy) {
for (final CardView eq : equippedBy) { for (final CardView eq : equippedBy) {
if (!eq.getController().equals(c.getController())) { if (eq.getController() != null && !eq.getController().equals(c.getController())) {
arcsOther.add(new Point[] { arcsOther.add(new Point[] {
endpoints.get(c.getId()), endpoints.get(c.getId()),
endpoints.get(eq.getId()) endpoints.get(eq.getId())
@@ -210,7 +210,7 @@ public enum TargetingOverlay {
} }
if (null != fortifiedBy) { if (null != fortifiedBy) {
for (final CardView eq : fortifiedBy) { for (final CardView eq : fortifiedBy) {
if (!eq.getController().equals(c.getController())) { if (eq.getController() != null && !eq.getController().equals(c.getController())) {
arcsOther.add(new Point[] { arcsOther.add(new Point[] {
endpoints.get(c.getId()), endpoints.get(c.getId()),
endpoints.get(eq.getId()) endpoints.get(eq.getId())