From aa3e8e381571ac9a5ca75e6a3c8afcd0de8ef1e5 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sun, 23 Apr 2017 02:09:15 +1000
Subject: [PATCH] Work on #436

---
 .../com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java     | 6 ++++++
 .../com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java     | 6 ++++++
 .../java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java    | 7 +++++++
 .../java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java  | 7 +++++++
 .../com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java    | 6 ++++++
 .../java/com/boydti/fawe/example/NMSMappedFaweQueue.java   | 2 ++
 .../main/java/com/boydti/fawe/example/NMSRelighter.java    | 5 +++--
 .../java/com/boydti/fawe/forge/v110/ForgeQueue_All.java    | 5 +++++
 .../java/com/boydti/fawe/forge/v111/ForgeQueue_All.java    | 5 +++++
 .../java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java   | 5 +++++
 .../java/com/boydti/fawe/forge/v189/ForgeQueue_All.java    | 5 +++++
 .../java/com/boydti/fawe/forge/v194/ForgeQueue_All.java    | 5 +++++
 .../boydti/fawe/nukkit/optimization/queue/NukkitQueue.java | 5 +++++
 .../com/boydti/fawe/sponge/v1_11/SpongeQueue_1_11.java     | 5 +++++
 14 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
index 01c477b7..d16ef791 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
@@ -165,6 +165,12 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<net.minecraft.server.v1_10_R
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(net.minecraft.server.v1_10_R1.Chunk chunk) {
+        chunk.f(true); // Set Modified
+        chunk.mustSave = true;
+    }
+
     @Override
     public ChunkSection[] getSections(net.minecraft.server.v1_10_R1.Chunk chunk) {
         return chunk.getSections();
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
index b2f34c26..0ea15699 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
@@ -199,6 +199,12 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<net.minecraft.server.v1_11_R
         return chunkSections[cy];
     }
 
+    @Override
+    public void saveChunk(net.minecraft.server.v1_11_R1.Chunk chunk) {
+        chunk.f(true); // Set Modified
+        chunk.mustSave = true;
+    }
+
     @Override
     public boolean regenerateChunk(World world, int x, int z, BaseBiome biome, Long seed) {
         if (biome != null) {
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
index 54abfbfd..26be3725 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import net.minecraft.server.v1_7_R4.Block;
+import net.minecraft.server.v1_7_R4.Chunk;
 import net.minecraft.server.v1_7_R4.ChunkCoordIntPair;
 import net.minecraft.server.v1_7_R4.ChunkPosition;
 import net.minecraft.server.v1_7_R4.ChunkSection;
@@ -113,6 +114,12 @@ public class BukkitQueue17 extends BukkitQueue_0<net.minecraft.server.v1_7_R4.Ch
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(Chunk nmsChunk) {
+        nmsChunk.e(); // Modified
+        nmsChunk.mustSave = true;
+    }
+
     @Override
     public boolean regenerateChunk(World world, int x, int z, BaseBiome biome, Long seed) {
         if (biome != null) {
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
index dd2d843b..dff17cc5 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
@@ -24,6 +24,7 @@ import java.util.Set;
 import java.util.UUID;
 import net.minecraft.server.v1_8_R3.Block;
 import net.minecraft.server.v1_8_R3.BlockPosition;
+import net.minecraft.server.v1_8_R3.Chunk;
 import net.minecraft.server.v1_8_R3.ChunkSection;
 import net.minecraft.server.v1_8_R3.Entity;
 import net.minecraft.server.v1_8_R3.EntityPlayer;
@@ -117,6 +118,12 @@ public class BukkitQueue18R3 extends BukkitQueue_0<net.minecraft.server.v1_8_R3.
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(Chunk nmsChunk) {
+        nmsChunk.f(true); // Modified
+        nmsChunk.mustSave = true;
+    }
+
     @Override
     public boolean regenerateChunk(World world, int x, int z, BaseBiome biome, Long seed) {
         if (biome != null) {
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
index 968054c2..2558232f 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
@@ -146,6 +146,12 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<net.minecraft.server.v1_9_
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(net.minecraft.server.v1_9_R2.Chunk chunk) {
+        chunk.f(true); // Set Modified
+        chunk.mustSave = true;
+    }
+
     @Override
     public boolean regenerateChunk(World world, int x, int z, BaseBiome biome, Long seed) {
         if (biome != null) {
diff --git a/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java b/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
index 5365067c..c427e820 100644
--- a/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
+++ b/core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
@@ -139,6 +139,8 @@ public abstract class NMSMappedFaweQueue<WORLD, CHUNK, CHUNKSECTION, SECTION> ex
         return section[j] >> 4;
     }
 
+    public void saveChunk(CHUNK chunk) {}
+
     public abstract void relight(int x, int y, int z);
 
     public abstract void relightBlock(int x, int y, int z);
diff --git a/core/src/main/java/com/boydti/fawe/example/NMSRelighter.java b/core/src/main/java/com/boydti/fawe/example/NMSRelighter.java
index 0d23dd9d..760f113e 100644
--- a/core/src/main/java/com/boydti/fawe/example/NMSRelighter.java
+++ b/core/src/main/java/com/boydti/fawe/example/NMSRelighter.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 
-public class NMSRelighter implements Relighter{
+public class NMSRelighter implements Relighter {
     private final NMSMappedFaweQueue queue;
 
     private final Map<Long, RelightSkyEntry> skyToRelight;
@@ -313,7 +313,7 @@ public class NMSRelighter implements Relighter{
                 }
                 int bx = chunk.x << 4;
                 int bz = chunk.z << 4;
-                queue.ensureChunkLoaded(chunk.x, chunk.z);
+                Object chunkObj = queue.ensureChunkLoaded(chunk.x, chunk.z);
                 Object sections = queue.getCachedSections(queue.getWorld(), chunk.x, chunk.z);
                 if (sections == null)continue;
                 Object section = queue.getCachedSection(sections, layer);
@@ -372,6 +372,7 @@ public class NMSRelighter implements Relighter{
                     chunk.smooth = true;
                     queue.setSkyLight(section, x, y, z, value);
                 }
+                queue.saveChunk(chunkObj);
             }
             for (RelightSkyEntry chunk : chunks) { // Smooth forwards
                 if (chunk.smooth) {
diff --git a/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java b/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java
index da2b6bda..af640e5a 100644
--- a/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java
+++ b/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java
@@ -95,6 +95,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(Chunk chunk) {
+        chunk.setChunkModified();
+    }
+
     @Override
     public void setHeightMap(FaweChunk chunk, byte[] heightMap) {
         Chunk forgeChunk = (Chunk) chunk.getChunk();
diff --git a/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java b/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java
index 5863ddff..eedcb7cb 100644
--- a/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java
+++ b/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java
@@ -125,6 +125,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(Chunk chunk) {
+        chunk.setChunkModified();
+    }
+
     @Override
     public ExtendedBlockStorage[] getSections(Chunk chunk) {
         return chunk.getBlockStorageArray();
diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
index e29e5e81..21b95633 100644
--- a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
+++ b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
@@ -85,6 +85,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         }
     }
 
+    @Override
+    public void saveChunk(Chunk chunk) {
+        chunk.setChunkModified();
+    }
+
     @Override
     public void setHeightMap(FaweChunk chunk, byte[] heightMap) {
         Chunk forgeChunk = (Chunk) chunk.getChunk();
diff --git a/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java b/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java
index 5af4d528..bb315157 100644
--- a/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java
+++ b/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java
@@ -88,6 +88,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(Chunk chunk) {
+        chunk.setChunkModified();
+    }
+
     @Override
     public ExtendedBlockStorage[] getSections(Chunk chunk) {
         return chunk.getBlockStorageArray();
diff --git a/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java b/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java
index 37c97836..e1eb108a 100644
--- a/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java
+++ b/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java
@@ -95,6 +95,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         getImpWorld();
     }
 
+    @Override
+    public void saveChunk(Chunk chunk) {
+        chunk.setChunkModified();
+    }
+
     @Override
     public ExtendedBlockStorage[] getSections(Chunk chunk) {
         return chunk.getBlockStorageArray();
diff --git a/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/queue/NukkitQueue.java b/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/queue/NukkitQueue.java
index 740db021..1fbbe319 100644
--- a/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/queue/NukkitQueue.java
+++ b/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/queue/NukkitQueue.java
@@ -111,6 +111,11 @@ public class NukkitQueue extends NMSMappedFaweQueue<Level, BaseFullChunk, BaseFu
         }
     }
 
+    @Override
+    public void saveChunk(BaseFullChunk baseFullChunk) {
+        baseFullChunk.setChanged();
+    }
+
     @Override
     public void refreshChunk(FaweChunk fs) {
         sendChunk(fs.getX(), fs.getZ(), fs.getBitMask());
diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeQueue_1_11.java b/sponge/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeQueue_1_11.java
index 96df314b..7f1c9bd5 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeQueue_1_11.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeQueue_1_11.java
@@ -186,6 +186,11 @@ public class SpongeQueue_1_11 extends NMSMappedFaweQueue<World, net.minecraft.wo
         }
     }
 
+    @Override
+    public void saveChunk(Chunk chunk) {
+        chunk.setChunkModified();
+    }
+
     @Override
     public ExtendedBlockStorage[] getSections(Chunk chunk) {
         return chunk.getBlockStorageArray();