Banned : to fix bugs with storage

Issue Reference: #185
booksaw · Jul 17, 2021 · 23c6753 · 23c6753
1 parent afd3509
commit 23c6753
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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(",");