geforkt von Mirrors/Paper
Fix custom statistic criteria creation (#9595)
Dieser Commit ist enthalten in:
Ursprung
3d0d1cb6ae
Commit
d96d1cb7dd
31
patches/api/Fix-custom-statistic-criteria-creation.patch
Normale Datei
31
patches/api/Fix-custom-statistic-criteria-creation.patch
Normale Datei
@ -0,0 +1,31 @@
|
|||||||
|
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
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
||||||
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
||||||
|
@@ -0,0 +0,0 @@ public interface UnsafeValues {
|
||||||
|
* @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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/scoreboard/Criteria.java
|
||||||
|
+++ b/src/main/java/org/bukkit/scoreboard/Criteria.java
|
||||||
|
@@ -0,0 +0,0 @@ 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
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
23
patches/server/Fix-custom-statistic-criteria-creation.patch
Normale Datei
23
patches/server/Fix-custom-statistic-criteria-creation.patch
Normale Datei
@ -0,0 +1,23 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
||||||
|
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
|
@@ -0,0 +0,0 @@ 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);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ @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
|
||||||
|
|
||||||
|
/**
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren