From 01ef5a53c4e7d2671f5db170521a123283223913 Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Sat, 12 Aug 2023 15:33:55 +0200 Subject: [PATCH] Fix custom statistic criteria creation --- paper-api/src/main/java/org/bukkit/UnsafeValues.java | 2 ++ paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/paper-api/src/main/java/org/bukkit/UnsafeValues.java b/paper-api/src/main/java/org/bukkit/UnsafeValues.java index 3328ae3ba..8e0877321 100644 --- a/paper-api/src/main/java/org/bukkit/UnsafeValues.java +++ b/paper-api/src/main/java/org/bukkit/UnsafeValues.java @@ -256,4 +256,6 @@ public interface UnsafeValues { @Deprecated(since = "1.21.3", forRemoval = true) void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey); // Paper end - namespaced key biome methods + + String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic); // Paper - fix custom stats criteria creation } diff --git a/paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java b/paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java index 7d79d7fad..3bc3abaf0 100644 --- a/paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java +++ b/paper-api/src/main/java/org/bukkit/scoreboard/Criteria.java @@ -335,7 +335,7 @@ public interface Criteria { @NotNull public static Criteria statistic(@NotNull Statistic statistic) { Preconditions.checkArgument(statistic != null, "statistic must not be null"); - return Bukkit.getScoreboardCriteria("minecraft.custom:minecraft." + statistic.getKey().getKey()); + return Bukkit.getScoreboardCriteria(org.bukkit.Bukkit.getUnsafe().getStatisticCriteriaKey(statistic)); // Paper } /**