testserver/patches/server/0752-Fix-CraftCriteria-defa...

20 lines
1.0 KiB
Diff
Raw Normal View History

2021-10-05 17:24:36 +00:00
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 a8728102499ec8a0b4946bcc9b59c16193731f8c..d849ef9a51dc901c8045d63218b8ee5fa5c7ee7a 100644
2021-10-05 17:24:36 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
@@ -54,7 +54,7 @@ public final class CraftCriteria implements Criteria {
2021-10-05 17:24:36 +00:00
}
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
}
public static CraftCriteria getFromBukkit(String name) {