2023-08-12 23:50:21 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
|
|
|
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
|
2024-04-06 21:53:39 +02:00
|
|
|
index d97e42de951527afb03eafc481704418dedffde9..c73eed20d18d1109e3b78b9daa92d7438fc52e8d 100644
|
2023-08-12 23:50:21 +02:00
|
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
2024-04-06 21:53:39 +02:00
|
|
|
@@ -276,5 +276,7 @@ public interface UnsafeValues {
|
2023-08-12 23:50:21 +02:00
|
|
|
* @throws IllegalStateException if no biome by the given key is registered.
|
|
|
|
|
*/
|
|
|
|
|
void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
|
|
|
|
|
+
|
|
|
|
|
+ String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic);
|
|
|
|
|
// Paper end
|
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
