Add creative-arrow-despawn-rate (#1411)

* Add creative-arrow-despawn-rate

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

@@ -1,4 +1,4 @@
-From 6e22f788fdc7627d53014e39fc83e9810d82ab64 Mon Sep 17 00:00:00 2001
+From cc78b6a0a71a18db09dd96d40bf04cf330e84327 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
@@ -6,25 +6,31 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6f96627a2e..0de3007392 100644
+index f238394923..7b821ebf16 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -203,4 +203,13 @@ public class PaperWorldConfig {
+@@ -203,4 +203,19 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
 +
 +    public int nonPlayerArrowDespawnRate = -1;
++    public int creativeArrowDespawnRate = -1;
 +    private void nonPlayerArrowDespawnRate() {
 +        nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1);
 +        if (nonPlayerArrowDespawnRate == -1) {
 +            nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate;
 +        }
++        creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", -1);
++        if (creativeArrowDespawnRate == -1) {
++            creativeArrowDespawnRate = spigotConfig.arrowDespawnRate;
++        }
 +        log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
++        log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index b0f93d9cf5..c24225892f 100644
+index b0f93d9cf5..74cf2ab68a 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -262,7 +262,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -32,10 +38,10 @@ index b0f93d9cf5..c24225892f 100644
      protected void f() {
          ++this.despawnCounter;
 -        if (this.despawnCounter >= world.spigotConfig.arrowDespawnRate) { // Spigot
-+        if (this.despawnCounter >= (fromPlayer != PickupStatus.DISALLOWED ? world.spigotConfig.arrowDespawnRate : world.paperConfig.nonPlayerArrowDespawnRate)) { // Spigot // Paper
++        if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : world.spigotConfig.arrowDespawnRate))) { // Spigot // Paper
              this.die();
          }
  
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,16 +1,16 @@
-From 1371b24db386bfe8ce9a0cadbf71a118ad9bb4da Mon Sep 17 00:00:00 2001
+From c86319d3f6cbf3c5a98fc7a170fd396b450a7242 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0de3007392..b05277067a 100644
+index 7b821ebf16..e968a47b94 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -212,4 +212,12 @@ public class PaperWorldConfig {
-         }
+@@ -218,4 +218,12 @@ public class PaperWorldConfig {
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
+         log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
      }
 +
 +    public double skeleHorseSpawnChance;
@@ -22,7 +22,7 @@ index 0de3007392..b05277067a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1188184f13..253019d89b 100644
+index 2341ce3f93..a7cc053dc8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -497,7 +497,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -35,5 +35,5 @@ index 1188184f13..253019d89b 100644
                          if (flag2) {
                              EntityHorseSkeleton entityhorseskeleton = new EntityHorseSkeleton(this);
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,4 +1,4 @@
-From 15b4f830be7e3b1e668873ee8953aadf68439d4a Mon Sep 17 00:00:00 2001
+From 45f8d6d55123ad50df9f0f520b88ff7d73dca05a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f7be165301..59436c208a 100644
+index e968a47b94..85acc8f3d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -220,4 +220,9 @@ public class PaperWorldConfig {
+@@ -226,4 +226,9 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }

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

@@ -1,4 +1,4 @@
-From fadc3cb3c1ae9baacfdfdc169ed24262494175c2 Mon Sep 17 00:00:00 2001
+From 13ed84bb9522cd10db5a7e1b734e91c936396099 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
@@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 59436c208..d8447d9e7 100644
+index 85acc8f3d9..e15589d895 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -225,4 +225,9 @@ public class PaperWorldConfig {
+@@ -231,4 +231,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }
@@ -23,7 +23,7 @@ index 59436c208..d8447d9e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index dee1f7bfe..5390396d5 100644
+index a36034cc52..7e1a90d904 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1246,7 +1246,7 @@ public class Chunk implements IChunkAccess {
@@ -36,5 +36,5 @@ index dee1f7bfe..5390396d5 100644
  
      public void b(long i) {
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,14 +1,14 @@
-From 288d52655275ce5ae4920f64ee897a79a4f259a5 Mon Sep 17 00:00:00 2001
+From 9f37bceb59d944975abbd6ab74871f6a0557ce39 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f62faf81e7..ee38eb8e05 100644
+index e15589d895..4f62ace8e3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -230,4 +230,10 @@ public class PaperWorldConfig {
+@@ -236,4 +236,10 @@ public class PaperWorldConfig {
      private void useInhabitedTime() {
          useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
      }
@@ -32,5 +32,5 @@ index b0e08a3365..52ae980d37 100644
              if (!a((IWorldReader) world, blockposition)) {
                  // CraftBukkit start
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,4 +1,4 @@
-From ef6db01e38c5b89e29bae002e4e8f980f301630e Mon Sep 17 00:00:00 2001
+From 345e6dd3e24f72ba67a50d5f9b1aa5df0515bf10 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5af6e0c97..b50bc5bf0 100644
+index 4f62ace8e3..dd9a8c39ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -236,4 +236,10 @@ public class PaperWorldConfig {
+@@ -242,4 +242,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
@@ -21,7 +21,7 @@ index 5af6e0c97..b50bc5bf0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index abed6bb97..8056dc40d 100644
+index abed6bb977..8056dc40df 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -490,13 +490,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index abed6bb97..8056dc40d 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b8fcfb609..411cfedd2 100644
+index b8fcfb6092..411cfedd25 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2881,8 +2881,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -78,7 +78,7 @@ index b8fcfb609..411cfedd2 100644
  
      public LongSet ag() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d661f2e87..b1b541f99 100644
+index d661f2e873..b1b541f990 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -998,7 +998,7 @@ public final class CraftServer implements Server {
@@ -91,7 +91,7 @@ index d661f2e87..b1b541f99 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 ac44dfeef..50923951a 100644
+index ac44dfeefb..50923951a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1275,8 +1275,9 @@ public class CraftWorld implements World {

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

@@ -1,14 +1,14 @@
-From f7ea6691ae48aa986e588c9f792755ce6108854c Mon Sep 17 00:00:00 2001
+From e7db92bad31962c695798793e38f3e9f8c7ee24d 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b50bc5bf06..3628ddb4db 100644
+index dd9a8c39ac..8a76150cfb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -242,4 +242,9 @@ public class PaperWorldConfig {
+@@ -248,4 +248,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
@@ -52,5 +52,5 @@ index 35159bcd8f..ef585b741b 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,14 +1,14 @@
-From 20e4fb71f59a552f2df178ab805c5c911a76d2e2 Mon Sep 17 00:00:00 2001
+From 1ab2b13e9bb811664a92a4abe8fcc7d1de2c26aa 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3628ddb4db..df2863ce1b 100644
+index 8a76150cfb..1afc113e77 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -247,4 +247,14 @@ public class PaperWorldConfig {
+@@ -253,4 +253,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
@@ -51,5 +51,5 @@ index af6c744ad3..7bea86f52b 100644
      }
  
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,4 +1,4 @@
-From e3250da854818c3f910dbc641c51a86995c4df86 Mon Sep 17 00:00:00 2001
+From b435c276fbc0a0e2e04823cfdd5079bae5e2363d 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
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index df2863ce1b..c2c4e16d13 100644
+index 1afc113e77..3822a119b5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -257,4 +257,26 @@ public class PaperWorldConfig {
+@@ -263,4 +263,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
@@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3fc9568663..d070d68d7c 100644
+index 5e3a1094e8..eaec95bf54 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -69,6 +69,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -762,5 +762,5 @@ index f29365c948..1937f7b9a2 100644
  
      public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,11 +1,11 @@
-From 2e63969b601f0219ad563c9f8a062268f7339496 Mon Sep 17 00:00:00 2001
+From f702d1759f4030e80d0c44489b7c79daf7e7b69d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c2c4e16d13..f8102d9f07 100644
+index 3822a119b5..4b2dcfd1df 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index c2c4e16d13..f8102d9f07 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -279,4 +278,14 @@ public class PaperWorldConfig {
+@@ -285,4 +284,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -115,5 +115,5 @@ index 87f3205f82..8c1d25979f 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -1,4 +1,4 @@
-From b225523bd1ad1b5fe22d7e364806877b61493bac Mon Sep 17 00:00:00 2001
+From bda7b944cb74d3529dca2cc80ba08f60efe89abd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ab2568ffcb..8918bbf7da 100644
+index 4b2dcfd1df..62268d34d1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -288,4 +288,18 @@ public class PaperWorldConfig {
+@@ -294,4 +294,18 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }

Spigot-Server-Patches/0136-Auto-Save-Improvements.patch

@@ -1,4 +1,4 @@
-From dff8b771c79b65f0225427e0fa0ca4d6f9c38feb Mon Sep 17 00:00:00 2001
+From fef201ed700ee4c30c8b2bb8aded0e6cca9e076b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -32,7 +32,7 @@ index aa0e3c757d..c1845d6811 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8918bbf7da..015d7fcb5c 100644
+index 62268d34d1..2399777c5e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -43,7 +43,7 @@ index 8918bbf7da..015d7fcb5c 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -302,4 +303,19 @@ public class PaperWorldConfig {
+@@ -308,4 +309,19 @@ public class PaperWorldConfig {
      private void skipEntityTickingInChunksScheduledForUnload() {
          skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
      }

Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch

@@ -1,14 +1,14 @@
-From 35c2cb8cce2e2a3c698ccd62abd90ef8aff04f1d Mon Sep 17 00:00:00 2001
+From 23e5004aa94503a3c9c221f734665887bc066eab Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 015d7fcb5c..9ee62da233 100644
+index 2399777c5e..d9f5ead011 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -318,4 +318,9 @@ public class PaperWorldConfig {
+@@ -324,4 +324,9 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }

Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch

@@ -1,4 +1,4 @@
-From b6fecf06db9aee33bb51e92efde67fd42ae5e0a2 Mon Sep 17 00:00:00 2001
+From c971a6e41bce603b22ca19f912e833b0fd0cce9d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,10 +7,10 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 79260172d9..381edf3e7d 100644
+index d9f5ead011..656ecdacaf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -319,6 +319,11 @@ public class PaperWorldConfig {
+@@ -325,6 +325,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -23,7 +23,7 @@ index 79260172d9..381edf3e7d 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7a972f4187..87744dcbfc 100644
+index a35eac043c..8acbd7bbff 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -234,6 +234,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -41,7 +41,7 @@ index 7a972f4187..87744dcbfc 100644
                  Chunk chunk = (Chunk) objectiterator.next();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 8e14f8c56c..2415404d69 100644
+index d40d9d1173..fc8f7574cf 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -148,6 +148,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -54,5 +54,5 @@ index 8e14f8c56c..2415404d69 100644
      @Nullable
      public Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0146-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch

@@ -1,11 +1,11 @@
-From efbd648ee65d57802a55f2fac78a344b3481f6e4 Mon Sep 17 00:00:00 2001
+From 8e423517ffae206c332d3a4874b324b9eae5fdfe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 381edf3e7d..c22afafd6a 100644
+index 656ecdacaf..2c7e6de02f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 381edf3e7d..c22afafd6a 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -328,4 +329,12 @@ public class PaperWorldConfig {
+@@ -334,4 +335,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
@@ -50,5 +50,5 @@ index 1fb912eb0d..3c3f82f987 100644
          if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
              this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0156-Configurable-Cartographer-Treasure-Maps.patch

@@ -1,4 +1,4 @@
-From 32fc8af4147db608136cb5c17b981e1e52693321 Mon Sep 17 00:00:00 2001
+From a42354725a30e777b61bd15f1f4fcc16297aed7f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c22afafd6a..391cdd2fa5 100644
+index 2c7e6de02f..a2af13185f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -337,4 +337,14 @@ public class PaperWorldConfig {
+@@ -343,4 +343,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
@@ -28,7 +28,7 @@ index c22afafd6a..391cdd2fa5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 10921c1cbc..0227196f1e 100644
+index 5aebdba56c..f03092f4d1 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -755,6 +755,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -40,5 +40,5 @@ index 10921c1cbc..0227196f1e 100644
  
              if (blockposition != null) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0172-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From 86e687c7ca2075a8210a77b978808f3e69ad5577 Mon Sep 17 00:00:00 2001
+From 90dee31ba9876459c1cc38a82bdd30d0e6900b6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 391cdd2fa..892345452 100644
+index a2af13185f..b3a0be0f79 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -347,4 +347,10 @@ public class PaperWorldConfig {
+@@ -353,4 +353,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -27,7 +27,7 @@ index 391cdd2fa..892345452 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f3422a097..11dd946b4 100644
+index f3422a097b..11dd946b44 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index f3422a097..11dd946b4 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 398ad151a..d926cbb24 100644
+index 398ad151a0..d926cbb247 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2357,8 +2357,11 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -1,4 +1,4 @@
-From e62bc03a0b8b6195c0dd66807a67c4132544d034 Mon Sep 17 00:00:00 2001
+From 9c43deb3a346ab36c9cc6c8666a79f71d5ee4682 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 89234545..0094f6ab 100644
+index b3a0be0f79..fe0ee64db1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -353,4 +353,10 @@ public class PaperWorldConfig {
+@@ -359,4 +359,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
@@ -26,7 +26,7 @@ index 89234545..0094f6ab 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ad9e7f7b..0f00eece 100644
+index ad9e7f7b54..0f00eecead 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -469,7 +469,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index ad9e7f7b..0f00eece 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e09f2f5b..8c7428c0 100644
+index e09f2f5b5f..8c7428c087 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1757,6 +1757,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -57,5 +57,5 @@ index e09f2f5b..8c7428c0 100644
  
          case STOP_SNEAKING:
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0182-provide-a-configurable-option-to-disable-creeper-lin.patch

@@ -1,4 +1,4 @@
-From c208f44b0480efebfb3d00395fa57e0c495adef4 Mon Sep 17 00:00:00 2001
+From 860a7627983af59336b514e3a6c19845d333ebe0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0094f6ab98..22af662ff3 100644
+index fe0ee64db1..7e5c710e1f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -359,4 +359,10 @@ public class PaperWorldConfig {
+@@ -365,4 +365,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
@@ -34,5 +34,5 @@ index a1c343d77b..765123e3d2 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0215-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,14 +1,14 @@
-From 4dcc46cb2f4f833fe2302e954c6b7e6a2ce41de4 Mon Sep 17 00:00:00 2001
+From a1c9725335b68ff009238b5e1f3be7a1e9448b71 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 22af662ff3..9864c95a8c 100644
+index 7e5c710e1f..35bef53358 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -365,4 +365,10 @@ public class PaperWorldConfig {
+@@ -371,4 +371,10 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }

Spigot-Server-Patches/0225-Configurable-Chunks-Sends-per-Tick-setting.patch

@@ -1,4 +1,4 @@
-From dec1c132081c3fd428f8ed46608cb15b011bac51 Mon Sep 17 00:00:00 2001
+From dc86831d4aa4d9e67856f02dec39e20d82522ffd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,10 +8,10 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9864c95a8c..9188e49b71 100644
+index 35bef53358..128ec7260a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -371,4 +371,13 @@ public class PaperWorldConfig {
+@@ -377,4 +377,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
@@ -26,7 +26,7 @@ index 9864c95a8c..9188e49b71 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index bfe2d03a57..9fd07f8596 100644
+index 395b5a470f..54f31349e9 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -172,7 +172,7 @@ public class PlayerChunkMap {
@@ -39,5 +39,5 @@ index bfe2d03a57..9fd07f8596 100644
              Iterator iterator2 = this.g.iterator();
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0226-Configurable-Max-Chunk-Gens-per-Tick.patch

@@ -1,4 +1,4 @@
-From d687cd8f13cfca085b63b6e13c73ecf1f97d2998 Mon Sep 17 00:00:00 2001
+From ff9c3cccf23d85361f76ea3db31453532137959f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,10 +13,10 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9188e49b71..a225b55853 100644
+index 128ec7260a..91ae634edd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -380,4 +380,15 @@ public class PaperWorldConfig {
+@@ -386,4 +386,15 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }
@@ -53,7 +53,7 @@ index 3f4a8f21c0..f8d8a44a88 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9fd07f8596..e29aaab2da 100644
+index 54f31349e9..d1a443ca8d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -140,6 +140,7 @@ public class PlayerChunkMap {
@@ -107,5 +107,5 @@ index 193c3621c6..cf1258c559 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0227-Make-max-squid-spawn-height-configurable.patch

@@ -1,4 +1,4 @@
-From 86f848b087c521ba4d031265f069657002f6b29f Mon Sep 17 00:00:00 2001
+From 0f811d854e26ae92eaf96b9be96a31844bfca523 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a225b55853..63f8f566cb 100644
+index 91ae634edd..6623a22c3d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -391,4 +391,9 @@ public class PaperWorldConfig {
+@@ -397,4 +397,9 @@ public class PaperWorldConfig {
              log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
          }
      }
@@ -37,5 +37,5 @@ index 5d7d0b6910..2dfa794a3f 100644
  
      public void c(float f, float f1, float f2) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0253-Configurable-sprint-interruption-on-attack.patch

@@ -1,4 +1,4 @@
-From 04010471fd6283265d586eb38347d7a4abbe8b88 Mon Sep 17 00:00:00 2001
+From be3db1127c4662fe631b1430e78f6452aeabac3b Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c9a44863..9ff73d53 100644
+index a0a1435249..eb0f8b0b33 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -401,4 +401,9 @@ public class PaperWorldConfig {
+@@ -407,4 +407,9 @@ public class PaperWorldConfig {
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
@@ -20,7 +20,7 @@ index c9a44863..9ff73d53 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5975578b..5e13cb06 100644
+index 5975578b38..5e13cb0640 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1088,7 +1088,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index 5975578b..5e13cb06 100644
  
                          if (flag3) {
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0257-Block-Enderpearl-Travel-Exploit.patch

@@ -1,4 +1,4 @@
-From cd1da8ec0aaa537d101490c3713e2c21b09682b8 Mon Sep 17 00:00:00 2001
+From 1a1a27d62f8316a31d8f0ebff482451b0122a750 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9ff73d531c..16e601f7e9 100644
+index eb0f8b0b33..df6ade40c8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -406,4 +406,10 @@ public class PaperWorldConfig {
+@@ -412,4 +412,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
@@ -39,5 +39,5 @@ index fc8c0cab55..dd8af4be80 100644
      }
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0272-Make-shield-blocking-delay-configurable.patch

@@ -1,14 +1,14 @@
-From c546b639b151d6b6137f0a838ee210b339fdd0de Mon Sep 17 00:00:00 2001
+From d47df5ff77a58c85e2c6176b8366bd1ed215a50e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 16e601f7e..2e3e48637 100644
+index df6ade40c8..08e8062c93 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -412,4 +412,9 @@ public class PaperWorldConfig {
+@@ -418,4 +418,9 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
@@ -19,7 +19,7 @@ index 16e601f7e..2e3e48637 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f5770884b..566f6e3a6 100644
+index f5770884b0..566f6e3a6a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2703,7 +2703,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,7 +49,7 @@ index f5770884b..566f6e3a6 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9acafadbb..a09cd0240 100644
+index 9acafadbbf..a09cd02403 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -533,5 +533,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

Spigot-Server-Patches/0282-Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -1,14 +1,14 @@
-From 265868945184568370507db8a877ef1ec7a987d3 Mon Sep 17 00:00:00 2001
+From 17fceb5202344b1f2a3759e757d7432e90eb9664 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2e3e48637a..8724c2816b 100644
+index 08e8062c93..e806cc1671 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -417,4 +417,9 @@ public class PaperWorldConfig {
+@@ -423,4 +423,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
@@ -63,5 +63,5 @@ index 96e920ead8..e083ea483a 100644
  
          for(EntityPlayer entityplayer1 : hashset1) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0286-Configurable-Bed-Search-Radius.patch

@@ -1,4 +1,4 @@
-From a6ee93a38a6a034c6b4b2b2ae4ecf4a3f2c70143 Mon Sep 17 00:00:00 2001
+From 98aea8bd07cb91cc8c2fec14401516da32b26cdb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8724c2816b..fb2467636a 100644
+index e806cc1671..acdff6b20a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -422,4 +422,15 @@ public class PaperWorldConfig {
+@@ -428,4 +428,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
@@ -101,5 +101,5 @@ index 4f97ff6f18..230c05ff07 100644
          return iblockaccess.getType(blockposition.down()).q() && !iblockaccess.getType(blockposition).getMaterial().isBuildable() && !iblockaccess.getType(blockposition.up()).getMaterial().isBuildable();
      }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From c6da84012c3f0a1403467ae6f87959436d5906cb Mon Sep 17 00:00:00 2001
+From 1b11c65966aa0ba8ac0d9c18c7cf1f87a3e16e37 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 01670da006..6a3d92e742 100644
+index acdff6b20a..abd60fe844 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -433,4 +433,47 @@ public class PaperWorldConfig {
+@@ -439,4 +439,47 @@ public class PaperWorldConfig {
              log("Bed Search Radius: " + bedSearchRadius);
          }
      }

Spigot-Server-Patches/0304-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -1,14 +1,14 @@
-From 242b6374788a22103f044df633362fa680011ee3 Mon Sep 17 00:00:00 2001
+From d64ee7315bb5fab2c104860441b804b7b96a8f9d Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3aa6f031f3..58f87794d6 100644
+index abd60fe844..01bad73690 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -353,6 +353,11 @@ public class PaperWorldConfig {
+@@ -359,6 +359,11 @@ public class PaperWorldConfig {
          }
      }
  

Spigot-Server-Patches/0334-Allow-disabling-armour-stand-ticking.patch

@@ -1,14 +1,14 @@
-From 2e26c681872c7a75274d912ea43d844faf0c39bc Mon Sep 17 00:00:00 2001
+From b9b3308e2e4b1558df9ad01f77f0ac0264161b8f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 58f87794d6..06c949ef06 100644
+index 01bad73690..65108dd3a4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -481,4 +481,10 @@ public class PaperWorldConfig {
+@@ -487,4 +487,10 @@ public class PaperWorldConfig {
                  break;
          }
      }
@@ -68,5 +68,5 @@ index 9f5c3b92e3..07ce93f17c 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0340-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 961790f1215deed4f84868d2d0c9d42267f341cc Mon Sep 17 00:00:00 2001
+From 0894620915a32a8197efd7a79b421436e584d209 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,10 +11,10 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 06c949ef06..19f4c61cdc 100644
+index 65108dd3a4..7b479cb019 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -407,6 +407,15 @@ public class PaperWorldConfig {
+@@ -413,6 +413,15 @@ public class PaperWorldConfig {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
  

Spigot-Server-Patches/0346-Anti-Xray.patch

@@ -1,11 +1,11 @@
-From a69c54d35c9703273e6d903e3d543fb7f89d85a7 Mon Sep 17 00:00:00 2001
+From d3b5ed9a5b20b89e0e0787f9851c384b2ce6fae0 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5fddb11774..bafc43f83c 100644
+index 7b479cb019..b6542fec41 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,10 @@
@@ -19,7 +19,7 @@ index 5fddb11774..bafc43f83c 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -496,4 +499,27 @@ public class PaperWorldConfig {
+@@ -502,4 +505,27 @@ public class PaperWorldConfig {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
          log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }

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

@@ -1,14 +1,14 @@
-From f6bd802467ab06a881f604a02270f992fb5d5bac Mon Sep 17 00:00:00 2001
+From c09079953d5a37bee728718bdcf58b06e30edb23 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3acb1ff9fd..24f353d6fc 100644
+index b6542fec41..4964607cbc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -451,6 +451,12 @@ public class PaperWorldConfig {
+@@ -457,6 +457,12 @@ public class PaperWorldConfig {
          }
      }
  
@@ -64,5 +64,5 @@ index 5346eaa348..ec77cbd57e 100644
  
      }
 -- 
-2.18.0
+2.19.0