Prepare for 1.20.3 dev
This commit is contained in:
		
					parent
					
						
							
								1fa2b7d2f5
							
						
					
				
			
			
				commit
				
					
						46f4547805
					
				
			
		
					 1514 changed files with 10 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -1,31 +0,0 @@
 | 
			
		|||
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
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
     /**
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue