Make scan-for-legacy-ender-dragon config work again

Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
2024-11-26 12:36:07 +01:00 · 2018-12-14 20:17:27 -05:00 · 2018-12-14 20:17:27 -05:00 · 8ed2992da9
commit 8ed2992da9
parent fa35d5a102
259 changed files with 763 additions and 800 deletions
--- a/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
@ -1,47 +0,0 @@
-From 1f59c8b7e5a197c0e92316d0d94a9abccea522bf 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 ae3d0f8f7..6b92ea437 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -280,4 +280,13 @@ public class PaperConfig {
-             maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
-         }
-     }
-+
-+    public static boolean removeInvalidStatistics = false;
-+    private static void removeInvalidStatistics() {
-+        if (version < 12) {
-+            boolean oldValue = getBoolean("remove-invalid-statistics", false);
-+            set("settings.remove-invalid-statistics", oldValue);
-+        }
-+        removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 4ddc33ca5..3ecd69786 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 {
-         try {
-             JsonReader jsonreader = new JsonReader(new StringReader(s));
-             Throwable throwable = null;
-+            java.util.List<String> invalidStats = com.google.common.collect.Lists.newArrayList(); // Paper
- 
-             try {
-                 jsonreader.setLenient(false);
-@@ -120,6 +121,7 @@ public class ServerStatisticManager extends StatisticManager {
- 
-                                             if (statistic == null) {
-                                                 ServerStatisticManager.b.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
-+                                                if (com.destroystokyo.paper.PaperConfig.removeInvalidStatistics) invalidStats.add(s2); // Paper
-                                             } else {
-                                                 this.a.put(statistic, nbttagcompound2.getInt(s2));
-                                             }
-- 
-2.19.2
-
--- a/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0158-Properly-fix-item-duplication-bug.patch
@ -1,4 +1,4 @@
-From 2e2a5e39152f5951b37a6e851906618b81937a2d Mon Sep 17 00:00:00 2001
+From c6826e0393670c1f2020fa57a8efa20ffc10a690 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@ -32,5 +32,5 @@ index 6530b6be8..553f76b81 100644
     // CraftBukkit end
 }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0159-String-based-Action-Bar-API.patch
@ -1,11 +1,11 @@
-From 4327088027d158125707cbc83a6e8528359caf57 Mon Sep 17 00:00:00 2001
+From 0d984d092d2501eb061c821b72120350a3e77d7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API


 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index faec947224..dce1417aff 100644
+index c97e116aa..e1af5c488 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
@ -42,7 +42,7 @@ index faec947224..dce1417aff 100644
     public static boolean isMainThread() {
         return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7c1444dff2..1ddbb4329d 100644
+index 1f21e54ab..05070285b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -65,5 +65,5 @@ index 7c1444dff2..1ddbb4329d 100644
     public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
          if (header != null) {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0160-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0160-Firework-API-s.patch
@ -1,11 +1,11 @@
-From 38fd6ea28a3b7560f0ec309f7bfa7ea6571c8655 Mon Sep 17 00:00:00 2001
+From 97fdbff7671b0ebe0afce23f07c242959fb53481 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's


 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 6e2592e96d..7ff57d9cda 100644
+index 1fa527fe4..3d9dd50d7 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
@ -54,7 +54,7 @@ index 6e2592e96d..7ff57d9cda 100644
 
     public boolean bk() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 936faccbf8..d971bbc76c 100644
+index 936faccbf..d971bbc76 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -14,6 +14,7 @@ public class ItemFireworks extends Item {
@ -74,7 +74,7 @@ index 936faccbf8..d971bbc76c 100644
                 if (!entityhuman.abilities.canInstantlyBuild) {
                     itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 2a66a30264..6046e3e7b9 100644
+index db4e4b859..49280bd60 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -101,7 +101,7 @@ public class NBTTagCompound implements NBTBase {
@ -87,7 +87,7 @@ index 2a66a30264..6046e3e7b9 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 7b3b206823..b39e33f4f0 100644
+index 7b3b20682..b39e33f4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -1,6 +1,7 @@
@ -130,5 +130,5 @@ index 7b3b206823..b39e33f4f0 100644
 +    // Paper end
 }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0161-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From f8d41615a68e7ccdf94eff4ab5fe3d84ebb58149 Mon Sep 17 00:00:00 2001
+From 44bfbea03ead23fa4f965221541ea75158baca92 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event

 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 2a17115ac6..b36dcb4d7d 100644
+index 1d934170f..af71c7c48 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
@@ -126,7 +126,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@ -19,5 +19,5 @@ index 2a17115ac6..b36dcb4d7d 100644
                     if (teleEvent.isCancelled()) {
                         return;
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0162-ShulkerBox-Dupe-Prevention.patch
@ -1,4 +1,4 @@
-From e618f0e07ba700822b5535b70b756e9b1c37664a Mon Sep 17 00:00:00 2001
+From e80a8c46c6462f6ab527d9ab29be39f9b904c84e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.

 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index 82b4d82c0e..d00bd9d610 100644
+index de8fc8bba..978c9954d 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
@@ -100,6 +100,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@ -19,5 +19,5 @@ index 82b4d82c0e..d00bd9d610 100644
             }
             world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0163-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,4 +1,4 @@
-From 3b2f3e7b47b162860acc8996994b710c83082a64 Mon Sep 17 00:00:00 2001
+From 5a5b6bd59f789ea63dab28946a3bb4f88293a24f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0b3de7a76..e0d91ff69 100644
+index f0e974dff..bcfe4c1da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -87,6 +87,29 @@ public class CraftWorld implements World {
@ -41,5 +41,5 @@ index 0b3de7a76..e0d91ff69 100644
 
     public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0164-Enforce-Sync-Player-Saves.patch
@ -1,4 +1,4 @@
-From 2a263f5083a6f68a1411638b82d48cddf7c608e4 Mon Sep 17 00:00:00 2001
+From c46ecb0b1a3747bc0c0b3c67b37e2a8d739aba66 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7d778ff3e0..06ce2af1e6 100644
+index 1259ec9d6..b10ac733f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1215,6 +1215,7 @@ public abstract class PlayerList {
@ -27,5 +27,5 @@ index 7d778ff3e0..06ce2af1e6 100644
     // Paper end
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0165-Enforce-Sync-Chunk-Unloads.patch
@ -1,4 +1,4 @@
-From 759515324317d0bb197271d3904fff448cbd9aa7 Mon Sep 17 00:00:00 2001
+From c199e596d1cda4b002a08669e4352b0ecba893eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e0d91ff69..dbc8dc4b9 100644
+index bcfe4c1da..3a30349f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -235,6 +235,7 @@ public class CraftWorld implements World {
@ -27,5 +27,5 @@ index e0d91ff69..dbc8dc4b9 100644
 
     public boolean regenerateChunk(int x, int z) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0166-Don-t-allow-entities-to-ride-themselves-572.patch
@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 058e8cad776e0ad46d4c4d966a5beb412db85f34 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 3c07995a1..04cd6350c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2077,6 +2077,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -17,5 +17,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         } else {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0167-Fix-block-break-desync.patch
@ -1,4 +1,4 @@
-From 1a44a092ae83a6bd26aa99853dc7e7076329992d Mon Sep 17 00:00:00 2001
+From 61acbcb04d8ab4e38ff284f67680f73979d5b137 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
@ -18,5 +18,5 @@ index 553f76b81..03b986bfa 100644
             } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                 return;
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From 0bd7c165024bdd1dca19cb06ee1d731bedcd34c2 Mon Sep 17 00:00:00 2001
+From ed3e84df8aeeedde312bc586cd7216a2a9d85c0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -257,5 +257,5 @@ index 3a09cab3d..3302af0e4 100644
     public EntityExperienceOrb getHandle() {
         return (EntityExperienceOrb) entity;
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From ccb735e983f8aeaee26011afd4004292fcb6c902 Mon Sep 17 00:00:00 2001
+From 7892fe99c3195ea12ed4d882c053f2fa4bbba3c1 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
--- a/Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0170-Remove-CraftScheduler-Async-Task-Debugger.patch
@ -1,4 +1,4 @@
-From f5086788419d64e74ca4647a8e34d439837a6f65 Mon Sep 17 00:00:00 2001
+From 9656eb24104944d9832febd4350401ee4178bfc6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching

 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 3f43d9eeab..5f228373e3 100644
+index e76882b8e..8963168ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -85,8 +85,8 @@ public class CraftScheduler implements BukkitScheduler {
@ -58,5 +58,5 @@ index 3f43d9eeab..5f228373e3 100644
 
     @Deprecated
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch
@ -1,4 +1,4 @@
-From 8d6e913bba8c42ec058c9bee03f22a2f43b4418f Mon Sep 17 00:00:00 2001
+From f0c1975cdbe87b4d2bba6c6cb2fc081b0d026433 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?

 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index 7148ea3692..6d4e82b404 100644
+index 7148ea369..6d4e82b40 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
@@ -46,7 +46,7 @@ public class BlockBeacon extends BlockTileEntity {
@ -34,5 +34,5 @@ index 7148ea3692..6d4e82b404 100644
     }
 }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0172-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@ -1,4 +1,4 @@
-From 63b46cf991a70de400e6f4f162c9f7860200973a Mon Sep 17 00:00:00 2001
+From 7c287d67fafef3b966a88602b803b14f44ce4188 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
@ -18,5 +18,5 @@ index 570ddc1a8..3854464e8 100644
 
                 LongIterator longiterator = this.unloadQueue.iterator();
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0173-Do-not-let-armorstands-drown.patch
@ -1,4 +1,4 @@
-From df943e565391509876e8ad06bbe47a9b0a2560f7 Mon Sep 17 00:00:00 2001
+From a1e7d68d0ae7f38e6b94e715c5a87a8af234c71d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
@ -41,5 +41,5 @@ index be0a3f38e..a6457e870 100644
                     if (this.getAirTicks() == -20) {
                         this.setAirTicks(0);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0174-Properly-handle-async-calls-to-restart-the-server.patch
@ -1,4 +1,4 @@
-From 9f61283f8da8c7033bc081f086dbaca6bb987824 Mon Sep 17 00:00:00 2001
+From 43480f765c8ce2abba530e068f7d17448fe4b92a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a547ee5ca1..8d345a0502 100644
+index acdfb0e1e..a1a574023 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -90,6 +90,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -68,7 +68,7 @@ index a547ee5ca1..8d345a0502 100644
     private boolean aT() {
         return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 06ce2af1e6..e61a638752 100644
+index b10ac733f..3f96443eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1333,10 +1333,15 @@ public abstract class PlayerList {
@ -97,7 +97,7 @@ index 06ce2af1e6..e61a638752 100644
     // CraftBukkit start
     public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 947c43a5d0..f15fd9f370 100644
+index 947c43a5d..f15fd9f37 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -46,88 +46,123 @@ public class RestartCommand extends Command
@ -296,5 +296,5 @@ index 947c43a5d0..f15fd9f370 100644
     }
 }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0175-Add-system-property-to-disable-book-size-limits.patch
@ -1,4 +1,4 @@
-From dd36b59cafdc53476976450108b186568f4ad908 Mon Sep 17 00:00:00 2001
+From 3105668521742bb253d9380fb45fcb8cce56e8cd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 6ff1a2dcd6..64a9399527 100644
+index a23ec1461..20cddd506 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@ -57,5 +57,5 @@ index 6ff1a2dcd6..64a9399527 100644
             }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0176-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -1,4 +1,4 @@
-From d137a62193d8957f4827a0fd88c9dc1ffb3ec296 Mon Sep 17 00:00:00 2001
+From 2567e9bea1e84723a4bd29eb7c83ff61e016e429 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
--- a/Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0177-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From e7c21d8261cf07245b54ac31b545edc05deb4eb8 Mon Sep 17 00:00:00 2001
+From 1d4727137de48e632ae85472704bb0cf5b165115 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,12 +6,12 @@ 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 6b92ea437..963096fb3 100644
+index 9f8b43d2a..3f59e060b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -289,4 +289,9 @@ public class PaperConfig {
+@@ -280,4 +280,9 @@ public class PaperConfig {
+             maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
         }
-         removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
     }
 +
 +    public static boolean suggestPlayersWhenNullTabCompletions = true;
@ -20,7 +20,7 @@ index 6b92ea437..963096fb3 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 67dd3b908..b671e17c8 100644
+index 5ec283f5d..ba702591a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2101,5 +2101,10 @@ public final class CraftServer implements Server {
@ -35,5 +35,5 @@ index 67dd3b908..b671e17c8 100644
     // Paper end
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0178-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -1,4 +1,4 @@
-From fc463a63b1182b9104003f32905dd6b61f567a45 Mon Sep 17 00:00:00 2001
+From eeaa1bd05811d93b423295ef79a28377e7af0b8d Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -588,5 +588,5 @@ index 5cee8f00e..08b6bb7f9 100644
             <AppenderRef ref="TerminalConsole" level="info"/>
         </Root>
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0179-provide-a-configurable-option-to-disable-creeper-lin.patch
@ -1,4 +1,4 @@
-From cce5d1e0dec1f229b70a547a10fa32e296d3fdc3 Mon Sep 17 00:00:00 2001
+From 71d83d49a94f00f87c916b14071cc7e2d0ed53c1 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
--- a/Spigot-Server-Patches/0180-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0180-Item-canEntityPickup.patch
@ -1,11 +1,11 @@
-From 1ab48f50256eaea71822fe4b181bfbb22bbb7f72 Mon Sep 17 00:00:00 2001
+From a0e86f8577578e900b88631dbb12e3ee8ffd4d7b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 41a4962e94..200d46a8a0 100644
+index 4ec79ccdb..a28aa016c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -529,6 +529,11 @@ public abstract class EntityInsentient extends EntityLiving {
@ -21,7 +21,7 @@ index 41a4962e94..200d46a8a0 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 5be2d93146..5446ff3e82 100644
+index 3c30cd5b3..ac0f38e12 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -13,6 +13,7 @@ public class EntityItem extends Entity {
@ -33,7 +33,7 @@ index 5be2d93146..5446ff3e82 100644
     private UUID f;
     private UUID g;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d69..1df17f09bb 100644
+index a17a537d6..1df17f09b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
@ -54,5 +54,5 @@ index a17a537d69..1df17f09bb 100644
     public String toString() {
         return "CraftItem";
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0181-PlayerPickupItemEvent-setFlyAtPlayer.patch
@ -1,11 +1,11 @@
-From df7bf328a6c36551758f3a52f2ec36c3a380afb1 Mon Sep 17 00:00:00 2001
+From 8e87c447aeaf60619c17d4800980fedcb2fdfb52 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer


 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 3e70a06397..d9d52a63d8 100644
+index ac0f38e12..c18654256 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -308,6 +308,7 @@ public class EntityItem extends Entity {
@ -43,5 +43,5 @@ index 3e70a06397..d9d52a63d8 100644
                     this.die();
                     itemstack.setCount(i);
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0182-PlayerAttemptPickupItemEvent.patch
@ -1,11 +1,11 @@
-From 9c188947d2debdea36e4796d455b317400fb7bd3 Mon Sep 17 00:00:00 2001
+From beb52bdc2048cc886d469c876fbac60eefbe1091 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent


 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index d9d52a63d8..946e59753e 100644
+index c18654256..0b4cab0af 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@ -40,5 +40,5 @@ index d9d52a63d8..946e59753e 100644
                 itemstack.setCount(canHold);
                 // Call legacy event
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0183-Add-UnknownCommandEvent.patch
@ -1,11 +1,11 @@
-From 0319cf8b364a3ccb8c8e282402132324106cea46 Mon Sep 17 00:00:00 2001
+From c8f278f4c0620be9cbd282756ffea604fcdc5ae5 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d7f7aa6f..0a4f18a6c 100644
+index 97fa98d2c..873170864 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -83,6 +83,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@ -32,5 +32,5 @@ index 7d7f7aa6f..0a4f18a6c 100644
         // Spigot end
 
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0184-Basic-PlayerProfile-API.patch
@ -1,4 +1,4 @@
-From 848a15e3d2e2154829285ceb64f36cb085541e8f Mon Sep 17 00:00:00 2001
+From 3fdf826658a104dd664d8178cecd9f402e5cd17d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@ -429,7 +429,7 @@ index e1af5c488..0ef5ad116 100644
      * Calculates distance between 2 entities
      * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64a3dafe6..12b1b1db7 100644
+index ce1805062..34ba382a4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1189,7 +1189,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -486,7 +486,7 @@ index a47a51a41..4c476f757 100644
 
         private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0a4f18a6c..2d034beae 100644
+index 873170864..72da1fe81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -162,6 +162,10 @@ import org.bukkit.event.server.ServerLoadEvent;
@ -523,5 +523,5 @@ index 0a4f18a6c..2d034beae 100644
     // Paper end
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0185-Shoulder-Entities-Release-API.patch
@ -1,4 +1,4 @@
-From ff3ab20478e71d9a45131040a17d5d0ee10edad4 Mon Sep 17 00:00:00 2001
+From 80ab0c3282b4be60a0f0703fd4341aae2bc71fed Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
@ -99,5 +99,5 @@ index be00d79e8..755d288ed 100644
     public boolean discoverRecipe(NamespacedKey recipe) {
         return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0186-Profile-Lookup-Events.patch
@ -1,4 +1,4 @@
-From 3a6c7455737ff1a22df6a359d0a65c72b2c77c04 Mon Sep 17 00:00:00 2001
+From 55c3f1f54797809a5ac5ef73753d9c4ae16edb65 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
     }
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0187-Block-player-logins-during-server-shutdown.patch
@ -1,11 +1,11 @@
-From 7961a44c32429c4b9ba1ca80f5dd68e3fb253db0 Mon Sep 17 00:00:00 2001
+From 912a05f471cf950cf051635db0bc1a1dc4836711 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown


 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 19ac21e38..8bbea9624 100644
+index bb08200e7..90d1096e5 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -50,6 +50,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -22,5 +22,5 @@ index 19ac21e38..8bbea9624 100644
             this.b();
         } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0188-Entity-fromMobSpawner.patch
@ -1,11 +1,11 @@
-From 2954712fa48765b5b56059acb6ff7a3337e582ca Mon Sep 17 00:00:00 2001
+From 13bc4086ea4079765780171471980e6003f2a62d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9565b7527..5b7f0215f 100644
+index e26c9ee28..07a64966e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -37,7 +37,7 @@ index 9565b7527..5b7f0215f 100644
 
         } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index ba4301346..7f84957bb 100644
+index ce43b4bc5..98065d6b0 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@ -64,5 +64,5 @@ index 2858f11ee..5689f8390 100644
     // Paper end
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0189-Fix-Anvil-Level-sync-to-client.patch
@ -1,4 +1,4 @@
-From 185c3ae637464f75ca6bfae9daacbe24f5b5093f Mon Sep 17 00:00:00 2001
+From 704e788ddc7c522ef2437e1e3f0cfbd9ada64b85 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@ -42,5 +42,5 @@ index 05070285b..0df834fc1 100644
         return true;
     }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0190-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@ -1,4 +1,4 @@
-From 27561c26a78ebee8146b8e4f040496bddde42e64 Mon Sep 17 00:00:00 2001
+From a9c576e831952dc4651dbad0ca7e64f188a4f94a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt


 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f9b4f314ce..65fe50882b 100644
+index b5b1a2637..b80315bc5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -24,5 +24,5 @@ index f9b4f314ce..65fe50882b 100644
         return result;
     }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0191-Improve-the-Saddle-API-for-Horses.patch
@ -1,4 +1,4 @@
-From b024c6904375e8248a5bcdbc6d29d4c9a1f3fcba Mon Sep 17 00:00:00 2001
+From 85ec0814325c3a54b11db44f173f4239975d47fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 14d0416802..e56bef3340 100644
+index 14d041680..e56bef334 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@ -27,7 +27,7 @@ index 14d0416802..e56bef3340 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 173818e682..2f68524049 100644
+index 173818e68..2f6852404 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
@@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@ -41,7 +41,7 @@ index 173818e682..2f68524049 100644
         super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 0000000000..99cfbaf90b
+index 000000000..99cfbaf90
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
@@ -0,0 +1,15 @@
@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b
 +
 +}
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0192-Implement-ensureServerConversions-API.patch
@ -1,4 +1,4 @@
-From 28e876d491ba820cc07a15dae470563eba5b7e31 Mon Sep 17 00:00:00 2001
+From 101bcf13b1aef3fa2e0e3b952e403005e9fb5edd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@ -22,5 +22,5 @@ index 52041caed..f5fa58d6c 100644
 +    // Paper end
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0193-Implement-getI18NDisplayName.patch
@ -1,4 +1,4 @@
-From b1af484d9a636ef9e977a8584f4c3a9f08f54ed0 Mon Sep 17 00:00:00 2001
+From 22cff63dd8b19e091581b367580ce88e89a22a75 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@ -48,5 +48,5 @@ index f5fa58d6c..3a6e6f687 100644
     // Paper end
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0194-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 0cdc623700a1b50c3acea53bb5dafa30c1d4b9ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne
 It's triggered when Hell/End worlds are empty of players.

 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index e5605c309..9d971a9c5 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -194,7 +194,7 @@ public class PlayerChunkMap {
@ -22,5 +22,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
             }
             } // Paper timing
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0195-ProfileWhitelistVerifyEvent.patch
@ -1,11 +1,11 @@
-From af4db5029b964c6798b837610a64d2adc9052174 Mon Sep 17 00:00:00 2001
+From 63e0e80ed62f23b45e71807d7247928949feb339 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index de549d207c..6bdeb2cc90 100644
+index fb9b0835b..64a86b699 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -544,9 +544,9 @@ public abstract class PlayerList {
@ -48,5 +48,5 @@ index de549d207c..6bdeb2cc90 100644
     public boolean isOp(GameProfile gameprofile) {
         return this.operators.d(gameprofile) || this.server.H() && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().u() && this.server.G().equalsIgnoreCase(gameprofile.getName()) || this.u;
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0196-Fix-this-stupid-bullshit.patch
@ -1,4 +1,4 @@
-From 4f58e975be7c2202435ea860d5e962941c021d0a Mon Sep 17 00:00:00 2001
+From afa4f9949f3ab39721d6d341ff2fda03ab44c855 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@ -29,5 +29,5 @@ index b174a4efa..c9a6b5afb 100644
                 }
 
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0197-Ocelot-despawns-should-honor-nametags-and-leash.patch
@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 57f01552ff909b09dde2830a199e523ebf74d855 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash


 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9fc35730a..2a5a5516a 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -61,7 +61,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -18,5 +18,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 
     protected void initAttributes() {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0198-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@ -1,11 +1,11 @@
-From 07ceae1ae72511ececf469231511c23d7be7a550 Mon Sep 17 00:00:00 2001
+From 57d7b3c61b1932a8b1e32158546d62f0e1007c82 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled


 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 72b12d869e..408ef423e9 100644
+index 98065d6b0..027ba7191 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -121,6 +121,9 @@ public abstract class MobSpawnerAbstract {
@ -28,5 +28,5 @@ index 72b12d869e..408ef423e9 100644
                 }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0199-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@ -1,11 +1,11 @@
-From dfe68b605eafeba30f3fb064ce05d08c96e63349 Mon Sep 17 00:00:00 2001
+From c5f69b14314ce7cd684e89b68e01fd1eb66e7de1 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 785611f0e2..b17215edf4 100644
+index c92df00e8..44ed34174 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1323,7 +1323,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -22,5 +22,5 @@ index 785611f0e2..b17215edf4 100644
             this.tileEntityListUnload.clear();
         }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0200-Allow-specifying-a-custom-authentication-servers-dow.patch
@ -1,4 +1,4 @@
-From ed7f8a0d3ff1263fbea81d77508bfe18f275606b Mon Sep 17 00:00:00 2001
+From 879525f34fe5bcee534a7b250b04d87a6190503e 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 963096fb3..a499578db 100644
+index 3f59e060b..305a1258f 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 963096fb3..a499578db 100644
 import com.google.common.base.Throwables;
 
 import java.io.File;
-@@ -294,4 +295,9 @@ public class PaperConfig {
+@@ -285,4 +286,9 @@ public class PaperConfig {
     private static void suggestPlayersWhenNull() {
         suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
     }
@ -42,5 +42,5 @@ index 90d1096e5..b682b3a43 100644
                             LoginListener.c.error("Couldn't verify username because servers are unavailable");
                         }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0201-LivingEntity-setKiller.patch
@ -1,4 +1,4 @@
-From 00cd9b171c9374b53c83a5f08df068c2c749740f Mon Sep 17 00:00:00 2001
+From bd1155c27e1a0fa98e542d14396d71befd73985d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
@ -26,5 +26,5 @@ index 716eda990..2f96842bb 100644
         return addPotionEffect(effect, false);
     }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0202-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@ -1,4 +1,4 @@
-From bd9ca6e169ebb2bfa1848f3ca94291a7c0beddc5 Mon Sep 17 00:00:00 2001
+From c4e09d0639b742ae0ac2e4a0ccec89eb9f34cf16 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.

 diff --git a/pom.xml b/pom.xml
-index d93a180de9..815f9ef393 100644
+index ea08d7d98..f34ca2285 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -62,6 +62,11 @@
@ -28,7 +28,7 @@ index d93a180de9..815f9ef393 100644
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 9fdb6d100b..674609cad3 100644
+index 908127630..fb9db65ee 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -45,5 +45,5 @@ index 9fdb6d100b..674609cad3 100644
 
         thread.setDaemon(true);
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0203-Handle-plugin-prefixes-using-Log4J-configuration.patch
@ -1,4 +1,4 @@
-From 45e1223c049ddcb41d076b94e742adf299b762eb Mon Sep 17 00:00:00 2001
+From 23440a8f025c817ae8d4040543e1b98c74a271d6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.

 diff --git a/pom.xml b/pom.xml
-index 815f9ef393..ed920ac4a0 100644
+index f34ca2285..70966a76a 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -60,7 +60,7 @@
@ -28,7 +28,7 @@ index 815f9ef393..ed920ac4a0 100644
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9dca5aeda1..9584950c63 100644
+index 9dca5aeda..9584950c6 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -292,7 +292,7 @@ public class SpigotConfig
@ -41,7 +41,7 @@ index 9dca5aeda1..9584950c63 100644
 
     public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f97..9f8334376f 100644
+index 08b6bb7f9..9f8334376 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
@@ -2,10 +2,22 @@
@ -70,5 +70,5 @@ index 08b6bb7f97..9f8334376f 100644
                 <TimeBasedTriggeringPolicy />
                 <OnStartupTriggeringPolicy />
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0204-Include-Log4J2-SLF4J-implementation.patch
@ -1,11 +1,11 @@
-From 2c68f0bd180e1a053dd2b9e87ff0f4e1d18ca09a Mon Sep 17 00:00:00 2001
+From 5059a539b473c09efe4b060eb59f100b935d1dba Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation


 diff --git a/pom.xml b/pom.xml
-index ed920ac4a0..b28f8e0929 100644
+index 70966a76a..f4dcd8564 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -62,6 +62,12 @@
@ -22,5 +22,5 @@ index ed920ac4a0..b28f8e0929 100644
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-iostreams</artifactId>
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0205-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@ -1,4 +1,4 @@
-From 5d4638bf1ac248bb211637ffb67ab6bbc61d4d38 Mon Sep 17 00:00:00 2001
+From 86fbf17a43556c991f01060a506a28a6b43523ec Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.

 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376f..6711e6dff9 100644
+index 9f8334376..6711e6dff 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
@@ -5,7 +5,8 @@
@ -35,5 +35,5 @@ index 9f8334376f..6711e6dff9 100644
                 </LoggerNamePatternSelector>
             </PatternLayout>
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0206-Add-PlayerJumpEvent.patch
@ -1,4 +1,4 @@
-From 17efa308f6cc4e7956119385e5668d65c1de9269 Mon Sep 17 00:00:00 2001
+From e2f61ee9a4bb38cdfd61fc9340e1b7042b04d1a6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
@ -66,5 +66,5 @@ index c8b251e69..00751a9d9 100644
 
                             this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0207-handle-PacketPlayInKeepAlive-async.patch
@ -1,4 +1,4 @@
-From 24f3bb70b4cad919e75878a444a0dde1bdabb956 Mon Sep 17 00:00:00 2001
+From 2b86a7eb79d741932c7ca5359af1ac0dd3cd00d9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@ -40,5 +40,5 @@ index 00751a9d9..587f00286 100644
 
     }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0208-Expose-client-protocol-version-and-virtual-host.patch
@ -1,4 +1,4 @@
-From 8ad7c912b5de1105857c07212ab0716f9f728506 Mon Sep 17 00:00:00 2001
+From 6bf21e9e7e77096e056c5631818d9a490dc849b6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@ -136,5 +136,5 @@ index 0df834fc1..8046a2a5f 100644
     public double getEyeHeight(boolean ignorePose) {
         if (ignorePose) {
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0209-revert-serverside-behavior-of-keepalives.patch
@ -1,4 +1,4 @@
-From 064858ed1b41ea7941a517f4307786f75836865a Mon Sep 17 00:00:00 2001
+From 68c17de42dd9181bf40c9da2053c577a5896e86b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
 at the cost of dead connections being kept open for longer.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 35a98bde1c..62b7f24b5a 100644
+index 587f00286..870b59ce1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -71,7 +71,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -74,5 +74,5 @@ index 35a98bde1c..62b7f24b5a 100644
         this.minecraftServer.methodProfiler.e();
         // CraftBukkit start
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0210-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@ -1,4 +1,4 @@
-From 87ff1130c173155c8c30225d7a91e3dd8a56e96e Mon Sep 17 00:00:00 2001
+From 82e0fec9fd1526ee71c3ff93a7f13729452a45f8 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList
 Fixes https://github.com/PaperMC/Paper/issues/588

 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
-index 80a5c29f3b..cd864c4047 100644
+index 80a5c29f3..cd864c404 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
@@ -8,7 +8,7 @@ import java.util.TreeSet;
@ -26,5 +26,5 @@ index 80a5c29f3b..cd864c4047 100644
 
     public HashTreeSet() {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0211-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@ -1,4 +1,4 @@
-From 0295ed3932dbebe229b0494888da7ab598fe1d1b Mon Sep 17 00:00:00 2001
+From 810b13008981b065074f558ab5e3e406504f9c9a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@ -89,5 +89,5 @@ index 44ed34174..c1ede0651 100644
         for (int i = 0; i < this.v.size(); ++i) {
             ((IWorldAccess) this.v.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0212-Option-for-maximum-exp-value-when-merging-orbs.patch
@ -1,4 +1,4 @@
-From 56adb5bd9b7aa2531ce2f3f063f755a948a03449 Mon Sep 17 00:00:00 2001
+From db27a9af2843c90224bd268bdc1ace22fcca28e0 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
--- a/Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
@ -1,4 +1,4 @@
-From 1297209afca38458f9f9f91d4dcbc873a3865d83 Mon Sep 17 00:00:00 2001
+From 5c51a9da0fcb134769342e0df890ca2eba28db0f Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
@ -42,5 +42,5 @@ index a13515a7f..bad1020c0 100644
         return this.g;
     }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0214-Prevent-logins-from-being-processed-when-the-player-.patch
@ -1,4 +1,4 @@
-From 6f93bb5e5f2bfb8117f9c93f7797e32d704293d4 Mon Sep 17 00:00:00 2001
+From e106aa50619ecca4bba2cfefef7aa059f6e71cb3 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has


 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 10c82107d4..1380a14274 100644
+index b682b3a43..30be39b0c 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -57,7 +57,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -23,5 +23,5 @@ index 10c82107d4..1380a14274 100644
             EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0215-use-CB-BlockState-implementations-for-captured-block.patch
@ -1,4 +1,4 @@
-From ff6e4c55a7fc5a3980d77e8b648537098b3974b7 Mon Sep 17 00:00:00 2001
+From 9b9fe2b3f6f190b099ab4e5400f6a60cd2ac759d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 564f2aecdf..f80f075287 100644
+index 15e07ce84..2ddc3f050 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -401,7 +401,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -31,5 +31,5 @@ index 564f2aecdf..f80f075287 100644
             }
             // CraftBukkit end
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
@ -1,4 +1,4 @@
-From 4a344899f2509f7795b5146bc8fad27228eab907 Mon Sep 17 00:00:00 2001
+From a598a45a2d27aa5cf843f0de44e3dc056571e6a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@ -39,7 +39,7 @@ index b3c5766a2..29fe031d8 100644
         return null;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 3dbeb376f..6dd92ced9 100644
+index 1fadbf054..96cbaef52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -274,6 +274,20 @@ public class CraftBlock implements Block {
@ -131,5 +131,5 @@ index e6f86cc4b..3a8f64360 100644
 
     @Override
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0217-AsyncTabCompleteEvent.patch
@ -1,4 +1,4 @@
-From 908f9b6cdd09ef8ecc8a4bb17e1d4036afa1a5f7 Mon Sep 17 00:00:00 2001
+From 5c19fb1b13f0e281aaf374a427335215bf77b770 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5693c15fb..a82ec4853 100644
+index 870b59ce1..371513042 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -508,10 +508,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -68,7 +68,7 @@ index 5693c15fb..a82ec4853 100644
 
     public void a(PacketPlayInSetCommandBlock packetplayinsetcommandblock) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2d034beae..2c6d488d2 100644
+index 72da1fe81..07364554a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1722,7 +1722,7 @@ public final class CraftServer implements Server {
@ -125,5 +125,5 @@ index 1e3aae3b8..95d13c146 100644
         Waitable<List<String>> waitable = new Waitable<List<String>>() {
             @Override
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0218-Avoid-NPE-in-PathfinderGoalTempt.patch
@ -1,11 +1,11 @@
-From 3bea380a901c68260b6eaf2225129a68c2e1f882 Mon Sep 17 00:00:00 2001
+From 109389523c9af61ab6f0655f9ae68269f8fe752f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt


 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 8ca996e652..1b82479418 100644
+index 8ca996e65..1b8247941 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
@@ -52,7 +52,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@ -18,5 +18,5 @@ index 8ca996e652..1b82479418 100644
         }
     }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0219-PlayerPickupExperienceEvent.patch
@ -1,4 +1,4 @@
-From ce5a7f73bb7a1d74c0ccd47ad9425dc765b8af3c Mon Sep 17 00:00:00 2001
+From ebc7081b58b5d456f4bc6346d65e20b3319ac661 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb

 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 31c8d4bc86..dcef63bb1f 100644
+index dfd6230b2..73205b2f7 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -218,7 +218,7 @@ public class EntityExperienceOrb extends Entity {
@ -19,5 +19,5 @@ index 31c8d4bc86..dcef63bb1f 100644
                 entityhuman.receive(this, 1);
                 ItemStack itemstack = EnchantmentManager.b(Enchantments.G, (EntityLiving) entityhuman);
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0220-ExperienceOrbMergeEvent.patch
@ -1,4 +1,4 @@
-From 1733fa91a63015f99c127379c07cd56e1397a1ad Mon Sep 17 00:00:00 2001
+From e7daf06af73e4ae7aec0982e034bd1ef4d35718f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f80f075287..7cf4a9c11e 100644
+index 2ddc3f050..a14518ba6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1042,7 +1042,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -21,5 +21,5 @@ index f80f075287..7cf4a9c11e 100644
                             if ((int) newTotal < 0) continue; // Overflow
                             if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0221-Ability-to-apply-mending-to-XP-API.patch
@ -1,4 +1,4 @@
-From 39b86fa69e8d2d6404b044b90c923f766294834e Mon Sep 17 00:00:00 2001
+From 362bcce7edac6cda9d4b8f998e760386a1a41ed6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.

 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index fd6df39f17..f03aef2fed 100644
+index fd6df39f1..f03aef2fe 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -223,6 +223,7 @@ public class EnchantmentManager {
@ -22,7 +22,7 @@ index fd6df39f17..f03aef2fed 100644
         List<ItemStack> list = enchantment.a(entityliving);// Paper - decompile fix
         if (list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java
-index 8cfb38b826..44b2d428b3 100644
+index 8cfb38b82..44b2d428b 100644
 --- a/src/main/java/net/minecraft/server/Enchantments.java
 +++ b/src/main/java/net/minecraft/server/Enchantments.java
@@ -35,7 +35,7 @@ public class Enchantments {
@ -35,7 +35,7 @@ index 8cfb38b826..44b2d428b3 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index dcef63bb1f..53cfc10017 100644
+index 73205b2f7..69d4dc9ab 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@ -52,7 +52,7 @@ index dcef63bb1f..53cfc10017 100644
         return i * 2;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0d76a42997..1c40f17ce9 100644
+index 8046a2a5f..45f7a4143 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1023,8 +1023,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -97,5 +97,5 @@ index 0d76a42997..1c40f17ce9 100644
     }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0222-Configurable-Chunks-Sends-per-Tick-setting.patch
@ -1,4 +1,4 @@
-From d1d3428265a603b62246b4a89b859957f01eaeb7 Mon Sep 17 00:00:00 2001
+From 7dfa55ecb28018b9084160369d510a4384ed4495 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
--- a/Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0223-Configurable-Max-Chunk-Gens-per-Tick.patch
@ -1,4 +1,4 @@
-From e09aa94bd74a5ae4edc39367df7b8d1f562351c1 Mon Sep 17 00:00:00 2001
+From f8f4c08e6822205bb69f8318ba136fab257a2f2d 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
--- a/Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0224-Make-max-squid-spawn-height-configurable.patch
@ -1,4 +1,4 @@
-From 8d22094e65f7e5e6d047591be201629bd123f290 Mon Sep 17 00:00:00 2001
+From 4fbd76666feb1e20f70b79f9deb27fb273113035 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
--- a/Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0225-PreCreatureSpawnEvent.patch
@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 6603f05cfc10b4537aa3ca2627062193db6e2d9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917

 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 027ba7191..eca3f85ad 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -1,6 +1,7 @@
@ -56,7 +56,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 
                     if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 1ff5dcd85..d1715fdfb 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -164,10 +164,30 @@ public final class SpawnerCreature {
@ -92,5 +92,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                                                                     entityinsentient = (EntityInsentient) biomebase_biomemeta.b.a((World) worldserver);
                                                                 } catch (Exception exception) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0226-PlayerNaturallySpawnCreaturesEvent.patch
@ -1,4 +1,4 @@
-From c2e105f84b7417ae201d9c23ccc2b819aa0dfa48 Mon Sep 17 00:00:00 2001
+From 9682a401a3cf8adc29ee2cf949ecc43701d644d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world

 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 3f6bcbbd76..95d98b65cf 100644
+index d1715fdfb..72cd9ba58 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -47,6 +47,15 @@ public final class SpawnerCreature {
@ -29,5 +29,5 @@ index 3f6bcbbd76..95d98b65cf 100644
                     for (int i1 = -b0; i1 <= b0; ++i1) {
                         for (k = -b0; k <= b0; ++k) {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0227-Add-setPlayerProfile-API-for-Skulls.patch
@ -1,4 +1,4 @@
-From fcf7838985692e85f2b8dc0451b53c608c21e454 Mon Sep 17 00:00:00 2001
+From 9aa37315aed4ddfdf70e53317d110d12eb948049 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@ -90,5 +90,5 @@ index 2ea2a355b..398cf958c 100644
     public OfflinePlayer getOwningPlayer() {
         if (hasOwner()) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0228-Fill-Profile-Property-Events.patch
@ -1,4 +1,4 @@
-From e7c6b3cc9faa0245c366ec6c840ff76155c6a3fa Mon Sep 17 00:00:00 2001
+From 7d4063a7135c1bb7d09900fde86a070b13290d82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls

 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423f..61cfdf73c8 100644
+index 4b2a67423..61cfdf73c 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
@@ -1,5 +1,7 @@
@ -40,5 +40,5 @@ index 4b2a67423f..61cfdf73c8 100644
 
     @Override
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0229-PlayerAdvancementCriterionGrantEvent.patch
@ -1,11 +1,11 @@
-From f7db7b5bf402cd0f61de0918d6e5b1b66763f1b8 Mon Sep 17 00:00:00 2001
+From 0b6035594dd684f00ad974a6eccc316657341c06 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent


 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index eff9589320..26eaa9be90 100644
+index 9b5a4f469..5cb3a605d 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -232,6 +232,12 @@ public class AdvancementDataPlayer {
@ -22,5 +22,5 @@ index eff9589320..26eaa9be90 100644
             this.i.add(advancement);
             flag = true;
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0230-Add-ArmorStand-Item-Meta.patch
@ -1,4 +1,4 @@
-From 11eb46a5745a6872cb071f7f2f23f1df432313af Mon Sep 17 00:00:00 2001
+From 0159128a90741991f54ab7f3851bfe6435d27ffd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@ -414,5 +414,5 @@ index 65b8123a8..0ad0004b9 100644
 
         assertThat("Forgotten test?", providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */));
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0231-Extend-Player-Interact-cancellation.patch
@ -1,4 +1,4 @@
-From 45b4f0ecce04b20a1e43f1a985155ef35e8d33db Mon Sep 17 00:00:00 2001
+From 72636b631f801d3c4b26d04d911d471581daceb7 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.

 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index aa7780eff5..23223e89d3 100644
+index aa7780eff..23223e89d 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -111,6 +111,11 @@ public class PlayerInteractManager {
@ -55,5 +55,5 @@ index aa7780eff5..23223e89d3 100644
             enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
         } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0232-Tameable-getOwnerUniqueId-API.patch
@ -1,4 +1,4 @@
-From 0caca786108d71c213532dbb058efd5f5bb3a771 Mon Sep 17 00:00:00 2001
+From f29a7edad856cf6587e90c89fcdf5ec08d504e16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index e56bef3340..cc9d432e7f 100644
+index e56bef334..cc9d432e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@ -21,7 +21,7 @@ index e56bef3340..cc9d432e7f 100644
         return getHandle().getOwnerUUID();
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index eaaebeab83..2e959321b5 100644
+index eaaebeab8..2e959321b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
@@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@ -35,5 +35,5 @@ index eaaebeab83..2e959321b5 100644
         try {
             return getHandle().getOwnerUUID();
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0233-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@ -1,11 +1,11 @@
-From 23502bc44acab3ad3bd991dff952cb88df286940 Mon Sep 17 00:00:00 2001
+From 9be837a19033cb6b1fb3b5e48593cd0dd20c86c3 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 67b4d576a..02c52958c 100644
+index 313dd9891..56226bc86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -182,6 +182,11 @@ public class PaperWorldConfig {
@ -33,5 +33,5 @@ index 4aa8e85ab..d5adc0a24 100644
                     if (flag2) {
                         f *= 1.5F;
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0234-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@ -1,4 +1,4 @@
-From 7ecd398e6b9b995538cc6c56cfe1cd5a605dd523 Mon Sep 17 00:00:00 2001
+From cd3976494de750293984da5f012611ef3de358fd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened


 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index ac81d3f86b..f50bae0123 100644
+index ac81d3f86..f50bae012 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
@@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@ -27,5 +27,5 @@ index ac81d3f86b..f50bae0123 100644
     }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0235-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@ -1,11 +1,11 @@
-From 0337ec68f7397efe5c6599cb488ae42952f290a8 Mon Sep 17 00:00:00 2001
+From 8e13d0697e68b74c47b0cfd20d0567fc8872a24b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks


 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 7bea86f52b..ea3a6f2fb1 100644
+index 7bea86f52..ea3a6f2fb 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
@@ -16,7 +16,8 @@ public class BlockIceFrost extends BlockIce {
@ -28,5 +28,5 @@ index 7bea86f52b..ea3a6f2fb1 100644
                     if (j >= i) {
                         boolean flag = false;
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0236-Disable-Explicit-Network-Manager-Flushing.patch
@ -1,4 +1,4 @@
-From 1bbdbfeadb10437782ff1ed24a4a09db0d8e52db Mon Sep 17 00:00:00 2001
+From 0019dfaa0a4e8fb508ad9e9298822ec3bae74686 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true

 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 4f3f88ff66..f8facddb40 100644
+index 4f3f88ff6..f8facddb4 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -66,6 +66,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -33,5 +33,5 @@ index 4f3f88ff66..f8facddb40 100644
 
         if (this.u++ % 20 == 0) {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0237-Implement-extended-PaperServerListPingEvent.patch
@ -1,4 +1,4 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From b38db1bcd7c796e5a1a6737d4710400d52e0bad6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent

 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..c1a8e295b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
@@ -0,0 +1,31 @@
@ -43,7 +43,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..a2a409e63
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
@@ -0,0 +1,11 @@
@ -60,7 +60,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 7ac07ac07ac0..7ac07ac07ac0
+index 000000000..26e3031d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
@@ -0,0 +1,112 @@
@ -177,7 +177,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 34ba382a4..c3efb5e1b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1,6 +1,7 @@
@ -211,7 +211,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
         return this.s.getMaxPlayers();
     }
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index c9edd289a..8aa121e2f 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -30,6 +30,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@ -234,7 +234,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
         // CraftBukkit end
     }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 615aa2cd0..408aad098 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
@@ -29,6 +29,7 @@ public class ServerPing {
@ -259,7 +259,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
             this.c = agameprofile;
         }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9584950c6..eed96c60c 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -291,7 +291,7 @@ public class SpigotConfig
@ -272,5 +272,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
     }
 
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0238-Improved-Async-Task-Scheduler.patch
@ -1,4 +1,4 @@
-From e84041324c9d6f185d71c400f96f22715e6df8ce Mon Sep 17 00:00:00 2001
+From ac5e264a067c2fd8b4a762a6e6ec31f09e2d35eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.

 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 0000000000..3c1992e212
+index 000000000..3c1992e21
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
@@ -0,0 +1,122 @@
@ -159,7 +159,7 @@ index 0000000000..3c1992e212
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 5f228373e3..a9107ce5d2 100644
+index 8963168ed..05285cf0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -16,7 +16,6 @@ import java.util.function.Consumer;
@ -370,5 +370,5 @@ index 5f228373e3..a9107ce5d2 100644
 
     private boolean isReady(final int currentTick) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0239-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@ -1,4 +1,4 @@
-From 982c19767d50214ca6c84babe208d483ddcb5e4e Mon Sep 17 00:00:00 2001
+From f7d0b364eb1ef2d4246d44382e38511d771dee26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.

 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1380a14274..ab85fd9a6e 100644
+index 30be39b0c..ca3a211a5 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -1,5 +1,7 @@
@ -44,5 +44,5 @@ index 1380a14274..ab85fd9a6e 100644
                             if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                 final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0240-Call-PortalCreateEvent-for-exit-portals.patch
@ -1,4 +1,4 @@
-From 66b22bb50ee08233312675626b9ed979fed3eac9 Mon Sep 17 00:00:00 2001
+From a001b53e9f4c971c4747d451f51ee92d4a47968e Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
@ -104,5 +104,5 @@ index 434589adb..7e858bab4 100644
     }
 
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0241-Player.setPlayerProfile-API.patch
@ -1,4 +1,4 @@
-From a347b25b7293f1b2eb1740a18840d7ae893bcd18 Mon Sep 17 00:00:00 2001
+From 897d4808a90fc03d824d304830659d3f6b35ee49 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.

 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b9e6a18293..73998e5a75 100644
+index d5adc0a24..507641fc6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -19,7 +19,7 @@ index b9e6a18293..73998e5a75 100644
     private final ItemCooldown ce;
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index ab85fd9a6e..5778a5201d 100644
+index ca3a211a5..58a2f3d28 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -38,7 +38,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -48,7 +48,7 @@ index ab85fd9a6e..5778a5201d 100644
                             uniqueId = i.getId();
                             // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 45f7a4143f..b1cba904e4 100644
+index 45f7a4143..b1cba904e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,6 +1,8 @@
@ -139,5 +139,5 @@ index 45f7a4143f..b1cba904e4 100644
     public void removeDisconnectingPlayer(Player player) {
         hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch
@ -1,4 +1,4 @@
-From e97afba9cc1e570e5e20d21303566e319cb6b325 Mon Sep 17 00:00:00 2001
+From cf49a77d720e289f094cb4e31e44d3053ef90e90 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.

 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index da89a69ed6..45f96078c5 100644
+index da89a69ed..45f96078c 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
@@ -49,7 +49,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@ -20,5 +20,5 @@ index da89a69ed6..45f96078c5 100644
                 blockposition$mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
             }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0243-getPlayerUniqueId-API.patch
@ -1,4 +1,4 @@
-From c2dc93bcdd5d8493ea4da4351517bfa77efc6d53 Mon Sep 17 00:00:00 2001
+From 46b48a06dd052ec7025966dfe111049bf74710d0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2c6d488d2..0eab17bd3 100644
+index 07364554a..71d1929c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1415,6 +1415,26 @@ public final class CraftServer implements Server {
@ -40,5 +40,5 @@ index 2c6d488d2..0eab17bd3 100644
     @Deprecated
     public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0244-Make-player-data-saving-configurable.patch
@ -1,14 +1,14 @@
-From adc6a73d736b3ddf87d8e3a1954d3deec8e14f3f Mon Sep 17 00:00:00 2001
+From db7f5c905af40c27d82de4775172e0de67666f6e 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 a499578db..dc15bfcf8 100644
+index 305a1258f..5c18e5770 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -300,4 +300,13 @@ public class PaperConfig {
+@@ -291,4 +291,13 @@ public class PaperConfig {
     private static void authenticationServersDownKickMessage() {
         authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
     }
@ -35,5 +35,5 @@ index 0fd6efec0..7553280d2 100644
             NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
             File file = new File(this.playerDir, entityhuman.bu() + ".dat.tmp");
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0245-Make-legacy-ping-handler-more-reliable.patch
@ -1,4 +1,4 @@
-From 03f5df321e1299135fb47f7febb879bb492a9dfb Mon Sep 17 00:00:00 2001
+From 5adc07529bf386d144cafa53eb41c66b1c2cea8b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13

 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 5691d0aeaf..aafca9c9c4 100644
+index 5691d0aea..aafca9c9c 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
@@ -13,6 +13,7 @@ import org.apache.logging.log4j.Logger;
@ -167,5 +167,5 @@ index 5691d0aeaf..aafca9c9c4 100644
         channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
     }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0246-Call-PaperServerListPingEvent-for-legacy-pings.patch
@ -1,4 +1,4 @@
-From 51238ebbbbd3fa77c730204f46bb3bee2db0cd15 Mon Sep 17 00:00:00 2001
+From 9a84ca1c9a75d3682f99f6f80938b597eb82b470 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings

 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 0000000000..74c012fd40
+index 000000000..74c012fd4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
@@ -0,0 +1,73 @@
@ -84,7 +84,7 @@ index 0000000000..74c012fd40
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index aafca9c9c4..860076fc23 100644
+index aafca9c9c..860076fc2 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
@@ -9,6 +9,7 @@ import java.net.InetSocketAddress;
@ -151,5 +151,5 @@ index aafca9c9c4..860076fc23 100644
     }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0247-Flag-to-disable-the-channel-limit.patch
@ -1,4 +1,4 @@
-From beeb06397df382083e4ce46067bffe583ad595ba Mon Sep 17 00:00:00 2001
+From 44a509258a75062d27fa7527eba1ee8641088fe3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ae28723ef2..898371e5f4 100644
+index b1cba904e..8699cc72f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -133,6 +133,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -30,5 +30,5 @@ index ae28723ef2..898371e5f4 100644
         if (channels.add(channel)) {
             server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0248-Add-method-to-open-already-placed-sign.patch
@ -1,11 +1,11 @@
-From d10e4e52c21070aa77e423b03a65302e5ca17f9d Mon Sep 17 00:00:00 2001
+From 605d907e273d4f15dfee8305b18a4e959e108a6b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 99705b1344..32fcba1d1a 100644
+index 755d288ed..707091754 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -559,4 +559,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@ -27,5 +27,5 @@ index 99705b1344..32fcba1d1a 100644
 +    // Paper end
 }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0249-Load-version-history-at-server-start.patch
@ -1,11 +1,11 @@
-From 48922982dfb8b16328a8e5c3e730750a8d5c5e6d Mon Sep 17 00:00:00 2001
+From 957c7817dad93a9d8cf4f0d4a104282337050884 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start


 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fe259e985..d9c6b1104 100644
+index fb9db65ee..3dc7e2a89 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -212,6 +212,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -17,5 +17,5 @@ index fe259e985..d9c6b1104 100644
 
             DedicatedServer.LOGGER.info("Generating keypair");
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0250-Configurable-sprint-interruption-on-attack.patch
@ -1,4 +1,4 @@
-From 25155c9ec86274414859937728b50d961386a7fd Mon Sep 17 00:00:00 2001
+From f4100dc6bb306ce750f2369a5802dad3590effa7 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
--- a/Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0251-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@ -1,4 +1,4 @@
-From 7caac3eb29b5b2438119eda8589590d63cf31bef Mon Sep 17 00:00:00 2001
+From b4306a885ddf71c79918aabff5fdb6865f2327b8 Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
@ -18,5 +18,5 @@ index 371513042..871dea68f 100644
             SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
             this.server.getPluginManager().callEvent(event);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0252-EndermanEscapeEvent.patch
@ -1,4 +1,4 @@
-From aac7b934c6ba1da1ee67804cca10f524efe67535 Mon Sep 17 00:00:00 2001
+From a1c129eac9366b285b7b4a5bed20576929f97195 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.

 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 53a3819ee4..6abe45fd6f 100644
+index db618ae68..5d5c21bba 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -1,6 +1,7 @@
@ -78,5 +78,5 @@ index 53a3819ee4..6abe45fd6f 100644
                         }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0253-Enderman.teleportRandomly.patch
@ -1,4 +1,4 @@
-From b0c4e5504b1e5e3cfc54db2057e31d7d8733fa05 Mon Sep 17 00:00:00 2001
+From 156fe49755603c461fdce079f0c681401edd58b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.

 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6abe45fd6f..5f636efb0c 100644
+index 5d5c21bba..d4f7805bb 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -184,6 +184,7 @@ public class EntityEnderman extends EntityMonster {
@ -18,7 +18,7 @@ index 6abe45fd6f..5f636efb0c 100644
         double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D;
         double d1 = this.locY + (double) (this.random.nextInt(64) - 32);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index b81693d9ff..9bc6a6c0c1 100644
+index b81693d9f..9bc6a6c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
@@ -17,6 +17,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
@ -30,5 +30,5 @@ index b81693d9ff..9bc6a6c0c1 100644
         IBlockData blockData = getHandle().getCarried();
         return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0254-Block-Enderpearl-Travel-Exploit.patch
@ -1,4 +1,4 @@
-From e97bd3b2054b415121bdc5eb131ccd3e207da94e Mon Sep 17 00:00:00 2001
+From cc5ce481cb20c7fec2258936b71ba6d8a478b561 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
--- a/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -1,4 +1,4 @@
-From 1f1c12ca7a9dc9d35d582850db5c44623e22f1a4 Mon Sep 17 00:00:00 2001
+From 76953fecb2b9aa243ac7b71bd8a42a804b28e07b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 682e0b87ea..a5dfc1ebf5 100644
+index b80315bc5..a30d92ce7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1206,12 +1206,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -34,7 +34,7 @@ index 682e0b87ea..a5dfc1ebf5 100644
 
             if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e1c09452b7..84bde3ef20 100644
+index e1c09452b..84bde3ef2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1746,11 +1746,17 @@ public class CraftWorld implements World {
@ -57,5 +57,5 @@ index e1c09452b7..84bde3ef20 100644
                 x, y, z, // Position
                 count,  // Count
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0256-EndermanAttackPlayerEvent.patch
@ -1,4 +1,4 @@
-From 081c20c5cacf693b7b401bb41b09f798db036263 Mon Sep 17 00:00:00 2001
+From 53f0c76aa8b97792b8279381a85ccaf2fa690725 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.

 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 5f636efb0c..e5ccd29a08 100644
+index d4f7805bb..d5c55d50e 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -135,7 +135,15 @@ public class EntityEnderman extends EntityMonster {
@ -28,5 +28,5 @@ index 5f636efb0c..e5ccd29a08 100644
 
         if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.19.0
+2.20.0

--- a/Show More
+++ b/Show More