From 04f3e0a28f059323ec5f456756fa6d1d028c85d3 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 5 Apr 2019 05:17:10 -0400
Subject: [PATCH] Update upstream CB

--- work/CraftBukkit
Submodule work/CraftBukkit 0e1cea5a..f40143ef:
  > SPIGOT-4691: Fix custom world generator when placing tiles
---
 Spigot-Server-Patches/Anti-Xray.patch                       | 6 +++---
 .../Optimize-and-Fix-ExpiringMap-Issues.patch               | 2 +-
 work/CraftBukkit                                            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Anti-Xray.patch b/Spigot-Server-Patches/Anti-Xray.patch
index 64b821075b..ceabeb612e 100644
--- a/Spigot-Server-Patches/Anti-Xray.patch
+++ b/Spigot-Server-Patches/Anti-Xray.patch
@@ -1571,13 +1571,13 @@ index c25c82bf1..1bd2167aa 100644
              if (iblockdata1 == null) {
                  // CraftBukkit start - remove blockstate if failed
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 550416bef..923d1b282 100644
+index 791017258..29695da2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-@@ -0,0 +0,0 @@ import org.bukkit.material.MaterialData;
- public final class CraftChunkData implements ChunkGenerator.ChunkData {
+@@ -0,0 +0,0 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
      private final int maxHeight;
      private final ChunkSection[] sections;
+     private Set<BlockPosition> tiles;
 +    private World world; // Paper - Anti-Xray
  
      public CraftChunkData(World world) {
diff --git a/Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch
index 455f762589..85af98ab2c 100644
--- a/Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -310,7 +310,7 @@ index 38c0201ac..ae271a57f 100644
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 4cca65666..9c917370a 100644
+index 23f4e24ce..9e553866e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -0,0 +0,0 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 0e1cea5a4a..f40143ef5e 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 0e1cea5a4a4b41004912ab7a8b2871349b1ef4a0
+Subproject commit f40143ef5e2215b15c08eac481517bd6a0cf7239