mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ci skip] Move logic in our patches to ItemType/BlockType (#10772)

Browse source
This commit is contained in:
Jake Potrebic 2024-05-23 10:32:02 -07:00 • committed by GitHub
parent b14958485d
commit a9201d4a7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 208 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

16
patches/server/0876-Fix-custom-statistic-criteria-creation.patch
View file

@ -5,19 +5,21 @@ 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 77cc32eb8b3e835af229fcb78229bfc09bd0da70..2d51418612e4df40b9536ac72ba0a070d59f32d1 100644
index f5e8ff2a98a2357cb766e69bea982b25f2e2911b..ea48f9317f66305bca0f01c51953b438f6e4833c 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -620,6 +620,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> biomeBase = cra.getHandle().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME).getHolderOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.BIOME, org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(biomeKey)));
cra.setBiome(x, y, z, biomeBase);
@@ -618,6 +618,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
}
+
// Paper end - namespaced key biome methods
+ // Paper start - fix custom stats criteria creation
+ @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
+ // Paper end - fix custom stats criteria creation
+
@Override
public String get(Class<?> aClass, String s) {
if (aClass == Enchantment.class) {