aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0404-Fix-custom-statistic-criteria-creation.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api/0404-Fix-custom-statistic-criteria-creation.patch')
-rw-r--r--patches/api/0404-Fix-custom-statistic-criteria-creation.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/api/0404-Fix-custom-statistic-criteria-creation.patch b/patches/api/0404-Fix-custom-statistic-criteria-creation.patch
new file mode 100644
index 0000000000..db402e8491
--- /dev/null
+++ b/patches/api/0404-Fix-custom-statistic-criteria-creation.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Noah van der Aa <[email protected]>
+Date: Sat, 12 Aug 2023 15:33:55 +0200
+Subject: [PATCH] Fix custom statistic criteria creation
+
+
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index 7e2a88fc1c73e3991100530d4a45872ba9f90843..960afe1bd12296797dca98bbfc66a54c5f1331d1 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -254,4 +254,6 @@ public interface UnsafeValues {
+ */
+ 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/src/main/java/org/bukkit/scoreboard/Criteria.java b/src/main/java/org/bukkit/scoreboard/Criteria.java
+index 7d79d7fadab19bfbefc4797d7e5bbd3e9d733b53..3bc3abaf093d13e22b6ac2ee59ab584c92b4666a 100644
+--- a/src/main/java/org/bukkit/scoreboard/Criteria.java
++++ b/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
+ }
+
+ /**