diff options
| author | Jake Potrebic <[email protected]> | 2024-05-23 10:32:02 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-23 10:32:02 -0700 |
| commit | a9201d4a7daceede594c5b8453b50a86dd12306c (patch) | |
| tree | acf569d6bfdb49656b352ad11ab982395296fd43 /patches/api/0412-Fix-custom-statistic-criteria-creation.patch | |
| parent | b14958485d88cdf2ba5e1ea4a7bc3171ba9a7de3 (diff) | |
| download | Paper-a9201d4a7daceede594c5b8453b50a86dd12306c.tar.gz Paper-a9201d4a7daceede594c5b8453b50a86dd12306c.zip | |
[ci skip] Move logic in our patches to ItemType/BlockType (#10772)
Diffstat (limited to 'patches/api/0412-Fix-custom-statistic-criteria-creation.patch')
| -rw-r--r-- | patches/api/0412-Fix-custom-statistic-criteria-creation.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/patches/api/0412-Fix-custom-statistic-criteria-creation.patch b/patches/api/0412-Fix-custom-statistic-criteria-creation.patch index bbfdc162d8..f4070d7bb4 100644 --- a/patches/api/0412-Fix-custom-statistic-criteria-creation.patch +++ b/patches/api/0412-Fix-custom-statistic-criteria-creation.patch @@ -5,16 +5,15 @@ 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 c49f73355da362abb1c0e52f867dcfad8d4680f3..289346bcd0ef42cfaf2afc270eeb7525e520ce80 100644 +index dad90b98413b57a878f940b8f423bd77e36fd179..f261bd5971003e542e4806c1a989add8e0143466 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -256,5 +256,7 @@ public interface UnsafeValues { - * @throws IllegalStateException if no biome by the given key is registered. +@@ -250,4 +250,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 end ++ 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 |