From b2c262e3827aa507e16539752dbad612bd9c9be7 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 10 Oct 2016 21:29:08 -0500
Subject: [PATCH] Update upstream CB

---
 Spigot-Server-Patches/0034-Generator-Settings.patch | 12 ++++++------
 work/CraftBukkit                                    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Spigot-Server-Patches/0034-Generator-Settings.patch b/Spigot-Server-Patches/0034-Generator-Settings.patch
index 51bc25162..af0873f87 100644
--- a/Spigot-Server-Patches/0034-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0034-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From b183f14705315562623ffaa7bdfce84d4855c4f3 Mon Sep 17 00:00:00 2001
+From 614348db3e370b5ac7e74b6c805d2003280a27f8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -110,7 +110,7 @@ index aa35a24..ea6a00e 100644
          int k = 0;
          boolean flag1 = true;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
-index db49131..534fd9f 100644
+index ac990af..0722956 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 @@ -158,32 +158,32 @@ public class ChunkProviderGenerate implements ChunkGenerator {
@@ -153,7 +153,7 @@ index db49131..534fd9f 100644
                  this.B.a(this.n, i, j, chunksnapshot);
              }
          }
-@@ -318,23 +318,23 @@ public class ChunkProviderGenerate implements ChunkGenerator {
+@@ -323,23 +323,23 @@ public class ChunkProviderGenerate implements ChunkGenerator {
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
  
          if (this.o) {
@@ -182,7 +182,7 @@ index db49131..534fd9f 100644
                  this.B.a(this.n, this.i, chunkcoordintpair);
              }
          }
-@@ -359,7 +359,7 @@ public class ChunkProviderGenerate implements ChunkGenerator {
+@@ -364,7 +364,7 @@ public class ChunkProviderGenerate implements ChunkGenerator {
              }
          }
  
@@ -191,7 +191,7 @@ index db49131..534fd9f 100644
              for (k1 = 0; k1 < this.s.t; ++k1) {
                  l1 = this.i.nextInt(16) + 8;
                  i2 = this.i.nextInt(256);
-@@ -424,23 +424,23 @@ public class ChunkProviderGenerate implements ChunkGenerator {
+@@ -429,23 +429,23 @@ public class ChunkProviderGenerate implements ChunkGenerator {
  
      public void recreateStructures(Chunk chunk, int i, int j) {
          if (this.o) {
@@ -265,5 +265,5 @@ index c965af1..3ce4449 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 9558f31eb..744e1a177 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 9558f31ebb5fe059c10c3590ce92a5f6d3dc3902
+Subproject commit 744e1a177a0c98a7690e72a640d6993c12ae4564