Merge branch 'main' of https://github.com/JaylyDev/GametestDB

JaylyDev · JaylyDev · commit 7debaf7fbff0 · 2022-07-26T10:50:06.000+01:00
diff --git a/scripts/get-scores/get-scores-tests.js b/scripts/get-scores/get-scores-tests.js
@@ -0,0 +1,8 @@
+import { getScore, getScores } from "./index.js";
+import { world } from "mojang-minecraft";
+
+let player = [...world.getPlayers()][0];
+
+getScores(player);
+
+getScore(player, "myObjective");
diff --git a/scripts/get-scores/index.js b/scripts/get-scores/index.js
@@ -1,4 +1,4 @@
-import { Player, Entity, world, ScoreboardIdentityType } from "mojang-minecraft";
+import { Player, Entity, world, ScoreboardIdentityType, ScoreboardIdentity, ScoreboardObjective } from "mojang-minecraft";
 
 /**
  * Get all scoreboard scores from a player or entity.
@@ -10,9 +10,27 @@ export function getScores (target) {
   let objectives = world.scoreboard.getObjectives();
   let targetScoreboard = {};
 
-  if (target.scoreboard === undefined) return targetScoreboard;
+  if (!(target.scoreboard instanceof ScoreboardIdentity)) return targetScoreboard;
   for (const objective of objectives) targetScoreboard[objective.id] = objective.getScores().find((score) => score.participant.type !== ScoreboardIdentityType.fakePlayer ? score.participant.getEntity() === target : false)?.score;
   return targetScoreboard;
 };
 
-console.warn(JSON.stringify(getScores([...world.getPlayers()][0])));
+/**
+ * Get scoreboard scores from a player or entity.
+ * Does not support fake player.
+ * @param {Player | Entity} target 
+ * @param {string} objectiveId 
+ * @return {number}
+ */
+export function getScore (target, objectiveId) {
+  let objective = world.scoreboard.getObjective(objectiveId);
+
+  if (!(target.scoreboard instanceof ScoreboardIdentity)) return;
+  if (!(objective instanceof ScoreboardObjective)) return;
+
+  try {
+    return objective.getScore(target.scoreboard);
+  } catch (err) {
+    console.error(err);
+  };
+};
