Corrected bug with hasAllNauts not being loaded properly

GreatWyrm · Jul 12, 2018 · 9cf599e · 9cf599e
1 parent 8992257
commit 9cf599e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/src/nautsTeamRandomizer/Model/AwesomenautsPlayer.java b/src/nautsTeamRandomizer/Model/AwesomenautsPlayer.java
@@ -22,46 +22,46 @@ public AwesomenautsPlayer(String name) {
 	public AwesomenautsPlayer(String name, String nautsOwned) {
 		playerName = name;
 		hasNauts = new boolean[AwesomenautsInfo.NUM_OF_NAUTS][];
-		for(int i = 0; i < AwesomenautsInfo.NUM_OF_NAUTS; i++) {
+		for (int i = 0; i < AwesomenautsInfo.NUM_OF_NAUTS; i++) {
 			hasNauts[i] = new boolean[AwesomenautsInfo.AWESOMENAUTS[i].getNumOfSkins() + 1];
 		}
-		if (nautsOwned.equals("")) {
-			hasAllNauts = false;
-		} else {
-			if (nautsOwned.equals("A")) {
-				hasAllNauts = true;
+		if (nautsOwned.charAt(0) == 'A') {
+			hasAllNauts = true;
+			for (int i = 0; i < hasNauts.length; i++) {
+				hasNauts[i][0] = true;
 			}
+		} else {
 			hasAllNauts = false;
-			int i = 0;
-			while (i != -1) {
-				String naut = nautsOwned.substring(0, i);
-				nautsOwned = nautsOwned.substring(i + 1);
-				i = nautsOwned.indexOf(" ");
-				if (naut.equals(" ") || naut.equals("")) {
-					continue;
-				}
-				if(naut.indexOf('.') != -1) {
-					String index = naut.substring(0, naut.indexOf('.'));
-					String index2 = naut.substring(naut.indexOf('.') + 1);
-					int intIndex = Integer.parseInt(index);
-					int intIndex2 = Integer.parseInt(index2);
-					hasNauts[intIndex][intIndex2] = true;
-				} else {
-					int intIndex = Integer.parseInt(naut);
-					hasNauts[intIndex][0] = true;
-				}
+		}
+		int i = 0;
+		while (i != -1) {
+			String naut = nautsOwned.substring(0, i);
+			nautsOwned = nautsOwned.substring(i + 1);
+			i = nautsOwned.indexOf(" ");
+			if (naut.equals(" ") || naut.equals("")) {
+				continue;
 			}
-			if(nautsOwned.indexOf('.') != -1) {
-				String index = nautsOwned.substring(0, nautsOwned.indexOf('.'));
-				String index2 = nautsOwned.substring(nautsOwned.indexOf('.') + 1);
+			if (naut.indexOf('.') != -1) {
+				String index = naut.substring(0, naut.indexOf('.'));
+				String index2 = naut.substring(naut.indexOf('.') + 1);
 				int intIndex = Integer.parseInt(index);
 				int intIndex2 = Integer.parseInt(index2);
 				hasNauts[intIndex][intIndex2] = true;
 			} else {
-				int intIndex = Integer.parseInt(nautsOwned);
+				int intIndex = Integer.parseInt(naut);
 				hasNauts[intIndex][0] = true;
 			}
 		}
+		if (nautsOwned.indexOf('.') != -1) {
+			String index = nautsOwned.substring(0, nautsOwned.indexOf('.'));
+			String index2 = nautsOwned.substring(nautsOwned.indexOf('.') + 1);
+			int intIndex = Integer.parseInt(index);
+			int intIndex2 = Integer.parseInt(index2);
+			hasNauts[intIndex][intIndex2] = true;
+		} else {
+			int intIndex = Integer.parseInt(nautsOwned);
+			hasNauts[intIndex][0] = true;
+		}
 	}
 	public AwesomenautsPlayer(String name, boolean hasAllNauts, boolean[][] hasNauts) {
 		playerName = name;

diff --git a/src/nautsTeamRandomizer/package-info.java b/src/nautsTeamRandomizer/package-info.java
@@ -4,7 +4,7 @@
 /**
  * @author Giginss
  * @startDate 5/30/2018
- * @version 1.1.0
+ * @version 1.1.1
  *
  */
 /** TO-DO