From fab197034e19855a09e4e5b8e3ad6efaf0fed8f5 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sun, 14 Apr 2019 21:43:06 +1000
Subject: [PATCH] fix NMS queue palette size

---
 .../com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java    | 1 +
 .../com/boydti/fawe/bukkit/v1_13/BukkitQueue_1_13.java    | 5 ++---
 .../main/java/com/boydti/fawe/object/MaskedFaweQueue.java | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java
index 4e7d2eeef..dac50ed91 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java
@@ -297,6 +297,7 @@ public class BukkitChunk_1_13 extends IntFaweChunk<Chunk, BukkitQueue_1_13> {
             net.minecraft.server.v1_13_R2.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
             nmsChunk.f(true); // Set Modified
             nmsChunk.mustSave = true;
+            nmsChunk.markDirty();
             net.minecraft.server.v1_13_R2.World nmsWorld = nmsChunk.world;
             ChunkSection[] sections = nmsChunk.getSections();
             List<Entity>[] entities = nmsChunk.getEntitySlices();
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitQueue_1_13.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitQueue_1_13.java
index c9bc8b23d..e31c9923f 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitQueue_1_13.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitQueue_1_13.java
@@ -700,7 +700,6 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
                         } else {
                             dirtyBits |= mask;
                         }
-                        System.out.println("Mask is " + dirtyBits);
 
                         fieldDirtyBits.set(playerChunk, dirtyBits);
                         fieldDirtyCount.set(playerChunk, 64);
@@ -829,7 +828,7 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
     }
 
     public static void setCount(int tickingBlockCount, int nonEmptyBlockCount, ChunkSection section) throws NoSuchFieldException, IllegalAccessException {
-//        fieldFluidCount.set(section, 0); // TODO FIXME
+        fieldFluidCount.set(section, 0); // TODO FIXME
         fieldTickingBlockCount.set(section, tickingBlockCount);
         fieldNonEmptyBlockCount.set(section, nonEmptyBlockCount);
     }
@@ -911,7 +910,7 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
                 try {
                     fieldBits.set(dataPaletteBlocks, nmsBits);
                     fieldPalette.set(dataPaletteBlocks, palette);
-                    fieldSize.set(dataPaletteBlocks, num_palette);
+                    fieldSize.set(dataPaletteBlocks, bitsPerEntry);
                     setCount(0, 4096 - air, section);
                 } catch (IllegalAccessException | NoSuchFieldException e) {
                     throw new RuntimeException(e);
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/MaskedFaweQueue.java b/worldedit-core/src/main/java/com/boydti/fawe/object/MaskedFaweQueue.java
index d817276c8..5e4e80269 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/MaskedFaweQueue.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/MaskedFaweQueue.java
@@ -87,6 +87,14 @@ public class MaskedFaweQueue extends DelegateFaweQueue {
         return false;
     }
 
+    @Override
+    public boolean setBiome(int x, int y, int z, BiomeType biome) {
+        if (region.contains(x, y, z)) {
+            return super.setBiome(x, y, z, biome);
+        }
+        return false;
+    }
+
     @Override
     public boolean setBiome(BlockVector2 position, BiomeType biome) {
         if (region.contains(position.getBlockX(), position.getBlockZ())) {