From ea56138b30dd20b3fa70219315b6cbf3dbbfb88b Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 23 Sep 2023 22:33:17 -0700 Subject: [PATCH] Fix some issues --- ...n-AdvancementProgress-getDateAwarded.patch | 19 ++++++++++++++ ...sidebar-objectives-not-being-cleared.patch | 25 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch create mode 100644 patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch new file mode 100644 index 0000000000..7ccf4c0f03 --- /dev/null +++ b/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch @@ -0,0 +1,19 @@ +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 diff --git a/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch new file mode 100644 index 0000000000..f4bcaa50c7 --- /dev/null +++ b/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 23 Sep 2023 22:31:54 -0700 +Subject: [PATCH] Fix team sidebar objectives not being cleared + +Objectives displayed in team sidebars were not cleared when switching +scoreboards. If a player's scoreboard has a displayed objective for the +'gold' sidebar, and their scoreboard was switched to one where they +still had a 'gold' team, it would still be displayed + +diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +index 628951be16da8f19f0e1a974a0b4efa86e873b99..7a2f46579352870cfbb32c343d7c68919758ffe3 100644 +--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java ++++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +@@ -87,8 +87,8 @@ public final class CraftScoreboardManager implements ScoreboardManager { + + // Old objective tracking + HashSet removed = new HashSet<>(); +- for (int i = 0; i < 3; ++i) { +- Objective scoreboardobjective = oldboard.getDisplayObjective(net.minecraft.world.scores.DisplaySlot.BY_ID.apply(i)); ++ for (net.minecraft.world.scores.DisplaySlot slot : net.minecraft.world.scores.DisplaySlot.values()) { // Paper - clear all display slots ++ Objective scoreboardobjective = oldboard.getDisplayObjective(slot); // Paper - clear all display slots + if (scoreboardobjective != null && !removed.contains(scoreboardobjective)) { + entityplayer.connection.send(new ClientboundSetObjectivePacket(scoreboardobjective, 1)); + removed.add(scoreboardobjective);