SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Begin update to 1.20.5

Browse Source
This commit is contained in:
Jake Potrebic
2024-04-23 10:02:08 -07:00
parent 73da69c09e
commit 47ee5579ff
1080 changed files with 381 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/unapplied/server/Fix-NPE-in-AdvancementProgress-getDateAwarded.patch Normal file
View File

@@ -0,0 +1,19 @@
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementProgress.java
@@ -0,0 +0,0 @@ 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