Support rematching with custom rules (#2234)

smogon · Apr 3, 2024 · ae907b5 · ae907b5
1 parent 8411650
commit ae907b5
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/play.pokemonshowdown.com/js/client-battle.js b/play.pokemonshowdown.com/js/client-battle.js
@@ -1243,10 +1243,17 @@
 			app.focusRoom('');
 		},
 		closeAndRematch: function () {
-			app.rooms[''].requestNotifications();
-			app.rooms[''].challenge(this.battle.farSide.name, this.battle.tier);
-			this.close();
-			app.focusRoom('');
+			app.once('response:fullformat', function (data) {
+				app.rooms[''].requestNotifications();
+				if (data) {
+					app.rooms[''].challenge(this.battle.farSide.name, data);
+				} else {
+					app.rooms[''].challenge(this.battle.farSide.name, this.battle.tier);
+				}
+				this.close();
+				app.focusRoom('');
+			}, this);
+			app.send('/cmd fullformat ' + this.id);
 		},
 
 		// choice buttons