From 23c675353ee664326f8514d7c8fdf8713b6497a3 Mon Sep 17 00:00:00 2001
From: James McNair <booksaw224@gmail.com>
Date: Sat, 17 Jul 2021 10:13:19 +0100
Subject: [PATCH] Banned : to fix bugs with storage

Issue Reference: #185
---
 changelog.txt                                             | 1 +
 src/com/booksaw/betterTeams/Team.java                     | 2 +-
 .../betterTeams/team/storage/convert/FlatFileToYaml.java  | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 7d56b625..faa90dc8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -363,6 +363,7 @@ Bug Fixes:
 - Fixed bug causing echest changes to not save (#181) 
 - Fixed bug causing teams to disband incorrectly (#178 #190 #182 #187 #176 #177)
 - Fixed bug causing /teama reload to crash the plugin (#189)
+- Fixed bug with team names with the symbol `:` in (#185)
 
 TODO (any TODO which is not specifically code), mainly used for reminders to update documentation
 
diff --git a/src/com/booksaw/betterTeams/Team.java b/src/com/booksaw/betterTeams/Team.java
index ff8d2478..e9e7970b 100644
--- a/src/com/booksaw/betterTeams/Team.java
+++ b/src/com/booksaw/betterTeams/Team.java
@@ -164,7 +164,7 @@ public static boolean isValidTeamName(String name) {
 		}
 
 		// stop players inputting color codes
-		if (name.contains("&")) {
+		if (name.contains("&") || name.contains(":")) {
 			return false;
 		}
 
diff --git a/src/com/booksaw/betterTeams/team/storage/convert/FlatFileToYaml.java b/src/com/booksaw/betterTeams/team/storage/convert/FlatFileToYaml.java
index 370ac5bc..f27020e8 100644
--- a/src/com/booksaw/betterTeams/team/storage/convert/FlatFileToYaml.java
+++ b/src/com/booksaw/betterTeams/team/storage/convert/FlatFileToYaml.java
@@ -94,7 +94,13 @@ protected void convert() {
 				configManager.config.set(key, get);
 			}
 
-			teamLookup.add(configManager.config.getString(StoredTeamValue.NAME.getReference()) + ":" + teamUUID);
+			String name = configManager.config.getString(StoredTeamValue.NAME.getReference());
+			if (name.contains(":")) {
+				name = name.replace(":", "");
+				configManager.config.set(StoredTeamValue.NAME.getReference(), name);
+			}
+
+			teamLookup.add(name + ":" + teamUUID);
 
 			for (String playerUUID : configManager.config.getStringList("players")) {
 				String[] split = playerUUID.split(",");