Fixes

smogon · Feb 2, 2025 · b1d9bff · b1d9bff
1 parent 6fdb02f
commit b1d9bff
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/play.pokemonshowdown.com/src/battle-dex-search.ts b/play.pokemonshowdown.com/src/battle-dex-search.ts
@@ -703,9 +703,6 @@ abstract class BattleTypedSearch<T extends SearchType> {
 		let results: SearchRow[];
 		let illegalResults: SearchRow[] | null;
 
-		if (this.defaultFilter) {
-			results = this.defaultFilter(this.baseResults);
-		}
 		if (filters) {
 			results = [];
 			illegalResults = [];
@@ -730,6 +727,9 @@ abstract class BattleTypedSearch<T extends SearchType> {
 			results = [...this.baseResults];
 			illegalResults = null;
 		}
+		if (this.defaultFilter) {
+			results = this.defaultFilter(results);
+		}
 
 		if (sortCol) {
 			results = results.filter(([rowType]) => rowType === this.searchType);
@@ -1309,7 +1309,7 @@ class BattleItemSearch extends BattleTypedSearch<'item'> {
 			// poisonheal: 'toxicorb',
 			// toxicboost: 'toxicorb',
 			// flareboost: 'flameorb',
-		}[toID(this.set?.ability) as string]
+		}[toID(this.set?.ability) as string];
 		for (const row of results) {
 			if (row[0] !== 'item') continue;
 			const item = this.dex.items.get(row[1]);
@@ -1319,13 +1319,13 @@ class BattleItemSearch extends BattleTypedSearch<'item'> {
 		if (speciesSpecific.length) {
 			results.unshift(
 				['header', "Specific to " + speciesName],
-				...speciesSpecific,
+				...speciesSpecific
 			);
 		}
 		if (abilitySpecific.length) {
 			results.unshift(
 				['header', "Specific to " + this.set!.ability],
-				...abilitySpecific,
+				...abilitySpecific
 			);
 		}
 		return results;