mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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
|