From 5f4779fc8619dd7470a8d93c0a9fa500dd452892 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

---
 .../java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
index 441e2122f..8464531a4 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java
@@ -54,7 +54,7 @@ public final class CraftCriteria implements Criteria {
     }
 
     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) {