OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 23:10:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix CraftCriteria defaults map (#6723)

Browse source
This commit is contained in:
Jake Potrebic 2021-10-05 10:24:36 -07:00 committed by GitHub
parent a3dfe6dca5
commit fdd5c65423
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
patches/server/0817-Fix-CraftCriteria-defaults-map.patch Normal file
View file

@ -0,0 +1,32 @@
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);
}