33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sat, 7 May 2016 23:33:08 -0400
|
||
|
|
Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
index 504efea7b6f50a0d17f4f353781953dfb18bdeca..1b8e5671c9dc8c15ce33d351c1bb20f28919b9a2 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
@@ -237,4 +237,9 @@ public class PaperConfig {
|
||
|
|
private static void enablePlayerCollisions() {
|
||
|
|
enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public static boolean saveEmptyScoreboardTeams = false;
|
||
|
|
+ private static void saveEmptyScoreboardTeams() {
|
||
|
|
+ saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
|
||
|
|
index 36a922029687b9fa3ca3a986ae42a373ced87a0e..b9e14d1c54b690f0b975bda5733c4cb4f6449f77 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
|
||
|
|
@@ -182,6 +182,7 @@ public class ScoreboardSaveData extends SavedData {
|
||
|
|
|
||
|
|
while (iterator.hasNext()) {
|
||
|
|
PlayerTeam scoreboardteam = (PlayerTeam) iterator.next();
|
||
|
|
+ if (!com.destroystokyo.paper.PaperConfig.saveEmptyScoreboardTeams && scoreboardteam.getPlayers().isEmpty()) continue; // Paper
|
||
|
|
CompoundTag nbttagcompound = new CompoundTag();
|
||
|
|
|
||
|
|
nbttagcompound.putString("Name", scoreboardteam.getName());
|