From 9a9ebb59bd4e3cc1d772475e5bd35755c3d25a58 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Fri, 19 Sep 2014 14:19:51 +0000
Subject: [PATCH] - NPE prevention in TargetingOverlay (not sure why
 getController would return null during an ongoing game in the first place
 though, might be worth investigating)

---
 .../java/forge/screens/match/TargetingOverlay.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
index cdfd22af0b4..eee1894258b 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
@@ -160,7 +160,7 @@ public enum TargetingOverlay {
         final CardView paired = c.getPairedWith();
 
         if (null != enchanting) {
-            if (!enchanting.getController().equals(c.getController())) {
+            if (enchanting.getController() != null && !enchanting.getController().equals(c.getController())) {
                 arcsOther.add(new Point[] {
                     endpoints.get(enchanting.getId()),
                     endpoints.get(c.getId())
@@ -169,7 +169,7 @@ public enum TargetingOverlay {
             }
         }
         if (null != equipping) {
-            if (!equipping.getController().equals(c.getController())) {
+            if (equipping.getController() != null && !equipping.getController().equals(c.getController())) {
                 arcsOther.add(new Point[] {
                     endpoints.get(equipping.getId()),
                     endpoints.get(c.getId())
@@ -178,7 +178,7 @@ public enum TargetingOverlay {
             }
         }
         if (null != fortifying) {
-            if (!fortifying.getController().equals(c.getController())) {
+            if (fortifying.getController() != null && !fortifying.getController().equals(c.getController())) {
                 arcsOther.add(new Point[] {
                     endpoints.get(fortifying.getId()),
                     endpoints.get(c.getId())
@@ -188,7 +188,7 @@ public enum TargetingOverlay {
         }
         if (null != 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[] {
                         endpoints.get(c.getId()),
                         endpoints.get(enc.getId())
@@ -199,7 +199,7 @@ public enum TargetingOverlay {
         }
         if (null != 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[] {
                         endpoints.get(c.getId()),
                         endpoints.get(eq.getId())
@@ -210,7 +210,7 @@ public enum TargetingOverlay {
         }
         if (null != 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[] {
                         endpoints.get(c.getId()),
                         endpoints.get(eq.getId())