mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
b62dfa0bf9
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 Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From 57a8cb1f914f889dc4a152de16a47ee1077d1040 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 27 Jul 2017 00:06:43 -0400
|
|
Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
|
|
in a world
|
|
|
|
This behavior causes a save to occur even though saving was supposed to be turned off.
|
|
|
|
It's triggered when Hell/End worlds are empty of players.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
index 7b67fa3208..395b5a470f 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -194,7 +194,7 @@ public class PlayerChunkMap {
|
|
try (Timing ignored = world.timings.doChunkMapUnloadChunks.startTiming()) { // Paper
|
|
WorldProvider worldprovider = this.world.worldProvider;
|
|
|
|
- if (!worldprovider.p()) {
|
|
+ if (!worldprovider.p() && !this.world.savingDisabled) { // Paper - respect saving disabled setting
|
|
this.world.getChunkProviderServer().b();
|
|
}
|
|
} // Paper timing
|
|
--
|
|
2.19.0
|
|
|