mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1dFix some tests randomly failing997d378dFix client stall in specific teleportation scenariosb3dc2366SPIGOT-4307: Fix hacky API for banners on shields2a271162SPIGOT-4301: Fix more invalid enchants5d0d83bbSPIGOT-4309: Add "forced" display of particlesa6772578Add additional tests for CraftBlockDatace1af0c3Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From d295278d6afa7785d9375cb4d0598d64a8ba7f60 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 cf5c76a78e..bfe2d03a57 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.18.0
|
|
|