Update upstream

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -1,14 +1,14 @@
-From 545d8cf103f27528e091883c29b100eaaf686986 Mon Sep 17 00:00:00 2001
+From 39d7a1ae851dc10f15ff92f7bd248b0a784e20dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9343615..f3d845d 100644
+index 4542987..b651edc 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -673,6 +673,7 @@ public class Chunk {
+@@ -675,6 +675,7 @@ public class Chunk {
          return !block.isTileEntity() ? null : ((ITileEntity) block).a(this.world, iblockdata.getBlock().toLegacyData(iblockdata));
      }
  
@@ -262,5 +262,5 @@ index 13b93a4..ffe2353 100644
  
      public NBTTagList() {}
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch

@@ -1,14 +1,14 @@
-From 5dd5701010a85eee8f0fc1e934e55ef4277c881b Mon Sep 17 00:00:00 2001
+From 32b85f0c39860801e6a9a399fe6125effef5d3b9 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f3d845d..2488902 100644
+index b651edc..015a223 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -720,6 +720,10 @@ public class Chunk {
+@@ -722,6 +722,10 @@ public class Chunk {
              tileentity.z();
              this.tileEntities.put(blockposition, tileentity);
              // CraftBukkit start
@@ -20,5 +20,5 @@ index f3d845d..2488902 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
 -- 
-2.8.3
+2.9.0
 

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

@@ -1,4 +1,4 @@
-From c02d72520a696880f5fa2f686bb2c8565ee82270 Mon Sep 17 00:00:00 2001
+From 0084d13fb4191ad8c27f46e73e9ea43003b7fd5b 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
@@ -42,7 +42,7 @@ index d78b688..158db3a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c051c77..770da2b 100644
+index 015a223..0fae95d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,6 +33,7 @@ public class Chunk {
@@ -53,7 +53,7 @@ index c051c77..770da2b 100644
      private boolean done;
      private boolean lit;
      private boolean r;
-@@ -227,6 +228,13 @@ public class Chunk {
+@@ -229,6 +230,13 @@ public class Chunk {
      private void h(boolean flag) {
          this.world.methodProfiler.a("recheckGaps");
          if (this.world.areChunksLoaded(new BlockPosition(this.locX * 16 + 8, 0, this.locZ * 16 + 8), 16)) {
@@ -67,7 +67,7 @@ index c051c77..770da2b 100644
              for (int i = 0; i < 16; ++i) {
                  for (int j = 0; j < 16; ++j) {
                      if (this.i[i + j * 16]) {
-@@ -479,7 +487,7 @@ public class Chunk {
+@@ -481,7 +489,7 @@ public class Chunk {
              } else {
                  if (flag) {
                      this.initLighting();
@@ -76,7 +76,7 @@ index c051c77..770da2b 100644
                      int j1 = iblockdata.c();
                      int k1 = iblockdata1.c();
  
-@@ -494,6 +502,7 @@ public class Chunk {
+@@ -496,6 +504,7 @@ public class Chunk {
                      if (j1 != k1 && (j1 < k1 || this.getBrightness(EnumSkyBlock.SKY, blockposition) > 0 || this.getBrightness(EnumSkyBlock.BLOCK, blockposition) > 0)) {
                          this.d(i, k);
                      }
@@ -85,17 +85,17 @@ index c051c77..770da2b 100644
  
                  TileEntity tileentity;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fe50511..51d95c6 100644
+index 2ee5c92..23dc778 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -290,6 +290,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -279,6 +279,7 @@ public class ChunkProviderServer implements IChunkProvider {
-                         if (event.isCancelled()) {
+         if (event.isCancelled()) {
-                             continue;
+             return false;
-                         }
+         }
-+                        chunk.lightingQueue.processUnload(); // Paper
++        chunk.lightingQueue.processUnload(); // Paper
  
-                         // Update neighbor counts
+         // Update neighbor counts
-                         for (int x = -2; x < 3; x++) {
+         for (int x = -2; x < 3; x++) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index ef0e063..71710b9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -222,7 +222,7 @@ index 0000000..2350fe3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index aa2b984..3aea2af 100644
+index 746438f..bcc5ed4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -384,7 +384,7 @@ public abstract class World implements IBlockAccess {
@@ -235,5 +235,5 @@ index aa2b984..3aea2af 100644
                  }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0053-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 6edb6b079c6896587c0286eab0dfa16b5bd24e58 Mon Sep 17 00:00:00 2001
+From 6c0ffed335679f15e993b32da3a4a85ae91ac371 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -32,5 +32,5 @@ index f6a9384..6e51c43 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0053-Don-t-create-a-chunk-just-to-unload-it.patch

@@ -1,28 +0,0 @@
-From b6e34821d3030412b88b2634b2204224b31be785 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 2 Mar 2016 23:55:20 -0600
-Subject: [PATCH] Don't create a chunk just to unload it
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ab7efc..d1385af 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -213,7 +213,13 @@ public class CraftWorld implements World {
-     }
- 
-     private boolean unloadChunk0(int x, int z, boolean save, boolean safe) {
--        net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkAt(x, z);
-+        // Paper start - Don't create a chunk just to unload it
-+        net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkIfLoaded(x, z);
-+        if (chunk == null) {
-+            return false;
-+        }
-+        // Paper end
-+
-         if (chunk.mustSave) {   // If chunk had previously been queued to save, must do save to avoid loss of that data
-             save = true;
-         }
--- 
-2.8.3
-

Spigot-Server-Patches/0054-Disable-chest-cat-detection.patch

@@ -1,4 +1,4 @@
-From 2b55727e5ed2d11e5af28f45dc51079b50c8ebfd Mon Sep 17 00:00:00 2001
+From 473d1b5f5ed6afeb1c58f652c01c6baea142f695 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -35,5 +35,5 @@ index 21be295..a5f2fc0 100644
  
          EntityOcelot entityocelot;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0055-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From e9038be64bae5e4e2766f01c41a4d74d67a2437f Mon Sep 17 00:00:00 2001
+From be3b69bb55a7198a0526725468880dae5e342cc5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -82,5 +82,5 @@ index 408ef34..541b8d8 100644
              return true;
          }
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0056-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,4 +1,4 @@
-From fb635704e127900190353403ff7999c9b4dc761d Mon Sep 17 00:00:00 2001
+From af8a36af99cd46c231933a0a8908ae22784f1236 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -33,5 +33,5 @@ index 334505f..616c2e8 100644
                  }
              }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0057-Add-Location-support-to-tab-completers-vanilla-featu.patch

@@ -1,4 +1,4 @@
-From 666b0179a43b74e82554af6d1c8643afb05a2098 Mon Sep 17 00:00:00 2001
+From bdde6e7c2dab8051003b8d07d52321d9ffab7452 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@@ -156,5 +156,5 @@ index 100d84a..a40218c 100644
  
      public static CommandSender lastSender = null; // Nasty :(
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0058-Optimize-Pathfinding.patch

@@ -1,4 +1,4 @@
-From 71e6327dabc023b18b83ca510513acd1a52a7c07 Mon Sep 17 00:00:00 2001
+From 6dc93d12b7697e416a6e8fdcbaefaafc78cc8a2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index c9cfe3f..b1a90c1 100644
      }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0059-Optimize-getBlockData.patch

@@ -1,4 +1,4 @@
-From c70068607b6fe555ded74276fc6331e5df296723 Mon Sep 17 00:00:00 2001
+From 4a9976d0b2b7783046a35a9c48146e0a562cb72f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize getBlockData
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize getBlockData
 Hot method, so reduce # of instructions for the method.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 770da2b..9b0b98b 100644
+index 0fae95d..1a0a5e5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -395,8 +395,15 @@ public class Chunk {
+@@ -397,8 +397,15 @@ public class Chunk {
          return this.a(i, j, k).c();
      }
  
@@ -27,5 +27,5 @@ index 770da2b..9b0b98b 100644
  
      public IBlockData a(final int i, final int j, final int k) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0060-Avoid-hopper-searches-if-there-are-no-items.patch

@@ -1,4 +1,4 @@
-From 811cc7c1702c42e9f23da17dfcfa503392b8df67 Mon Sep 17 00:00:00 2001
+From 7000bff5800158522ae29ddfeb1433a4844d8f59 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bd7cbd2..407bbd8 100644
+index 1a0a5e5..f0f4264 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -47,6 +47,13 @@ public class Chunk {
@@ -30,8 +30,8 @@ index bd7cbd2..407bbd8 100644
 +
      // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
      private int neighbors = 0x1 << 12;
- 
+     public long chunkKey;
-@@ -623,6 +630,13 @@ public class Chunk {
+@@ -625,6 +632,13 @@ public class Chunk {
          entity.ad = k;
          entity.ae = this.locZ;
          this.entitySlices[k].add(entity);
@@ -45,7 +45,7 @@ index bd7cbd2..407bbd8 100644
          // Spigot start - increment creature type count
          // Keep this synced up with World.a(Class)
          if (entity instanceof EntityInsentient) {
-@@ -655,6 +669,13 @@ public class Chunk {
+@@ -657,6 +671,13 @@ public class Chunk {
          }
  
          this.entitySlices[i].remove(entity);
@@ -59,7 +59,7 @@ index bd7cbd2..407bbd8 100644
          // Spigot start - decrement creature type count
          // Keep this synced up with World.a(Class)
          if (entity instanceof EntityInsentient) {
-@@ -846,6 +867,15 @@ public class Chunk {
+@@ -848,6 +869,15 @@ public class Chunk {
              if (!this.entitySlices[k].isEmpty()) {
                  Iterator iterator = this.entitySlices[k].iterator();
  
@@ -75,7 +75,7 @@ index bd7cbd2..407bbd8 100644
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
  
-@@ -882,7 +912,18 @@ public class Chunk {
+@@ -884,7 +914,18 @@ public class Chunk {
          i = MathHelper.clamp(i, 0, this.entitySlices.length - 1);
          j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
  
@@ -95,5 +95,5 @@ index bd7cbd2..407bbd8 100644
  
              while (iterator.hasNext()) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0061-Expose-server-CommandMap.patch

@@ -1,4 +1,4 @@
-From 682d06959c7c22c508a6959c8a158ce6a6a37a73 Mon Sep 17 00:00:00 2001
+From f13c3a2728d644b624656810efa02069d44ec301 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
@@ -17,5 +17,5 @@ index 73f5ea0..07a69d7 100644
          return commandMap;
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,4 +1,4 @@
-From d17d7a6e2f46be6ccca4462dae4706eeac1d9ca9 Mon Sep 17 00:00:00 2001
+From 2e57178592ad2d78a55f221af67ac8e63ed1c764 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
@@ -21,5 +21,5 @@ index e662e4a..f13ca63 100644
  
          if (entity instanceof EntityPlayer && health == 0) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0063-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From b070b3e313e0ef0b1f22f4da2f3438123953e99e Mon Sep 17 00:00:00 2001
+From c1cf998ff2314c70cb0de8a55586676bdd7b162f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -28,7 +28,7 @@ index 07a69d7..274b83b 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c3ba701..1281514 100644
+index 9955de3..88412f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -56,5 +56,5 @@ index c3ba701..1281514 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0064-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 5c439c32cad69e1b32e7244d20900e1fc695492f Mon Sep 17 00:00:00 2001
+From 9bbb8fc51c33eb96c773efbf925c0df43e361548 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -78,7 +78,7 @@ index 31a2b21..8a0839c 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1281514..74fdd3c 100644
+index 88412f8..d9dd3eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -173,5 +173,5 @@ index 1281514..74fdd3c 100644
  
      @Override
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0065-Ensure-inv-drag-is-in-bounds.patch

@@ -1,4 +1,4 @@
-From 6f591f5aa44578cc019bef95a7b3480f50b9ddb2 Mon Sep 17 00:00:00 2001
+From 5cfaf07def26c1caf6625a18f49386e78ab0299a Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
@@ -18,5 +18,5 @@ index 00f035a..a1368a0 100644
                  if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
                      this.h.add(slot);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0066-Change-implementation-of-tile-entity-removal-list.patch

@@ -1,11 +1,11 @@
-From 5a6370e213cbfefd2d2b8f3f1d7af85b490d8c7f Mon Sep 17 00:00:00 2001
+From 279fede1ac5e6ed7499702b85e1c6bbfed03db84 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1b58f7d..1e092b0 100644
+index 18062df..1764791 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -119,10 +119,10 @@ public abstract class Entity implements ICommandListener {
@@ -24,7 +24,7 @@ index 1b58f7d..1e092b0 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0b3360c..47036e1 100644
+index c8c7a41..2bf74ea 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -84,5 +84,5 @@ index 0b3360c..47036e1 100644
          this.f.clear();
          this.l();
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0067-Add-configurable-portal-search-radius.patch

@@ -1,4 +1,4 @@
-From b9f357936f5bbc5b4f9a6227e266a8d1f95ca45c Mon Sep 17 00:00:00 2001
+From dbf7b0e43495ab62d668d7571acebe46c616200d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
@@ -19,7 +19,7 @@ index 75e7b78..5807609 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 81d65f1..f483a3a 100644
+index f93a95f..ee1ac7d 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0068-Add-velocity-warnings.patch

@@ -1,4 +1,4 @@
-From 786d50439034b85bf6e395da2eb896393d5c6fc3 Mon Sep 17 00:00:00 2001
+From ca1fca4babc5402d36fc058a8847955cdbe2d0cc Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
@@ -22,5 +22,5 @@ index 5e81076..43f2c68 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0069-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From e9fa4f45cd495078a5fb89817ec675277ede71ae Mon Sep 17 00:00:00 2001
+From 11301f2c211f2ea89528de536eeacfcf4ead86f2 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -39,5 +39,5 @@ index d9dd3eb..101dc2b 100644
          return true;
      }
 -- 
-2.8.3
+2.9.0
 

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

@@ -1,4 +1,4 @@
-From 3af3b015b5891d9a2130ce49ea26835fdcab3fe4 Mon Sep 17 00:00:00 2001
+From cd3e2243707e47c864ccffb74f635c23f680c009 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
@@ -50,7 +50,7 @@ index 0000000..9339718
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 407bbd8..8b78a7c 100644
+index f0f4264..f16a5dc 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -63,12 +63,12 @@ index 407bbd8..8b78a7c 100644
 @@ -16,6 +17,7 @@ import org.apache.logging.log4j.Logger;
  
  import com.google.common.collect.Lists; // CraftBukkit
- import org.bukkit.Bukkit; // CraftBukkit
+ import org.bukkit.Server; // CraftBukkit
-+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
++import org.bukkit.craftbukkit.util.CraftMagicNumbers; // Paper
  
  public class Chunk {
  
-@@ -762,10 +764,15 @@ public class Chunk {
+@@ -764,10 +766,15 @@ public class Chunk {
              this.tileEntities.remove(blockposition);
              // Paper end
          } else {
@@ -89,7 +89,7 @@ index 407bbd8..8b78a7c 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 51d95c6..c1dc4fa 100644
+index 23dc778..d814670 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -11,6 +11,7 @@ import java.util.Iterator;
@@ -100,7 +100,7 @@ index 51d95c6..c1dc4fa 100644
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
-@@ -218,7 +219,11 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -189,7 +190,11 @@ public class ChunkProviderServer implements IChunkProvider {
  
              return chunk;
          } catch (Exception exception) {
@@ -113,7 +113,7 @@ index 51d95c6..c1dc4fa 100644
              return null;
          }
      }
-@@ -227,7 +232,11 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -198,7 +203,11 @@ public class ChunkProviderServer implements IChunkProvider {
          try {
              this.chunkLoader.b(this.world, chunk);
          } catch (Exception exception) {
@@ -126,7 +126,7 @@ index 51d95c6..c1dc4fa 100644
          }
  
      }
-@@ -237,9 +246,14 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -208,9 +217,14 @@ public class ChunkProviderServer implements IChunkProvider {
              chunk.setLastSaved(this.world.getTime());
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
@@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0071-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,4 +1,4 @@
-From 14700c98dde8496b26b71b17f280e71263ab314d Mon Sep 17 00:00:00 2001
+From 4b5fde287ea26f500f8edf14d1636c0d372ab9b6 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -26,5 +26,5 @@ index c0e1199..bc6c054 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0072-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From b7cbd2b9ee5b422b23f63f71139095e6ad13741b Mon Sep 17 00:00:00 2001
+From 777b799746e474f24272c0b8932a63dc6f2e4c9a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -49,5 +49,5 @@ index 1764791..153fc76 100644
      }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0073-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,11 +1,11 @@
-From 092524b44ebe0d815bddc2cc3da6177e97eaa876 Mon Sep 17 00:00:00 2001
+From 91af7f355185096176f4070926669c40151b5333 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c1c6822..a5d3657 100644
+index 42ef70f..124811f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1307,10 +1307,12 @@ public abstract class EntityLiving extends Entity {
@@ -43,5 +43,5 @@ index f13ca63..16da1c9 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0074-Complete-resource-pack-API.patch

@@ -1,4 +1,4 @@
-From 83bebd36fa79bf8d27b4f23405728e5acb42fb5f Mon Sep 17 00:00:00 2001
+From 98ba9d47b5f6b8d99fd00e68ea966674c74f1890 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@@ -72,5 +72,5 @@ index 101dc2b..9299695 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0075-Re-add-Spigot-s-hopper-check-feature.patch

@@ -1,4 +1,4 @@
-From 6e48e1f0bcab04adbb381b1488ef6708e5896277 Mon Sep 17 00:00:00 2001
+From ff7e19c54ec11a8211c8dbeca7e2e71802a23462 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
@@ -36,5 +36,5 @@ index d1ce2b9..197bdfe 100644
              return false;
          } else {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0076-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From 5186a9f25fcac14abe91f6b49adcf8ee41ad3c2a Mon Sep 17 00:00:00 2001
+From 1082497acdfe306440b40df188fb49ec9e320efd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements

Spigot-Server-Patches/0077-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From 75189c880180b4e629a100e7672b7e7e43686232 Mon Sep 17 00:00:00 2001
+From 89a3a519e4d2b83ea8d1ece326af825a76359f17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d4386e3..facc97b 100644
+index c89d533..940f4e9 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -174,11 +174,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -42,5 +42,5 @@ index c9bd856..1fe5019 100644
  
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0078-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From e1968270a2c8cdeddffca1a687a0adee2cdfd00c Mon Sep 17 00:00:00 2001
+From 6767ecd0b2bdd6694d872ac098e9575f0e5f0248 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -51,5 +51,5 @@ index 274b83b..012d707 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0079-Allow-Reloading-of-Custom-Permissions.patch

@@ -1,4 +1,4 @@
-From 148f24b5deefd6ffc1dee0dd4091332860377f1a Mon Sep 17 00:00:00 2001
+From 5f65cecee125448dd46386c3a7a5e88bff946270 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -32,5 +32,5 @@ index 012d707..25dd732 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0080-Remove-Metadata-on-reload.patch

@@ -1,4 +1,4 @@
-From a9bceb5d8baac0ffcd64b2043d5cc8362559bb43 Mon Sep 17 00:00:00 2001
+From 469ab12bed07d8349d8e46c14d2aec61c6f375e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -26,5 +26,5 @@ index 25dd732..de45d8b 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0081-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 0e2562f117605d13549f2837949909da33c67621 Mon Sep 17 00:00:00 2001
+From b6c9198666362fafdb1113d0fc4e3d49390cd845 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -32,5 +32,5 @@ index ef429c1..38c4f61 100644
      }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0082-Fix-Furnace-cook-time-bug.patch

@@ -1,4 +1,4 @@
-From 066074bd90e51a8b89d86a9b977e71fde716545a Mon Sep 17 00:00:00 2001
+From 03ac1c1a1577ede07787c0ffb012a32d2c76021b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
@@ -22,5 +22,5 @@ index fd6c246..db235c3 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0083-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From aae185d1bb080ef2b3a9dc0dbf99e4a587285c70 Mon Sep 17 00:00:00 2001
+From 5a9cce0d979b8f386d5bd14e7d8f79b883d9450f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0084-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 15b116f7733f5dfd8625af0118f34334eaa774e6 Mon Sep 17 00:00:00 2001
+From 646fe3e6b248037980db9a34ce73a5d1597787fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -24,7 +24,7 @@ index 57e1fcf..3f8a47b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 91fda88..8130ca6 100644
+index ccbf47e..b7ac5f7 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -149,7 +149,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -37,5 +37,5 @@ index 91fda88..8130ca6 100644
                  }
              } else {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0085-Add-World-Util-Methods.patch

@@ -1,4 +1,4 @@
-From 08a65e6dbb21e258c26f46d19d4f02c44168d2c9 Mon Sep 17 00:00:00 2001
+From 774ef91a1facbc95c2553fdcf3ff263997d91030 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6b2875d..db4bbd9 100644
+index d54ff64..12f6761 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -153,6 +153,12 @@ public abstract class World implements IBlockAccess {
@@ -93,5 +93,5 @@ index 6b2875d..db4bbd9 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0086-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From e2a40825c87e38de01e164e494a2103b00fde6d9 Mon Sep 17 00:00:00 2001
+From 9a613f51aa662677034ca6ae4b50e4834470a8cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -131,5 +131,5 @@ index 6981185..798b9c5 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D, EntityHuman.affectsSpawningFilter()) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { // Paper - affectsSpawning filter
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0087-Pass-world-to-Village-creation.patch

@@ -1,4 +1,4 @@
-From dbc19e6395eaca56b7421a2f137e52b988b4b83f Mon Sep 17 00:00:00 2001
+From dfcc0ce210acfc019a056521d045530c84b27c9c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -32,5 +32,5 @@ index 1fa7cb2..fc3a6ab 100644
          this.d = BlockPosition.ZERO;
          this.j = new TreeMap();
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0088-Custom-replacement-for-eaten-items.patch

@@ -1,11 +1,11 @@
-From e197b180f6bdc9f5a0bf812e77f73d3abda9aff9 Mon Sep 17 00:00:00 2001
+From d7da853993caa9fb5552c447700a55d8955499fa Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a5d3657..eec5dd5 100644
+index 124811f..c6d5986 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2265,12 +2265,24 @@ public abstract class EntityLiving extends Entity {
@@ -34,5 +34,5 @@ index a5d3657..eec5dd5 100644
  
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0089-Set-health-before-death-event.patch

@@ -1,4 +1,4 @@
-From 9292e503b51f518fc19a70f6be9763fc86381d58 Mon Sep 17 00:00:00 2001
+From e00d6b5e984f4094d39d50abdaa0e9c0f38c985a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
@@ -46,5 +46,5 @@ index 16da1c9..b1e63f0 100644
  
      public double getMaxHealth() {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0090-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,4 +1,4 @@
-From 07d037f8f1b8cdc0725819415b68c33e3b521707 Mon Sep 17 00:00:00 2001
+From 2486ffed9b27c2bc743fdbeca5011f39322c701d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -56,5 +56,5 @@ index 9299695..e941f5f 100644
      }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0091-Catch-Async-PlayerChunkMap-operations.patch

@@ -1,4 +1,4 @@
-From e38307270e2a1c0c6595dc760f79a198635bdf5b Mon Sep 17 00:00:00 2001
+From 047cb571ae5bebf5552dae64251c9798f4aea496 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
@@ -22,5 +22,5 @@ index df6801f..6320247 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0092-Support-offline-mode-in-whitelist-command-as-well.patch

@@ -1,4 +1,4 @@
-From 348049fa62d381ff2473f83152e3b7f933046499 Mon Sep 17 00:00:00 2001
+From 347f67ad379a3896b94e16eef873877d4a11f552 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
@@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0093-Fix-SkullCache-case-bug.patch

@@ -1,4 +1,4 @@
-From 6cd4c784f7c1c06fbea56d9e56989a8286a7d228 Mon Sep 17 00:00:00 2001
+From 6a32f12665124c6a996667bef11906a2d11bcc73 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 654b51d..a8adbcb 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0094-Waving-banner-workaround.patch

@@ -1,4 +1,4 @@
-From a0b9b1b558de13bfb4cc19a431a8d2dd64fc5697 Mon Sep 17 00:00:00 2001
+From 622aaa52969e38210d9fb21cdcb4d50733e0fbbe Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -33,5 +33,5 @@ index c5c3f40..3ed2356 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0095-Use-a-Shared-Random-for-Entities.patch

@@ -1,4 +1,4 @@
-From 804d1bd1396b4f8a6c264b7e20bd2ab0e7aadedb Mon Sep 17 00:00:00 2001
+From fe4e74f137ae6f78391549744051b88ea46ba584 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fb2bbda..3db24dd 100644
+index 153fc76..3d5a23c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -44,6 +44,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index fb2bbda..3db24dd 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0096-Don-t-teleport-dead-entities.patch

@@ -1,4 +1,4 @@
-From f914a2ed987032315fc8febb9439ae4311e75e91 Mon Sep 17 00:00:00 2001
+From 01685a4f00fb187001f989b8839d1368db7b6e55 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -20,5 +20,5 @@ index 3d5a23c..3ed3732 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0097-Optimize-Chunk-Access.patch

@@ -1,4 +1,4 @@
-From 3ca522e3f2ce88a0be43c1d933a921e310346642 Mon Sep 17 00:00:00 2001
+From e5e40424dbd26cdf7935353671f5322e25464303 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -8,31 +8,11 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 
 Optimize this look up by using a Last Access cache.
 
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bc6e190..770d7ed 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -30,6 +30,7 @@ public class Chunk {
-     private boolean j;
-     public final World world;
-     public final int[] heightMap;
-+    public final long chunkKey; // Paper
-     public final int locX;
-     public final int locZ;
-     private boolean m;
-@@ -96,6 +97,7 @@ public class Chunk {
-         this.world = world;
-         this.locX = i;
-         this.locZ = j;
-+        this.chunkKey = org.bukkit.craftbukkit.util.LongHash.toLong(this.locX, this.locZ); // Paper
-         this.heightMap = new int[256];
- 
-         for (int k = 0; k < this.entitySlices.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 990e3f0..1fd844b 100644
+index d814670..36515cd 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -26,7 +26,27 @@ public class ChunkProviderServer implements IChunkProvider {
      public final Set<Long> unloadQueue = Sets.newHashSet();
      public final ChunkGenerator chunkGenerator;
      private final IChunkLoader chunkLoader;
@@ -62,5 +42,5 @@ index 990e3f0..1fd844b 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0098-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,4 +1,4 @@
-From c80a2361d5023ed598f22f1f77977c0851dfd32c Mon Sep 17 00:00:00 2001
+From 5ddb0e43c99a57e1a2e606e99ec3555cd5cb8e82 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -35,5 +35,5 @@ index bc6ddc7..9eec243 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0099-Optimize-isValidLocation-for-inlining.patch

@@ -1,4 +1,4 @@
-From 6d92841b8e9c02666f048cac7e7ba88ab5f4a44f Mon Sep 17 00:00:00 2001
+From 5c67471847f9f1f0efc8f68a1675aeed56250f41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 23:41:34 -0400
 Subject: [PATCH] Optimize isValidLocation for inlining
@@ -41,7 +41,7 @@ index 8603d83..9ba987a 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index db4bbd9..0e59c34 100644
+index 12f6761..8233ee7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -274,8 +274,8 @@ public abstract class World implements IBlockAccess {
@@ -92,5 +92,5 @@ index db4bbd9..0e59c34 100644
          return null;
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0100-Use-correct-item-in-arrow-pickup-event.patch

@@ -1,11 +1,11 @@
-From 4b6ad9057b1330b5277fee463fbed00aae8cb727 Mon Sep 17 00:00:00 2001
+From 9ba4a309f6d6596993df301c090164d59a758737 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 22 Mar 2016 16:00:16 -0400
 Subject: [PATCH] Use correct item in arrow pickup event
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 8130ca6..7ad21ca 100644
+index b7ac5f7..37cb17c 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -444,7 +444,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -27,5 +27,5 @@ index 8130ca6..7ad21ca 100644
              }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0101-Fix-cooked-fish-legacy-import.patch

@@ -1,4 +1,4 @@
-From 2c83c777d84efcf62d38e71808a30a43f47813d3 Mon Sep 17 00:00:00 2001
+From fbbbd0c8b1d8b5aa1225d4469ac27e89163aed7c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0102-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch

@@ -1,4 +1,4 @@
-From 8c0b4790a0453aa99d73133c0f39288f44adbee2 Mon Sep 17 00:00:00 2001
+From 5e121b5dc2021f9ad2315f1213646109b3305cdb Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sat, 26 Mar 2016 21:36:05 -0500
 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
@@ -87,5 +87,5 @@ index 9ba987a..557fa3a 100644
                              this.b.b = i;
                              this.b.c = j;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0103-Access-items-by-EquipmentSlot.patch

@@ -1,4 +1,4 @@
-From 09e000dce3d01d1062934b75f9ed734f1230bd46 Mon Sep 17 00:00:00 2001
+From ffe1e11ceb3bceed707d8dfcf613e38a5ec315e0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -64,5 +64,5 @@ index 51a8b4e..47654a0 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0104-Check-async-remove-unused-vars-GH-159.patch

@@ -1,4 +1,4 @@
-From dd8acf573e8248ba6ba33d7190fa312862d5a06b Mon Sep 17 00:00:00 2001
+From d2f5088de2801207e9186ccd8c469168760f1a53 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
@@ -28,5 +28,5 @@ index b603b2c..14f1833 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0105-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch

@@ -1,4 +1,4 @@
-From fdb38bc86b7a41719e36e64124550f1e1abdfbce Mon Sep 17 00:00:00 2001
+From b32ea1463566d788c7c741ecf045c25b512ebc50 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
@@ -25,7 +25,7 @@ index 5652108..a97eee7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0e59c34..c6ba578 100644
+index 8233ee7..a5392fd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -558,7 +558,7 @@ public abstract class World implements IBlockAccess {
@@ -67,5 +67,5 @@ index 9eec243..3377f97 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0106-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,11 +1,11 @@
-From 6aa898b84e61cb78b8e8f364dbab1ba03728da00 Mon Sep 17 00:00:00 2001
+From 46184d4b56450191f8e6a7bd0c5bb5b18df45a19 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c6ba578..9a71c35 100644
+index a5392fd..970c963 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1111,6 +1111,7 @@ public abstract class World implements IBlockAccess {
@@ -25,5 +25,5 @@ index c6ba578..9a71c35 100644
      }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0107-Configurable-Chunk-Inhabited-Timer.patch

@@ -1,4 +1,4 @@
-From 91b181b60c817b2bf5ae68f47b61d5ea130d20df Mon Sep 17 00:00:00 2001
+From 9980980250aadce72171d5d66013b0444e050383 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -23,10 +23,10 @@ index a97eee7..8966b4a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8327394..12edcfe 100644
+index f16a5dc..1c113cf 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1367,7 +1367,7 @@ public class Chunk {
+@@ -1394,7 +1394,7 @@ public class Chunk {
      }
  
      public long x() {
@@ -36,5 +36,5 @@ index 8327394..12edcfe 100644
  
      public void c(long i) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0108-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From c33f8209c86a33a54107645dbda7217d9fc6e0a9 Mon Sep 17 00:00:00 2001
+From fe79ecdc9c91781b8c44d18810fa5b0331d192d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index b1a90c1..5d0b5a4 100644
                  float f = this.h();
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0109-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch

@@ -1,4 +1,4 @@
-From e5d1b4b9d4a30a3d79feb370f3dd3d2e43689f65 Mon Sep 17 00:00:00 2001
+From 8f4d8a4c78b6b567e4ad2bcea34c48da1b8a0af5 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
@@ -48,5 +48,5 @@ index 0336b9c..044ad71 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0110-Minecart-drop-name-workaround.patch

@@ -1,4 +1,4 @@
-From 8e05edadfaf5acfea99f4e546f094c7cefd9a718 Mon Sep 17 00:00:00 2001
+From 11fca59c65fa2c5e88d0f8549f48ea15f761754f Mon Sep 17 00:00:00 2001
 From: Fabse <fabse@uwmc.info>
 Date: Mon, 28 Mar 2016 00:46:46 +0200
 Subject: [PATCH] Minecart drop name workaround
@@ -7,7 +7,7 @@ This is a workaround for MC-68446 (or similar).
 In Survival Minecraft this bug only shows in minecart drops, so this is the only thing fixed here.
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 0dfba1e..3b977a4 100644
+index 4438d83..9df7dfc 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -172,7 +172,7 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -20,5 +20,5 @@ index 0dfba1e..3b977a4 100644
              }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0111-Reduce-IO-ops-opening-a-new-region-file.patch

@@ -1,4 +1,4 @@
-From 24ef5650af1017f32574f590506aab75ce21b55e Mon Sep 17 00:00:00 2001
+From b465ecaa189a7047564172d11e8c99a122723db7 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
@@ -49,5 +49,5 @@ index 1fe5019..45d490e 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0112-Sanitise-RegionFileCache-and-make-configurable.patch

@@ -1,4 +1,4 @@
-From f6311cdf32d0f56f99ed505b8bc756c2944bae62 Mon Sep 17 00:00:00 2001
+From f2d3287c91ba106c1a17dc9321523695cc2b778f Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -25,7 +25,7 @@ index f0f8cb2..22c7dea 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 5eb01c3..9744e72 100644
+index 2121e84..a7ab262 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -8,10 +8,12 @@ import java.io.File;
@@ -77,5 +77,5 @@ index 5eb01c3..9744e72 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0113-Add-getEntity-by-UUID-API.patch

@@ -1,4 +1,4 @@
-From 1ad3298b70bd7775f2f4666f9981b07154a15a2c Mon Sep 17 00:00:00 2001
+From 82dceb56570d6f01e3d1a9924bc419d05f9edd6a Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
@@ -53,5 +53,5 @@ index de45d8b..5cb0eba 100644
      // Paper end
  }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0114-Use-Optimized-Collections.patch

@@ -1,4 +1,4 @@
-From fcbbb13b4fb8142f1d320bc5ddf3533a6afd134e Mon Sep 17 00:00:00 2001
+From e062ea357a0764c8027c0364c91c9f663e64c0c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -13,10 +13,10 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1fd844b..f8905b4 100644
+index 36515cd..cc8602e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -24,7 +24,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
+@@ -23,7 +23,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
  public class ChunkProviderServer implements IChunkProvider {
  
      private static final Logger a = LogManager.getLogger();
@@ -46,5 +46,5 @@ index ec77a5c..86ad41d 100644
      private boolean e = true;
      private boolean f;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0115-Do-not-load-chunks-for-light-checks.patch

@@ -1,4 +1,4 @@
-From 141f4cad8cc1716a1cecd20f8f11aecf00c41be5 Mon Sep 17 00:00:00 2001
+From 2025ef8530622278c906685e364ae0cf7964bdec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9a71c35..7e6b3e6 100644
+index 970c963..e508be3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -707,6 +707,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index 9a71c35..7e6b3e6 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0116-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 549c18ba79d697266a1e8f900e6c0a9feeede245 Mon Sep 17 00:00:00 2001
+From 00ebbfe2ebbbe367b61599f397f8a61430ea896b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -39,5 +39,5 @@ index cb1169c..06c4f12 100644
      }
  
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0117-Fix-reducedDebugInfo-not-initialized-on-client.patch

@@ -1,4 +1,4 @@
-From 78788df9460d44cd8f60b40e80560e86dddf1c8f Mon Sep 17 00:00:00 2001
+From 11a1a646df18c0d48fb18cc5df7b91b681b2502a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
@@ -17,5 +17,5 @@ index 6e51c43..540e178 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0118-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,4 +1,4 @@
-From 26d634ee4072c8d6346220f82d06e78e615c294b Mon Sep 17 00:00:00 2001
+From 856525a95504aab542a6b267217fdeb727980812 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
@@ -32,5 +32,5 @@ index 21e722d..e41f2b2 100644
              int lightLevel = -1; // Paper
              if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0119-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 4ba2f736cb2b1cc395ca4499377bec36a907180d Mon Sep 17 00:00:00 2001
+From 8cd87982b44492ea4e3fad29203bfe7b7c6053d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -65,10 +65,10 @@ index 5cb0eba..8202800 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3d688d1..4315653 100644
+index 8cea8e5..f11d2f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1261,8 +1261,9 @@ public class CraftWorld implements World {
+@@ -1205,8 +1205,9 @@ public class CraftWorld implements World {
          int chunkCoordX = chunkcoordinates.getX() >> 4;
          int chunkCoordZ = chunkcoordinates.getZ() >> 4;
          // Cycle through the 25x25 Chunks around it to load/unload the chunks.
@@ -81,5 +81,5 @@ index 3d688d1..4315653 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0120-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -1,11 +1,11 @@
-From a6ce609b39169e191e73fd1a6756cadefe7c98fa Mon Sep 17 00:00:00 2001
+From e8253303924fa0aa2d06dbde96012bd5d38e4f46 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bf1ac49..4cba507 100644
+index 5b2b8de..facbdad 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -516,6 +516,7 @@ public abstract class World implements IBlockAccess {
@@ -17,5 +17,5 @@ index bf1ac49..4cba507 100644
          this.e(blockposition.east(), block);
          this.e(blockposition.down(), block);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0121-Don-t-spam-reload-spawn-chunks-in-nether-end.patch

@@ -1,4 +1,4 @@
-From 8470cf64eaf8b15d2aa5de3abc471015652dfc41 Mon Sep 17 00:00:00 2001
+From 9e60152ce508910c50b5d635fc066faeaf3f9f80 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@@ -31,5 +31,5 @@ index e30d346..d1b2d15 100644
      }
  }
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0122-Remove-Debug-checks-from-DataBits.patch

@@ -1,4 +1,4 @@
-From 67ffacacb4a1cc339cf5d36608fa014fedadc11c Mon Sep 17 00:00:00 2001
+From cecb8f8ae50271615c1c7714d7f4761ad4c22dde Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -42,5 +42,5 @@ index f3a6799..fa0fd8a 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0123-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From 73022cc55788f18264c82e5558f7ad190f398c0c Mon Sep 17 00:00:00 2001
+From 0021cfc35b58d8605c27fe57c75c6f577f9e8df0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -39,5 +39,5 @@ index 06c4f12..2538cc5 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0124-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 887884dd866c1ec1c9f9c2e6de0099ee9ef1163b Mon Sep 17 00:00:00 2001
+From ec4c864f8f44361607434a46fddbb00c25fda046 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -28,5 +28,5 @@ index e941f5f..e20c4ef 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0125-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch

@@ -1,4 +1,4 @@
-From d111aad2241cf5bb659fde0f464392e3845c445b Mon Sep 17 00:00:00 2001
+From 647bda8348b38151b9956753392c2fede265009c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Apr 2016 22:36:10 -0400
 Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
@@ -7,7 +7,7 @@ Otherwise the player will trigger a "moved too quickly" next movement packet
 and rubber band.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 61d7605..a3b8cfb 100644
+index 3ed3732..eff088d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -292,6 +292,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,7 +19,7 @@ index 61d7605..a3b8cfb 100644
          float f1 = this.length;
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9d595dc..f517c6a 100644
+index 2538cc5..390528c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -204,7 +204,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -32,5 +32,5 @@ index 9d595dc..f517c6a 100644
          this.m = this.player.locY;
          this.n = this.player.locZ;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0126-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From 0593878dd3cee051ef50c1cc39526da11a267db8 Mon Sep 17 00:00:00 2001
+From 3543fd59b86e411f4979606f543c2f6db96a001b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -67,5 +67,5 @@ index e25b864..b3165eb 100644
              }
  
 -- 
-2.8.3.windows.1
+2.9.0
 

Spigot-Server-Patches/0127-Don-t-tick-Skulls-unused-code.patch

@@ -1,4 +1,4 @@
-From 5f6c0a8618bca442f74cf1b98863fb3aefede23d Mon Sep 17 00:00:00 2001
+From f111af4039872df7ea8ba4e5c075669e13185981 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@@ -18,5 +18,5 @@ index a8adbcb..ff5929f 100644
      private int a;
      public int rotation;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0128-Fix-some-players-not-being-kicked-on-shutdown.patch

@@ -1,4 +1,4 @@
-From e07828e9702b2bfad344d2037d4f84ea274ccf1d Mon Sep 17 00:00:00 2001
+From f6ae56e4c2d9042ff278827a27a377108058c12b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 29 Mar 2016 20:19:20 -0400
 Subject: [PATCH] Fix some players not being kicked on shutdown
@@ -23,5 +23,5 @@ index 540e178..5ff5017 100644
      }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0129-Configurable-Player-Collision.patch

@@ -1,4 +1,4 @@
-From 6751f7be364373bd4c4fae7d3ace435176daa2fa Mon Sep 17 00:00:00 2001
+From 9838b5ed83155b41d03da1361db86907470af133 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
@@ -32,5 +32,5 @@ index d8ec504..eb45d3c 100644
          }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0130-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From 112ce5255f8527edc40f5898466f0aec2951c00d Mon Sep 17 00:00:00 2001
+From cf9d9c64c0bbbb64963f6a7f7288279515800f71 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -45,5 +45,5 @@ index 37c5fe5..acfcb80 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0131-Water-mobs-should-only-spawn-in-the-water.patch

@@ -1,4 +1,4 @@
-From e66832ff3e208f99dc45cfe5134ce5e13b37407e Mon Sep 17 00:00:00 2001
+From a37608db3922c27b8c4bfc0d46bd6ae3d1bfb66c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
@@ -26,5 +26,5 @@ index 76394a3..e61f9a2 100644
  
      public boolean canSpawn() {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0132-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch

@@ -1,4 +1,4 @@
-From f7e14ffde3b8e7f63085730e140df5df945d91cc Mon Sep 17 00:00:00 2001
+From eac57545e4af2be5afdcbacfc57641f44b2d7129 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -14,7 +14,7 @@ Specially with servers using smaller mob spawn ranges than view distance, as wel
 This patch returns mob counting to use all loaded chunks, and 17x17 division.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c994dc0..ffd2a26 100644
+index 1c113cf..d670671 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -672,7 +672,7 @@ public class Chunk {
@@ -56,5 +56,5 @@ index 14f1833..4f392fb 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0133-Configurable-RCON-IP-address.patch

@@ -1,4 +1,4 @@
-From 2a2561251c2175f504897dcc0a4f46c667b730c8 Mon Sep 17 00:00:00 2001
+From 2304e7d9cf2d99b463ab4a315826b179f91d52e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index a6a0d5a..efcafe7 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0134-Prevent-Fire-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From ad7b8a12f0b5035455c18c0a644640cd27c8c9c9 Mon Sep 17 00:00:00 2001
+From 3c8ae0d36856cd89c14944ba9f95e35c49833ed4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -45,5 +45,5 @@ index cb11099..951f0cf 100644
  
              return i;
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0135-Implement-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 9f4ad2b7defdfba2a0e64ed9f04182c8f6918996 Mon Sep 17 00:00:00 2001
+From 118eabe40eb578c54ebc193da348f6f9eac3f9f0 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -50,5 +50,5 @@ index e20c4ef..3f871a7 100644
  
          @Override
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0136-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,4 +1,4 @@
-From c9bc52c9b190af4b7ae33ba62addfd65af1bdd88 Mon Sep 17 00:00:00 2001
+From 7f41214fdeb5f5d5cbb2687cd160531ae6f37afd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 01f779c..d0bce92 100644
+index ff9096f..22333ea 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -741,10 +741,16 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index af4f97e..df31391 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0137-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,4 +1,4 @@
-From fb91fc815d1bee7353d6e10fbcbd1c48f9105f23 Mon Sep 17 00:00:00 2001
+From 145884a82101e7d9715f6a606b4b5a1c618c2028 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
@@ -44,5 +44,5 @@ index 8f502b9..bddfea0 100644
  
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0138-Vehicle-Event-Cancellation-Changes.patch

@@ -1,4 +1,4 @@
-From 8d2082d83ba9184205d4334e34de9cb6b6a9e9f7 Mon Sep 17 00:00:00 2001
+From 03228d9f034e01c313fa6d4898cb9cfa3b2a0f40 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
@@ -90,5 +90,5 @@ index eff088d..c3efc7f 100644
          return this.bx().size() < 1;
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0139-Arrow-pickup-rule-API.patch

@@ -1,4 +1,4 @@
-From 5e6f62e26308239337b2a112df5fe8247e4eb9c0 Mon Sep 17 00:00:00 2001
+From bc96ad5586de906f720c4dae537aaeed5bd63c75 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:16:11 -0500
 Subject: [PATCH] Arrow pickup rule API
@@ -54,5 +54,5 @@ index 2a3482c..fbf289f 100644
      private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0140-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch

@@ -1,4 +1,4 @@
-From 5a07728558b0e44a48bc8c0409fcfbe755cf1950 Mon Sep 17 00:00:00 2001
+From e3a313ca14af95c77206c86528e8daae51792ddf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@@ -51,5 +51,5 @@ index 61a6b8a..25f7b4b 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0141-Improve-Minecraft-Hopper-Performance.patch

@@ -1,4 +1,4 @@
-From ca73b2a000c37d9a4ce86949248160dbf9d2864e Mon Sep 17 00:00:00 2001
+From bbac89af60c38b75044e3161d729843c819bf8d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -66,5 +66,5 @@ index 197bdfe..8717ae1 100644
          return this.g > 0;
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0142-remove-null-possibility-for-getServer-singleton.patch

@@ -1,4 +1,4 @@
-From 64591484c89d9a754d94ea02daf0676cab8ab94e Mon Sep 17 00:00:00 2001
+From 12deafddafaa2e61cdb9d05f32dc8a5d143a9c74 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -35,5 +35,5 @@ index bfa6836..de67aca 100644
      // CraftBukkit end
  }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0143-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -1,4 +1,4 @@
-From 8c11b7257b5a93914e6375d8a6d2a3d318dae8fa Mon Sep 17 00:00:00 2001
+From 5395987701e0de5b725031c31c928050b726c248 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -48,7 +48,7 @@ index 413925e..f505e3c 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f15178a..8d99b83 100644
+index b3165eb..38a3692 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1148,6 +1148,7 @@ public abstract class World implements IBlockAccess {
@@ -145,5 +145,5 @@ index 256a131..5768cd5 100644
  
      public RenderData() {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0144-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,4 +1,4 @@
-From e3ccecb266de8fc701d6946f7d1012de931daa5e Mon Sep 17 00:00:00 2001
+From 1ac7c10918e24d0ba8739bb98c10e92d4c22bbbb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -752,5 +752,5 @@ index e9963e2..acb4dee 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0145-Do-not-load-chunks-for-pathfinding.patch

@@ -1,4 +1,4 @@
-From 7d4fbadd98b52010c07a13459a2098cff7f64653 Mon Sep 17 00:00:00 2001
+From d17e644ae739920dd3b964a8d17be4bebddcd73f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index a8fd64c..11c11cf 100644
          }
  
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0146-Entity-Tracking-Improvements.patch

@@ -1,4 +1,4 @@
-From 0d61161de989e9ae402bb65db3b7627e5f1f7891 Mon Sep 17 00:00:00 2001
+From b3b374803b9f4e4a4afe64e5ca8bb6fd946449ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b9d9fb9..ef97ad1 100644
+index c3efc7f..797e078 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -51,6 +51,7 @@ public abstract class Entity implements ICommandListener {
@@ -99,5 +99,5 @@ index f505e3c..b97769f 100644
  
      }
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0147-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch

@@ -1,4 +1,4 @@
-From 100738e2b451b4d1384c81daf52e674f7b80ec08 Mon Sep 17 00:00:00 2001
+From 33702c0ad5a5fa70ee060427c5a5b86a6fb07d98 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
@@ -31,5 +31,5 @@ index 230004b..62752f8 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.8.3
+2.9.0
 

Spigot-Server-Patches/0148-Do-not-mark-chunks-as-active-for-neighbor-updates.patch

@@ -0,0 +1,48 @@
+From 2eac14cc481adc373ca6a73bcfe96ff35a020a60 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Thu, 12 May 2016 01:55:17 -0400
+Subject: [PATCH] Do not mark chunks as active for neighbor updates
+
+Fixes chunk unload issues
+
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index d670671..2b7679f 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -995,25 +995,25 @@ public class Chunk {
+         }
+         // CraftBukkit end
+ 
+-        Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
+-        Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
+-        Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
+-        Chunk chunk3 = ichunkprovider.getLoadedChunkAt(this.locX - 1, this.locZ);
++        Chunk chunk = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX, this.locZ - 1); // Paper
++        Chunk chunk1 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX + 1, this.locZ); // Paper
++        Chunk chunk2 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX, this.locZ + 1); // Paper
++        Chunk chunk3 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX - 1, this.locZ); // Paper
+ 
+-        if (chunk1 != null && chunk2 != null && ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ + 1) != null) {
++        if (chunk1 != null && chunk2 != null && MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX + 1, this.locZ + 1) != null) { // Paper
+             this.a(chunkgenerator);
+         }
+ 
+-        if (chunk3 != null && chunk2 != null && ichunkprovider.getLoadedChunkAt(this.locX - 1, this.locZ + 1) != null) {
++        if (chunk3 != null && chunk2 != null && MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX - 1, this.locZ + 1) != null) { // Paper
+             chunk3.a(chunkgenerator);
+         }
+ 
+-        if (chunk != null && chunk1 != null && ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ - 1) != null) {
++        if (chunk != null && chunk1 != null && MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX + 1, this.locZ - 1) != null) { // Paper
+             chunk.a(chunkgenerator);
+         }
+ 
+         if (chunk != null && chunk3 != null) {
+-            Chunk chunk4 = ichunkprovider.getLoadedChunkAt(this.locX - 1, this.locZ - 1);
++            Chunk chunk4 = MCUtil.getLoadedChunkWithoutMarkingActive(ichunkprovider,this.locX - 1, this.locZ - 1); // Paper
+ 
+             if (chunk4 != null) {
+                 chunk4.a(chunkgenerator);
+-- 
+2.9.0
+