diff options
| author | Jakub Zacek <[email protected]> | 2024-07-15 23:35:51 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-15 17:35:51 -0400 |
| commit | 2cd8c461af74f0a524878dcdffba86cd105c48c6 (patch) | |
| tree | ac107a76fe3d6cdd2e6ef5804ef3cba152957e4c /patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch | |
| parent | b57b24d549c65ddc5eb3edcc1ecc6aad2826dbd8 (diff) | |
| download | Paper-2cd8c461af74f0a524878dcdffba86cd105c48c6.tar.gz Paper-2cd8c461af74f0a524878dcdffba86cd105c48c6.zip | |
Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897)
Diffstat (limited to 'patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch')
| -rw-r--r-- | patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch new file mode 100644 index 0000000000..7ccf4c0f03 --- /dev/null +++ b/patches/server/0894-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Sat, 23 Sep 2023 22:07:15 -0700 +Subject: [PATCH] Fix NPE in AdvancementProgress#getDateAwarded + + +diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java +index aeb04a65a1201f05fd02151fce5756d797c63615..ec3b9cb901913b093c3eb0bda8dc0dbb738c165e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java ++++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java +@@ -44,7 +44,7 @@ public class CraftAdvancementProgress implements AdvancementProgress { + @Override + public Date getDateAwarded(String criteria) { + CriterionProgress criterion = this.handle.getCriterion(criteria); +- return (criterion == null) ? null : Date.from(criterion.getObtained()); ++ return (criterion == null) ? null : criterion.getObtained() == null ? null : Date.from(criterion.getObtained()); // Paper - fix NPE if criterion isn't obtained + } + + @Override |