From 208f7a2e3b0b6665803298259ce033657d2c5490 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Tue, 16 Jun 2015 10:19:25 +0100 Subject: [PATCH] Remove a special case in vanilla's chunk saving as it interferes with our autosave changes --- .../0070-Improve-AutoSave-Mechanism.patch | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch index c9315b4334..d807324c14 100644 --- a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 010f2388c126b6770595d89ffd8694bad89c568b Mon Sep 17 00:00:00 2001 +From 8753e9e009518c9d9650b3b437679b88072a9683 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -11,7 +11,7 @@ Instead we will mimic the save-all command in its behaviour, which is both safe Also, only save modified chunks, or chunks with entities after 4 auto save passes diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 5208dbc..f8bfc2d 100644 +index f461f50..994903f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -942,7 +942,7 @@ public class Chunk { @@ -23,8 +23,21 @@ index 5208dbc..f8bfc2d 100644 return true; } +diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java +index af77eef..24df6bc 100644 +--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java ++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +@@ -323,7 +323,7 @@ public class ChunkProviderServer implements IChunkProvider { + this.saveChunk(chunk); + chunk.f(false); + ++i; +- if (i == 24 && !flag) { ++ if (i == 24 && !flag && false) { + return false; + } + } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 43ef181..7060622 100644 +index 69a99cb..37c0627 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -657,7 +657,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs