diff options
author | Jake Potrebic <[email protected]> | 2024-06-14 14:07:44 -0700 |
---|---|---|
committer | Jake Potrebic <[email protected]> | 2024-06-14 14:07:44 -0700 |
commit | ffe310a8e1dd4ed1027e903b4683f0ab42ee9ff8 (patch) | |
tree | 7748595488691c8494b5bdb2d01711a5242f6b34 /patches/server/0628-Fix-CraftCriteria-defaults-map.patch | |
parent | 188cff20c75367d8c90ae548a0dd528805d4a5a3 (diff) | |
download | Paper-ffe310a8e1dd4ed1027e903b4683f0ab42ee9ff8.tar.gz Paper-ffe310a8e1dd4ed1027e903b4683f0ab42ee9ff8.zip |
remove api that was scheduled for removal
Diffstat (limited to 'patches/server/0628-Fix-CraftCriteria-defaults-map.patch')
-rw-r--r-- | patches/server/0628-Fix-CraftCriteria-defaults-map.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0628-Fix-CraftCriteria-defaults-map.patch b/patches/server/0628-Fix-CraftCriteria-defaults-map.patch new file mode 100644 index 0000000000..3e79bd7fb7 --- /dev/null +++ b/patches/server/0628-Fix-CraftCriteria-defaults-map.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +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 441e2122f837712a21328eb7659cc9925ff9b6f8..8464531a4ee400834d25c23b1eb723f49be8689e 100644 +--- 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 { + } + + 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) { |