twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-04 22:22:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues

Browse Source
This commit is contained in:
Jake Potrebic
2023-09-23 22:33:17 -07:00
parent 7834ec5bcc
commit 6c18da61ba
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/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

25
patches/server/Fix-team-sidebar-objectives-not-being-cleared.patch Normal file
View File

@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
@@ -0,0 +0,0 @@ public final class CraftScoreboardManager implements ScoreboardManager {
// Old objective tracking
HashSet<Objective> 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);