diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index 5c09353eb6..3b2095bca6 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,21 +1,22 @@
-From 49b42c949cd1c28bcf4fb9ff73e86810e4ed5d90 Mon Sep 17 00:00:00 2001
+From f7b834bdab10e17a64f8bc34a000dd44ce295b40 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ed58f4bb..6eddceb06 100644
+index 1ed58f4bb..a797a5767 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -124,4 +124,18 @@ public class PaperWorldConfig {
+@@ -124,4 +124,19 @@ public class PaperWorldConfig {
          if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
          if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
      }
 +
 +    public int netherVoidTopDamageHeight;
++    public boolean doNetherTopVoidDamage() { return netherVoidTopDamageHeight > 0; }
 +    private void netherVoidTopDamageHeight() {
-+        netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 128);
++        netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 0);
 +        log("Top of the nether void damage height: " + netherVoidTopDamageHeight);
 +
 +        if (PaperConfig.version < 18) {
@@ -28,7 +29,7 @@ index 1ed58f4bb..6eddceb06 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bff44d535..040ecb2c1 100644
+index bff44d535..6804b7274 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,13 +48,16 @@ index bff44d535..040ecb2c1 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -473,6 +479,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -473,6 +479,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.world.methodProfiler.exit();
      }
  
 +    // Paper start
 +    protected void performVoidDamage() {
-+        if (this.locY < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
++        if (this.locY < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
++            && world.paperConfig.doNetherTopVoidDamage()
++            && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
++
 +            this.doVoidDamage();
 +        }
 +    }
@@ -62,7 +66,7 @@ index bff44d535..040ecb2c1 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -540,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -540,6 +557,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch
index 0a7fa21e4d..b45f9b28b0 100644
--- a/Spigot-Server-Patches/0028-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 9176d0600774732f414a30b9b30dac85e40eb83e Mon Sep 17 00:00:00 2001
+From 547543692e3fbff83ee3fc2e930fefdebe974113 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -28,7 +28,7 @@ index 145cb274b..eff9dcf54 100644
  
      public static Timing getTickList(WorldServer worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1256a0d58..2c97c6533 100644
+index 7691409f6..cfcc24467 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -191,6 +191,13 @@ public class PaperConfig {
@@ -46,10 +46,10 @@ index 1256a0d58..2c97c6533 100644
          boolean timings = getBoolean("timings.enabled", true);
          boolean verboseTimings = getBoolean("timings.verbose", true);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6eddceb06..28b852b46 100644
+index a797a5767..59d82fa4f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -138,4 +138,12 @@ public class PaperWorldConfig {
+@@ -139,4 +139,12 @@ public class PaperWorldConfig {
              }
          }
      }
diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
index fcfbc6ae74..32b66e7cfb 100644
--- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
@@ -1,14 +1,14 @@
-From e6867b527d0832f9eb00c8ce1ebee5af5061d9e8 Mon Sep 17 00:00:00 2001
+From 17bb8cb79a49ccbe456823a7318af6d6018b9453 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 28b852b46..36e49616c 100644
+index 59d82fa4f..012182378 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -146,4 +146,10 @@ public class PaperWorldConfig {
+@@ -147,4 +147,10 @@ public class PaperWorldConfig {
          log("Warning: This feature may help reduce TPS loss from light, but comes at the cost of buggy light data");
          log("We are working to improve this feature.");
      }
diff --git a/Spigot-Server-Patches/0031-Optimize-explosions.patch b/Spigot-Server-Patches/0031-Optimize-explosions.patch
index 8a35c39e08..fbaed060f3 100644
--- a/Spigot-Server-Patches/0031-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0031-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 07e0df3b6a6c5fdfa93103063d46cdbd75e332fb Mon Sep 17 00:00:00 2001
+From 76f17072927f08a5f8157937ae7546aee879754b 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
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 36e49616c..a65db0b06 100644
+index 012182378..a39451c69 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -152,4 +152,10 @@ public class PaperWorldConfig {
+@@ -153,4 +153,10 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
diff --git a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
index 1aaa891aee..b5754b05a1 100644
--- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
@@ -1,14 +1,14 @@
-From b3bc616303f9056349c6fde2750423e31269408a Mon Sep 17 00:00:00 2001
+From 9c6c3d95e82c1e6e446e14bf31504388fcbc6403 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a65db0b06..75d8c35be 100644
+index a39451c69..65a99b2a4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -158,4 +158,9 @@ public class PaperWorldConfig {
+@@ -159,4 +159,9 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch
index f8a8dcacaf..b2d9219a11 100644
--- a/Spigot-Server-Patches/0034-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0034-Disable-thunder.patch
@@ -1,14 +1,14 @@
-From 65f4b512b23c376d4cea51508f5d096041028ddb Mon Sep 17 00:00:00 2001
+From 1988234e00e21b0bb7ac4b5ce6b91f6c4f95828a 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 75d8c35be..7010102eb 100644
+index 65a99b2a4..0ba604ffc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -163,4 +163,9 @@ public class PaperWorldConfig {
+@@ -164,4 +164,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
index 9ddd5fedb2..96e0ec40d7 100644
--- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
@@ -1,14 +1,14 @@
-From bd37e8da13d6647b94ad07f9b585f0c63e8c01aa Mon Sep 17 00:00:00 2001
+From b5f0de38c2e522d97fa115f456ff2e1c7c956fe0 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7010102eb..65c5cfd3a 100644
+index 0ba604ffc..8b3c7b05c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -168,4 +168,9 @@ public class PaperWorldConfig {
+@@ -169,4 +169,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
diff --git a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
index c77189c903..f308010efc 100644
--- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
@@ -1,14 +1,14 @@
-From d74aa86834e98f074ccff5dbeb29fcbd1b2871b7 Mon Sep 17 00:00:00 2001
+From cce68ac47a1a79807f128345cbdad59a734d56d0 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 65c5cfd3a..92abe7f7e 100644
+index 8b3c7b05c..7c16ec997 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -173,4 +173,9 @@ public class PaperWorldConfig {
+@@ -174,4 +174,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
index fa83c33cc1..4d089c1367 100644
--- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
@@ -1,14 +1,14 @@
-From f1f33913c393a123fdb82cf71b44d56408c43bb1 Mon Sep 17 00:00:00 2001
+From 1db25ac54ccde81938bb34496f242edb1f50a4ef 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92abe7f7e..ae2f73aa2 100644
+index 7c16ec997..4266a87fe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -178,4 +178,9 @@ public class PaperWorldConfig {
+@@ -179,4 +179,9 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
diff --git a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
index c78649e6d3..8e718889d0 100644
--- a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
@@ -1,4 +1,4 @@
-From ab040271bb86e9e0038f4d57874a6312f859ad1f Mon Sep 17 00:00:00 2001
+From d1f74537965b0b0d5e0ddd63e619874823c424ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Configurable Disabling Cat Chest Detection
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
 Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ae2f73aa2..e5ee61378 100644
+index 4266a87fe..4641eaf2f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -183,4 +183,9 @@ public class PaperWorldConfig {
+@@ -184,4 +184,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
diff --git a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
index ed6bff2c9c..ecb1dafc4e 100644
--- a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,14 +1,14 @@
-From 3d2a3723f7c468c1892681d8de31b54d7e3a08e0 Mon Sep 17 00:00:00 2001
+From 9b67bd34da01401d30a699411b346805a95c9078 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e5ee61378..f5cb4b420 100644
+index 4641eaf2f..05d2d50e5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -188,4 +188,9 @@ public class PaperWorldConfig {
+@@ -189,4 +189,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
diff --git a/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch
index 8b1fdc0546..9b66d6b700 100644
--- a/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch
@@ -1,14 +1,14 @@
-From ebaf3a76307fdfa3cd578975fea4c4ceea824cde Mon Sep 17 00:00:00 2001
+From 943089e6e5db3579fee6d6cd09d4e3f45badf674 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f5cb4b420..59a58dc79 100644
+index 05d2d50e5..313712878 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -193,4 +193,9 @@ public class PaperWorldConfig {
+@@ -194,4 +194,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
diff --git a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
index 7706c54198..071bad28fd 100644
--- a/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From ac9279f204c594830e8f85715fcb866d5dcca814 Mon Sep 17 00:00:00 2001
+From c921194576a702ea41d47779f04f9c45524938d7 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 59a58dc79..3966d2c9c 100644
+index 313712878..40b54191e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -198,4 +198,9 @@ public class PaperWorldConfig {
+@@ -199,4 +199,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
diff --git a/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch
index 911f6be32b..225a03e57e 100644
--- a/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 848925762955d0e0a15e644ef5d4d4e58596acd7 Mon Sep 17 00:00:00 2001
+From c3260d4f2c1b5ac0248ce1533cec3b2a6a74e550 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
@@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3966d2c9c..932cae2f9 100644
+index 40b54191e..06417c825 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -203,4 +203,9 @@ public class PaperWorldConfig {
+@@ -204,4 +204,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -25,10 +25,10 @@ index 3966d2c9c..932cae2f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 040ecb2c1..24e0fc3c5 100644
+index 6804b7274..86ea3f518 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2261,6 +2261,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
diff --git a/Spigot-Server-Patches/0066-Undead-horse-leashing.patch b/Spigot-Server-Patches/0066-Undead-horse-leashing.patch
index e488932bea..b306d6700a 100644
--- a/Spigot-Server-Patches/0066-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0066-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 3b5748f2fb9a7a1562bb861705fb5636b010e783 Mon Sep 17 00:00:00 2001
+From 93e3d5e47501589140e29792fdd123027b3f8921 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 932cae2f9..a9739bcb4 100644
+index 06417c825..66243835a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -208,4 +208,9 @@ public class PaperWorldConfig {
+@@ -209,4 +209,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
diff --git a/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 53cbbcff6f..ed561ca5a8 100644
--- a/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From c3270fd2c5b1010fe2857dea35a4030c4f414baf Mon Sep 17 00:00:00 2001
+From 25571b96ef3f25aed15ba39f10aaa8d012538cdf 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,10 +6,10 @@ 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 a9739bcb4..f248983a9 100644
+index 66243835a..803e68089 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -213,4 +213,19 @@ public class PaperWorldConfig {
+@@ -214,4 +214,19 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
diff --git a/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch
index 16032101bd..6912f02f3d 100644
--- a/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 6bf9bcfab1a26cd84e99700cbbb5204b607685e4 Mon Sep 17 00:00:00 2001
+From 9204f21b38dd0ddebe4bf14a00cf2b708b9544a3 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
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a66e5c5543..e87b6b8c1a 100644
+index 3584161c4..01d88ce66 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2576,7 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2579,7 +2579,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
@@ -20,5 +20,5 @@ index a66e5c5543..e87b6b8c1a 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              DimensionManager dimensionmanager = worldserver1.dimension;
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch
index 08260a82af..ed07f8bad1 100644
--- a/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,14 +1,14 @@
-From d242e85eac2dc3db23322ecbcf0986880268570f Mon Sep 17 00:00:00 2001
+From 270807a1f8c7638d0a365fee70ece496a2c64869 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 f248983a9..e41502da2 100644
+index 803e68089..be380ac75 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -228,4 +228,12 @@ public class PaperWorldConfig {
+@@ -229,4 +229,12 @@ public class PaperWorldConfig {
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
          log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
      }
diff --git a/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch
index 1c2ace6147..bdf4c4ca4a 100644
--- a/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch
+++ b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch
@@ -1,4 +1,4 @@
-From b27903c8e28cfe0ddfad2374bb47fa43d2fe30c4 Mon Sep 17 00:00:00 2001
+From 77d354aa2dbabcd0cdbeb77d8063789978bdf230 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 Time
@@ -11,10 +11,10 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e41502da2..ec76f7b80 100644
+index be380ac75..69ac43d9a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -236,4 +236,19 @@ public class PaperWorldConfig {
+@@ -237,4 +237,19 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }
diff --git a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
index c6561f891c..068c177278 100644
--- a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,14 +1,14 @@
-From 2a1104785a4c3ccb13bb94cfe0c0985ce40c9b87 Mon Sep 17 00:00:00 2001
+From 55159254602789dd514a44b22bd38ef503ce4ae2 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 ec76f7b80..d190e5228 100644
+index 69ac43d9a..6b74f810a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -251,4 +251,10 @@ public class PaperWorldConfig {
+@@ -252,4 +252,10 @@ public class PaperWorldConfig {
          }
          fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
      }
diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 9978c063dd..a00daf6799 100644
--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From cd9e9e53a805dc38a57d7f7dfcb939e2edc2f8b9 Mon Sep 17 00:00:00 2001
+From ea660ab24b09540762357d57efda9b08db4da6be 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 d190e5228..cd8ee8df8 100644
+index 6b74f810a..260c55016 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -257,4 +257,10 @@ public class PaperWorldConfig {
+@@ -258,4 +258,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
diff --git a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index e36d10e765..7cb12d27bf 100644
--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 9563128427dbd5b90e4e42fe14d63228bfc5736d Mon Sep 17 00:00:00 2001
+From 37a67d8562ace9e45671aa956335bb24ee186c5d 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
@@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves 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 cd8ee8df8..071c7d062 100644
+index 260c55016..37cc057ab 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -263,4 +263,9 @@ public class PaperWorldConfig {
+@@ -264,4 +264,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
diff --git a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
index adaa0f5b94..ddf49cb148 100644
--- a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,14 +1,14 @@
-From 3a8c3fdcb86526df441d14e78ba2889b194f64e5 Mon Sep 17 00:00:00 2001
+From 05b1b8e004565cb788aff3ca7297dce8a582107b 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 071c7d062..f1c8f1ead 100644
+index 37cc057ab..52a6ff855 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -268,4 +268,14 @@ public class PaperWorldConfig {
+@@ -269,4 +269,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
diff --git a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
index f0e9bb4023..78545e8a90 100644
--- a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 8b08f2e1799a2e91fdb2b4028353d1ed8bd3eb69 Mon Sep 17 00:00:00 2001
+From 3ab046e2a34ea4d6e6d88080954337985c19e1ca 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 f1c8f1ead..fa9c733a3 100644
+index 52a6ff855..720b87a5e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -278,4 +278,26 @@ public class PaperWorldConfig {
+@@ -279,4 +279,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 000000000..d50410532
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 00f2b2a63..b771644d5 100644
+index 01d88ce66..6c7043023 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
index 2446e533e2..8784a63bdf 100644
--- a/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 06835ff658a91c3e94a1f43d6bcd64bdf200a253 Mon Sep 17 00:00:00 2001
+From 5ed6d63e100f8b293b5e2573bf2b6c5d595825bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index dfd7496c7c..052e11606d 100644
+index bc364ce37..80e13dfb2 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -387,6 +387,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -22,10 +22,10 @@ index dfd7496c7c..052e11606d 100644
              return new BlockPosition(this);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c7737b068b..d004f7e620 100644
+index a091f88bb..3e292c231 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -589,6 +589,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -592,6 +592,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.recalcPosition();
          } else {
              if (enummovetype == EnumMoveType.PISTON) {
@@ -34,7 +34,7 @@ index c7737b068b..d004f7e620 100644
  
                  if (i != this.aM) {
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 20b7c2c6dc..d659c57dbe 100644
+index 20b7c2c6d..d659c57db 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -46,7 +46,7 @@ index 20b7c2c6dc..d659c57dbe 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e5322de974..c530824596 100644
+index e5322de97..c53082459 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -105,6 +105,17 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -68,7 +68,7 @@ index e5322de974..c530824596 100644
          return this.moveController;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fe1c5a49ba..f58ebe3c23 100644
+index e8f2f11c4..c0ef0c51f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
@@ -81,7 +81,7 @@ index fe1c5a49ba..f58ebe3c23 100644
      protected int ticksFarFromPlayer;
      protected float aZ;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index b19bd2b99a..5e19768710 100644
+index b19bd2b99..5e1976871 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -93,7 +93,7 @@ index b19bd2b99a..5e19768710 100644
          return this.bQ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index a146a8b459..a19853463c 100644
+index a146a8b45..a19853463 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -109,7 +109,7 @@ index a146a8b459..a19853463c 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index d5c08aa7cb..756d63239c 100644
+index d5c08aa7c..756d63239 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,12 +2,12 @@ package net.minecraft.server;
@@ -150,7 +150,7 @@ index d5c08aa7cb..756d63239c 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index f3df91181f..3e2f9c749b 100644
+index f3df91181..3e2f9c749 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -11,10 +11,10 @@ public class PathfinderGoalSelector {
@@ -189,7 +189,7 @@ index f3df91181f..3e2f9c749b 100644
          Iterator iterator = this.b.iterator();
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 09df00e94b..d08ef3fe10 100644
+index 09df00e94..d08ef3fe1 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
@@ -387,7 +387,7 @@ index 09df00e94b..d08ef3fe10 100644
          {
              isActive = false;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index d3c2abc398..1d222eaff7 100644
+index d3c2abc39..1d222eaff 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -150,12 +150,14 @@ public class SpigotWorldConfig
@@ -406,5 +406,5 @@ index d3c2abc398..1d222eaff7 100644
          log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );
      }
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
index fd110b43e1..5c90de1246 100644
--- a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From dd6bf1ec82b0224859c167344b62dc986e209251 Mon Sep 17 00:00:00 2001
+From 8c6bf6b19ba3fbbe21a1d98cec46c93bb9ca8f0d 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 fa9c733a3..ff69f3927 100644
+index 720b87a5e..bcc2ecaa3 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 fa9c733a3..ff69f3927 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -300,4 +299,14 @@ public class PaperWorldConfig {
+@@ -301,4 +300,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -32,10 +32,10 @@ index fa9c733a3..ff69f3927 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 182f6903d..828d61e6e 100644
+index 3e292c231..31c53552f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1187,6 +1187,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1190,6 +1190,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean aq() {
@@ -48,7 +48,7 @@ index 182f6903d..828d61e6e 100644
          return this.isInWater() || this.q();
      }
  
-@@ -2738,6 +2744,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2741,6 +2747,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bw() {
diff --git a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 84cbd03a7e..95f074a1ca 100644
--- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From d42ea19198de063d55931d90612c1c322922a5b2 Mon Sep 17 00:00:00 2001
+From d8326d25da4180c98e1ef31864b813237a5351d7 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
@@ -20,10 +20,10 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
 a spare chunk is added to the server thats outside of view distance.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ff69f3927..914b9410c 100644
+index bcc2ecaa3..c70771614 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -309,4 +309,18 @@ public class PaperWorldConfig {
+@@ -310,4 +310,18 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
diff --git a/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
index 7016e3ec51..5edde3a1b2 100644
--- a/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From e34aa064d327e08c4e2f4eacc0ec281f3f3d0da3 Mon Sep 17 00:00:00 2001
+From 1c1f11c91cfa610479809bda5f00f4d6c5dc25bf 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
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4e07ab0fe..a4853e04b 100644
+index fb7ada813..17b4e01aa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -269,4 +269,15 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 4e07ab0fe..a4853e04b 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 914b9410c..cf3f6cb65 100644
+index c70771614..6e28410c3 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 914b9410c..cf3f6cb65 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -323,4 +324,19 @@ public class PaperWorldConfig {
+@@ -324,4 +325,19 @@ public class PaperWorldConfig {
      private void skipEntityTickingInChunksScheduledForUnload() {
          skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
      }
diff --git a/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
index 43a19cc187..03f7caf37d 100644
--- a/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
@@ -1,14 +1,14 @@
-From 6a9a7fe58a449fbd511ebdfa7cf1dfaba32440ee Mon Sep 17 00:00:00 2001
+From 525caab8efebfe0c3a2e0130f7b40d6823a83d41 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 cf3f6cb65..7711431db 100644
+index 6e28410c3..7e847af00 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -339,4 +339,9 @@ public class PaperWorldConfig {
+@@ -340,4 +340,9 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
diff --git a/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 7e0a559a89..f29cf4455c 100644
--- a/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 099d0cd62bcfc918434472e15bcc545dd8d35e0c Mon Sep 17 00:00:00 2001
+From c6aae818d76a353a6ad830f8970370d2f0661085 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 7711431db..83a284505 100644
+index 7e847af00..9829b3b64 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -340,6 +340,11 @@ public class PaperWorldConfig {
+@@ -341,6 +341,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
diff --git a/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index d46586fadb..4ace76a08e 100644
--- a/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From 5006c24c2036139dc05c789ba184dc83722cbd2e Mon Sep 17 00:00:00 2001
+From cb5197c80105b6f86294986d21c162f9e23a39cf 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 83a284505..1593f2e2f 100644
+index 9829b3b64..104a3acf3 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 83a284505..1593f2e2f 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -349,4 +350,12 @@ public class PaperWorldConfig {
+@@ -350,4 +351,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
diff --git a/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
index cc108d1346..bbba6497b3 100644
--- a/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 7306db580bb63b51c6e135d5071f169ecde0ab1b Mon Sep 17 00:00:00 2001
+From 607f9a373a20595be543b567b39a2c7a4e634f13 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 1593f2e2f..a47f6a339 100644
+index 104a3acf3..13f54e05a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -358,4 +358,14 @@ public class PaperWorldConfig {
+@@ -359,4 +359,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
diff --git a/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
index 0939020e4d..29d422ba5e 100644
--- a/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,14 +1,14 @@
-From 454ed699339b0c9dd1c5e881c4ce5ef50fe94f60 Mon Sep 17 00:00:00 2001
+From 4bc2336680d437f7decc95ba9ea8e866e22525d7 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7c91bfbb78..f9973a3637 100644
+index 309ad0219..184b59f03 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2091,6 +2091,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2094,6 +2094,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit
@@ -17,5 +17,5 @@ index 7c91bfbb78..f9973a3637 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.20.1
+2.21.0
 
diff --git a/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
index e72ea5551b..2f80c9a66d 100644
--- a/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 1e39a1de5495058977d44734200fb42ac2843390 Mon Sep 17 00:00:00 2001
+From c60ecc3058c029c6315331763fd8039cfd663085 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 a47f6a339..8af7bd277 100644
+index 13f54e05a..72eb530d7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -368,4 +368,10 @@ public class PaperWorldConfig {
+@@ -369,4 +369,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -27,7 +27,7 @@ index a47f6a339..8af7bd277 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fd30936c6..68fc58716 100644
+index 184b59f03..3773cc1bf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 3bca527dd1..07fbb8591f 100644
--- a/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From c2d216af32d0d000bc0afa1c3a01edec5e62c7a5 Mon Sep 17 00:00:00 2001
+From b4c5f00c5a060d72fd6f43891e9b70a895153a67 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 8af7bd277..7765e72f1 100644
+index 72eb530d7..8ff454e25 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -374,4 +374,10 @@ public class PaperWorldConfig {
+@@ -375,4 +375,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
diff --git a/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
index 9f24061da9..f8d9b904eb 100644
--- a/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From e7ec90a2f370af760914960228952385170912c4 Mon Sep 17 00:00:00 2001
+From ffbd793d22aefce0315f601cc89e85ff0e01dc9b 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 7765e72f1..235e2ffec 100644
+index 8ff454e25..3baf0380c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -380,4 +380,10 @@ public class PaperWorldConfig {
+@@ -381,4 +381,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
diff --git a/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
index b09842860e..f8a4c4b5a8 100644
--- a/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0187-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 1874cc24efdd0fee1e491b481b6e071f548a1adf Mon Sep 17 00:00:00 2001
+From 1c90168eb25629a9e0da66888bb23a91100e7b61 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2da7bbe81..c59f137f0 100644
+index 3773cc1bf..1bb79a61e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 2da7bbe81..c59f137f0 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1664,6 +1665,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1667,6 +1668,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index 2da7bbe81..c59f137f0 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1811,6 +1816,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1814,6 +1819,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (!originTag.isEmpty()) {
                  origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
diff --git a/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
index 5979cb9d23..3946de4a72 100644
--- a/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,14 +1,14 @@
-From 0174153107fce0839887e809226f02da6bda3a79 Mon Sep 17 00:00:00 2001
+From 896911a34642dd25f670d30ad85288eb6a23bf73 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 235e2ffec..c0569963b 100644
+index 3baf0380c..c9422d545 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -386,4 +386,10 @@ public class PaperWorldConfig {
+@@ -387,4 +387,10 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
diff --git a/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
index 961ac02807..5d35ff1c9c 100644
--- a/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From 443d8a46f316c49e41109f43fb4e4a0c51619793 Mon Sep 17 00:00:00 2001
+From 1c662af5a106fffa0514dbee6473f834da307c81 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 c0569963b..100b8a97c 100644
+index c9422d545..6a8b1c5e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -392,4 +392,13 @@ public class PaperWorldConfig {
+@@ -393,4 +393,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
diff --git a/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
index 1b5b58f58f..cce781986a 100644
--- a/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From eca822dc7103d4e7f66f41105eb707f180d36170 Mon Sep 17 00:00:00 2001
+From db6c0db5bbe084d6e31ee7d903da97ddb08896fe 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 100b8a97c..c7108e9c3 100644
+index 6a8b1c5e0..99d6ccc59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -401,4 +401,15 @@ public class PaperWorldConfig {
+@@ -402,4 +402,15 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }
diff --git a/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
index 372376a726..b947db5cc5 100644
--- a/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From d08cc0efdc7a0ca77aff3772431825e6093e8eea Mon Sep 17 00:00:00 2001
+From 73a422844a780dfbcdb5b04afc75721e55463611 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 c7108e9c3..3d47b991a 100644
+index 99d6ccc59..07a8ef697 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 {
+@@ -413,4 +413,9 @@ public class PaperWorldConfig {
              log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
          }
      }
diff --git a/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 989a115e9f..83502c86d6 100644
--- a/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,14 +1,14 @@
-From 6f74c219c8913850933c61eb1ea2a237d2e4cca7 Mon Sep 17 00:00:00 2001
+From 901bf01a38e3a4292469669893dafed38c33e014 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3d47b991a..cf3fba4af 100644
+index 07a8ef697..f68b8a4b0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -190,6 +190,11 @@ public class PaperWorldConfig {
+@@ -191,6 +191,11 @@ public class PaperWorldConfig {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
  
diff --git a/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
index 3e597593e3..5d541c0c0b 100644
--- a/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 0f4a20d55921ecc3e2107c58b540fdcd8c71da17 Mon Sep 17 00:00:00 2001
+From 5d95bb06af5610d1e5d9c5bc549e8b928af7fcfa 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 cf3fba4af..33270a169 100644
+index f68b8a4b0..6fb76388e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -422,4 +422,9 @@ public class PaperWorldConfig {
+@@ -423,4 +423,9 @@ public class PaperWorldConfig {
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
diff --git a/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
index de55ef7eca..05b71f1761 100644
--- a/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 2d2ff76e9090cf63d6d2930f4ff233c03f3fd38c Mon Sep 17 00:00:00 2001
+From 1d29ffbf1178feefceda1ceda347ec0ef96c30c0 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 33270a169..ba82ca9f1 100644
+index 6fb76388e..0a270b899 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -427,4 +427,10 @@ public class PaperWorldConfig {
+@@ -428,4 +428,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
diff --git a/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch b/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
index 6a88bf5825..16b8b87697 100644
--- a/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
+++ b/Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch
@@ -1,4 +1,4 @@
-From bffa724c8c9c385f1fa6b56586d8bc62a4289623 Mon Sep 17 00:00:00 2001
+From da606fe577aaf444fda2bfe33ae89a291e7bf999 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Villages loading chunks for door checks
 This avoids villages spam loading chunks sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba82ca9f1..994e925dd 100644
+index 0a270b899..4727ac6eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -433,4 +433,12 @@ public class PaperWorldConfig {
+@@ -434,4 +434,12 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
diff --git a/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
index 76a1e3b26e..3142106f53 100644
--- a/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0264-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 41555aaf3ad7b457129248b588529ebdc76a2089 Mon Sep 17 00:00:00 2001
+From d6effb7b11bcebd1208e442c7e2da371ba3a6132 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,10 +22,10 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c59f137f0..f7a3e2ce7 100644
+index 1bb79a61e..97d21f65d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2608,7 +2608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2611,7 +2611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end */
  
diff --git a/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
index 98673c5821..4c26c21b03 100644
--- a/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch
@@ -1,14 +1,14 @@
-From a0331bf8dd08e986a5076f2862f5e9a2ac852c29 Mon Sep 17 00:00:00 2001
+From 35cbb3436bb6a3ec07a2c81d4018491e1b6c3432 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 994e925dd..49d6b1a7c 100644
+index 4727ac6eb..47f8dfcc4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -441,4 +441,9 @@ public class PaperWorldConfig {
+@@ -442,4 +442,9 @@ public class PaperWorldConfig {
              log("Villages can load chunks - Warning this can cause intense TPS loss. Strongly consider disabling this.");
          }
      }
diff --git a/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
index 0274582db1..8970e98c0a 100644
--- a/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,14 +1,14 @@
-From b3bb68564a597a2e603263d976d8702a6e89ea2e Mon Sep 17 00:00:00 2001
+From d96e3ac5649e8899b83a08ec658fc1708086dff8 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 49d6b1a7c..45d8b52b7 100644
+index 47f8dfcc4..aa2be2ede 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -446,4 +446,9 @@ public class PaperWorldConfig {
+@@ -447,4 +447,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
diff --git a/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
index fae6f5caf6..46df4fd7c3 100644
--- a/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From c52d374c494f11ada14981a77b34467c89e924dc Mon Sep 17 00:00:00 2001
+From 57cdb70e3ec6a29015eb71a3f33734ca762d1357 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 45d8b52b7..471a8d6f0 100644
+index aa2be2ede..f5b2e88f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -451,4 +451,15 @@ public class PaperWorldConfig {
+@@ -452,4 +452,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
diff --git a/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
index 4e67fafa56..fa7c4f0ba5 100644
--- a/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0289-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From f575e9f84da3025facfbcc342e13529e79cca9eb Mon Sep 17 00:00:00 2001
+From 8648a80864f6608a2b69bd1100de4f905e950a2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f7a3e2ce7..8e7eedd09 100644
+index 97d21f65d..1f471888b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2511,7 +2511,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2514,7 +2514,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
diff --git a/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
index 7591d65a2c..1fedb681e0 100644
--- a/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 839b6ba6410971ca20b19a8b881aa451b3ba97b3 Mon Sep 17 00:00:00 2001
+From 07a1a16b609fede1a55eef44e09bdb1f7c57e97d 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 471a8d6f0..9cdc63a03 100644
+index f5b2e88f3..8c4ff1886 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -462,4 +462,43 @@ public class PaperWorldConfig {
+@@ -463,4 +463,43 @@ public class PaperWorldConfig {
              log("Bed Search Radius: " + bedSearchRadius);
          }
      }
@@ -163,10 +163,10 @@ index 1c1f39524..edae53b82 100644
              // CraftBukkit start
              List<Entity> toRemove = new LinkedList<>();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0b23b5af9..f4cdf7548 100644
+index ac9fca304..0d3aacf8d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2736,6 +2736,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2739,6 +2739,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
diff --git a/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 54e38bb6a9..08a6d31237 100644
--- a/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,14 +1,14 @@
-From 2f802d8c02eb54fb1f7b690525b587af03e63485 Mon Sep 17 00:00:00 2001
+From 60ea8c098f578211ad648ff7acfb3fd24876e4fd 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 9cdc63a03..773099166 100644
+index 8c4ff1886..6c4cb61dc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -374,6 +374,11 @@ public class PaperWorldConfig {
+@@ -375,6 +375,11 @@ public class PaperWorldConfig {
          }
      }
  
diff --git a/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
index 7bf0bf8102..8b1896f993 100644
--- a/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch
@@ -1,14 +1,14 @@
-From 2f96701f58556985184d42578abf7acb8aeb7817 Mon Sep 17 00:00:00 2001
+From 1042406ec858e20c2ed7e82e47fc94fc8b46587e 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 773099166..bc96f0796 100644
+index 6c4cb61dc..0b60ca82c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -506,4 +506,10 @@ public class PaperWorldConfig {
+@@ -507,4 +507,10 @@ public class PaperWorldConfig {
                  break;
          }
      }
diff --git a/Spigot-Server-Patches/0332-Optimize-Hoppers.patch b/Spigot-Server-Patches/0332-Optimize-Hoppers.patch
index d22fb5459a..f13a44c5dc 100644
--- a/Spigot-Server-Patches/0332-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0332-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From e05f725ac3e6fd1db94b82977db7700dca19e023 Mon Sep 17 00:00:00 2001
+From 058d9e7e33b9dbe4a5e2db58689e59e281d8b9c8 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 bc96f0796..2b8ad6d58 100644
+index 0b60ca82c..e87fb94c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -428,6 +428,15 @@ public class PaperWorldConfig {
+@@ -429,6 +429,15 @@ public class PaperWorldConfig {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
  
diff --git a/Spigot-Server-Patches/0336-Anti-Xray.patch b/Spigot-Server-Patches/0336-Anti-Xray.patch
index c71bb3e67d..fd7d6ece99 100644
--- a/Spigot-Server-Patches/0336-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0336-Anti-Xray.patch
@@ -1,11 +1,11 @@
-From 52d96728e9d538d1d61d181d4757e95a4ea9af4f Mon Sep 17 00:00:00 2001
+From b97faa806b0369e82235daa8f3360c404c973e1b 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 2b8ad6d58..89e4dcd73 100644
+index e87fb94c0..8f4926222 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 2b8ad6d58..89e4dcd73 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -521,4 +524,34 @@ public class PaperWorldConfig {
+@@ -522,4 +525,34 @@ public class PaperWorldConfig {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
          log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }
diff --git a/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
index 05691c9240..36ac0364f1 100644
--- a/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0337-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,14 +1,14 @@
-From b2ecad4a75de1a8b47605c6a521bc0a28f613660 Mon Sep 17 00:00:00 2001
+From 5f1c809fee84656d4c22041bffd48e4427081257 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 89e4dcd73..a9df93b56 100644
+index 8f4926222..869bf8a9f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -480,6 +480,12 @@ public class PaperWorldConfig {
+@@ -481,6 +481,12 @@ public class PaperWorldConfig {
          }
      }
  
diff --git a/Spigot-Server-Patches/0346-Improve-death-events.patch b/Spigot-Server-Patches/0346-Improve-death-events.patch
index 055755ab0b..214a0a1776 100644
--- a/Spigot-Server-Patches/0346-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0346-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From da5ff47c5f1e7f19ad1a558c85dc31a25b215fd2 Mon Sep 17 00:00:00 2001
+From 3722b77d870c4a5be3f1bed43a26dd38653930a2 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -27,10 +27,10 @@ index bbd5e2b2a..19750ceed 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 47d3609c3..f470d7090 100644
+index 4da34cf84..055fc6d89 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1553,6 +1553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1556,6 +1556,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -38,7 +38,7 @@ index 47d3609c3..f470d7090 100644
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2405,6 +2406,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2408,6 +2409,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
@@ -46,7 +46,7 @@ index 47d3609c3..f470d7090 100644
      public void b(EntityLiving entityliving) {}
  
      protected boolean i(double d0, double d1, double d2) {
-@@ -3069,6 +3071,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3072,6 +3074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return EnumPistonReaction.NORMAL;
      }
  
diff --git a/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 6fa0bd9e88..ff8109a07f 100644
--- a/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0359-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From c7e5b48b5ea474914bbc5dd37cac4a39a69a2b87 Mon Sep 17 00:00:00 2001
+From 5d94befd25ec2d72c8045bb9bcd070fe6beb667f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -26,10 +26,10 @@ index e38a0d488..a245df1dc 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f470d7090..be555f82d 100644
+index 055fc6d89..5ea556995 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1742,7 +1742,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1745,7 +1745,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.setPosition(this.locX, this.locY, this.locZ);
              this.setYawPitch(this.yaw, this.pitch);
              if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
diff --git a/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
index b5622b307a..7278755adf 100644
--- a/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From 00a896b679177fdfc8eca7f47828cc42481641fe Mon Sep 17 00:00:00 2001
+From 60c7b76985ed6b530dd14c5c4b78183ee8562abf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,10 +14,10 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3e81ebdb8..52ef2c9c2 100644
+index b0af43362..9e8bd174e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1729,7 +1729,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1732,7 +1732,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.setAirTicks(nbttagcompound.getShort("Air"));
              this.onGround = nbttagcompound.getBoolean("OnGround");
              if (nbttagcompound.hasKey("Dimension")) {
diff --git a/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
index 66e8269a55..97c670cdfc 100644
--- a/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0372-Add-LivingEntity-getTargetEntity.patch
@@ -1,4 +1,4 @@
-From 0fad12f0b78bc75be6ccade99778318ffde58ee0 Mon Sep 17 00:00:00 2001
+From b9704a274c9d027079530b52bf6e02ce9164380b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -46,10 +46,10 @@ index 1c0b783e8..dad1ff737 100644
      public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
          return this.a(vec3d, vec3d1, (BlockPosition) null);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 52ef2c9c2..4fa992316 100644
+index 9e8bd174e..22d13f7ef 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1533,6 +1533,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1536,6 +1536,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return new Vec3D((double) (f5 * f6), (double) (-f7), (double) (f4 * f6));
      }
  
@@ -57,7 +57,7 @@ index 52ef2c9c2..4fa992316 100644
      public Vec3D i(float f) {
          if (f == 1.0F) {
              return new Vec3D(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ);
-@@ -2180,10 +2181,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2183,10 +2184,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.bP().size() < 1;
      }
  
diff --git a/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
index 7ec16771ea..6e96aa61b6 100644
--- a/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch
@@ -1,14 +1,14 @@
-From 764ac0fbaeca1e56ba4fd66b52a86dd49725fcda Mon Sep 17 00:00:00 2001
+From 6ea9730b2677904875a5180ad75c151f42068262 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a9df93b56..a3022846c 100644
+index 869bf8a9f..2a912286b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -245,6 +245,28 @@ public class PaperWorldConfig {
+@@ -246,6 +246,28 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }
diff --git a/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 8ed0a50d4a..f61a6d6fa6 100644
--- a/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From ff7bfbfdb5d328d544475c02745c9e820aea67c4 Mon Sep 17 00:00:00 2001
+From c4b7d0c1358a54da78b98fa35c04c114370108b8 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a3022846c..aa74c159a 100644
+index 2a912286b..61ad2cef7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -582,4 +582,9 @@ public class PaperWorldConfig {
+@@ -583,4 +583,9 @@ public class PaperWorldConfig {
          replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList("stone", "planks"));
          log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
      }
diff --git a/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
index e03a86a922..b7cca278fa 100644
--- a/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0385-Reset-players-airTicks-on-respawn.patch
@@ -1,14 +1,14 @@
-From 160f88409f7264bfd857f58826b83555d7b626db Mon Sep 17 00:00:00 2001
+From cd9b04c415742c09625c3dce302e1271ee90fa7f Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4fa992316..b3491c7ce 100644
+index 22d13f7ef..8da18b8af 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2332,7 +2332,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2335,7 +2335,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
diff --git a/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
index ace978ba43..939fabb9b7 100644
--- a/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 4e2f2eff29218a6eb117f162299eb901a020f222 Mon Sep 17 00:00:00 2001
+From d476245f6673b26958fae0aa6d4c91fe2c5a5201 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,10 +19,10 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index aa74c159a..a5231169c 100644
+index 61ad2cef7..a70a64070 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -587,4 +587,14 @@ public class PaperWorldConfig {
+@@ -588,4 +588,14 @@ public class PaperWorldConfig {
      private void preventMovingIntoUnloadedChunks() {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }
diff --git a/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
index 051af72b94..4cf28f56e0 100644
--- a/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0397-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From c6ddf8aedf7a24641bfb79511c59c10242f607ac Mon Sep 17 00:00:00 2001
+From 091f9b2150aa9540f90b4795c0f04ca4abba52c7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b3491c7ce..3c2e79b14 100644
+index 8da18b8af..640660605 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2094,12 +2094,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2097,12 +2097,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -41,7 +41,7 @@ index b3491c7ce..3c2e79b14 100644
          }
  
      }
-@@ -2144,7 +2147,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2147,7 +2150,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return true; // CraftBukkit
      }
  
@@ -53,7 +53,7 @@ index b3491c7ce..3c2e79b14 100644
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2154,7 +2160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2157,7 +2163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) getBukkitEntity(),
@@ -62,7 +62,7 @@ index b3491c7ce..3c2e79b14 100644
                  );
                  Bukkit.getPluginManager().callEvent(event);
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2165,7 +2171,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2168,7 +2174,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
diff --git a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
index c7ffe1db28..0659352a5e 100644
--- a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From a47a1c2705956a50668c50cda94cf19fc3843d84 Mon Sep 17 00:00:00 2001
+From 12731060cb2596d81c5efd7c77c929168b50e79e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -23,7 +23,7 @@ index 7734712af..dce52ac0f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3c2e79b14..0c58a4766 100644
+index 640660605..3449b86da 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -34,7 +34,7 @@ index 3c2e79b14..0c58a4766 100644
      // Paper end
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
-@@ -1671,6 +1672,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1674,6 +1675,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -44,7 +44,7 @@ index 3c2e79b14..0c58a4766 100644
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
-@@ -1824,6 +1828,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1827,6 +1831,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 5b2859651a..1ef2078b29 100644
--- a/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 2c29c1376a6d21e9459fb15b2c99f6d34f0bb3ed Mon Sep 17 00:00:00 2001
+From 60b76b471464505db520bfd096b006c320864b44 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
@@ -17,10 +17,10 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5231169c..1d21277b7 100644
+index a70a64070..bfd690ecc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -597,4 +597,14 @@ public class PaperWorldConfig {
+@@ -598,4 +598,14 @@ public class PaperWorldConfig {
              log("Using vanilla redstone algorithm.");
          }
      }