🐛 Add teamkill and killedByTeam scoreboard criteria (#1501)

SpyglassMC · Jul 11, 2024 · 60694bc · 60694bc
1 parent 51a6fcb
commit 60694bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...kages/java-edition/test-out/mcfunction/parser/argument/minecraftObjectiveCriteria.spec.js b/...kages/java-edition/test-out/mcfunction/parser/argument/minecraftObjectiveCriteria.spec.js
diff --git a/packages/java-edition/src/mcfunction/node/argument.ts b/packages/java-edition/src/mcfunction/node/argument.ts
@@ -452,6 +452,8 @@ export namespace ObjectiveCriteriaNode {
 		'totalKillCount',
 		'trigger',
 		'xp',
+		...core.Color.ColorNames.map((n) => `killedByTeam.${n}`),
+		...core.Color.ColorNames.map((n) => `teamkill.${n}`),
 	]
 	export const ComplexCategories = new Map<string, core.RegistryCategory>([
 		['broken', 'item'],

diff --git a/packages/java-edition/test/mcfunction/parser/argument.spec.ts b/packages/java-edition/test/mcfunction/parser/argument.spec.ts
@@ -114,7 +114,7 @@ const Suites: Partial<
 	'minecraft:nbt_tag': [{ content: ['0', '0b', '0l', '0.0', '"foo"', '{foo:bar}'] }],
 	'minecraft:objective': [{ content: ['foo', '012'] }],
 	'minecraft:objective_criteria': [{
-		content: ['dummy', 'used:spyglass', 'minecraft.used:minecraft.spyglass'],
+		content: ['dummy', 'used:spyglass', 'minecraft.used:minecraft.spyglass', 'teamkill.aqua'],
 	}],
 	'minecraft:operation': [{ content: ['=', '>', '<'] }],
 	'minecraft:particle': [{