Update upstream CB and rebuild

Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch

@@ -1,4 +1,4 @@
-From 8ee73bd6f2efd593b1dab427d9ed13e034c00f73 Mon Sep 17 00:00:00 2001
+From 7995af463977ca7eeec05b1651e267e18c19b03b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
@@ -19,7 +19,7 @@ index 03a4fb4..6d6793c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1a6b406..cee3b4a 100644
+index b3f637f..d115234 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -43,6 +43,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index 1a6b406..cee3b4a 100644
  
      public EntityInsentient(World world) {
          super(world);
-@@ -622,6 +623,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -623,6 +624,12 @@ public abstract class EntityInsentient extends EntityLiving {
          // Spigot Start
          if ( this.fromMobSpawner )
          {
@@ -56,5 +56,5 @@ index 1a20dbf..c56a0d0 100644
          ((Navigation) entityinsentient.getNavigation()).c(true);
      }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,4 +1,4 @@
-From 176621ca524f307f1b7620ef2b54ab3d10cbe7f9 Mon Sep 17 00:00:00 2001
+From ce0854bb55f35fce8f1539b124a7865322e839c3 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
@@ -30,10 +30,10 @@ index 8a63435..f9da7f8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index cee3b4a..fdda1ae 100644
+index d115234..c706963 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -601,13 +601,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -602,13 +602,13 @@ public abstract class EntityInsentient extends EntityLiving {
                  double d2 = entityhuman.locZ - this.locZ;
                  double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
@@ -51,5 +51,5 @@ index cee3b4a..fdda1ae 100644
                  }
              }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0019-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From 2c0e6a7dc46e9b8862871d672e57651b019f5cd6 Mon Sep 17 00:00:00 2001
+From ab1bcbaacff40a69b94ba83f4488771599eedce3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
@@ -37,10 +37,10 @@ index 11388ab..767c384 100644
      public boolean fauxSleeping;
      public String spawnWorld = "";
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index fdda1ae..d598f94 100644
+index c706963..393ea79 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -593,7 +593,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -594,7 +594,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (this.persistent) {
              this.ticksFarFromPlayer = 0;
          } else {

Spigot-Server-Patches/0031-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From 3918396fc7f5413c3b04eb4023c329fd638f648a Mon Sep 17 00:00:00 2001
+From 4458f44347f9ab06bb50e6608531a6039c5d0b3d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -135,10 +135,10 @@ index cde4124..3b5e8c2 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 83857a6..4dd672a 100644
+index 7d3adde..54c83f3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -284,6 +284,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -288,6 +288,7 @@ public class ChunkProviderServer implements IChunkProvider {
                  long chunkcoordinates = this.unloadQueue.popFirst();
                  Chunk chunk = this.chunks.get(chunkcoordinates);
                  if (chunk == null) continue;

Spigot-Server-Patches/0073-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 4e878aa92cc3db36e47201744cc503c5627c0545 Mon Sep 17 00:00:00 2001
+From f4e4e69cd47607767872a6b9ab976abd535fab93 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -89,7 +89,7 @@ index 806e499..8b11266 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4dd672a..450bf9b 100644
+index 54c83f3..969ae9d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -4,6 +4,7 @@ import java.io.IOException;
@@ -100,7 +100,7 @@ index 4dd672a..450bf9b 100644
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
-@@ -220,7 +221,11 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -224,7 +225,11 @@ public class ChunkProviderServer implements IChunkProvider {
  
              return chunk;
          } catch (Exception exception) {
@@ -113,7 +113,7 @@ index 4dd672a..450bf9b 100644
              return null;
          }
      }
-@@ -229,7 +234,11 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -233,7 +238,11 @@ public class ChunkProviderServer implements IChunkProvider {
          try {
              this.chunkLoader.b(this.world, chunk);
          } catch (Exception exception) {
@@ -126,7 +126,7 @@ index 4dd672a..450bf9b 100644
          }
  
      }
-@@ -239,9 +248,14 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -243,9 +252,14 @@ public class ChunkProviderServer implements IChunkProvider {
              chunk.setLastSaved(this.world.getTime());
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {

Spigot-Server-Patches/0098-Optimize-Chunk-Unload-Queue.patch

@@ -1,4 +1,4 @@
-From ee06b0730cdcaa25235e3fec5594288200403a26 Mon Sep 17 00:00:00 2001
+From 1cd7e2932293b05351c6d063b308e7d75f473346 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 17:57:25 -0400
 Subject: [PATCH] Optimize Chunk Unload Queue
@@ -36,7 +36,7 @@ index 8b11266..ac35cf4 100644
  
      // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 450bf9b..5485a66 100644
+index 969ae9d..4d0653c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -21,7 +21,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
@@ -84,16 +84,17 @@ index 450bf9b..5485a66 100644
          return chunk;
      }
  
-@@ -120,7 +131,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -124,7 +135,8 @@ public class ChunkProviderServer implements IChunkProvider {
      }
  
-     public Chunk getChunkAt(int i, int j, Runnable runnable) {
+     public Chunk getChunkAt(int i, int j, Runnable runnable, boolean generate) {
 -        unloadQueue.remove(i, j);
 +        //unloadQueue.remove(i, j); // Paper
++
          Chunk chunk = chunks.get(LongHash.toLong(i, j));
          ChunkRegionLoader loader = null;
  
-@@ -144,12 +155,13 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -148,12 +160,13 @@ public class ChunkProviderServer implements IChunkProvider {
          if (runnable != null) {
              runnable.run();
          }
@@ -108,7 +109,7 @@ index 450bf9b..5485a66 100644
          Chunk chunk = this.chunks.get(LongHash.toLong(i, j));
          boolean newChunk = false;
          // CraftBukkit end
-@@ -195,7 +207,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -199,7 +212,7 @@ public class ChunkProviderServer implements IChunkProvider {
                          continue;
                      }
  
@@ -117,7 +118,7 @@ index 450bf9b..5485a66 100644
                      if (neighbor != null) {
                          neighbor.setNeighborLoaded(-x, -z);
                          chunk.setNeighborLoaded(x, z);
-@@ -206,6 +218,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -210,6 +223,7 @@ public class ChunkProviderServer implements IChunkProvider {
              chunk.loadNearby(this, this.chunkGenerator);
              world.timings.syncChunkLoadTimer.stopTiming(); // Spigot
          }
@@ -125,7 +126,7 @@ index 450bf9b..5485a66 100644
  
          return chunk;
      }
-@@ -294,10 +307,17 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -298,10 +312,17 @@ public class ChunkProviderServer implements IChunkProvider {
          if (!this.world.savingDisabled) {
              // CraftBukkit start
              Server server = this.world.getServer();
@@ -147,7 +148,7 @@ index 450bf9b..5485a66 100644
                  if (chunk.hasLightUpdates()) continue; // Paper - Don't unload chunks with pending light updates.
  
                  ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
-@@ -320,13 +340,18 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -324,13 +345,18 @@ public class ChunkProviderServer implements IChunkProvider {
                                  continue;
                              }
  
@@ -167,7 +168,7 @@ index 450bf9b..5485a66 100644
                  }
              }
              // CraftBukkit end
-@@ -362,4 +387,69 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -366,4 +392,69 @@ public class ChunkProviderServer implements IChunkProvider {
      public boolean e(int i, int j) {
          return this.chunks.containsKey(LongHash.toLong(i, j)); // CraftBukkit
      }

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit b70058afa240034895eb061b123643a708a53480
+Subproject commit b103841da3263c7bce42ec5e4331ebc821bfd65e