2017-03-25 06:22:02 +01:00
|
|
|
From 1a355ce13efceaac09befef07ab6da6dbb1b3950 Mon Sep 17 00:00:00 2001
|
2016-05-08 05:39:22 +02:00
|
|
|
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
|
2017-03-25 06:22:02 +01:00
|
|
|
index ee884ba57..5fbaa99e9 100644
|
2016-05-08 05:39:22 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2017-03-25 06:22:02 +01:00
|
|
|
@@ -229,4 +229,9 @@ public class PaperConfig {
|
2016-05-08 05:39:22 +02:00
|
|
|
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/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
|
2017-03-25 04:18:58 +01:00
|
|
|
index 230004b4a..62752f816 100644
|
2016-05-08 05:39:22 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
|
2016-05-12 04:07:46 +02:00
|
|
|
@@ -184,6 +184,7 @@ public class PersistentScoreboard extends PersistentBase {
|
2016-05-08 05:39:22 +02:00
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
ScoreboardTeam scoreboardteam = (ScoreboardTeam) iterator.next();
|
|
|
|
+ if (!com.destroystokyo.paper.PaperConfig.saveEmptyScoreboardTeams && scoreboardteam.getPlayerNameSet().isEmpty()) continue; // Paper
|
|
|
|
NBTTagCompound nbttagcompound = new NBTTagCompound();
|
|
|
|
|
|
|
|
nbttagcompound.setString("Name", scoreboardteam.getName());
|
|
|
|
--
|
2017-03-25 04:18:58 +01:00
|
|
|
2.12.0.windows.1
|
2016-05-08 05:39:22 +02:00
|
|
|
|