33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Mon, 4 Oct 2021 22:31:51 -0700
|
|
Subject: [PATCH] Fix CraftCriteria defaults map
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
|
|
index 22801e33fa15322c37cd11d73a40a43fa721a8e4..0cd63772871311fc0cb7111657cc9a9dac106167 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
|
|
@@ -37,7 +37,7 @@ final class CraftCriteria {
|
|
}
|
|
|
|
static CraftCriteria getFromNMS(Objective objective) {
|
|
- return CraftCriteria.DEFAULTS.get(objective.getCriteria().getName());
|
|
+ return java.util.Objects.requireNonNullElseGet(CraftCriteria.DEFAULTS.get(objective.getCriteria().getName()), () -> new CraftCriteria(objective.getCriteria())); // Paper
|
|
}
|
|
|
|
static CraftCriteria getFromBukkit(String name) {
|
|
@@ -45,6 +45,12 @@ final class CraftCriteria {
|
|
if (criteria != null) {
|
|
return criteria;
|
|
}
|
|
+ // Paper start - fix criteria defaults
|
|
+ var nmsCriteria = ObjectiveCriteria.byName(name);
|
|
+ if (nmsCriteria.isPresent()) {
|
|
+ return new CraftCriteria(nmsCriteria.get());
|
|
+ }
|
|
+ // Paper end
|
|
return new CraftCriteria(name);
|
|
}
|
|
|