Fix duplicate formats in watch battle format list

Closes smogon#856
ChibiChanNya · Jan 30, 2017 · 0fd9108 · 0fd9108
1 parent 2f61b7d
commit 0fd9108
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
@@ -906,7 +906,7 @@
 				if (selectType === 'teambuilder') {
 					if (!format.isTeambuilderFormat) continue;
 				} else {
-					if (format.effectType !== 'Format') continue;
+					if (format.effectType !== 'Format' || format.battleFormat) continue;
 					if (selectType != 'watch' && !format[selectType + 'Show']) continue;
 				}
 

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
@@ -1201,7 +1201,7 @@
 				return;
 			}
 
-			if (window.BattleFormats && BattleFormats[format] && BattleFormats[format].hasBattleFormat) {
+			if (window.BattleFormats && BattleFormats[format] && BattleFormats[format].battleFormat) {
 				format = BattleFormats[format].battleFormat;
 			}
 			app.sendTeam(this.curTeam);

diff --git a/js/client.js b/js/client.js
@@ -1126,10 +1126,8 @@
 					// The base format is not available.
 					if (teambuilderFormat.battleFormat) {
 						multivariantFormats[teambuilderFormat.id] = 1;
-						teambuilderFormat.hasBattleFormat = false;
 						teambuilderFormat.battleFormat = '';
 					} else {
-						teambuilderFormat.hasBattleFormat = true;
 						teambuilderFormat.battleFormat = id;
 					}
 				}