From c0a3d51ab35930e410fcd9752ceaff6c3f581c24 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 3 Dec 2024 17:58:41 +0100 Subject: Start update, apply API patches --- ...42-Fix-custom-statistic-criteria-creation.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch (limited to 'patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch') diff --git a/patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch new file mode 100644 index 0000000000..ff197a490c --- /dev/null +++ b/patches/unapplied/server/0842-Fix-custom-statistic-criteria-creation.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Noah van der Aa +Date: Sat, 12 Aug 2023 15:33:49 +0200 +Subject: [PATCH] Fix custom statistic criteria creation + + +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +index d4d5d40ba3bcf715e52aeb72ec4d14718c793e7c..939bc76ca46081d51a6cb18ac39cd05d3ce58ac8 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +@@ -608,6 +608,12 @@ public final class CraftMagicNumbers implements UnsafeValues { + public void setBiomeKey(org.bukkit.RegionAccessor accessor, int x, int y, int z, org.bukkit.NamespacedKey biomeKey) { + accessor.setBiome(x, y, z, org.bukkit.Registry.BIOME.getOrThrow(biomeKey)); + } ++ ++ @Override ++ public String getStatisticCriteriaKey(org.bukkit.Statistic statistic) { ++ if (statistic.getType() != org.bukkit.Statistic.Type.UNTYPED) return "minecraft.custom:minecraft." + statistic.getKey().getKey(); ++ return org.bukkit.craftbukkit.CraftStatistic.getNMSStatistic(statistic).getName(); ++ } + // Paper end + + /** -- cgit v1.2.3