From 8fdf7071e470a6a4f9525ff7b0b7a069d055b16e Mon Sep 17 00:00:00 2001
From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:48:26 +0000
Subject: [PATCH 1/4] Colo ca fix

---
 src/lib/combat_achievements/master.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/combat_achievements/master.ts b/src/lib/combat_achievements/master.ts
index e80e94c6ee..2f977641b3 100644
--- a/src/lib/combat_achievements/master.ts
+++ b/src/lib/combat_achievements/master.ts
@@ -1472,7 +1472,9 @@ export const masterCombatAchievements: CombatAchievement[] = [
 		rng: {
 			chancePerKill: 15,
 			hasChance: (data, _user, index) =>
-				data.type === 'Colosseum' && (!data.diedAt || (Array.isArray(data.diedAt) && data.diedAt[index]! > 11))
+				data.type === 'Colosseum' && 
+				Array.isArray(data.diedAt) && 
+				(!data.diedAt[index] || data.diedAt[index] > 11)
 		}
 	},
 	{

From a7ce530950984a94a8f5b1cb8c3b46d9ee10ea8c Mon Sep 17 00:00:00 2001
From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:51:09 +0000
Subject: [PATCH 2/4] Update master.ts

---
 src/lib/combat_achievements/master.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/combat_achievements/master.ts b/src/lib/combat_achievements/master.ts
index 2f977641b3..271ce2b8f6 100644
--- a/src/lib/combat_achievements/master.ts
+++ b/src/lib/combat_achievements/master.ts
@@ -1472,9 +1472,9 @@ export const masterCombatAchievements: CombatAchievement[] = [
 		rng: {
 			chancePerKill: 15,
 			hasChance: (data, _user, index) =>
-				data.type === 'Colosseum' && 
-				Array.isArray(data.diedAt) && 
-				(!data.diedAt[index] || data.diedAt[index] > 11)
+				data.type === 'Colosseum' &&
+				(!data.diedAt ||
+				(Array.isArray(data.diedAt) && (!data.diedAt[index] || data.diedAt[index] > 11)))
 		}
 	},
 	{

From de42566fcdd8f73039d50c4fd099339c06abfb7e Mon Sep 17 00:00:00 2001
From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:57:10 +0000
Subject: [PATCH 3/4] Update master.ts

---
 src/lib/combat_achievements/master.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/combat_achievements/master.ts b/src/lib/combat_achievements/master.ts
index 271ce2b8f6..7576c65b87 100644
--- a/src/lib/combat_achievements/master.ts
+++ b/src/lib/combat_achievements/master.ts
@@ -1473,8 +1473,7 @@ export const masterCombatAchievements: CombatAchievement[] = [
 			chancePerKill: 15,
 			hasChance: (data, _user, index) =>
 				data.type === 'Colosseum' &&
-				(!data.diedAt ||
-				(Array.isArray(data.diedAt) && (!data.diedAt[index] || data.diedAt[index] > 11)))
+				(!data.diedAt || (Array.isArray(data.diedAt) && (!data.diedAt[index] || data.diedAt[index] > 11)))
 		}
 	},
 	{

From 1e2ab175f86e39423a033cb1a04ee41e4f0e2a69 Mon Sep 17 00:00:00 2001
From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:59:08 +0000
Subject: [PATCH 4/4] Update elite.ts

---
 src/lib/combat_achievements/elite.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/combat_achievements/elite.ts b/src/lib/combat_achievements/elite.ts
index 982ba3cc28..175a9fe2a5 100644
--- a/src/lib/combat_achievements/elite.ts
+++ b/src/lib/combat_achievements/elite.ts
@@ -1521,7 +1521,8 @@ export const eliteCombatAchievements: CombatAchievement[] = [
 		rng: {
 			chancePerKill: 12,
 			hasChance: (data, _user, index) =>
-				data.type === 'Colosseum' && (!data.diedAt || (Array.isArray(data.diedAt) && data.diedAt[index]! > 7))
+				data.type === 'Colosseum' &&
+				(!data.diedAt || (Array.isArray(data.diedAt) && (!data.diedAt[index] || data.diedAt[index] > 7)))
 		}
 	},
 	{