mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
0708fa363b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:eb2e6578SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance989f9b3dSPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate eventsf554183cSPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving2349feb8SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
From 67287a0553617ecd063e0328812389e8741a5ca4 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 dc3438890..cbfe12734 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -228,4 +228,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/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
|
|
index fab5962e2..de7ac6c20 100644
|
|
--- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
|
|
+++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
|
|
@@ -174,6 +174,7 @@ public class PersistentScoreboard extends PersistentBase {
|
|
|
|
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());
|
|
--
|
|
2.22.0
|
|
|