From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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