From b41a5ab5669322c0bb5c20426b56c0761729b6f4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 9 Dec 2016 18:07:35 -0600
Subject: [PATCH] Update upstream B/CB

---
 Spigot-Server-Patches/0005-Timings-v2.patch   | 86 +++++++++----------
 ...le-speed-for-water-flowing-over-lava.patch | 12 +--
 ...lowing-block-if-material-has-changed.patch | 10 +--
 .../0035-Fast-draining.patch                  | 16 ++--
 .../0036-Configurable-lava-flow-speed.patch   | 10 +--
 ...sable-BlockPhysicsEvent-for-Redstone.patch | 14 +--
 ...w-BlockFromToEvent-from-loading-chun.patch | 20 ++---
 .../0165-Auto-Save-Improvements.patch         | 18 ++--
 .../0170-Disable-Vanilla-Chunk-GC.patch       | 10 +--
 .../0172-Add-EntityZapEvent.patch             | 12 +--
 ...2-Add-source-to-PlayerExpChangeEvent.patch | 12 +--
 scripts/importmcdev.sh                        |  1 -
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 14 files changed, 112 insertions(+), 113 deletions(-)

diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index bf48d822b..67be8a99e 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,11 +1,11 @@
-From 8818914cb1f14d8f19c57e5777344df5f60c6d99 Mon Sep 17 00:00:00 2001
+From c6b316a39c0fb4143c7b793cd80beb0c9d87abb5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
 diff --git a/pom.xml b/pom.xml
-index 2fa1925..911c0a9 100644
+index 2fa192515..911c0a9c5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -23,7 +23,7 @@ index 2fa1925..911c0a9 100644
              <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 0000000..29838de
+index 000000000..29838de47
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,114 @@
@@ -143,7 +143,7 @@ index 0000000..29838de
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 0000000..b79f1be
+index 000000000..b79f1be7a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,126 @@
@@ -275,7 +275,7 @@ index 0000000..b79f1be
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 0000000..e778911
+index 000000000..e7789117b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -381,7 +381,7 @@ index 0000000..e778911
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3d0a005..f509bed 100644
+index 3d0a00512..f509bed8a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -425,7 +425,7 @@ index 3d0a005..f509bed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 9d14403..da86874 100644
+index 9d144039c..da868740f 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -35,6 +35,15 @@ public class Block {
@@ -445,7 +445,7 @@ index 9d14403..da86874 100644
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 81fc04e..bd3b160 100644
+index 81fc04ed3..bd3b16025 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -900,7 +900,7 @@ public class Chunk {
@@ -493,7 +493,7 @@ index 81fc04e..bd3b160 100644
  
      private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b39937f..17d39bb 100644
+index b39937f3b..17d39bb0f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -515,7 +515,7 @@ index b39937f..17d39bb 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 15969b1..ca33899 100644
+index 15969b14d..ca33899bb 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -555,7 +555,7 @@ index 15969b1..ca33899 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index f01bd35..51d6b3e 100644
+index f01bd35bc..51d6b3efd 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -23,7 +23,7 @@ import java.io.PrintStream;
@@ -586,7 +586,7 @@ index f01bd35..51d6b3e 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e148e37..e0276a6 100644
+index e148e3761..e0276a62c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@@ -625,7 +625,7 @@ index e148e37..e0276a6 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4617473..3756f25 100644
+index 4617473aa..3756f2558 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -696,7 +696,7 @@ index 4617473..3756f25 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 347a2b6..aceb08c 100644
+index 347a2b671..aceb08ce1 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -175,7 +175,7 @@ public class EntityTracker {
@@ -727,7 +727,7 @@ index 347a2b6..aceb08c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b790ab..81a69e8 100644
+index 0b790ab68..81a69e82f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,7 +47,7 @@ import org.bukkit.Bukkit;
@@ -869,7 +869,7 @@ index 0b790ab..81a69e8 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a5a096b..c546139 100644
+index a5a096be5..c546139c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -969,7 +969,7 @@ index a5a096b..c546139 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2a195ca..3c4cc27 100644
+index 2a195ca32..3c4cc27a5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1017,7 +1017,7 @@ index 2a195ca..3c4cc27 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5359e8c..04d6355 100644
+index 5359e8c07..04d6355f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1041,7 +1041,7 @@ index 5359e8c..04d6355 100644
  
      public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index f1f2065..fb350c4 100644
+index f1f206501..fb350c408 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1083,7 +1083,7 @@ index f1f2065..fb350c4 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8d54eb3..0f505ed 100644
+index 8d54eb367..0f505ed5b 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1103,7 +1103,7 @@ index 8d54eb3..0f505ed 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8bd0250..78b5a3c 100644
+index 8bd0250ee..78b5a3c6e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1209,7 +1209,7 @@ index 8bd0250..78b5a3c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 695bb42..6afcf7c 100644
+index f369b4977..2817191e6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1230,7 +1230,7 @@ index 695bb42..6afcf7c 100644
          this.methodProfiler.c("chunkMap");
          timings.doChunkMap.startTiming(); // Spigot
          this.manager.flush();
-@@ -486,7 +486,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -468,7 +468,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      }
                  }
  
@@ -1239,7 +1239,7 @@ index 695bb42..6afcf7c 100644
                  if (i > 0) {
                      ChunkSection[] achunksection = chunk.getSections();
                      int i1 = achunksection.length;
-@@ -514,6 +514,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -496,6 +496,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                          }
                      }
                  }
@@ -1247,7 +1247,7 @@ index 695bb42..6afcf7c 100644
              }
  
              this.methodProfiler.b();
-@@ -709,6 +710,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -691,6 +692,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                  this.methodProfiler.a("cleaning");
  
@@ -1255,7 +1255,7 @@ index 695bb42..6afcf7c 100644
                  NextTickListEntry nextticklistentry;
  
                  for (int j = 0; j < i; ++j) {
-@@ -722,9 +724,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -704,9 +706,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      // this.nextTickListHash.remove(nextticklistentry);
                      this.U.add(nextticklistentry);
                  }
@@ -1267,7 +1267,7 @@ index 695bb42..6afcf7c 100644
                  Iterator iterator = this.U.iterator();
  
                  while (iterator.hasNext()) {
-@@ -734,6 +738,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -716,6 +720,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                      if (this.areChunksLoadedBetween(nextticklistentry.a.a(0, 0, 0), nextticklistentry.a.a(0, 0, 0))) {
                          IBlockData iblockdata = this.getType(nextticklistentry.a);
@@ -1276,7 +1276,7 @@ index 695bb42..6afcf7c 100644
  
                          if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
                              try {
-@@ -746,10 +752,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -728,10 +734,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                                  throw new ReportedException(crashreport);
                              }
                          }
@@ -1289,7 +1289,7 @@ index 695bb42..6afcf7c 100644
  
                  this.methodProfiler.b();
                  this.U.clear();
-@@ -845,7 +853,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -827,7 +835,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              gen = new org.bukkit.craftbukkit.generator.NormalChunkGenerator(this, this.getSeed());
          }
  
@@ -1298,7 +1298,7 @@ index 695bb42..6afcf7c 100644
          // CraftBukkit end
      }
  
-@@ -1010,6 +1018,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -992,6 +1000,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
          if (chunkproviderserver.e()) {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
@@ -1306,7 +1306,7 @@ index 695bb42..6afcf7c 100644
              if (iprogressupdate != null) {
                  iprogressupdate.a("Saving level");
              }
-@@ -1019,7 +1028,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1001,7 +1010,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  iprogressupdate.c("Saving chunks");
              }
  
@@ -1316,7 +1316,7 @@ index 695bb42..6afcf7c 100644
              // CraftBukkit - ArrayList -> Collection
              Collection arraylist = chunkproviderserver.a();
              Iterator iterator = arraylist.iterator();
-@@ -1031,7 +1042,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1013,7 +1024,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      chunkproviderserver.unload(chunk);
                  }
              }
@@ -1325,7 +1325,7 @@ index 695bb42..6afcf7c 100644
          }
      }
  
-@@ -1044,6 +1055,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1026,6 +1037,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
      }
  
      protected void a() throws ExceptionWorldConflict {
@@ -1333,7 +1333,7 @@ index 695bb42..6afcf7c 100644
          this.checkSession();
          WorldServer[] aworldserver = this.server.worldServer;
          int i = aworldserver.length;
-@@ -1073,6 +1085,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1055,6 +1067,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
          this.worldData.e(this.getWorldBorder().i());
          this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t());
          this.worldMaps.a();
@@ -1342,7 +1342,7 @@ index 695bb42..6afcf7c 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4b0871..761c8e4 100644
+index f4b0871ed..761c8e462 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1729,6 +1729,7 @@ public final class CraftServer implements Server {
@@ -1380,7 +1380,7 @@ index f4b0871..761c8e4 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 41d2d87..0000000
+index 41d2d87ee..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1558,7 +1558,7 @@ index 41d2d87..0000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b44..b5efb9c 100644
+index 3a95b4465..b5efb9c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1602,7 +1602,7 @@ index 3a95b44..b5efb9c 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index feeaa9a..fbd7df9 100644
+index feeaa9a58..fbd7df94b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1636,7 +1636,7 @@ index feeaa9a..fbd7df9 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 92d217b..198c37c 100644
+index 92d217bce..198c37c3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -189,7 +189,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -1677,7 +1677,7 @@ index 92d217b..198c37c 100644
                      task.getOwner().getLogger().log(
                              Level.WARNING,
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39a..afc6c17 100644
+index 220e39abe..afc6c17e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1759,7 +1759,7 @@ index 220e39a..afc6c17 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47..3d90b34 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1771,7 +1771,7 @@ index e52ef47..3d90b34 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c32d44d..5c2fb00 100644
+index c32d44df0..5c2fb0058 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@@ -1833,5 +1833,5 @@ index c32d44d..5c2fb00 100644
      }
  }
 -- 
-2.9.3
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
index 0c66bf3ec..48d3d4c36 100644
--- a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From eac74f310db6273e941e40504ba31fab0bbad29c Mon Sep 17 00:00:00 2001
+From 1c5ada35bc900cbdd76d751faa0fb1fdeec7a7fd Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d44fdae..06d1527 100644
+index d44fdaea6..06d152762 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -137,4 +137,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index d44fdae..06d1527 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 40c7b55..e9f73cd 100644
+index c9294a58d..f4ac7bafa 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
-@@ -35,7 +35,7 @@ public class BlockFlowing extends BlockFluids {
+@@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids {
              b0 = 2;
          }
  
@@ -32,7 +32,7 @@ index 40c7b55..e9f73cd 100644
          int k;
  
          if (i > 0) {
-@@ -263,8 +263,22 @@ public class BlockFlowing extends BlockFluids {
+@@ -261,8 +261,22 @@ public class BlockFlowing extends BlockFluids {
  
      public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
          if (!this.e(world, blockposition, iblockdata)) {
@@ -57,5 +57,5 @@ index 40c7b55..e9f73cd 100644
 +    }
  }
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
index 0c180807b..2533fe95d 100644
--- a/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0034-Stop-updating-flowing-block-if-material-has-changed.patch
@@ -1,21 +1,21 @@
-From fb7f9985a6e06097d8a35efff62d104649223bdd Mon Sep 17 00:00:00 2001
+From f1c57d4b59b8184c15bd0162c9c69b503077b55a Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index e9f73cd..83433e8 100644
+index f4ac7bafa..801b9cb7b 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
-@@ -95,6 +95,7 @@ public class BlockFlowing extends BlockFluids {
+@@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids {
              this.f(world, blockposition, iblockdata);
          }
  
 +        if (world.getType(blockposition).getBlock().getBlockData().getMaterial() != material) return; // Paper - Stop updating flowing block if material has changed
+         org.bukkit.block.Block source = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
          IBlockData iblockdata2 = world.getType(blockposition.down());
  
-         if (this.h(world, blockposition.down(), iblockdata2)) {
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0035-Fast-draining.patch b/Spigot-Server-Patches/0035-Fast-draining.patch
index edb305875..fd4f8a7e3 100644
--- a/Spigot-Server-Patches/0035-Fast-draining.patch
+++ b/Spigot-Server-Patches/0035-Fast-draining.patch
@@ -1,11 +1,11 @@
-From d51651300f04706da2dbeb17dbf7ddcb63bca70b Mon Sep 17 00:00:00 2001
+From ec2f189973a97ab5ac70fe2faf183e8ee14bdc8f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 356265e..2ec5068 100644
+index 356265e91..2ec50685c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -191,4 +191,11 @@ public class PaperWorldConfig {
@@ -21,10 +21,10 @@ index 356265e..2ec5068 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 83433e8..2b21aec 100644
+index 801b9cb7b..8e9de3bcb 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
-@@ -74,7 +74,7 @@ public class BlockFlowing extends BlockFluids {
+@@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids {
                  }
              }
  
@@ -33,7 +33,7 @@ index 83433e8..2b21aec 100644
                  j *= 4;
              }
  
-@@ -82,7 +82,7 @@ public class BlockFlowing extends BlockFluids {
+@@ -77,7 +77,7 @@ public class BlockFlowing extends BlockFluids {
                  this.f(world, blockposition, iblockdata);
              } else {
                  i = i1;
@@ -42,7 +42,7 @@ index 83433e8..2b21aec 100644
                      world.setAir(blockposition);
                  } else {
                      iblockdata = iblockdata.set(BlockFlowing.LEVEL, Integer.valueOf(i1));
-@@ -269,6 +269,7 @@ public class BlockFlowing extends BlockFluids {
+@@ -267,6 +267,7 @@ public class BlockFlowing extends BlockFluids {
  
      }
  
@@ -50,7 +50,7 @@ index 83433e8..2b21aec 100644
      /**
       * Paper - Get flow speed. Throttle if its water and flowing adjacent to lava
       */
-@@ -282,4 +283,57 @@ public class BlockFlowing extends BlockFluids {
+@@ -280,4 +281,57 @@ public class BlockFlowing extends BlockFluids {
          }
          return super.a(world);
      }
@@ -109,5 +109,5 @@ index 83433e8..2b21aec 100644
 +    // Paper end
  }
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
index a93fc3e32..bfbbd65d4 100644
--- a/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0036-Configurable-lava-flow-speed.patch
@@ -1,11 +1,11 @@
-From 5f8b909ecc7f3564eaf77b9591ad02940d086f55 Mon Sep 17 00:00:00 2001
+From f160baf867681c46bfa3a01220c0add48fbff2e2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2ec5068..b5a106d 100644
+index 2ec50685c..b5a106d5b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -198,4 +198,11 @@ public class PaperWorldConfig {
@@ -21,10 +21,10 @@ index 2ec5068..b5a106d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 2b21aec..3174326 100644
+index 8e9de3bcb..765a37160 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
-@@ -274,6 +274,9 @@ public class BlockFlowing extends BlockFluids {
+@@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids {
       * Paper - Get flow speed. Throttle if its water and flowing adjacent to lava
       */
      public int getFlowSpeed(World world, BlockPosition blockposition) {
@@ -35,5 +35,5 @@ index 2b21aec..3174326 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0098-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0098-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 9c456ff04..4ec2ea867 100644
--- a/Spigot-Server-Patches/0098-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0098-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 1efd458d6f84d28d9a77373c4d77e2fddaf7a04e Mon Sep 17 00:00:00 2001
+From e482dc823e0e0935a379abb0cce95b9525dc22c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -11,7 +11,7 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d92ccc7..298c48f 100644
+index d92ccc735..298c48fc5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -274,4 +274,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 14ac6d2..2573b8e 100644
+index 224e4c941..0ac8a5736 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index 14ac6d2..2573b8e 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 04f61e9..27e13e2 100644
+index 2c75c15cb..f04486e86 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -49,7 +49,7 @@ index 04f61e9..27e13e2 100644
      private final MinecraftServer server;
      public EntityTracker tracker;
      private final PlayerChunkMap manager;
-@@ -744,6 +745,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -726,6 +727,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                          if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
                              try {
@@ -57,7 +57,7 @@ index 04f61e9..27e13e2 100644
                                  iblockdata.getBlock().b((World) this, nextticklistentry.a, iblockdata, this.random);
                              } catch (Throwable throwable) {
                                  CrashReport crashreport = CrashReport.a(throwable, "Exception while ticking a block");
-@@ -751,7 +753,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -733,7 +735,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                                  CrashReportSystemDetails.a(crashreportsystemdetails, nextticklistentry.a, iblockdata);
                                  throw new ReportedException(crashreport);
@@ -67,5 +67,5 @@ index 04f61e9..27e13e2 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0102-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0102-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 00ac819ae..6fc0d6b85 100644
--- a/Spigot-Server-Patches/0102-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0102-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From fe206616818e3c39b87dcb2d1039d49bd437ccff Mon Sep 17 00:00:00 2001
+From 6164cfed01bee6e1ec4ae381b1e20451d45ae423 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@@ -12,26 +12,26 @@ of unloaded chunks anyways.
 This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 3174326..009a757 100644
+index 765a37160..6939ac2cc 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
-@@ -99,6 +99,7 @@ public class BlockFlowing extends BlockFluids {
-         IBlockData iblockdata2 = world.getType(blockposition.down());
+@@ -96,6 +96,7 @@ public class BlockFlowing extends BlockFluids {
  
          if (this.h(world, blockposition.down(), iblockdata2)) {
+             // CraftBukkit start
 +            if (!canFlowTo(world, source, BlockFace.DOWN)) { return; } // Paper
-             // CraftBukkit start - Send "down" to the server
              BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
-             if (server != null) {
+             world.getServer().getPluginManager().callEvent(event);
+ 
 @@ -136,6 +137,7 @@ public class BlockFlowing extends BlockFluids {
                  EnumDirection enumdirection1 = (EnumDirection) iterator1.next();
  
                  // CraftBukkit start
 +                if (!canFlowTo(world, source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection1))) { continue; } // Paper
                  BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection1));
-                 if (server != null) {
-                     server.getPluginManager().callEvent(event);
-@@ -150,8 +152,14 @@ public class BlockFlowing extends BlockFluids {
+                 world.getServer().getPluginManager().callEvent(event);
+ 
+@@ -148,8 +150,14 @@ public class BlockFlowing extends BlockFluids {
  
      }
  
@@ -48,5 +48,5 @@ index 3174326..009a757 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0165-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0165-Auto-Save-Improvements.patch
index bb965469f..e38342fd7 100644
--- a/Spigot-Server-Patches/0165-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0165-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 6f88b5620b63b44c056baec11dbe05479e809409 Mon Sep 17 00:00:00 2001
+From 4a3555714b95d6e286bee597c340598df3b235ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -10,7 +10,7 @@ Process auto save every tick instead of once per auto tick interval, so that chu
 Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and make it configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 965edc9..da530f9 100644
+index 965edc99c..da530f9aa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -42,7 +42,7 @@ index 965edc9..da530f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 88437d7..9f7f32d 100644
+index 88437d77a..9f7f32dc2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -960,11 +960,9 @@ public class Chunk {
@@ -60,7 +60,7 @@ index 88437d7..9f7f32d 100644
  
      public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7a56a64..5c5a56c 100644
+index 7a56a6416..5c5a56c51 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -80,7 +80,7 @@ index 7a56a64..5c5a56c 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 968b0ec..683ace3 100644
+index 968b0ecd0..683ace3af 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -117,6 +117,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -122,10 +122,10 @@ index 968b0ec..683ace3 100644
          this.methodProfiler.a("tallying");
          this.h[this.ticks % 100] = System.nanoTime() - i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 27e13e2..639f14d 100644
+index f04486e86..2ac1d7498 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1020,8 +1020,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1002,8 +1002,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
          ChunkProviderServer chunkproviderserver = this.getChunkProviderServer();
  
          if (chunkproviderserver.e()) {
@@ -136,7 +136,7 @@ index 27e13e2..639f14d 100644
              if (iprogressupdate != null) {
                  iprogressupdate.a("Saving level");
              }
-@@ -1030,6 +1031,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1012,6 +1013,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              if (iprogressupdate != null) {
                  iprogressupdate.c("Saving chunks");
              }
@@ -145,5 +145,5 @@ index 27e13e2..639f14d 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0170-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0170-Disable-Vanilla-Chunk-GC.patch
index 957e8e51e..636a9bba1 100644
--- a/Spigot-Server-Patches/0170-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0170-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From ff30d0c74a5f78ca1e17141adcdb4d0b19e41c2d Mon Sep 17 00:00:00 2001
+From 59f5468075f4fc98a3aeae6d107d3d5482e3e9bf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,10 +6,10 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 639f14d..eb05984 100644
+index 2ac1d7498..4d4828a44 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1037,7 +1037,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1019,7 +1019,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              chunkproviderserver.a(flag);
              timings.worldSaveChunks.stopTiming(); // Paper
              // CraftBukkit - ArrayList -> Collection
@@ -18,7 +18,7 @@ index 639f14d..eb05984 100644
              Iterator iterator = arraylist.iterator();
  
              while (iterator.hasNext()) {
-@@ -1046,7 +1046,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1028,7 +1028,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
                      chunkproviderserver.unload(chunk);
                  }
@@ -29,5 +29,5 @@ index 639f14d..eb05984 100644
          }
      }
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0172-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0172-Add-EntityZapEvent.patch
index 9af0638f1..f51903c47 100644
--- a/Spigot-Server-Patches/0172-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0172-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From 1aedffb7a373c068a1444d2f2c870235a56eb6b8 Mon Sep 17 00:00:00 2001
+From 51633679da869034a68ca0c5c2f2fac459132268 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 5279a60..c5f5b57 100644
+index 5279a60c7..c5f5b57a3 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -146,6 +146,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 5279a60..c5f5b57 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a2e68c5..4a6b3da 100644
+index a2e68c59e..4a6b3da1b 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -616,6 +616,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,10 +48,10 @@ index a2e68c5..4a6b3da 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f8846ff..102ff6b 100644
+index 1e7fdb576..9b36fb1af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -670,6 +670,14 @@ public class CraftEventFactory {
+@@ -671,6 +671,14 @@ public class CraftEventFactory {
          return event;
      }
  
@@ -67,5 +67,5 @@ index f8846ff..102ff6b 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/Spigot-Server-Patches/0182-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0182-Add-source-to-PlayerExpChangeEvent.patch
index 888c1fb33..248904278 100644
--- a/Spigot-Server-Patches/0182-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0182-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From ca820327d41080f3cbe833840ba151e927c6316a Mon Sep 17 00:00:00 2001
+From 17e625b39d6946da74619b776f3337cbb8afbbe2 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 9da8ae4..11f3b31 100644
+index 9da8ae451..11f3b3189 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,10 +18,10 @@ index 9da8ae4..11f3b31 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 102ff6b..67669c1 100644
+index 9b36fb1af..75b014952 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -44,6 +44,7 @@ import org.bukkit.entity.Player;
+@@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
  import org.bukkit.entity.Projectile;
  import org.bukkit.entity.ThrownExpBottle;
  import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index 102ff6b..67669c1 100644
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.block.*;
-@@ -642,6 +643,17 @@ public class CraftEventFactory {
+@@ -643,6 +644,17 @@ public class CraftEventFactory {
          return event;
      }
  
@@ -48,5 +48,5 @@ index 102ff6b..67669c1 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.10.2
+2.11.0.windows.1
 
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 0fb60ba2a..b11c0da70 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -41,7 +41,6 @@ import BiomeBase
 import BiomeMesa
 import BlockChest
 import BlockFalling
-import BlockFluids
 import BlockFurnace
 import BlockIceFrost
 import BlockPosition
diff --git a/work/Bukkit b/work/Bukkit
index b7a392c07..47a45036f 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b7a392c072a92bdeef8e6fc1e2849740bdb1ccca
+Subproject commit 47a45036fc7aa18c4dd306be562e7d08f693b7ac
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 58bff62b2..622630c82 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 58bff62b2dc68da958f2e90371582a13aa3c9355
+Subproject commit 622630c823bfd8b39113dd0279dcb45ca5b09118