mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 21:17:00 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From 571545c9c126571aa5ad9c1a9c63baecf61ef5e0 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
|
|
|