Merge pull request #1248

c2d29a73 PlayerElytraBoostEvent (BillyGalbreath)

* pull/1248/head:
  PlayerElytraBoostEvent

Also merged paper config into parent

Spigot-API-Patches/0125-PlayerElytraBoostEvent.patch

@@ -0,0 +1,95 @@
+From f0c0d6c6182c1c89de1125c0c2f22559724cfaf5 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sat, 21 Jul 2018 01:59:53 -0500
+Subject: [PATCH] PlayerElytraBoostEvent
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+new file mode 100644
+index 00000000..cecb2182
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
+@@ -0,0 +1,80 @@
++package com.destroystokyo.paper.event.player;
++
++import org.bukkit.entity.Firework;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++import org.bukkit.inventory.ItemStack;
++
++/**
++ * Fired when a player boosts elytra flight with a firework
++ */
++public class PlayerElytraBoostEvent extends PlayerEvent implements Cancellable {
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled = false;
++    private final ItemStack itemStack;
++    private Firework firework;
++    private boolean consume = true;
++
++    public PlayerElytraBoostEvent(Player player, ItemStack itemStack, Firework firework) {
++        super(player);
++        this.itemStack = itemStack;
++        this.firework = firework;
++    }
++
++    /**
++     * Get the firework itemstack used
++     *
++     * @return ItemStack of firework
++     */
++    public ItemStack getItemStack() {
++        return itemStack;
++    }
++
++    /**
++     * Get the firework entity that was spawned
++     *
++     * @return Firework entity
++     */
++    public Firework getFirework() {
++        return firework;
++    }
++
++    /**
++     * Get whether to consume the firework or not
++     *
++     * @return True to consume
++     */
++    public boolean shouldConsume() {
++        return consume;
++    }
++
++    /**
++     * Set whether to consume the firework or not
++     *
++     * @param consume True to consume
++     */
++    public void setShouldConsume(boolean consume) {
++        this.consume = consume;
++    }
++
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        cancelled = cancel;
++    }
++}
+-- 
+2.11.0
+

Spigot-Server-Patches/0002-Paper-config-files.patch

@@ -1,4 +1,4 @@
-From b03f578652215491a2fda2190e0b3941e902b2dc Mon Sep 17 00:00:00 2001
+From ea7585a551532e04ec7b38c220a373a9130dc062 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -249,10 +249,10 @@ index 000000000..e8f7b7292
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 000000000..3d8ee9ed3
+index 000000000..d5c6c37fa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,177 @@
 +package com.destroystokyo.paper;
 +
 +import com.google.common.base.Throwables;
@@ -317,6 +317,10 @@ index 000000000..3d8ee9ed3
 +        readConfig(PaperConfig.class, null);
 +    }
 +
++    protected static void logError(String s) {
++        Bukkit.getLogger().severe(s);
++    }
++
 +    protected static void log(String s) {
 +        if (verbose) {
 +            Bukkit.getLogger().info(s);
@@ -428,10 +432,10 @@ index 000000000..3d8ee9ed3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 new file mode 100644
-index 000000000..621bf7051
+index 000000000..b8a6161d8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,67 @@
 +package com.destroystokyo.paper;
 +
 +import java.util.List;
@@ -441,6 +445,7 @@ index 000000000..621bf7051
 +import org.spigotmc.SpigotWorldConfig;
 +
 +import static com.destroystokyo.paper.PaperConfig.log;
++import static com.destroystokyo.paper.PaperConfig.logError;
 +
 +public class PaperWorldConfig {
 +
@@ -514,7 +519,7 @@ index 5ff1e9686..3706e44a3 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5046ecb3b..3fa32228b 100644
+index 47fd48399..29c7043c8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -134,9 +134,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {

Spigot-Server-Patches/0005-Paper-Metrics.patch

@@ -1,4 +1,4 @@
-From 7c4375fab7a71d9ff634dd0c4a2d1aaba13cee49 Mon Sep 17 00:00:00 2001
+From 240642e5baed8846c03bd8543cab3c711a65965d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 24 Mar 2017 23:56:01 -0500
 Subject: [PATCH] Paper Metrics
@@ -647,7 +647,7 @@ index 000000000..e257d6b36
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3d8ee9ed3..5ab2cf6ee 100644
+index d5c6c37fa..b89ec4252 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -39,6 +39,7 @@ public class PaperConfig {
@@ -658,7 +658,7 @@ index 3d8ee9ed3..5ab2cf6ee 100644
  
      public static void init(File configFile) {
          CONFIG_FILE = configFile;
-@@ -72,6 +73,11 @@ public class PaperConfig {
+@@ -76,6 +77,11 @@ public class PaperConfig {
          for (Map.Entry<String, Command> entry : commands.entrySet()) {
              MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
          }
@@ -671,7 +671,7 @@ index 3d8ee9ed3..5ab2cf6ee 100644
  
      static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 5175e9523..676780b61 100644
+index e12511291..ff85d45ab 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -84,6 +84,7 @@ public class SpigotConfig

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 4a42cad650e2d9c8a48001ef506ce74e0437cf22 Mon Sep 17 00:00:00 2001
+From 43fde1b1776449b70599136969eca45343f953a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -432,7 +432,7 @@ index 000000000..145cb274b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ab2cf6ee..b5795b6d3 100644
+index b89ec4252..e4ed7d674 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -450,7 +450,7 @@ index 5ab2cf6ee..b5795b6d3 100644
  
  public class PaperConfig {
  
-@@ -176,4 +179,24 @@ public class PaperConfig {
+@@ -180,4 +183,24 @@ public class PaperConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }
@@ -660,7 +660,7 @@ index 3706e44a3..bf1fffcfe 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 36cc0c18d..4830c7b8b 100644
+index e67c5dc90..f1e71de42 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -1054,7 +1054,7 @@ index ac6d8cc6e..d975c2ccf 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 556989f60..17b925f88 100644
+index 42e0630e6..5d42cfe81 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;

Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch

@@ -1,14 +1,14 @@
-From 40b2ff991bc8a48ef7f31000cd11b4f705aea329 Mon Sep 17 00:00:00 2001
+From 17b75b1da091d4982e72e3604c4b0380515d34d1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:02:51 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 621bf7051..4a692ac1b 100644
+index b8a6161d8..32d00e274 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -63,4 +63,13 @@ public class PaperWorldConfig {
+@@ -64,4 +64,13 @@ public class PaperWorldConfig {
          config.addDefault("world-settings.default." + path, def);
          return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
      }

Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch

@@ -1,14 +1,14 @@
-From b9f4abe2c78d9c5499c1249747e038186fb27393 Mon Sep 17 00:00:00 2001
+From 97a67535fcd794c822375c92418cf46eb118ab01 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4a692ac1b..d44cacc7e 100644
+index 32d00e274..a3c0d9159 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -72,4 +72,10 @@ public class PaperWorldConfig {
+@@ -73,4 +73,10 @@ public class PaperWorldConfig {
          log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
  
      }
@@ -20,7 +20,7 @@ index 4a692ac1b..d44cacc7e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index b24e73f2c..268e4d57b 100644
+index 3f0e636b7..9f8f667c1 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -17,7 +17,7 @@ public class EntityZombie extends EntityMonster {

Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch

@@ -1,14 +1,14 @@
-From 4d52eec46bc302c6dfccc2548eaa454640a703fb Mon Sep 17 00:00:00 2001
+From 12dd50f4836a33df93b0ab65175a5cdf1f842e90 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d44cacc7e..45bddf3f4 100644
+index a3c0d9159..cacf58607 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -78,4 +78,12 @@ public class PaperWorldConfig {
+@@ -79,4 +79,12 @@ public class PaperWorldConfig {
          babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
          log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
      }
@@ -22,7 +22,7 @@ index d44cacc7e..45bddf3f4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 2512ad353..866f41980 100644
+index a9bd59418..7c119282b 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -386,7 +386,7 @@ public class EntityFishingHook extends Entity {

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

@@ -1,14 +1,14 @@
-From e2da442d9796c473f37e5fde6c8ff6b17cc2593b Mon Sep 17 00:00:00 2001
+From 36849476a5ac4508bd8ff4f0d3e1b46c3e22a695 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 45bddf3f4..1d9dd0e0b 100644
+index cacf58607..de8680e4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -86,4 +86,9 @@ public class PaperWorldConfig {
+@@ -87,4 +87,9 @@ public class PaperWorldConfig {
          fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
          log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
      }

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

@@ -1,14 +1,14 @@
-From 48f4ebe1a46124663d68afc009c623f0be3b87df Mon Sep 17 00:00:00 2001
+From 483632d2372f106559fde7170741ae63fe441c28 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1d9dd0e0b..22c1113a1 100644
+index de8680e4d..02f7e506e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -91,4 +91,20 @@ public class PaperWorldConfig {
+@@ -92,4 +92,20 @@ public class PaperWorldConfig {
      private void nerfedMobsShouldJump() {
          nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
      }
@@ -30,7 +30,7 @@ index 1d9dd0e0b..22c1113a1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 27b01d1ee..c8c191667 100644
+index 3744d01ec..27c97530f 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -620,13 +620,13 @@ public abstract class EntityInsentient extends EntityLiving {

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

@@ -1,14 +1,14 @@
-From 9a9d8af54bf1def19ceb5c483f07e8dbf8654f52 Mon Sep 17 00:00:00 2001
+From 71c3064807448910dfda790cbc35d23fc2f4dae3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 22c1113a1..0094d1a87 100644
+index 02f7e506e..cef0c47ac 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -107,4 +107,10 @@ public class PaperWorldConfig {
+@@ -108,4 +108,10 @@ public class PaperWorldConfig {
          softDespawnDistance = softDespawnDistance*softDespawnDistance;
          hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
      }
@@ -20,7 +20,7 @@ index 22c1113a1..0094d1a87 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e6b916a5d..05d363171 100644
+index 562a85b72..6ca7a2069 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -199,6 +199,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,14 +1,14 @@
-From d5144d6679ef94b9546b0f81bd9dfd3bd747b6e6 Mon Sep 17 00:00:00 2001
+From 7465f3a6749b94c0f59bd6149c59a5fa7e9d7140 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0094d1a87..4da846719 100644
+index cef0c47ac..38a697e1b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -113,4 +113,14 @@ public class PaperWorldConfig {
+@@ -114,4 +114,14 @@ public class PaperWorldConfig {
          keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
          log("Keep spawn chunk loaded: " + keepSpawnInMemory);
      }
@@ -24,7 +24,7 @@ index 0094d1a87..4da846719 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2ed362791..20248de7e 100644
+index f1e71de42..d6cf65db6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1885,6 +1885,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -36,7 +36,7 @@ index 2ed362791..20248de7e 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 850436d42..8d47b58c9 100644
+index e7e7d57c4..5e01aa0f8 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -86,6 +86,17 @@ public class EntityFallingBlock extends Entity {

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

@@ -1,14 +1,14 @@
-From 93cc4b95be1d52ac3f84b30a07ad93bd756584b5 Mon Sep 17 00:00:00 2001
+From 45fbad5474fc22989af2dac59e41e035ff3ea414 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 4da846719..a340866f3 100644
+index 38a697e1b..68898d624 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -123,4 +123,10 @@ public class PaperWorldConfig {
+@@ -124,4 +124,10 @@ 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);
      }
@@ -20,7 +20,7 @@ index 4da846719..a340866f3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6bb4cf48e..d378f1a9d 100644
+index 778b8d440..1870930f6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -464,9 +464,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index 6bb4cf48e..d378f1a9d 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 2f4e1a280..3598998b5 100644
+index 6e48cf475..4644d7efe 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -201,9 +201,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT

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

@@ -1,4 +1,4 @@
-From 6cb336dbbff71913a308dcd2a18fc2db4c6c6c6a Mon Sep 17 00:00:00 2001
+From 8dca59c82d4970ec06b04d9656b4b2d6cb1b841d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -28,10 +28,10 @@ index 145cb274b..eff9dcf54 100644
  
      public static Timing getTickList(WorldServer worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a340866f3..1e3405cc1 100644
+index 68898d624..4b36a0f05 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -129,4 +129,10 @@ public class PaperWorldConfig {
+@@ -130,4 +130,10 @@ public class PaperWorldConfig {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }

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

@@ -1,14 +1,14 @@
-From 57383fb576aa72fde6d72aa34d7c7f60e8984c52 Mon Sep 17 00:00:00 2001
+From f73a01ec2601dd1fc514d363f860195dc920ce36 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 1e3405cc1..dccccbf5b 100644
+index 4b36a0f05..53921b381 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -135,4 +135,10 @@ public class PaperWorldConfig {
+@@ -136,4 +136,10 @@ public class PaperWorldConfig {
          queueLightUpdates = getBoolean("queue-light-updates", false);
          log("Lighting Queue enabled: " + queueLightUpdates);
      }
@@ -20,7 +20,7 @@ index 1e3405cc1..dccccbf5b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d4e9f489d..ace6db1fa 100644
+index 67f14370e..47808e22d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From b8d7f6c6cd036f9e845a1f07708681a023b68a2e Mon Sep 17 00:00:00 2001
+From de1dc6533183312e946c2138dc81c82ce73a9def 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 dccccbf5b..3626aa717 100644
+index 53921b381..ae4a7cb09 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -141,4 +141,10 @@ public class PaperWorldConfig {
+@@ -142,4 +142,10 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }

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

@@ -1,14 +1,14 @@
-From f620d59ecbd4bff1544e6d010208a17cb8549df5 Mon Sep 17 00:00:00 2001
+From ebdc4a1bf59df98fa5aababccb2d3c935dde070d 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 3626aa717..be92c1af6 100644
+index ae4a7cb09..f2f45ae4a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -147,4 +147,9 @@ public class PaperWorldConfig {
+@@ -148,4 +148,9 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }

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

@@ -1,14 +1,14 @@
-From cd9a4513e386b038109e500412c6c2c6d8a93849 Mon Sep 17 00:00:00 2001
+From 703ce6a2582f6aea1e9134b9468232cdb0481382 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 be92c1af6..efacd5ea0 100644
+index f2f45ae4a..a27e52d03 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -152,4 +152,9 @@ public class PaperWorldConfig {
+@@ -153,4 +153,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
@@ -19,7 +19,7 @@ index be92c1af6..efacd5ea0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d7f86bf76..a4003896d 100644
+index f032ecab6..5ee771e83 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -491,7 +491,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,14 +1,14 @@
-From cab788edd773fc1a581a521107226a7696be225d Mon Sep 17 00:00:00 2001
+From 227e944778893d855f8d85e11d8ffd0dad2354ec 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 efacd5ea0..0130e5860 100644
+index a27e52d03..ab119b914 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -157,4 +157,9 @@ public class PaperWorldConfig {
+@@ -158,4 +158,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
@@ -19,7 +19,7 @@ index efacd5ea0..0130e5860 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a4003896d..9bd11a5fd 100644
+index 5ee771e83..dd09ab20e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -513,7 +513,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,14 +1,14 @@
-From a38f27e8f25f8c3abdd17a3637544e15c42d87fc Mon Sep 17 00:00:00 2001
+From a2dce69cf0a7c65dc36e93f20528370a4f6f7c7b 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 0130e5860..47f391243 100644
+index ab119b914..59bd3e28f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -162,4 +162,9 @@ public class PaperWorldConfig {
+@@ -163,4 +163,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }

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

@@ -1,14 +1,14 @@
-From 46a15c4b0cd3a9491acf600f25d0cf791c6462c2 Mon Sep 17 00:00:00 2001
+From de00011ef7d2a81cec22bf1ee37a8c00441150d1 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 47f391243..26d8dbb60 100644
+index 59bd3e28f..f8d2aae08 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -167,4 +167,9 @@ public class PaperWorldConfig {
+@@ -168,4 +168,9 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
@@ -19,7 +19,7 @@ index 47f391243..26d8dbb60 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8ca7da336..55eaa89f6 100644
+index 2b13729e4..80371a836 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -81,6 +81,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,14 +1,14 @@
-From 2f4912d0c8eec5bad1fcda1233ac3457c68fb86c Mon Sep 17 00:00:00 2001
+From 14bab37b82c4924cb1ece931a0a2c57a9a54bfe8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b5795b6d3..36689db74 100644
+index e4ed7d674..d48ef7e85 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -199,4 +199,9 @@ public class PaperConfig {
+@@ -203,4 +203,9 @@ public class PaperConfig {
                  " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
                  " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }

Spigot-Server-Patches/0044-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,4 +1,4 @@
-From b10258425b32f52227c068e59270453ce6fbaac5 Mon Sep 17 00:00:00 2001
+From 450ef34e2ad19b38f7904431dc535982919b165d 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 26d8dbb60..43aa73e1d 100644
+index f8d2aae08..d91b48b0a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -172,4 +172,9 @@ public class PaperWorldConfig {
+@@ -173,4 +173,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }

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

@@ -1,14 +1,14 @@
-From 5a999ec5367ea0c9db12b34d098b39d8ff86404b Mon Sep 17 00:00:00 2001
+From 8d686401dc81d0556b8c9157171301b1b0661901 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 43aa73e1d..0743db5ac 100644
+index d91b48b0a..7d1f6cde9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -177,4 +177,9 @@ public class PaperWorldConfig {
+@@ -178,4 +178,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
@@ -19,7 +19,7 @@ index 43aa73e1d..0743db5ac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 3167c3f5f..3b13b697a 100644
+index 31e066b54..eeaf98e82 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -252,7 +252,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {

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

@@ -1,14 +1,14 @@
-From 74a7ab25d619909662d40a3c39e68fc40f87bc97 Mon Sep 17 00:00:00 2001
+From c75d946dc9c6bf4a6fae51cbe0ef7bf3e4b506ad 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 0743db5ac..1ba09df9c 100644
+index 7d1f6cde9..c98286999 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -182,4 +182,9 @@ public class PaperWorldConfig {
+@@ -183,4 +183,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }

Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From 7d4cc359892f4167574b00e9ae7bb76c528545d6 Mon Sep 17 00:00:00 2001
+From ab452f9cd59aa0e074a0b65d0a91148dd0b4932d 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 1ba09df9c..6fc3b7621 100644
+index c98286999..4a2d29674 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -187,4 +187,9 @@ public class PaperWorldConfig {
+@@ -188,4 +188,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
@@ -30,7 +30,7 @@ index 1ba09df9c..6fc3b7621 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 23562388a..23cab725d 100644
+index 90cb2d277..8b3c2d287 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -798,7 +798,7 @@ public abstract class PlayerList {
@@ -43,7 +43,7 @@ index 23562388a..23cab725d 100644
              entityplayer.getBukkitEntity().setVelocity(velocity);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 18f68b925..aacf8ea7f 100644
+index 06e79b4b3..650523614 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -660,7 +660,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From 4f6efae4b2d228e98af8ea5272a70d3677808374 Mon Sep 17 00:00:00 2001
+From cdec1c94f32c30d5af8e5eeb755a84c5984218b7 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 6fc3b7621d..93486b4b82 100644
+index 4a2d29674..2b25da046 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -192,4 +192,9 @@ public class PaperWorldConfig {
+@@ -193,4 +193,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -25,7 +25,7 @@ index 6fc3b7621d..93486b4b82 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1870930f69..085f95dfe3 100644
+index 1870930f6..085f95dfe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2258,6 +2258,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 1870930f69..085f95dfe3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 574883462d..dd48c6af0c 100644
+index 574883462..dd48c6af0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -537,6 +537,7 @@ public abstract class EntityLiving extends Entity {

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

@@ -1,4 +1,4 @@
-From 9cb479ab95970eba850de078eaa105429a3024a7 Mon Sep 17 00:00:00 2001
+From c8b51eeedd60beed4dc70db20bba967b5f60e48e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 36689db74..3898ad8fa 100644
+index d48ef7e85..280cfd553 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -204,4 +204,10 @@ public class PaperConfig {
+@@ -208,4 +208,10 @@ public class PaperConfig {
      private static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }

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

@@ -1,4 +1,4 @@
-From 5a623a83533bb34b25140ad0d0e91f8000e7ce0f Mon Sep 17 00:00:00 2001
+From 457a6a9134923a2de82ec70c97818156be6d88b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3898ad8fa..2f6e169f5 100644
+index 280cfd553..40c5ea474 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -210,4 +210,9 @@ public class PaperConfig {
+@@ -214,4 +214,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }
@@ -30,7 +30,7 @@ index 3898ad8fa..2f6e169f5 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a9d60b8d2..4db5aacc4 100644
+index 899002f27..ff966de55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -330,6 +330,7 @@ public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
-From f69028b687e1bd6a11652475c83091366a7ebf5c Mon Sep 17 00:00:00 2001
+From d42451ddbcec9ccf105db6654eaea64ef60471ae 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 93486b4b8..cd20572eb 100644
+index 2b25da046..6f96627a2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -197,4 +197,9 @@ public class PaperWorldConfig {
+@@ -198,4 +198,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -20,7 +20,7 @@ index 93486b4b8..cd20572eb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index fbf6aa40d..0fe269bc8 100644
+index 2af12985e..7c8053acd 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -113,7 +113,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven

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

@@ -1,4 +1,4 @@
-From 15e60f77a6867cd52694f9283af1e6e795315e79 Mon Sep 17 00:00:00 2001
+From e6a1c83e22ebf7b1ccff924966d57c88588796ae 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 cd20572eb..b9dc0be2c 100644
+index 6f96627a2..0de300739 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -202,4 +202,13 @@ public class PaperWorldConfig {
+@@ -203,4 +203,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }

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

@@ -1,14 +1,14 @@
-From b03e35486eb18d15d0e8e46d3ac4a6e198931453 Mon Sep 17 00:00:00 2001
+From 67ea6458bbbc22760d99d38cf8f310c0be092846 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 b9dc0be2c..9f586774d 100644
+index 0de300739..c2c33d75b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -211,4 +211,9 @@ public class PaperWorldConfig {
+@@ -212,4 +212,9 @@ public class PaperWorldConfig {
          }
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
      }
@@ -19,7 +19,7 @@ index b9dc0be2c..9f586774d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9bd11a5fd..88868b4c4 100644
+index dd09ab20e..ecee3b406 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -498,7 +498,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,4 +1,4 @@
-From b89267bd8d1f5a2ba7b23efb6064e12b1f38f5b9 Mon Sep 17 00:00:00 2001
+From d93b67db207815adc72e749ec35bc04c27fbd1aa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9f586774d..1c2209270 100644
+index c2c33d75b..b3b3baddc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -216,4 +216,9 @@ public class PaperWorldConfig {
+@@ -217,4 +217,9 @@ public class PaperWorldConfig {
      private void skeleHorseSpawnChance() {
          skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", 0.01D); // -1.0D represents a "vanilla" state
      }
@@ -25,7 +25,7 @@ index 9f586774d..1c2209270 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f8e4cd14c..11012360b 100644
+index 489c152ee..2f1290163 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -582,7 +582,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -38,7 +38,7 @@ index f8e4cd14c..11012360b 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 88868b4c4..e3d62fc9c 100644
+index ecee3b406..96002184b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -36,6 +36,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;

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

@@ -1,4 +1,4 @@
-From 3ba69a9113ba68ccbe0efb4fc90b93e7116a8a9e Mon Sep 17 00:00:00 2001
+From 3886acfd07271f1c99ec15a9751112ea7444500c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1c2209270..17fb883f6 100644
+index b3b3baddc..613964ce0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -221,4 +221,9 @@ public class PaperWorldConfig {
+@@ -222,4 +222,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }

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

@@ -1,4 +1,4 @@
-From 2441c587560e34e5b7252b89a3b5234911e5b641 Mon Sep 17 00:00:00 2001
+From fd6ccdfc2049340dd24439852e20e25a9dd7c9bb Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2f6e169f5..ec4643384 100644
+index 40c5ea474..7d29ad369 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -215,4 +215,9 @@ public class PaperConfig {
+@@ -219,4 +219,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
@@ -25,7 +25,7 @@ index 2f6e169f5..ec4643384 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 384628ccc..b335016fd 100644
+index ff473a263..3b8d01ea1 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -9,10 +9,12 @@ import java.io.IOException;

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

@@ -1,14 +1,14 @@
-From aa81b601a06d1482b03985113d4bfe799307ce36 Mon Sep 17 00:00:00 2001
+From f5381978161686a8bc5c898c9a74cb4319bd7236 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 17fb883f6..eb09be512 100644
+index 613964ce0..bb1c1c57c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -226,4 +226,10 @@ public class PaperWorldConfig {
+@@ -227,4 +227,10 @@ public class PaperWorldConfig {
      private void useInhabitedTime() {
          useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
      }

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

@@ -1,4 +1,4 @@
-From 988ae523c43ece4e6e69d0bbd13d0ceb3f72c013 Mon Sep 17 00:00:00 2001
+From 90bc150bac4110f2a0cd4144e46d5e33171c8f21 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 eb09be5126..6ac58e5ec5 100644
+index bb1c1c57c..667a0dde8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -232,4 +232,10 @@ public class PaperWorldConfig {
+@@ -233,4 +233,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
@@ -21,7 +21,7 @@ index eb09be5126..6ac58e5ec5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 96d31f8749..071a1e30f7 100644
+index 96d31f874..071a1e30f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -485,13 +485,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index 96d31f8749..071a1e30f7 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6ec1ee26dc..a4c8e62e22 100644
+index 6ec1ee26d..a4c8e62e2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2825,8 +2825,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -78,7 +78,7 @@ index 6ec1ee26dc..a4c8e62e22 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 62872675d9..7cb795dd89 100644
+index 62872675d..7cb795dd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -990,7 +990,7 @@ public final class CraftServer implements Server {
@@ -91,7 +91,7 @@ index 62872675d9..7cb795dd89 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0b2a9d09df..ff3558363b 100644
+index 0b2a9d09d..ff3558363 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1285,8 +1285,9 @@ public class CraftWorld implements World {

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

@@ -1,14 +1,14 @@
-From 0b9bcb936fe6d77e2a1ffd169ec008a2f91ff999 Mon Sep 17 00:00:00 2001
+From 57e306afd1db9d7a08c55f911df40939787d3a7a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ac58e5ec5..ff9929a051 100644
+index 667a0dde8..b6ef1d437 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -238,4 +238,9 @@ public class PaperWorldConfig {
+@@ -239,4 +239,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
@@ -19,7 +19,7 @@ index 6ac58e5ec5..ff9929a051 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a465f1cf79..76934f81a8 100644
+index a465f1cf7..76934f81a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2270,6 +2270,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index a465f1cf79..76934f81a8 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 12b7afc524..9d705ed7d1 100644
+index 90ab7f065..8902e3db0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1622,7 +1622,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,14 +1,14 @@
-From 3ee292c7290a2edfc9b0e97fb5ff14e1f8e0a595 Mon Sep 17 00:00:00 2001
+From 5af22f227e6bf0613e322053e4f50c714c19dd28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ec4643384..430b5d0cd 100644
+index 7d29ad369..bd9f03a76 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -220,4 +220,9 @@ public class PaperConfig {
+@@ -224,4 +224,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
@@ -19,7 +19,7 @@ index ec4643384..430b5d0cd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 664007c29..eb0e1361a 100644
+index 071a1e30f..f88105382 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -418,6 +418,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

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

@@ -1,14 +1,14 @@
-From fd07a26f0eccd02458943d5b15c84a6951a8a3ee Mon Sep 17 00:00:00 2001
+From 90aeab4e9f63ccbfff85966e96b7c95afa07182a 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 ff9929a05..0c50cb4bd 100644
+index b6ef1d437..8d54af6bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -243,4 +243,14 @@ public class PaperWorldConfig {
+@@ -244,4 +244,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }

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

@@ -1,4 +1,4 @@
-From ec99cec780a2ae3c3ff8194fc74467161697b99f Mon Sep 17 00:00:00 2001
+From 5adbcec5141acf1e524b36ac8667998cff3f10d8 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 0c50cb4bd6..38de48ebc2 100644
+index 8d54af6bb..a3823408c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -253,4 +253,26 @@ public class PaperWorldConfig {
+@@ -254,4 +254,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);
      }
@@ -43,7 +43,7 @@ index 0c50cb4bd6..38de48ebc2 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 0000000000..36c36d158f
+index 000000000..36c36d158
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 0000000000..36c36d158f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 0000000000..20d236c451
+index 000000000..20d236c45
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 0000000000..20d236c451
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 0000000000..1150dee01e
+index 000000000..1150dee01
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 0000000000..1150dee01e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 0000000000..668097620f
+index 000000000..668097620
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 0000000000..668097620f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 0000000000..9a65603bcb
+index 000000000..9a65603bc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 0000000000..9a65603bcb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 9ec73ac06a..8bd7976f97 100644
+index 9ec73ac06..8bd7976f9 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -540,7 +540,7 @@ index 9ec73ac06a..8bd7976f97 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index fbda02b321..e6fc1ae923 100644
+index fbda02b32..e6fc1ae92 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,12 +1,16 @@
@@ -657,7 +657,7 @@ index fbda02b321..e6fc1ae923 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index ac9b4297b2..0558cafe31 100644
+index ac9b4297b..0558cafe3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -670,7 +670,7 @@ index ac9b4297b2..0558cafe31 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 6a54f2a166..a94c785126 100644
+index 6a54f2a16..a94c78512 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,6 +1,7 @@
@@ -691,7 +691,7 @@ index 6a54f2a166..a94c785126 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 1dc8bfecd2..bfcf9b6c4d 100644
+index 1dc8bfecd..bfcf9b6c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -711,7 +711,7 @@ index 1dc8bfecd2..bfcf9b6c4d 100644
      public CraftDispenser(final Block block) {
          super(block, TileEntityDispenser.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index 6566554ab6..df156d0d92 100644
+index 6566554ab..df156d0d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -731,7 +731,7 @@ index 6566554ab6..df156d0d92 100644
      public CraftHopper(final Block block) {
          super(block, TileEntityHopper.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index c029a12441..c26f0b5afc 100644
+index c029a1244..c26f0b5af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -751,7 +751,7 @@ index c029a12441..c26f0b5afc 100644
      public CraftShulkerBox(final Block block) {
          super(block, TileEntityShulkerBox.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c4576..4291edf252 100644
+index 69435c457..4291edf25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -771,7 +771,7 @@ index 69435c4576..4291edf252 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21cd..acb4dee04f 100644
+index e9963e21c..acb4dee04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@

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

@@ -1,14 +1,14 @@
-From e285eb1fe1e6cbe2acba6d05392b04005024bb6f Mon Sep 17 00:00:00 2001
+From 0d46f1966984e67b959aaf94ab2beccf1cf48dcf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 430b5d0cdc..011cbf5e31 100644
+index bd9f03a76..5538dfd9d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -225,4 +225,9 @@ public class PaperConfig {
+@@ -229,4 +229,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
@@ -19,7 +19,7 @@ index 430b5d0cdc..011cbf5e31 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index 0260fb7ec9..45d8de1b7b 100644
+index 0260fb7ec..45d8de1b7 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -177,6 +177,7 @@ public class PersistentScoreboard extends PersistentBase {

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

@@ -1,11 +1,11 @@
-From 371a7184180641fd732e454d8ef10f8606018c60 Mon Sep 17 00:00:00 2001
+From 30789a3c8edc5f4e26a7320e5cd9f1e5bdf5a056 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 38de48ebc2..321da3be35 100644
+index a3823408c..41e73b340 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 38de48ebc2..321da3be35 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -275,4 +274,14 @@ public class PaperWorldConfig {
+@@ -276,4 +275,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -32,7 +32,7 @@ index 38de48ebc2..321da3be35 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 93df154b15..e56f458ca9 100644
+index 93df154b1..e56f458ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1195,6 +1195,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -61,7 +61,7 @@ index 93df154b15..e56f458ca9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 87f3205f82..8c1d25979f 100644
+index 87f3205f8..8c1d25979 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {

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

@@ -1,4 +1,4 @@
-From d94fba211d446e594b97bb2eecd19a7dc92544d8 Mon Sep 17 00:00:00 2001
+From b08649391177cc01b16d318a959465094d90a183 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 321da3be35..0e6c18b327 100644
+index 41e73b340..ec6b550ff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -284,4 +284,18 @@ public class PaperWorldConfig {
+@@ -285,4 +285,18 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
@@ -40,7 +40,7 @@ index 321da3be35..0e6c18b327 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index acc21aec02..c27073d27c 100644
+index acc21aec0..c27073d27 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -39,6 +39,7 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index acc21aec02..c27073d27c 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index bac5c921b6..4f9ece9e47 100644
+index bac5c921b..4f9ece9e4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -317,6 +317,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -76,7 +76,7 @@ index bac5c921b6..4f9ece9e47 100644
              this.f.a();
              this.chunkLoader.b();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ffff87dc03..344b95233f 100644
+index ffff87dc0..344b95233 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -33,14 +33,23 @@ public class PlayerChunk {
@@ -112,7 +112,7 @@ index ffff87dc03..344b95233f 100644
  
              return this.chunk != null;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4d888d6d4f..cf5c76a78e 100644
+index 4d888d6d4..cf5c76a78 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -461,7 +461,13 @@ public class PlayerChunkMap {
@@ -131,7 +131,7 @@ index 4d888d6d4f..cf5c76a78e 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f1c036aa6a..95ec4f48f2 100644
+index f1c036aa6..95ec4f48f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1294,7 +1294,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -150,7 +150,7 @@ index f1c036aa6a..95ec4f48f2 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ff3558363b..90e260f3b3 100644
+index ff3558363..90e260f3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1581,7 +1581,7 @@ public class CraftWorld implements World {
@@ -163,7 +163,7 @@ index ff3558363b..90e260f3b3 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a9b84fdec4..e02647f806 100644
+index a9b84fdec..e02647f80 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -284,6 +284,10 @@ public class ActivationRange

Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch

@@ -1,14 +1,14 @@
-From 0a01c1e28d8e2357e9fa7cdf4682286cafc51820 Mon Sep 17 00:00:00 2001
+From d6def09be9332d4ca4880e9c531e267a369b6516 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 011cbf5e31..cf06f8ac3c 100644
+index 5538dfd9d..0e5773bae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -230,4 +230,9 @@ public class PaperConfig {
+@@ -234,4 +234,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
@@ -19,7 +19,7 @@ index 011cbf5e31..cf06f8ac3c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index f135349174..85c7a96c5a 100644
+index f13534917..85c7a96c5 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -60,7 +60,8 @@ public class NameReferencingFileConverter {
@@ -33,7 +33,7 @@ index f135349174..85c7a96c5a 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7cb795dd89..e125632ffe 100644
+index 7cb795dd8..e125632ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1357,7 +1357,8 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0136-Configurable-packet-in-spam-threshold.patch

@@ -1,14 +1,14 @@
-From 337acb808b81ce7d4dbfe020a896347e929ec663 Mon Sep 17 00:00:00 2001
+From 9f53223bbee1f9a9c355d6db7f8526b5bbb300e1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cf06f8ac3c..2001175bf8 100644
+index 0e5773bae..ed9ae4df3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -235,4 +235,13 @@ public class PaperConfig {
+@@ -239,4 +239,13 @@ public class PaperConfig {
      private static void bungeeOnlineMode() {
          bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
      }
@@ -23,7 +23,7 @@ index cf06f8ac3c..2001175bf8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9ec898d164..7baa679e16 100644
+index 47554df42..c9613bf2d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1186,13 +1186,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch

@@ -1,14 +1,14 @@
-From d69854a0718d761e7e8a5bf74c3716a1f64a6635 Mon Sep 17 00:00:00 2001
+From db73402e6e13134db182d0dde9f1174efe995fbf Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2001175bf8..621c585e7e 100644
+index ed9ae4df3..4bdb0a5f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -244,4 +244,11 @@ public class PaperConfig {
+@@ -248,4 +248,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
@@ -21,7 +21,7 @@ index 2001175bf8..621c585e7e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7baa679e16..fc4e927d67 100644
+index c9613bf2d..4ccebb3f9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,6 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From aabf1de6eaa18e36ab9b50c24db1b2f2ec369eda Mon Sep 17 00:00:00 2001
+From fe7cdbbd2c1695cd6b3237b9cd951b1cd24b99a6 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,10 +12,10 @@ 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 621c585e7e..459c86bce2 100644
+index 4bdb0a5f9..315d85090 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -251,4 +251,15 @@ public class PaperConfig {
+@@ -255,4 +255,15 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
@@ -32,7 +32,7 @@ index 621c585e7e..459c86bce2 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0e6c18b327..c182ceffb1 100644
+index ec6b550ff..499230af6 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 0e6c18b327..c182ceffb1 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -298,4 +299,19 @@ public class PaperWorldConfig {
+@@ -299,4 +300,19 @@ public class PaperWorldConfig {
      private void skipEntityTickingInChunksScheduledForUnload() {
          skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
      }
@@ -64,7 +64,7 @@ index 0e6c18b327..c182ceffb1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c27073d27c..06d6814b83 100644
+index c27073d27..06d6814b8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -52,9 +52,9 @@ public class Chunk implements IChunkAccess {
@@ -96,7 +96,7 @@ index c27073d27c..06d6814b83 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4f9ece9e47..afeb0685b0 100644
+index 4f9ece9e4..afeb0685b 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -116,7 +116,7 @@ index 4f9ece9e47..afeb0685b0 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 982e18f8af..1879c32381 100644
+index 982e18f8a..1879c3238 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -38,6 +38,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -128,7 +128,7 @@ index 982e18f8af..1879c32381 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5f17ec1e9d..94df23c31f 100644
+index d25e5c508..3447afcad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -144,6 +144,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -175,7 +175,7 @@ index 5f17ec1e9d..94df23c31f 100644
          this.methodProfiler.a("snooper");
          if (getSnooperEnabled() && !this.j.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d0c547cc99..12f6812d67 100644
+index d0c547cc9..12f6812d6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -341,6 +341,7 @@ public abstract class PlayerList {
@@ -214,7 +214,7 @@ index d0c547cc99..12f6812d67 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 96002184bb..bf07155bc1 100644
+index 96002184b..bf07155bc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -872,8 +872,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,14 +1,14 @@
-From 2a52beed13f3f3eeccccaec83bb210f0c10aad43 Mon Sep 17 00:00:00 2001
+From ebe77e76a5d76ad93b286e6a654d8e4b78c85c93 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 c182ceffb1..9a2ec07939 100644
+index 499230af6..189ec79f0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -314,4 +314,9 @@ public class PaperWorldConfig {
+@@ -315,4 +315,9 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
@@ -19,7 +19,7 @@ index c182ceffb1..9a2ec07939 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 06d6814b83..7a797bef0d 100644
+index 06d6814b8..7a797bef0 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -829,6 +829,12 @@ public class Chunk implements IChunkAccess {

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

@@ -1,4 +1,4 @@
-From a3cbf1ef9b9bef9fb1dc6f3b8aaf989d380cc04b Mon Sep 17 00:00:00 2001
+From 09a8983338740bfacd3ce69e393a7962c9cd62c7 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 9a2ec07939..f88444c7e7 100644
+index 189ec79f0..4d0f2051a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -315,6 +315,11 @@ public class PaperWorldConfig {
+@@ -316,6 +316,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -23,7 +23,7 @@ index 9a2ec07939..f88444c7e7 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index afeb0685b0..a4c4a9486b 100644
+index afeb0685b..a4c4a9486 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -249,6 +249,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,7 +51,7 @@ index afeb0685b0..a4c4a9486b 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2f1488ee53..859148cb86 100644
+index 2f1488ee5..859148cb8 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -137,6 +137,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

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

@@ -1,11 +1,11 @@
-From 0e73fa9632dbbe4ec144af5f0b97994773f52470 Mon Sep 17 00:00:00 2001
+From 4134a60719294c89762a82aa1ed2141094d07b7a 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 f88444c7e7..f64a5ef35f 100644
+index 4d0f2051a..872001d04 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 f88444c7e7..f64a5ef35f 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -324,4 +325,12 @@ public class PaperWorldConfig {
+@@ -325,4 +326,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
@@ -30,7 +30,7 @@ index f88444c7e7..f64a5ef35f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 33bc46b054..4e1b74ebe4 100644
+index 33bc46b05..4e1b74ebe 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {

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

@@ -1,4 +1,4 @@
-From 964311e665d25efb129818b19d3c3ac8630214d4 Mon Sep 17 00:00:00 2001
+From 39a196741c1700fa0eb36c211f9a2656e89fe58f 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 f64a5ef35f..5df8b1143f 100644
+index 872001d04..b95f259a9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -333,4 +333,14 @@ public class PaperWorldConfig {
+@@ -334,4 +334,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
@@ -28,7 +28,7 @@ index f64a5ef35f..5df8b1143f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 45df38bad4..e8fdf86250 100644
+index 45df38bad..e8fdf8625 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -755,6 +755,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {

Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch

@@ -1,14 +1,14 @@
-From cecf8ef12df4777c1c8f69f7f6420609a352b043 Mon Sep 17 00:00:00 2001
+From 76c7552376cc1589c2638fc771b9267878df9f51 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 459c86bce2..ea6fcb39f4 100644
+index 315d85090..644e01101 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -262,4 +262,13 @@ public class PaperConfig {
+@@ -266,4 +266,13 @@ public class PaperConfig {
              maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
          }
      }
@@ -23,7 +23,7 @@ index 459c86bce2..ea6fcb39f4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 07e7db455b..34c57e26f4 100644
+index 07e7db455..34c57e26f 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -83,6 +83,7 @@ public class ServerStatisticManager extends StatisticManager {

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

@@ -1,4 +1,4 @@
-From b2a476a7e2062d113de8a10658ce6b40b2bad9ee Mon Sep 17 00:00:00 2001
+From 24e6eede4853d38e743e99254a59a3d849df67bb 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 5df8b1143f..0b748d402b 100644
+index b95f259a9..4991138df 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -343,4 +343,10 @@ public class PaperWorldConfig {
+@@ -344,4 +344,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -27,7 +27,7 @@ index 5df8b1143f..0b748d402b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 78b7b8be99..6db20aa75c 100644
+index 78b7b8be9..6db20aa75 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -181,6 +181,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 78b7b8be99..6db20aa75c 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f9a76ce27c..3b4867bfc9 100644
+index f9a76ce27..3b4867bfc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2318,8 +2318,11 @@ public abstract class EntityLiving extends Entity {

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

@@ -1,4 +1,4 @@
-From 6c42bd5659094d1a85307d9ef4dc551473126982 Mon Sep 17 00:00:00 2001
+From 0341dbda511917a87f7fbdb2bbab37c277495bd9 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 0b748d402b..99fe720e8b 100644
+index 4991138df..87c599338 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -349,4 +349,10 @@ public class PaperWorldConfig {
+@@ -350,4 +350,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
@@ -26,7 +26,7 @@ index 0b748d402b..99fe720e8b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 06b663c4db..42c6249535 100644
+index 06b663c4d..42c624953 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -460,7 +460,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 06b663c4db..42c6249535 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 62b7d86e17..932eeb19db 100644
+index 3bcca32ba..355d61704 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1746,6 +1746,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From b8c5c89c35bee66e660db73012b2a74ab647db9e Mon Sep 17 00:00:00 2001
+From 04394aa31f043947da9b7c674852016776da133d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ea6fcb39f4..dbafef023e 100644
+index 644e01101..329950802 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -271,4 +271,9 @@ public class PaperConfig {
+@@ -275,4 +275,9 @@ public class PaperConfig {
          }
          removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
      }
@@ -20,7 +20,7 @@ index ea6fcb39f4..dbafef023e 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d7247a1ec9..ff93460235 100644
+index d7247a1ec..ff9346023 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1987,5 +1987,10 @@ public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
-From 1f16a8e86d08dd4f21e281e6ef39d68909d61119 Mon Sep 17 00:00:00 2001
+From 588438d85b874d5d68a5abfe77c3ab961e773eb9 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 99fe720e8b..c80d84b9b2 100644
+index 87c599338..23cb3feef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -355,4 +355,10 @@ public class PaperWorldConfig {
+@@ -356,4 +356,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
@@ -21,7 +21,7 @@ index 99fe720e8b..c80d84b9b2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 8b0134ecdb..0147054dff 100644
+index 8b0134ecd..0147054df 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -214,7 +214,7 @@ public class EntityCreeper extends EntityMonster {

Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch

@@ -1,4 +1,4 @@
-From 73f5986b0b8ceebddcfb6e30b3c7a4f7d43cd778 Mon Sep 17 00:00:00 2001
+From 0b0a3e748bda1f720b5c63af9d9175550f43232f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dbafef023e..ec89ecfcae 100644
+index 329950802..7a2c70302 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index dbafef023e..ec89ecfcae 100644
  import com.google.common.base.Throwables;
  
  import java.io.File;
-@@ -276,4 +277,9 @@ public class PaperConfig {
+@@ -280,4 +281,9 @@ public class PaperConfig {
      private static void suggestPlayersWhenNull() {
          suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
      }
@@ -27,7 +27,7 @@ index dbafef023e..ec89ecfcae 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 85eff6e2dd..3464af6791 100644
+index 85eff6e2d..3464af679 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -241,6 +241,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {

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

@@ -1,14 +1,14 @@
-From ba753e79cce891252f5a7acc373fe4bd63a7d969 Mon Sep 17 00:00:00 2001
+From 07b380c41787410463243cd3b4610603b2f93945 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 c80d84b9b2..605e84173d 100644
+index 23cb3feef..1c642e636 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -361,4 +361,10 @@ public class PaperWorldConfig {
+@@ -362,4 +362,10 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
@@ -20,7 +20,7 @@ index c80d84b9b2..605e84173d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2904a845b1..142b6cc033 100644
+index 2904a845b..142b6cc03 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -994,16 +994,30 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,4 +1,4 @@
-From 7f9f65664836f95ae0a274c8d6895f515ddcd0c6 Mon Sep 17 00:00:00 2001
+From eb6289939059668071131cd9acee2ee6c026caf7 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 605e84173d..703642c0b6 100644
+index 1c642e636..87c0feb25 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -367,4 +367,13 @@ public class PaperWorldConfig {
+@@ -368,4 +368,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
@@ -26,7 +26,7 @@ index 605e84173d..703642c0b6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index bfe2d03a57..9fd07f8596 100644
+index bfe2d03a5..9fd07f859 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -172,7 +172,7 @@ public class PlayerChunkMap {

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

@@ -1,4 +1,4 @@
-From 5afc717dcba0250b8eae9c051c8cde1729b95414 Mon Sep 17 00:00:00 2001
+From 463a09fd84f4d456094bbaf1608897879de235ff 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 703642c0b6..faa7597b35 100644
+index 87c0feb25..f3ab146d3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -376,4 +376,15 @@ public class PaperWorldConfig {
+@@ -377,4 +377,15 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }
@@ -33,7 +33,7 @@ index 703642c0b6..faa7597b35 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 344b95233f..fcd9f5491f 100644
+index 344b95233..fcd9f5491 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -28,6 +28,7 @@ public class PlayerChunk {
@@ -53,7 +53,7 @@ index 344b95233f..fcd9f5491f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9fd07f8596..e29aaab2da 100644
+index 9fd07f859..e29aaab2d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -140,6 +140,7 @@ public class PlayerChunkMap {
@@ -77,7 +77,7 @@ index 9fd07f8596..e29aaab2da 100644
                      if (playerchunk1.a(flag)) {
                          iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 9aaca21a79..f50d55c8ee 100644
+index 9aaca21a7..f50d55c8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -35,4 +35,10 @@ public class ChunkIOExecutor {
@@ -92,7 +92,7 @@ index 9aaca21a79..f50d55c8ee 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621c6..cf1258c559 100644
+index 193c3621c..cf1258c55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 @@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {

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

@@ -1,4 +1,4 @@
-From 2c20d9aab412c5b9d160456ef45d397a162298f5 Mon Sep 17 00:00:00 2001
+From d28ac9662ec743cf08fb7978e1033b1ecf267d31 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 faa7597b35..fddd52caf7 100644
+index f3ab146d3..128034dbb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -387,4 +387,9 @@ public class PaperWorldConfig {
+@@ -388,4 +388,9 @@ public class PaperWorldConfig {
              log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
          }
      }
@@ -21,7 +21,7 @@ index faa7597b35..fddd52caf7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 97de169de2..3099f6aa7a 100644
+index 97de169de..3099f6aa7 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {

Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch

@@ -1,14 +1,14 @@
-From 1abea43276b9357235efc7be09498deb92abb24d Mon Sep 17 00:00:00 2001
+From 03bde12d5856ae2c86d660a0e14b4e3d272c82c3 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 fddd52caf7..79df2c171c 100644
+index 128034dbb..2ce60eb05 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -179,6 +179,11 @@ public class PaperWorldConfig {
+@@ -180,6 +180,11 @@ public class PaperWorldConfig {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
  
@@ -21,7 +21,7 @@ index fddd52caf7..79df2c171c 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cd3e021a09..d04f9b380e 100644
+index cd3e021a0..d04f9b380 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1021,6 +1021,7 @@ public abstract class EntityHuman extends EntityLiving {

Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch

@@ -1,14 +1,14 @@
-From fe2892e1dc7eb3ac18ed6567e1147369884de47f Mon Sep 17 00:00:00 2001
+From 1a71c96aa9cb6788c37d8c728f6f264c51d6556f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ec89ecfcae..b602bbf122 100644
+index 7a2c70302..03846919f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -282,4 +282,13 @@ public class PaperConfig {
+@@ -286,4 +286,13 @@ public class PaperConfig {
      private static void authenticationServersDownKickMessage() {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
@@ -23,7 +23,7 @@ index ec89ecfcae..b602bbf122 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a562e1e46c..cbfdb3cf79 100644
+index a562e1e46..cbfdb3cf7 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -144,6 +144,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {

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

@@ -1,4 +1,4 @@
-From 0fb62afd179e3993ab22f01b2d2e3de1f49b6637 Mon Sep 17 00:00:00 2001
+From 2d83beeb89c8ab579c3069503d3a404cd87058c9 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 79df2c171c..b07ff95871 100644
+index 2ce60eb05..9daa8f66a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -397,4 +397,9 @@ public class PaperWorldConfig {
+@@ -398,4 +398,9 @@ public class PaperWorldConfig {
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
@@ -20,7 +20,7 @@ index 79df2c171c..b07ff95871 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5015bd0710..738ac8570c 100644
+index 5015bd071..738ac8570 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1073,7 +1073,11 @@ public abstract class EntityHuman extends EntityLiving {

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

@@ -1,4 +1,4 @@
-From 1cd1ff965f693b0ec852d79ea2355cb37abb2f9d Mon Sep 17 00:00:00 2001
+From 09e45ce6ab61d7e5c112db870bf4595d1b849fab 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 b07ff95871..f1db4becde 100644
+index 9daa8f66a..3467da7c8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -402,4 +402,10 @@ public class PaperWorldConfig {
+@@ -403,4 +403,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
@@ -27,7 +27,7 @@ index b07ff95871..f1db4becde 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index fc8c0cab55..dd8af4be80 100644
+index fc8c0cab5..dd8af4be8 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -242,6 +242,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {

Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch

@@ -1,4 +1,4 @@
-From dea60591fcd04c41b13cfd83ac0f530d1b32a9d5 Mon Sep 17 00:00:00 2001
+From 2c64129f6d08bbf3d89edebe4c9c5c0ae61849b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,10 +36,10 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b602bbf122..62bce18061 100644
+index 03846919f..5a17ce3d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -291,4 +291,12 @@ public class PaperConfig {
+@@ -295,4 +295,12 @@ public class PaperConfig {
                      "such as inventories, experience points, advancements and the like will not be saved when they log out.");
          }
      }
@@ -53,7 +53,7 @@ index b602bbf122..62bce18061 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
-index add618866b..9f8e17b9d3 100644
+index add618866..9f8e17b9d 100644
 --- a/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 @@ -14,8 +14,8 @@ import java.util.Random;

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

@@ -1,14 +1,14 @@
-From 78c7950323b1153c58924dade556acde3e186391 Mon Sep 17 00:00:00 2001
+From b8fa6ff3c7fec9b9e738a30b035ac02f99458639 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 f1db4becde..ef4bfb480c 100644
+index 3467da7c8..ddb5ced79 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -408,4 +408,9 @@ public class PaperWorldConfig {
+@@ -409,4 +409,9 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
@@ -19,7 +19,7 @@ index f1db4becde..ef4bfb480c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 999a02cad3..eaab10a146 100644
+index 999a02cad..eaab10a14 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2664,7 +2664,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,7 +49,7 @@ index 999a02cad3..eaab10a146 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 524cfd99b7..a6f847e313 100644
+index 524cfd99b..a6f847e31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -530,5 +530,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

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

@@ -1,14 +1,14 @@
-From 770fa922234383edf17ee299d257f62ac875b832 Mon Sep 17 00:00:00 2001
+From 15430aff83e4e6c4898c73d44039ce3e8ef05064 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 ef4bfb480c..1607619bd0 100644
+index ddb5ced79..270138804 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -413,4 +413,9 @@ public class PaperWorldConfig {
+@@ -414,4 +414,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
@@ -19,7 +19,7 @@ index ef4bfb480c..1607619bd0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index a20d54ee34..48bcda0f50 100644
+index a20d54ee3..48bcda0f5 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -29,9 +29,12 @@ public class EnderDragonBattle {

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

@@ -1,4 +1,4 @@
-From 940ace0eb306f6911a0743804edec04b445cff9c Mon Sep 17 00:00:00 2001
+From 27e79afaee379c27cfeebbbe409643abff6b530a 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 1607619bd0..6922061276 100644
+index 270138804..7bd7aa0d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -418,4 +418,15 @@ public class PaperWorldConfig {
+@@ -419,4 +419,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
@@ -30,7 +30,7 @@ index 1607619bd0..6922061276 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 6832eaac5d..b9cb59fa72 100644
+index 6832eaac5..b9cb59fa7 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -172,7 +172,54 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {

Spigot-Server-Patches/0300-Additional-Paper-Config-options.patch

@@ -1,37 +0,0 @@
-From ccd7f0abffd40781df772807c10fbbfeeb72f496 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 21 Jul 2018 14:23:31 -0400
-Subject: [PATCH] Additional Paper Config options
-
-Have to keep as sep patch for now until 1.13, otherwise we can't merge :/
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 62bce18061..5a17ce3d22 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -67,6 +67,10 @@ public class PaperConfig {
-         readConfig(PaperConfig.class, null);
-     }
- 
-+    protected static void logError(String s) {
-+        Bukkit.getLogger().severe(s);
-+    }
-+
-     protected static void log(String s) {
-         if (verbose) {
-             Bukkit.getLogger().info(s);
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6922061276..7bd7aa0d94 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -8,6 +8,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
- import org.spigotmc.SpigotWorldConfig;
- 
- import static com.destroystokyo.paper.PaperConfig.log;
-+import static com.destroystokyo.paper.PaperConfig.logError;
- 
- public class PaperWorldConfig {
- 
--- 
-2.18.0
-

Spigot-Server-Patches/0300-PlayerElytraBoostEvent.patch

@@ -0,0 +1,32 @@
+From 6bfd7bc02e47e3745fdbe5bd300fff5b02a63082 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sat, 21 Jul 2018 01:59:59 -0500
+Subject: [PATCH] PlayerElytraBoostEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
+index d4420e68f..82da8dd38 100644
+--- a/src/main/java/net/minecraft/server/ItemFireworks.java
++++ b/src/main/java/net/minecraft/server/ItemFireworks.java
+@@ -35,9 +35,15 @@ public class ItemFireworks extends Item {
+                 EntityFireworks entityfireworks = new EntityFireworks(world, itemstack, entityhuman);
+ 
+                 entityfireworks.spawningEntity = entityhuman.getUniqueID(); // Paper
+-                world.addEntity(entityfireworks);
+-                if (!entityhuman.abilities.canInstantlyBuild) {
+-                    itemstack.subtract(1);
++                // Paper start
++                com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Firework) entityfireworks.getBukkitEntity());
++                if (event.callEvent() && world.addEntity(entityfireworks)) {
++                    if (event.shouldConsume() && !entityhuman.abilities.canInstantlyBuild) {
++                        itemstack.subtract(1);
++                    } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
++                } else if (entityhuman instanceof EntityPlayer) {
++                    ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
++                    // Paper end
+                 }
+             }
+ 
+-- 
+2.18.0
+