From 7989e4df4f0cc5bb5b8fc8eb5b90bef431b648bb Mon Sep 17 00:00:00 2001
From: Instruct <66930476+xInstruct@users.noreply.github.com>
Date: Tue, 2 Feb 2021 23:56:08 -0500
Subject: [PATCH] /battlefactory: Fix searching for nonexistent tiers (#7989)

* BF cmd: Fix crash searching for a valid tier not included in a specific gen

* Update server/chat-plugins/random-battles.ts

* Update server/chat-plugins/random-battles.ts

* Update server/chat-plugins/random-battles.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
---
 server/chat-plugins/random-battles.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/chat-plugins/random-battles.ts b/server/chat-plugins/random-battles.ts
index e4bdf87df9..6d1e268806 100644
--- a/server/chat-plugins/random-battles.ts
+++ b/server/chat-plugins/random-battles.ts
@@ -102,6 +102,9 @@ function battleFactorySets(species: string | Species, tier: string | null, gen =
 	if (!isBSS) {
 		if (!tier) return {e: `Please provide a valid tier.`};
 		if (!(toID(tier) in TIERS)) return {e: `That tier isn't supported.`};
+		if (['Mono', 'LC'].includes(TIERS[toID(tier)]) && genNum < 7) {
+			return {e: `${TIERS[toID(tier)]} is not included in [Gen ${genNum}] Battle Factory.`};
+		}
 		const t = statsFile[TIERS[toID(tier)]];
 		if (!(species.id in t)) {
 			const formatName = Dex.getFormat(`${gen}battlefactory`).name;