Add rate limiting to PacketPlayInUseItem as well

Also removes our toggle for Spigot's option, I doubt anyone uses it.

Spigot-Server-Patches/0012-Player-Exhaustion-Multipliers.patch

@@ -1,4 +1,4 @@
-From b7d32c2cb04b15597d51c3b33499d01a086ad70d Mon Sep 17 00:00:00 2001
+From da91460fe9c232759f9523b67a9f656cf4a2a854 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Tue, 1 Mar 2016 13:43:16 -0600
 Subject: [PATCH] Player Exhaustion Multipliers
@@ -56,5 +56,5 @@ index 30c5116..ffcc235 100644
              } else if (this.m_()) {
                  if (d1 > 0.0D) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch

@@ -1,40 +0,0 @@
-From e0a86e364a8ce22e9465fdbb332de75844adfc1a Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 13:31:05 -0600
-Subject: [PATCH] Toggle for player interact limiter
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7739e78..87bae87 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -184,4 +184,12 @@ public class PaperConfig {
-                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
-                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
-     }
-+
-+    public static boolean useInteractLimiter;
-+    private static void useInteractLimiter() {
-+        useInteractLimiter = getBoolean("settings.limit-player-interactions", true);
-+        if (!useInteractLimiter) {
-+            Bukkit.getLogger().log(Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users");
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1a39ba3..5bbb644 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -914,7 +914,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-         this.player.resetIdleTimer();
-         // Spigot start
-         boolean throttled = false;
--        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
-+        // Paper - Allow disabling interact limiter
-+        if (com.destroystokyo.paper.PaperConfig.useInteractLimiter && lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
-             throttled = true;
-         } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
-         {
--- 
-2.8.3.windows.1
-

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

@@ -1,4 +1,4 @@
-From f40e12f5196e4d6a1f4b5a216616133016dc780b Mon Sep 17 00:00:00 2001
+From 0765aaedfd591133840b85dd8399cedb173a3b46 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
@@ -51,5 +51,5 @@ index bbf7f02..85d4b81 100644
                  }
              }
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0014-Allow-for-toggling-of-spawn-chunks.patch

@@ -1,4 +1,4 @@
-From 87ba7a3f09983fa690278baf262b8ba6c3823e37 Mon Sep 17 00:00:00 2001
+From 2a60bdf1a9f93a1969dfe37d9e6a73fd27dddb2f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
@@ -20,7 +20,7 @@ index 402dbe7..78dcf26 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f8c8e4b..c110c74 100644
+index 932e826..3e79e02 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index f8c8e4b..c110c74 100644
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0015-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,4 +1,4 @@
-From 32ef7d31604f2cf0aee7bae369ab702f2e626441 Mon Sep 17 00:00:00 2001
+From 2180a0f774d1077f684fbee8360b9f9db2c84be2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,7 +24,7 @@ index 78dcf26..f19ae97 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 4514401..65c1150 100644
+index b8449fe..dbcda27 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -80,6 +80,17 @@ public class EntityFallingBlock extends Entity {
@@ -64,5 +64,5 @@ index 0ed3f89..2745c49 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0016-Configurable-speed-for-water-flowing-over-lava.patch

@@ -1,4 +1,4 @@
-From 95738bca3c885025041cad1726919f30b68a8055 Mon Sep 17 00:00:00 2001
+From 1cf26e0671905c3572a05a55b68d4c04d934fb4b 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
@@ -57,5 +57,5 @@ index c0f4961..b00865e 100644
 +    }
  }
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -1,4 +1,4 @@
-From 2053173e8972809f9e883ec0633d325101aad5c9 Mon Sep 17 00:00:00 2001
+From 6758ff9e302ca3dc0b004c9724d49d831026dcc2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 299aa64e2a7e8669521ab3a452d925f128308304 Mon Sep 17 00:00:00 2001
+From 97bbce71d023974e57cfae01c96b05e7086e2d77 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
@@ -184,7 +184,7 @@ index 3e79e02..e3d971c 100644
                  double d4 = entityhuman.e(d0, d1, d2);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d6cf997..f678d7f 100644
+index 5874554..95cdbab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1427,6 +1427,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -205,5 +205,5 @@ index d6cf997..f678d7f 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.0.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0019-Metrics.patch

@@ -1,4 +1,4 @@
-From 0a3ca307c7e50e0961b26442794c63bf7c356be6 Mon Sep 17 00:00:00 2001
+From d8a42f222d0f8146e852a3895d3a7eb0e9c267c2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:54:32 -0600
 Subject: [PATCH] Metrics
@@ -18,5 +18,5 @@ index a5fd59d..680283c 100644
          String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
          String serverVersion = Bukkit.getVersion();
 -- 
-2.8.3
+2.10.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 32b85f0c39860801e6a9a399fe6125effef5d3b9 Mon Sep 17 00:00:00 2001
+From f4ee8852de88f04a10452efeadde65721090b7a2 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 b651edc..015a223 100644
+index 5807bb8..445419f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -722,6 +722,10 @@ public class Chunk {
@@ -20,5 +20,5 @@ index b651edc..015a223 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.9.0
+2.10.0.windows.1
 

Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch

@@ -1,4 +1,4 @@
-From b2d99fa9ab15185be72c51be72eadd7f05406428 Mon Sep 17 00:00:00 2001
+From acf62d273a781fa52762156b98d76d0f27e28a4d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@@ -186,5 +186,5 @@ index d5f0d61..b257bc4 100644
      }
  
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From 047c0e003720a57493daadd0211932a833a55331 Mon Sep 17 00:00:00 2001
+From 01d6f991f6f4b263e38da7878cad63b7a7cd7b1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -211,5 +211,5 @@ index be2e31d..6d21c32 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch

@@ -1,11 +1,11 @@
-From 3329d9605d312326a35d19f576307a30694bff8f Mon Sep 17 00:00:00 2001
+From 52edc592b137c32d87f8ead08ea7b011614b406e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 11e3028..eac8062 100644
+index 95cdbab..3b0e58b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1151,12 +1151,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -24,5 +24,5 @@ index 11e3028..eac8062 100644
  
      @Override
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch

@@ -1,11 +1,11 @@
-From dbace07a52c033002d6798acd32beea67d52d9d8 Mon Sep 17 00:00:00 2001
+From c4f8d2a04dc43344dc465aeee0ad81a67677ea1e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4eacee7..4ab7efc 100644
+index b1e4026..9ef8fc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -125,6 +125,26 @@ public class CraftWorld implements World {
@@ -36,5 +36,5 @@ index 4eacee7..4ab7efc 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0025-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From fbab4ca7a4c094c2b6f537d701af390f8e33c8cc Mon Sep 17 00:00:00 2001
+From ed3cf379c0f5d770f5cf271899c9e6e86803d915 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API

Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch

@@ -1,4 +1,4 @@
-From 68a72eaea8d7ded8e658aebf0bc89951e62c99bb Mon Sep 17 00:00:00 2001
+From 9180cb4c79c197a377028ff0066f36a57010f7e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -23,7 +23,7 @@ index 2b82312..9fa93ed 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8b133c1..746438f 100644
+index 5b3e50c..8fb8176 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1445,10 +1445,12 @@ public abstract class World implements IBlockAccess {
@@ -62,5 +62,5 @@ index 8b133c1..746438f 100644
                      // Spigot start
                      finally {
 -- 
-2.8.3.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch

@@ -1,4 +1,4 @@
-From 57fda9063cff2eb244d9802e4a449f30ff528f56 Mon Sep 17 00:00:00 2001
+From a926366fca50262a094af3fe90e733f386d83b7c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -20,7 +20,7 @@ index 8fc2f6c..d78b688 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 395811a..3228932 100644
+index 38df1c6..fd51ecb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -386,9 +386,15 @@ public abstract class Entity implements ICommandListener {
@@ -87,5 +87,5 @@ index 36ef2da..4438d83 100644
          int i;
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch

@@ -1,4 +1,4 @@
-From 44bda2888bfd777effdc6a9c6569801f2637263a Mon Sep 17 00:00:00 2001
+From 1f849507582b5b1dae133b05b73c29aa78ef9d14 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
@@ -18,5 +18,5 @@ index 75e2338..f077398 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch

@@ -1,4 +1,4 @@
-From 765f4d691c277fc18b11ad8e045bc30a691d3dc2 Mon Sep 17 00:00:00 2001
+From 67763518c9084c592b734afd2bd4118da9127b92 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
@@ -25,5 +25,5 @@ index eb30abe..c4ed64a 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.8.3
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 55cfaf3677015d0009f483b6c496d43dc1c4c8b7 Mon Sep 17 00:00:00 2001
+From 92e46c6a80210fe9152b447e7dc2275dadb8e575 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
@@ -235,5 +235,5 @@ index 8fb8176..672167a 100644
                  }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0031-Optimize-draining.patch

@@ -1,4 +1,4 @@
-From a403f340774e9d181e2ddd8c2d7f4f738ae0b170 Mon Sep 17 00:00:00 2001
+From 06168b7a4b64d23e90503435a82258588871d586 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:55:24 -0600
 Subject: [PATCH] Optimize draining
@@ -24,5 +24,5 @@ index b00865e..72654df 100644
              }
          } else {
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0032-Configurable-end-credits.patch

@@ -1,4 +1,4 @@
-From efc0f30551d46d77f1132db3ebe51095e79f64c6 Mon Sep 17 00:00:00 2001
+From 40b69207b686437a0b1414c9f46ad9c3d11f5d6f Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -52,5 +52,5 @@ index 37c94f8..522c7f2 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0033-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -1,4 +1,4 @@
-From 38d908fa1f68546678a01f1a50ab203cf69a1a7d Mon Sep 17 00:00:00 2001
+From 8bd58b6f24a637fc603a703b2d20cc4208c564ac Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
@@ -25,5 +25,5 @@ index acbf7a8..f4765d3 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0034-Generator-Settings.patch

@@ -1,4 +1,4 @@
-From 165f860eb9571e17f3ffefd6cc4259cee7f21592 Mon Sep 17 00:00:00 2001
+From b183f14705315562623ffaa7bdfce84d4855c4f3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -265,5 +265,5 @@ index c965af1..3ce4449 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0035-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From 6eed8e312a9ea1123c11b99233f9411bfc7a0e03 Mon Sep 17 00:00:00 2001
+From 428b111b0dd4542d55db721110adf33e7feead76 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -124,7 +124,7 @@ index f4765d3..caf29c7 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7f6a29d..a41c931 100644
+index d0060d0..d1d268f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -872,6 +872,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -156,5 +156,5 @@ index 672167a..e8cfe2b 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.9.0.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0036-Stop-updating-flowing-block-if-material-has-changed.patch

@@ -1,4 +1,4 @@
-From 0334b767beb65705a85a902bb77a5da60faff822 Mon Sep 17 00:00:00 2001
+From dac6bac6e17684e8b5b4b0fa5e51fe76f0f5b92f 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
@@ -17,5 +17,5 @@ index 72654df..def694a 100644
  
          if (this.h(world, blockposition.down(), iblockdata2)) {
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0037-Fast-draining.patch

@@ -1,4 +1,4 @@
-From a4d358914233d0cb8f5ac40de23b832507fb39e2 Mon Sep 17 00:00:00 2001
+From 678a7464e92867731d118c7beea8f565e5ad6c69 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
@@ -109,5 +109,5 @@ index def694a..0b5bc19 100644
 +    // Paper end
  }
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch

@@ -1,4 +1,4 @@
-From b24e5f750fea9cddda7c7379f0e0d3a041c6c4d3 Mon Sep 17 00:00:00 2001
+From 2ce25ad8cfc444a0f5bf7e327e99ce0f05618bfe 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
@@ -35,5 +35,5 @@ index 0b5bc19..0336b9c 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0039-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From 32205193321f857475c11a9e4b1e30a7d9031817 Mon Sep 17 00:00:00 2001
+From 47bf3a4b1683d16807ed8e5af8ac10fae61beb57 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -194,7 +194,7 @@ index 797a84f..fcd0186 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 64c9c1c..e09dc78 100644
+index 3b0e58b..75c7ece 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1438,6 +1438,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -215,5 +215,5 @@ index 64c9c1c..e09dc78 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0040-Disable-explosion-knockback.patch

@@ -1,4 +1,4 @@
-From aee68d2743a1f3e7e3633cd3b348282fc2c26fa3 Mon Sep 17 00:00:00 2001
+From b17bd30962bd0c8bf018b8e06301ccb0670b0dfa Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@@ -19,7 +19,7 @@ index 004d4c0..87979dd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b5db35f..c1c6822 100644
+index 0a583bc..8aaab9e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -872,12 +872,14 @@ public abstract class EntityLiving extends Entity {
@@ -69,5 +69,5 @@ index caf29c7..6cdc3a3 100644
                              }
                          }
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0041-Disable-thunder.patch

@@ -1,4 +1,4 @@
-From c711eee0e721258c1a39c806dc080353e634b425 Mon Sep 17 00:00:00 2001
+From c5512f2eb68c4789b22668680af20606826726e6 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -19,7 +19,7 @@ index 87979dd..076fcbb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a691d8f..651ce53 100644
+index 94d07eb..9b5142c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -423,7 +423,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -33,5 +33,5 @@ index a691d8f..651ce53 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0042-Disable-ice-and-snow.patch

@@ -1,4 +1,4 @@
-From 724df761f25877ebcb44e2353b1c6d6eb036522f Mon Sep 17 00:00:00 2001
+From 767a9ef7974c8e7f760f8bae8cfcb2c6207e8c71 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -19,7 +19,7 @@ index 076fcbb..9018df5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 651ce53..bc6ddc7 100644
+index 9b5142c..54446aa 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -447,7 +447,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index 651ce53..bc6ddc7 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch

@@ -1,4 +1,4 @@
-From f9f44c91550d016394da0bdaacc52398e4f35589 Mon Sep 17 00:00:00 2001
+From 8515d9b08aa94851190b4db7d33556486959394f Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
@@ -64,5 +64,5 @@ index f040775..f17aea4 100644
                  }
  
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0044-Send-absolute-position-the-first-time-an-entity-is-s.patch

@@ -1,4 +1,4 @@
-From 467701b9fae3fe6b53c2c3d46a4240f50ddc43ed Mon Sep 17 00:00:00 2001
+From dd7e4e1f6e09b5ca1cd4fec140922e502897e0b5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -76,5 +76,5 @@ index af32116..413925e 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0045-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From a73b6bfd3a69352a8bf17b618de3549a8a32dbc4 Mon Sep 17 00:00:00 2001
+From 22b4e5883590e2eaf7bc9b74535c121415f700e2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -69,5 +69,5 @@ index 48f8793..9b0a1c4 100644
          }
  
 -- 
-2.9.0
+2.10.0.windows.1
 

Spigot-Server-Patches/0046-Configurable-container-update-tick-rate.patch

@@ -1,4 +1,4 @@
-From c9968ad7e95cefe2bb154eec2b9695f711e8fa10 Mon Sep 17 00:00:00 2001
+From e808b68be47b3f1ce457b049edda796ef093895c Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -45,5 +45,5 @@ index 4950db4..e9baaa2 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0047-Fix-lava-water-some-times-creating-air-instead-of-co.patch

@@ -1,4 +1,4 @@
-From 123e2e4ee662aefbaf32cce1397b45b43e6c9aee Mon Sep 17 00:00:00 2001
+From 09fc25a75ad2b07d03779bba1a2e1daf5552f12a Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:38:52 -0600
 Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
@@ -18,5 +18,5 @@ index ddd5199..d7308dd 100644
                      this.fizz(world, blockposition);
                      return true;
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0048-Use-UserCache-for-player-heads.patch

@@ -1,4 +1,4 @@
-From 020ae40d595f94caf0b507f1da371109cc8a07b7 Mon Sep 17 00:00:00 2001
+From 9aa63267f4da12a9959ab0593cd83f192e05297d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
@@ -32,5 +32,5 @@ index 2abca0c..7d83bbe 100644
  
          return true;
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0049-Disable-spigot-tick-limiters.patch

@@ -1,11 +1,11 @@
-From 0127334be1d39b225f0f7257a5fd53b1bb453122 Mon Sep 17 00:00:00 2001
+From d1bde73c4ab05ed8bcabd66007507773a57976b0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f9c803f..c8c7a41 100644
+index e8cfe2b..5881ffb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1422,10 +1422,10 @@ public abstract class World implements IBlockAccess {
@@ -35,5 +35,5 @@ index f9c803f..c8c7a41 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.8.3.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0050-Configurable-Chunk-IO-Thread-Base-Count.patch

@@ -1,16 +1,16 @@
-From e423c9fa1d8a9de6de4cf6b62658cbe3e15d421f Mon Sep 17 00:00:00 2001
+From 0bc1fd3d9584ce9a5afc3aba22e151b72549ca70 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 87bae87..9ab6445 100644
+index 858eb9a..de13cf7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -192,4 +192,9 @@ public class PaperConfig {
-             Bukkit.getLogger().log(Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users");
-         }
+@@ -184,4 +184,9 @@ public class PaperConfig {
+                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
+                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
 +
 +    public static int minChunkLoadThreads = 2;
@@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.8.3
+2.10.0.windows.1
 

Spigot-Server-Patches/0051-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch

@@ -1,4 +1,4 @@
-From 0d36bbd3acce3758461d6acd54014d4c68560a25 Mon Sep 17 00:00:00 2001
+From 7abfa914ed445aecdbb95b38452cc08c28d035f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -7,7 +7,7 @@ Plugins like Dynmap can end up creating tons of emtpy Region Files
 when using chunkExists.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 665851a..24cb51b 100644
+index 17dd7bb..162cdd6 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,7 +39,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -23,7 +23,7 @@ index 665851a..24cb51b 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 5528019..01a08d4 100644
+index 01b54e7..49fa5e4 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -12,7 +12,13 @@ public class RegionFileCache {
@@ -49,5 +49,5 @@ index 5528019..01a08d4 100644
                  file1.mkdirs();
              }
 -- 
-2.8.3
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 6c0ffed335679f15e993b32da3a4a85ae91ac371 Mon Sep 17 00:00:00 2001
+From e6aac3fdbf9ad18ef5a42c10511f2eb1849fbe5e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f6a9384..6e51c43 100644
+index 6bd7151..e88e918 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -100,6 +100,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index f6a9384..6e51c43 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.9.0
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 473d1b5f5ed6afeb1c58f652c01c6baea142f695 Mon Sep 17 00:00:00 2001
+From 6dde4f165a8a3f04b039b1145e575b35a4de7950 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.9.0
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From ba0189de9deaa9bdd967c32551bdb726c63979d6 Mon Sep 17 00:00:00 2001
+From a3f1b920e6fe3e658415a0a3b8b4ea9bff990ab1 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
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 06f394b..7d67e67 100644
+index f1ac7bc..c6785c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1266,6 +1266,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1265,6 +1265,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -82,5 +82,5 @@ index b5132cd..8e501b6 100644
              return true;
          }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From af8a36af99cd46c231933a0a8908ae22784f1236 Mon Sep 17 00:00:00 2001
+From bc0fc5be08c6177fa6f078a0607bf3f450734fb4 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.9.0
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 945883cc3c1607c13de3b07dc660287c8d5d87ac Mon Sep 17 00:00:00 2001
+From 9d545994314c0b641e4f24f76479e3c4135b52ad 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From fb9bba1325d10fa5e1b3b026cf23084d07259544 Mon Sep 17 00:00:00 2001
+From 3c9f00d356700b2c9288061db06adf8fcd38c9d4 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 0fae95d..684e5f7 100644
+index 76130c9..989d510 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 {
@@ -95,5 +95,5 @@ index 0fae95d..684e5f7 100644
  
              while (iterator.hasNext()) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From c3907844a571935fcc6702d446cdb9a4f86c4354 Mon Sep 17 00:00:00 2001
+From 028e0e4e1c31a297efd9b0b7c469885c0260b4de 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 8e501b6..c7cd3f7 100644
          return commandMap;
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 2d0f7682e747d6066192545d2d664a974b7fd112 Mon Sep 17 00:00:00 2001
+From 61f47aad92e775d2245d216fd1fa0cd76ac96efc 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 cffa778..a123d5e 100644
  
          if (health == 0) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 24439dcdd7417c184668ebb038d974f5abea1224 Mon Sep 17 00:00:00 2001
+From f7a77a02bb5af91929d969693245c5b4c88c9c85 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
@@ -56,5 +56,5 @@ index 75c7ece..ed69814 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 759dd716bdc7dfccd3b4450b6ea6321cf7114434 Mon Sep 17 00:00:00 2001
+From c1a0abb30cce9a96969b18361556a6ad34138742 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
@@ -173,5 +173,5 @@ index ed69814..86286a5 100644
  
      @Override
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 95706d529b7c7d6d68f3c5d9ab39b8c00db8febe Mon Sep 17 00:00:00 2001
+From 9c5904d0c9c48916644ebd66cf9f5faa167c5e75 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 02b1fb1..d39ffbe 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From e13c2b098cff6523e0f9bdaabe9fbb759c7b173f Mon Sep 17 00:00:00 2001
+From dfdacf75724fe2b443ab11fb59134edf4426a997 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 3228932..cc484dc 100644
+index fd51ecb..14c2d2c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -120,10 +120,10 @@ public abstract class Entity implements ICommandListener {
@@ -84,5 +84,5 @@ index 5881ffb..a905ff9 100644
          this.f.clear();
          this.l();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 0f11e06322d6f8d2678033081b477196fb5d9d77 Mon Sep 17 00:00:00 2001
+From 4f23bd2161337be926d6e5de1047307b278c7fef 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
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From e03a75ce7f4d8561cd2ae428ed4b5c4a2d1054cb Mon Sep 17 00:00:00 2001
+From 94f85cb0553842b03af9aeeaa90a338663423cb2 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 6f6b90b..719dd66 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 6b98bfa4a580925dc777e7182ab2d6e17d7b381a Mon Sep 17 00:00:00 2001
+From c0feff9eee686659da793e2e1312911148b8cee5 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 86286a5..a6851e6 100644
          return true;
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 108eb9cb891131532840f1a0cc670a5ae1f92409 Mon Sep 17 00:00:00 2001
+From 67cefb5448ca6c3964a3a37e7e423f068901f12a 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 684e5f7..bc55a2b 100644
+index 989d510..9118e4d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From a829086a2ebc2b827c4b58d4c2fba1b0d5d14728 Mon Sep 17 00:00:00 2001
+From 0cc68b6860a5cd71a47e24323700f4060852e7b4 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 90efcaee9d494cc9c411001c68a80095c498aa5d Mon Sep 17 00:00:00 2001
+From 102e4f5e00e09d8d0c5c918d2a4f201736c79130 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

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

@@ -1,4 +1,4 @@
-From 154d80b8db25446e496480dedefa1f4c4d9f4537 Mon Sep 17 00:00:00 2001
+From 82702a3641371be61590cb8432fe5c6ed836fa94 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
@@ -43,5 +43,5 @@ index a123d5e..79d60a6 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,14 +1,14 @@
-From 07bd002edcb8a62463ae788686c76f84ac2474d2 Mon Sep 17 00:00:00 2001
+From f865c4ed737abbf9b84a2b21cebdf4641b0e57e7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7d67e67..d5e06f0 100644
+index c6785c8..4911787 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1027,7 +1027,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1026,7 +1026,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
@@ -72,5 +72,5 @@ index a6851e6..8ac7ec5 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From be477a85ae20e7d9e729c909da01a8bb3e5f0734 Mon Sep 17 00:00:00 2001
+From fe4a48095ff2b4486e3ee9f7d514b998823d3d7c 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
@@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9ab6445..d01bca1 100644
+index de13cf7..8c1d6ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -197,4 +197,10 @@ public class PaperConfig {
+@@ -189,4 +189,10 @@ public class PaperConfig {
      private static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }
@@ -177,5 +177,5 @@ index acfdd52..fdbaf5f 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 5f1fd279518e6cd364df680680f68e978bdff8ec Mon Sep 17 00:00:00 2001
+From ab76a45357dcabf90d3b249332f063abae6f5a89 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 73b8b8b..d68bd28 100644
+index e6e7626..eb36e1f 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From aac4eafc0b5c966555720e61adea0f17d43be2e6 Mon Sep 17 00:00:00 2001
+From fc30732d2a216d6882bbcbe75e2c09b6df297cd6 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
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d01bca1..2e17397 100644
+index 8c1d6ac..4a4043e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -203,4 +203,9 @@ public class PaperConfig {
+@@ -195,4 +195,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }
@@ -51,5 +51,5 @@ index b44808f..034f8ed 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From ac5650f87ce333c15cb6386da4243c8132497ba6 Mon Sep 17 00:00:00 2001
+From c89b153ed8441d201cc65ea8a414d111352b5973 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 034f8ed..1609b07 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From d473ed0e9183c9884c773f74eda8649df8a67a1f Mon Sep 17 00:00:00 2001
+From 9406ab6fe06587ae33af9378d98cae65d734c761 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 1609b07..15bef42 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 7279a750c265627cbc2a1fae0b3b55e7ef3dd626 Mon Sep 17 00:00:00 2001
+From 0be5ec05d4859565b5882514e5baa36b84e42513 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 20fc130a9938e0150010d5167509874426a80209 Mon Sep 17 00:00:00 2001
+From 4ad90c5c991a89873d11100f71c5d1da2aa702ed 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 402afb8adba1a22e669b87d6b4cfadc466393385 Mon Sep 17 00:00:00 2001
+From 6fd544c68b28a552dfe94301008aaa522dcc4580 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From e721477da0a544ce6a720cb99d03bafa9e068547 Mon Sep 17 00:00:00 2001
+From 04cbb784fabeaca52caa2a70f748c21693fa39a0 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
@@ -37,5 +37,5 @@ index ccbf47e..b7ac5f7 100644
                  }
              } else {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 3ef8c34d7825dbf1baedc8ce07899569f7248ada Mon Sep 17 00:00:00 2001
+From fcd4926f5eb3b787aa3be7f625e93b249e34dc51 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
@@ -93,5 +93,5 @@ index 48c0e14..a3bce9a 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From f3e4a3fcceff16f90d7c8ea2d84e5130ca202dac Mon Sep 17 00:00:00 2001
+From 0f9e01ade8983db89a2e945bfbcb04169590f2fa 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 73fca77c401a155b2b8106d07ef9e21f3b2d99fe Mon Sep 17 00:00:00 2001
+From 07d8e704ef4a680c1b1b82c7cabbc674dccc5904 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 10d82cfe5366d9756a1ef587ded186f646f0c834 Mon Sep 17 00:00:00 2001
+From bdf88901a30aee6aaf5f3f6d869c2ea8ebde0ebd 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
@@ -34,5 +34,5 @@ index 89e6ef5..ad320c2 100644
  
      }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,14 +1,14 @@
-From 3d192ba83e69c17fb5d9b21a9e30b0f1c72a4076 Mon Sep 17 00:00:00 2001
+From b62a77541e096a2f2f265d404adc1bd6a8b5bf17 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2e17397..f0f8cb2 100644
+index 4a4043e..c1c168a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -208,4 +208,9 @@ public class PaperConfig {
+@@ -200,4 +200,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
@@ -45,5 +45,5 @@ index 79d60a6..b807a3f 100644
  
      public double getMaxHealth() {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 471a920a25cd0d6f11228593543823c7a0b967a8 Mon Sep 17 00:00:00 2001
+From 20ec082afd5d349eee7bf6d5c7e2fa30ed605224 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 8ac7ec5..d5aed11 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From bec543d7b63fca82cd25dde00b15f8f631eb247f Mon Sep 17 00:00:00 2001
+From 694f9d8f5ef28f63522d63d422677147164f23b1 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 fcd0186..c9d48ac 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From c1334946dd4f272895db6244f2c3a453edf42916 Mon Sep 17 00:00:00 2001
+From 7815a7f52dd5b61a214ed564bf3aa586d2383f8c 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 24e61a8f91668f86b4113d87034bb68bbf65cecc Mon Sep 17 00:00:00 2001
+From bcff5421212a9cc6abcbc97a51794617060d5433 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 977583ad1bb17c4efb0d70b9c9516e7b248283ba Mon Sep 17 00:00:00 2001
+From a2e556037eb637dd250e998dc57b83e6618e9e56 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
@@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From b87a7a33be7a5198c4839566f7b13de67dc3a1a4 Mon Sep 17 00:00:00 2001
+From 047148112d1e51f5165c68449b3b84ef1146c4aa 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 e1cc3fd..a331888 100644
+index 232ba8e..fab8eb4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index e1cc3fd..a331888 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 8e4e9acbf0011264d6385b2b79b26726cff04415 Mon Sep 17 00:00:00 2001
+From 26da32e5e28a2611a881625cfb24d7190e337633 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

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

@@ -1,4 +1,4 @@
-From 329cc97ccf1645837c504b25c06fd42f7f06ee78 Mon Sep 17 00:00:00 2001
+From 11adf2a4659244e5bbb675c50b3516608b48a860 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
@@ -42,5 +42,5 @@ index 299cc91..9077696 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 65acc19909c2fccb23de55b6c1a11a6e61d1f17c Mon Sep 17 00:00:00 2001
+From d5594099e7d56ad2c0b61376bd58ad98359c851b 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
@@ -22,7 +22,7 @@ index b701e5e..d29f2a4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 60696ea..72a604a 100644
+index 54446aa..db71eef 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -431,7 +431,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -35,5 +35,5 @@ index 60696ea..72a604a 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0095-Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -1,4 +1,4 @@
-From af32c8a3329ffeab7d8d49f4ee952da1a917c2b2 Mon Sep 17 00:00:00 2001
+From 829bb30a29ee26ea339d2f531d8053acdb6a6ce7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -52,7 +52,7 @@ index 8603d83..704faa9 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bc55a2b..c7452d9 100644
+index 9118e4d..63e11aa 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -406,11 +406,26 @@ public class Chunk {
@@ -255,5 +255,5 @@ index a3bce9a..b683c3e 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 29da1473760184b2509d1dca0926be9cbf52a558 Mon Sep 17 00:00:00 2001
+From 15e946b55fd9b5ac3de05556f9be1cd875ca480b 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
@@ -27,5 +27,5 @@ index b7ac5f7..37cb17c 100644
              }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 3dcbfd6d24e6d06d0efc34c3150a5402a3813eed Mon Sep 17 00:00:00 2001
+From 9962daf76e84e4a612e7eb16a38022a93a9d5a92 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 558f80834dec489fa405e3cbe67c9d54cdb3c577 Mon Sep 17 00:00:00 2001
+From e00b889aae810de1bf509a3f407f8c42993668cc 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 704faa9..d6cc51b 100644
                              this.b.b = i;
                              this.b.c = j;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From d791d634713d7e261e2100d77e4b80edd40f74b2 Mon Sep 17 00:00:00 2001
+From cf650dfca5010124a180cee6604395233b5c2bf7 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 7474360dfd11de2dce0e701f7a0ea28ec251007c Mon Sep 17 00:00:00 2001
+From ba8c69221abe7ea03db5e311d97710c737807d88 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 b3edaee..ea0a145 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 70d03c83ecc34c518360084ab4a0e5e2ba5cec37 Mon Sep 17 00:00:00 2001
+From a665617ef7bb355cd7ca3ab6d21f0b136dbaa9ce 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
@@ -38,7 +38,7 @@ index b683c3e..0c7558f 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 72a604a..d448277 100644
+index db71eef..87abf7f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -33,6 +33,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 72a604a..d448277 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From fbe7a5ea13e1cebf44901f7561480ed2e78a06b9 Mon Sep 17 00:00:00 2001
+From 429e147d3bdd2f258f81059023ec3197ea0bb90e 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
@@ -25,5 +25,5 @@ index 0c7558f..a494569 100644
      }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From d8659025421b5fd8ab7fbb2a32fe39689d5d49f0 Mon Sep 17 00:00:00 2001
+From a5d07ebe4f66acd155172c044bc2cbbfbf0785e1 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
@@ -36,5 +36,5 @@ index 63e11aa..74ffa66 100644
  
      public void c(long i) {
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

Spigot-Server-Patches/0104-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From dc12e66c9b125599754adf9ad30cde24a3a63122 Mon Sep 17 00:00:00 2001
+From 11fe39b95d0d96d380cee15223eb4153a987f2ce 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 84d52cc4bf3b5ec096d1c29e0042ccfd83734aec Mon Sep 17 00:00:00 2001
+From e4cb01011a8eac5453584a41f68a05436b1e6f8c 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From e035cc22efde49cb0ce7a107bc992be863a6bd42 Mon Sep 17 00:00:00 2001
+From 7eb8cf7577ac2dfcca7744c89c9dfe883b5aa356 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
@@ -20,5 +20,5 @@ index 4438d83..9df7dfc 100644
              }
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From cdc7c47397def03707027d5f174d8ff691533397 Mon Sep 17 00:00:00 2001
+From d099ea7b5cb2c8828602a35a4195c14aa1911a3a 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.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 767ab4912331bac74784499d8dccb5f3db99ef6e Mon Sep 17 00:00:00 2001
+From 51ef59e61048ce1cf3722e0e58a2314a441ef011 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.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f0f8cb2..22c7dea 100644
+index c1c168a..d5ee3ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -213,4 +213,9 @@ public class PaperConfig {
+@@ -205,4 +205,9 @@ public class PaperConfig {
      private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }
@@ -77,5 +77,5 @@ index 2121e84..a7ab262 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 20dffc64e29b1d40122a76c32012992ea674346c Mon Sep 17 00:00:00 2001
+From 027f133012b8a6625b8188ad57a7a007a7c377db 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 15bef42..703aff1 100644
      // Paper end
  }
 -- 
-2.9.2.windows.1
+2.10.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 3b0df507ab8e1866e84440941a95d178563bfd08 Mon Sep 17 00:00:00 2001
+From 28ae278b19a3091b675ae90c7dfeb2eb220bf351 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
@@ -47,5 +47,5 @@ index 47968a8..1f5e6c0 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.9.2.windows.1
+2.10.0.windows.1