diff --git a/paper-server/patches/unapplied/net/minecraft/world/scores/ScoreboardSaveData.java.patch b/paper-server/patches/sources/net/minecraft/world/scores/ScoreboardSaveData.java.patch similarity index 89% rename from paper-server/patches/unapplied/net/minecraft/world/scores/ScoreboardSaveData.java.patch rename to paper-server/patches/sources/net/minecraft/world/scores/ScoreboardSaveData.java.patch index d29c6da396..c8b1a7802f 100644 --- a/paper-server/patches/unapplied/net/minecraft/world/scores/ScoreboardSaveData.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/scores/ScoreboardSaveData.java.patch @@ -1,10 +1,10 @@ --- a/net/minecraft/world/scores/ScoreboardSaveData.java +++ b/net/minecraft/world/scores/ScoreboardSaveData.java -@@ -148,6 +148,7 @@ +@@ -148,6 +_,7 @@ ListTag listTag = new ListTag(); for (PlayerTeam playerTeam : this.scoreboard.getPlayerTeams()) { + if (!io.papermc.paper.configuration.GlobalConfiguration.get().scoreboards.saveEmptyScoreboardTeams && playerTeam.getPlayers().isEmpty()) continue; // Paper - Don't save empty scoreboard teams to scoreboard.dat CompoundTag compoundTag = new CompoundTag(); compoundTag.putString("Name", playerTeam.getName()); - compoundTag.putString("DisplayName", Component.Serializer.toJson(playerTeam.getDisplayName(), registries)); + compoundTag.putString("DisplayName", Component.Serializer.toJson(playerTeam.getDisplayName(), levelRegistry));