Merge pull request #182 from samsmithnz/bug/nullexceptionintargeting

Fix to return a valid name or null
samsmithnz · Oct 29, 2021 · c2c131c · c2c131c
2 parents e977598 + 2bbcc50
commit c2c131c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Battle.Logic/Characters/Character.cs b/src/Battle.Logic/Characters/Character.cs
@@ -115,7 +115,14 @@ public void SetLocationAndRange(string[,,] map, Vector3 characterLocation, int f
         public List<string> TargetCharacters { get; set; }
         public string GetTargetCharacter()
         {
-            return TargetCharacters[TargetCharacterIndex];
+            if (TargetCharacterIndex >= 0)
+            {
+                return TargetCharacters[TargetCharacterIndex];
+            }
+            else
+            {
+                return null;
+            }
         }
 
         public void NextTarget()