Revert "Re-track players that dismount from other players"

2020-04-22 00:06:30 +02:00 · 2020-04-22 00:06:30 +02:00 · bf698865f7
Commit bf698865f7
--- a/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch
@ -1,11 +1,11 @@
-From cf32bd46104a23ec0112f2f1b2ca50a45cbf832b Mon Sep 17 00:00:00 2001
+From f769f45108864c73e6c1b3e096870a904d8bb99a Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 67f35fe66b..53f96a1576 100644
+index 67f35fe6..53f96a15 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@ -31,7 +31,7 @@ index 67f35fe66b..53f96a1576 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 1422503e11..d3c2e1bedf 100644
+index 1422503e..d3c2e1be 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -58,7 +58,8 @@ public class NameReferencingFileConverter {
@ -45,7 +45,7 @@ index 1422503e11..d3c2e1bedf 100644
         } else {
             String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cf0733baf7..1c25dc8f36 100644
+index cf0733ba..1c25dc8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1399,7 +1399,8 @@ public final class CraftServer implements Server {
@ -59,5 +59,5 @@ index cf0733baf7..1c25dc8f36 100644
                 profile = console.getUserCache().getProfile( name );
             }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch
@ -1,36 +0,0 @@
-From b0a3d2baf0878e99b5852b16ac314019ef009af7 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sun, 31 Jul 2016 16:33:03 -0500
-Subject: [PATCH] Re-track players that dismount from other players
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d4bba876d0..ae1f0d5783 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -997,6 +997,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         if (entity1 != entity && this.playerConnection != null) {
-             this.playerConnection.a(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
-         }
-+        // Paper start - "Fixes" an issue in which the vehicle player would not be notified that the passenger dismounted
-+        if (entity instanceof EntityPlayer) {
-+            // TODO verify this solution
-+            WorldServer worldServer = (WorldServer) entity.getWorld();
-+            worldServer.getChunkProvider().playerChunkMap.removeEntity(this);
-+            worldServer.getChunkProvider().playerChunkMap.addEntity(this);
-+        }
-+        // Paper end
- 
-     }
- 
-@@ -1013,7 +1021,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-         if (!this.isSpectator()) {
-             super.b(blockposition);
-         }
-
-     }
- 
-     public void a(double d0, boolean flag) {
-- 
-2.25.1
-
--- a/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch
+++ b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch
@ -1,4 +1,4 @@
-From 2bdd76a1c17eddcc04f21002f53c0941833fe1ec Mon Sep 17 00:00:00 2001
+From bef6f5e0736412aec113d29e4fc408e0596960b8 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockState's hashCode/equals
@ -9,7 +9,7 @@ object identity checks safely.
 Use a simpler optimized hashcode

 diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java
-index 0ce77d9230..00e67b567f 100644
+index 0ce77d92..00e67b56 100644
 --- a/src/main/java/net/minecraft/server/BlockState.java
 +++ b/src/main/java/net/minecraft/server/BlockState.java
@@ -28,23 +28,13 @@ public abstract class BlockState<T extends Comparable<T>> implements IBlockState
@ -41,7 +41,7 @@ index 0ce77d9230..00e67b567f 100644
 
     public int c() {
 diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java
-index d8738447d7..7ca302b522 100644
+index d8738447..7ca302b5 100644
 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java
 +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java
@@ -30,8 +30,7 @@ public class BlockStateBoolean extends BlockState<Boolean> {
@ -55,7 +55,7 @@ index d8738447d7..7ca302b522 100644
             return true;
         } else if (object instanceof BlockStateBoolean && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 1486d460c8..7cdadc6b6a 100644
+index 1486d460..7cdadc6b 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
@@ -49,8 +49,7 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@ -69,7 +69,7 @@ index 1486d460c8..7cdadc6b6a 100644
             return true;
         } else if (object instanceof BlockStateEnum && super.equals(object)) {
 diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java
-index 6f35c365f9..0499a71705 100644
+index 6f35c365..0499a717 100644
 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java
 +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java
@@ -38,8 +38,7 @@ public class BlockStateInteger extends BlockState<Integer> {
@ -83,5 +83,5 @@ index 6f35c365f9..0499a71705 100644
             return true;
         } else if (object instanceof BlockStateInteger && super.equals(object)) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch
@ -1,11 +1,11 @@
-From 43dfe118b9c76025227c5e16d5fba88210cbed84 Mon Sep 17 00:00:00 2001
+From 5ca2647df8db59e280e0339d47eca2e6491b5a44 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 53f96a1576..010b17d2e7 100644
+index 53f96a15..010b17d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -243,4 +243,13 @@ public class PaperConfig {
@ -23,7 +23,7 @@ index 53f96a1576..010b17d2e7 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7476f07aa1..f057ebda81 100644
+index 7476f07a..f057ebda 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -44,5 +44,5 @@ index 7476f07aa1..f057ebda81 100644
             limitedPackets = 0;
             return true;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch
@ -1,11 +1,11 @@
-From 7921cd0efdadd166ff62add3473a7f0778f4c5db Mon Sep 17 00:00:00 2001
+From 32e8c434b4561dfdc75a82a414d27d77ad48b16f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 010b17d2e7..5a83fc21cb 100644
+index 010b17d2..5a83fc21 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -252,4 +252,11 @@ public class PaperConfig {
@ -21,7 +21,7 @@ index 010b17d2e7..5a83fc21cb 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f057ebda81..5b304c04bc 100644
+index f057ebda..5b304c04 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -43,5 +43,5 @@ index f057ebda81..5b304c04bc 100644
                 }
             } else {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch
@ -1,4 +1,4 @@
-From 72fe11d692b51e46025bd53e005221fe322a22ff Mon Sep 17 00:00:00 2001
+From 45d68970559eb14d25442d51f220fb6edff10f15 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3004270455..eb99f3a967 100644
+index 30042704..eb99f3a9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -696,7 +696,7 @@ public class WorldServer extends World {
@ -21,5 +21,5 @@ index 3004270455..eb99f3a967 100644
 
         if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@ -1,11 +1,11 @@
-From 4684fa6318e2f4abedd442c40cb86c2704417b73 Mon Sep 17 00:00:00 2001
+From aee342c48579a1ce3e7383f8c26746807103cc29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
-index cd04a2b997..174b9f5431 100644
+index cd04a2b9..174b9f54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
@@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook {
@ -25,5 +25,5 @@ index cd04a2b997..174b9f5431 100644
 +    
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch
@ -1,4 +1,4 @@
-From 7cffcdf6e990c602452b5ae2c1f56914aa16600d Mon Sep 17 00:00:00 2001
+From 3ba304dde4eaa20b0d3da20b280e6a5f9d0879a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ae1f0d5783..a5701623bf 100644
+index d4bba876..222bb312 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -197,6 +197,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -18,5 +18,5 @@ index ae1f0d5783..a5701623bf 100644
             if (this.getMinecraftServer().getForceGamemode()) {
                 this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode());
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch
@ -1,11 +1,11 @@
-From 7d18db5d5b1c93da93819f4c984297cfae943e51 Mon Sep 17 00:00:00 2001
+From 8b83c17ec516576320f3251f9add49a1c30dfcdf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8cf3076f4..721eceeff 100644
+index 8cf3076f..721eceef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -298,4 +298,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index 8cf3076f4..721eceeff 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8963acb9f..bb58fb796 100644
+index 8963acb9..bb58fb79 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -616,6 +616,12 @@ public class Chunk implements IChunkAccess {
@ -36,5 +36,5 @@ index 8963acb9f..bb58fb796 100644
             // CraftBukkit end
         }
 -- 
-2.26.0
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch
@ -1,11 +1,11 @@
-From e69214e04ad26a535b149ce7611763cca83ad7a6 Mon Sep 17 00:00:00 2001
+From d7dc0221e397f8332fb4724121b7c2174af395ba Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent


 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 5c24e22c7d..8d277566e9 100644
+index 5c24e22c..8d277566 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -164,6 +164,12 @@ public class EntityPig extends EntityAnimal {
@ -22,7 +22,7 @@ index 5c24e22c7d..8d277566e9 100644
         if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
             return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f723470503..5e3835851d 100644
+index f7234705..5e383585 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -681,6 +681,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@ -39,7 +39,7 @@ index f723470503..5e3835851d 100644
         entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
         entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 72b8677f26..2d454a3c3e 100644
+index 72b8677f..2d454a3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1045,6 +1045,14 @@ public class CraftEventFactory {
@ -58,5 +58,5 @@ index 72b8677f26..2d454a3c3e 100644
         HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
         horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@ -1,11 +1,11 @@
-From d88ab15995a757498456e1495ab3dc8dd8591256 Mon Sep 17 00:00:00 2001
+From a31f3551cbd2ac2a1b306cf31033ba910c741e24 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 721eceeffc..bff2e9d26d 100644
+index 721eceef..bff2e9d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@ -30,7 +30,7 @@ index 721eceeffc..bff2e9d26d 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index e64722f63b..6683f7c5f3 100644
+index e64722f6..6683f7c5 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -233,6 +233,15 @@ public class EntityFallingBlock extends Entity {
@ -50,5 +50,5 @@ index e64722f63b..6683f7c5f3 100644
         if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
             this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch
@ -1,11 +1,11 @@
-From b704867d1819955074cbb3ccc90c76c0d276f426 Mon Sep 17 00:00:00 2001
+From 21af3ee89e421dacb95f08387f84cce82fc68e28 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a5701623bf..d3bdec7995 100644
+index 222bb312..09dd7f06 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@ -50,7 +50,7 @@ index a5701623bf..d3bdec7995 100644
 
             this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
         }
-@@ -1332,7 +1341,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1325,7 +1334,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.lastHealthSent = -1.0F;
         this.lastFoodSent = -1;
         // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit
@ -67,5 +67,5 @@ index a5701623bf..d3bdec7995 100644
         this.cr = entityplayer.cr;
         this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0122-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch
@ -1,11 +1,11 @@
-From fd472dc103b6e36824b557a86822a4d3b6f17f55 Mon Sep 17 00:00:00 2001
+From 18f68ee880df235c4d6e9a1e180246d93fea96d4 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue


 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c6fd50daa8..19e72da6d9 100644
+index c6fd50da..19e72da6 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -97,6 +97,12 @@ public class LoginListener implements PacketLoginInListener {
@ -66,5 +66,5 @@ index c6fd50daa8..19e72da6d9 100644
     }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From bd1aebbf6f16c7633c376529f45e91d5f4aaf9e0 Mon Sep 17 00:00:00 2001
+From b8a2b9046bf1c7514f777dac87e094c002a3bd9b Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1c25dc8f36..8f7b7e67f3 100644
+index 1c25dc8f..8f7b7e67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2118,5 +2118,24 @@ public final class CraftServer implements Server {
@ -35,5 +35,5 @@ index 1c25dc8f36..8f7b7e67f3 100644
     // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch
@ -1,11 +1,11 @@
-From ba66292e0b855e1b32ab15c7189aeaa5b5398560 Mon Sep 17 00:00:00 2001
+From 3f7441f2c620db73c18600e59d423dc37029c462 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent


 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index f72bb0c138..0447800d9d 100644
+index f72bb0c1..0447800d 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -193,7 +193,7 @@ public class EntityExperienceOrb extends Entity {
@ -18,7 +18,7 @@ index f72bb0c138..0447800d9d 100644
 
                 this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2d454a3c3e..95973558e3 100644
+index 2d454a3c..95973558 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion;
@ -48,5 +48,5 @@ index 2d454a3c3e..95973558e3 100644
         return handleBlockGrowEvent(world, pos, block, 3);
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch
@ -1,11 +1,11 @@
-From d72d69736365f04a5b40642fc3262d44e449b37e Mon Sep 17 00:00:00 2001
+From 44c5bb2c6355406dc77de81f8ee0602a9e2e7b71 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7e552f985a..2ab877c87b 100644
+index 7e552f98..2ab877c8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -161,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -18,7 +18,7 @@ index 7e552f985a..2ab877c87b 100644
     public DimensionManager dimension;
     protected BlockPosition ai;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 40bdcf4e75..39e3bd3795 100644
+index 40bdcf4e..39e3bd37 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -160,6 +160,12 @@ public class EntityFishingHook extends Entity {
@ -35,5 +35,5 @@ index 40bdcf4e75..39e3bd3795 100644
     }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch
@ -1,11 +1,11 @@
-From cd5636eda85b76cacc81b1ccabafd6386896ff61 Mon Sep 17 00:00:00 2001
+From 4b6652a77776d09cba74b6e19177cdc74bf8a768 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent


 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 2b14b2c3fa..634e2bd304 100644
+index 2b14b2c3..634e2bd3 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -187,6 +187,17 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -27,7 +27,7 @@ index 2b14b2c3fa..634e2bd304 100644
                     this.a((MovingObjectPosition) object);
                     this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 078cc25231..6756c79b31 100644
+index 078cc252..6756c79b 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity {
@ -49,7 +49,7 @@ index 078cc25231..6756c79b31 100644
 
                 // CraftBukkit start - Fire ProjectileHitEvent
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 39e3bd3795..807ec3394d 100644
+index 39e3bd37..807ec339 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -214,7 +214,16 @@ public class EntityFishingHook extends Entity {
@ -71,7 +71,7 @@ index 39e3bd3795..807ec3394d 100644
             if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
                 this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 2e4c9d4267..724b78b5d2 100644
+index 2e4c9d42..724b78b5 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -99,7 +99,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@ -93,7 +93,7 @@ index 2e4c9d4267..724b78b5d2 100644
                 this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition());
             } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 95973558e3..c45b7c15fc 100644
+index 95973558..c45b7c15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1149,6 +1149,16 @@ public class CraftEventFactory {
@ -114,5 +114,5 @@ index 95973558e3..c45b7c15fc 100644
         Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
         ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch
@ -1,4 +1,4 @@
-From fcc715150803fa51d3b3fafa3d595d171e29d2b2 Mon Sep 17 00:00:00 2001
+From f32384944ebec3c10e236bf563648fd6cf5f1c4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border

 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 39a0c45bb0..bdd092e49d 100644
+index 39a0c45b..bdd092e4 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -123,7 +123,7 @@ public abstract class NavigationAbstract {
@ -19,5 +19,5 @@ index 39a0c45bb0..bdd092e49d 100644
                     if (!copiedSet) {
                         copiedSet = true;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch
@ -1,4 +1,4 @@
-From dbef5e27ac9329eea9eac13f8262809bc66236a6 Mon Sep 17 00:00:00 2001
+From 5f3c851b5a2ad7a219d45ad5d680c85c8fb4b92a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 05ee02c4c2..ff14c265b1 100644
+index 86de3c63..96328395 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -224,6 +224,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -22,5 +22,5 @@ index 05ee02c4c2..ff14c265b1 100644
         return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
@ -1,4 +1,4 @@
-From afee5d8e6bb2a78515a3da8d7288e819da577af9 Mon Sep 17 00:00:00 2001
+From 92063b53c457ea12dd4f9d3fa3f1c571391312f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.

 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 0f248b6de3..e8ce2ecf23 100644
+index 0f248b6d..e8ce2ecf 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -108,6 +108,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@ -23,7 +23,7 @@ index 0f248b6de3..e8ce2ecf23 100644
 
                                 if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 4ee13ac454..5f10c4338e 100644
+index 4ee13ac4..5f10c433 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
@@ -24,6 +24,18 @@ public class WorldBorder {
@ -46,5 +46,5 @@ index 4ee13ac454..5f10c4338e 100644
         return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f();
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
@ -1,4 +1,4 @@
-From 5530a9b263ae79a80b9a46fe22034007ec906132 Mon Sep 17 00:00:00 2001
+From 87b159cec63df0af8d0d0262d74110d0d5ce0633 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bff2e9d26d..f164844f33 100644
+index bff2e9d2..f164844f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -312,4 +312,14 @@ public class PaperWorldConfig {
@ -28,7 +28,7 @@ index bff2e9d26d..f164844f33 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index 3bcf0b385d..4764ffef77 100644
+index 3bcf0b38..4764ffef 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
@@ -92,7 +92,8 @@ public class VillagerTrades {
@ -42,5 +42,5 @@ index 3bcf0b385d..4764ffef77 100644
                 if (blockposition != null) {
                     ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
@ -1,4 +1,4 @@
-From 67a0f28671a63dd0541a0cbc89a93c374c445ffd Mon Sep 17 00:00:00 2001
+From 7ecd6cb56b0a0291549a49f25190e3c4bc864f82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index db11c8ec69..854cffe6c9 100644
+index db11c8ec..854cffe6 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -150,7 +150,7 @@ public final class ItemStack {
@ -19,5 +19,5 @@ index db11c8ec69..854cffe6c9 100644
 
     public ItemStack cloneAndSubtract(int i) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,11 +1,11 @@
-From 085f39ca706bdfb003624eb6c180cf934a8a9405 Mon Sep 17 00:00:00 2001
+From 4da20ed499a4b6ec5a8ba5364d0ae240a39c46d2 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index ed6092f65a..176af6c889 100644
+index ed6092f6..176af6c8 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@ -31,7 +31,7 @@ index ed6092f65a..176af6c889 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ade..124c3185bc 100644
+index 2b66a08a..124c3185 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@ -52,5 +52,5 @@ index 2b66a08ade..124c3185bc 100644
 +    // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
@ -1,4 +1,4 @@
-From c14beb24f2fd5ecb413ecde5e4df9b8947e3ec45 Mon Sep 17 00:00:00 2001
+From 52e1e31d7ee25cfe9bfc388429520919327bc64a 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
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d3bdec7995..1296eb04f0 100644
+index 09dd7f06..95e09e35 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1800,7 +1800,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1793,7 +1793,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     @Override
     protected boolean isFrozen() {
@ -19,7 +19,7 @@ index d3bdec7995..1296eb04f0 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5b304c04bc..f367a76e82 100644
+index 5b304c04..f367a76e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2526,7 +2526,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -32,5 +32,5 @@ index 5b304c04bc..f367a76e82 100644
     // CraftBukkit end
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
@ -1,11 +1,11 @@
-From a6b5edccaf9bf86cd8c10cfa0156902839a41c93 Mon Sep 17 00:00:00 2001
+From 6c1d5b081a6dfd1aef3ca4bdf9d242e07153fa1a 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 9fb9a96ccb..48f88eaba4 100644
+index 9fb9a96c..48f88eab 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 9fb9a96ccb..48f88eaba4 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 060a21840f..d1745c4e93 100644
+index 060a2184..d1745c4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -65,5 +65,5 @@ index 060a21840f..d1745c4e93 100644
     public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
          if (header != null) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0135-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0135-Firework-API-s.patch
@ -1,11 +1,11 @@
-From 2343191bdb15c6a3287804f78858c35fd631aef5 Mon Sep 17 00:00:00 2001
+From 852ef08c9fa8869fe5b5c23ca304870633b2a13b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 07:18:33 +0100
 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 4f51b9b654..278ef79d89 100644
+index 4f51b9b6..278ef79d 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@ -53,7 +53,7 @@ index 4f51b9b654..278ef79d89 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 313076d6d8..7be41c8698 100644
+index 313076d6..7be41c86 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
@@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@ -65,7 +65,7 @@ index 313076d6d8..7be41c8698 100644
                 object = a(world, entityliving, itemstack, itemstack1);
                 if (flag || f3 != 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 058c016b7b..92dac35ec4 100644
+index 058c016b..92dac35e 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -18,6 +18,7 @@ public class ItemFireworks extends Item {
@ -90,7 +90,7 @@ index 058c016b7b..92dac35ec4 100644
                     itemstack.subtract(1);
                 }
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 75604dbc69..98deaba12c 100644
+index 75604dbc..98deaba1 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase {
@ -103,7 +103,7 @@ index 75604dbc69..98deaba12c 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 475b7b004b..de74e7214a 100644
+index 475b7b00..de74e721 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity;
@ -145,5 +145,5 @@ index 475b7b004b..de74e7214a 100644
 +    // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From 67e81833b91a07330074fc7e72c905b67b59f91d Mon Sep 17 00:00:00 2001
+From 7bbf507c90412fdf8acd6d7e158d2a98ead54452 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 b907a3c4d8..78fba79378 100644
+index b907a3c4..78fba793 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
@@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@ -19,5 +19,5 @@ index b907a3c4d8..78fba79378 100644
                     if (teleEvent.isCancelled()) {
                         return;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,4 +1,4 @@
-From bcfbc728fd05e1d34c7db822258ca12d4875aafb Mon Sep 17 00:00:00 2001
+From 90524519681bd794aaa137bdeb4cc051e3d78717 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 16b78bd02e..c06b10c6b1 100644
+index 16b78bd0..c06b10c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -278,6 +278,48 @@ public class CraftWorld implements World {
@ -60,5 +60,5 @@ index 16b78bd02e..c06b10c6b1 100644
 
     public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
@ -1,4 +1,4 @@
-From 37df96a0b9a2dac98753370a77dc1a9af7980f8d Mon Sep 17 00:00:00 2001
+From 3a6c017d5a8ef4b9fb510297cb3b5db3c3deb413 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 643e58839..293251988 100644
+index 643e5883..29325198 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -918,11 +918,13 @@ public abstract class PlayerList {
@ -25,5 +25,5 @@ index 643e58839..293251988 100644
 
     public WhiteList getWhitelist() {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
@ -1,11 +1,11 @@
-From 573d1cfd449b7e3c354033b3e6846b4c455874ae Mon Sep 17 00:00:00 2001
+From b891916ae62c25ff68a788e8c226d34a92059e1a 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 2ab877c87b..1c8958d15d 100644
+index 2ab877c8..1c8958d1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2029,6 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -17,5 +17,5 @@ index 2ab877c87b..1c8958d15d 100644
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         } else {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From b8fe1ba7ee5dcbf4f63adefe4d57181b32da4dda Mon Sep 17 00:00:00 2001
+From 02c5588d0d0f678d2820893db36cefa7f04183db 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
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.

 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 5de881371a..5f261b9b92 100644
+index 5de88137..5f261b9b 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -511,13 +511,13 @@ public class Block implements IMaterial {
@ -28,7 +28,7 @@ index 5de881371a..5f261b9b92 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index 2d2cd09ad1..ed88e208d0 100644
+index 2d2cd09a..ed88e208 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
@@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@ -41,7 +41,7 @@ index 2d2cd09ad1..ed88e208d0 100644
 
                     world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 8762577696..138e2ea56a 100644
+index 87625776..138e2ea5 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@ -54,7 +54,7 @@ index 8762577696..138e2ea56a 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 0447800d9d..d4275e733d 100644
+index 0447800d..d4275e73 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@ -134,7 +134,7 @@ index 0447800d9d..d4275e733d 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 807ec3394d..73f5961aa3 100644
+index 807ec339..73f5961a 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity {
@ -147,7 +147,7 @@ index 807ec3394d..73f5961aa3 100644
                     // CraftBukkit end
                     if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dd1caec9da..2775afc327 100644
+index dd1caec9..2775afc3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1379,7 +1379,8 @@ public abstract class EntityLiving extends Entity {
@ -161,7 +161,7 @@ index dd1caec9da..2775afc327 100644
             this.expToDrop = 0;
         }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0bfc0a773d..ba2f90cc6a 100644
+index 0bfc0a77..ba2f90cc 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
@@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@ -174,7 +174,7 @@ index 0bfc0a773d..ba2f90cc6a 100644
 
             this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index c73cc9ae4b..76296119a1 100644
+index c73cc9ae..76296119 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal {
@ -187,7 +187,7 @@ index c73cc9ae4b..76296119a1 100644
 
         }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 5e3835851d..6ca4fa43c4 100644
+index 5e383585..6ca4fa43 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -509,7 +509,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@ -200,7 +200,7 @@ index 5e3835851d..6ca4fa43c4 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index 530c699964..2ad8dba5c0 100644
+index 530c6999..2ad8dba5 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@ -213,7 +213,7 @@ index 530c699964..2ad8dba5c0 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 1ab2668e91..2b708761d0 100644
+index 1ab2668e..2b708761 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
@@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@ -226,7 +226,7 @@ index 1ab2668e91..2b708761d0 100644
                 // CraftBukkit end
             }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index f6c6ea4aaf..dff3eb1188 100644
+index f6c6ea4a..dff3eb11 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -374,7 +374,7 @@ public class PlayerInteractManager {
@ -239,7 +239,7 @@ index f6c6ea4aaf..dff3eb1188 100644
 
                 return true;
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index d2698e847c..edc4a5c34e 100644
+index d2698e84..edc4a5c3 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
@@ -2,7 +2,7 @@ package net.minecraft.server;
@ -252,7 +252,7 @@ index d2698e847c..edc4a5c34e 100644
 
     public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 8dc47452a4..560e2f42b7 100644
+index 8dc47452..560e2f42 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@ -265,7 +265,7 @@ index 8dc47452a4..560e2f42b7 100644
 
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c06b10c6b1..d3df3f593f 100644
+index c06b10c6..d3df3f59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1795,7 +1795,7 @@ public class CraftWorld implements World {
@ -278,7 +278,7 @@ index c06b10c6b1..d3df3f593f 100644
             entity = new EntityLightning(world, x, y, z, false);
         } else if (Firework.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 1b512cc45c..fbad045675 100644
+index 1b512cc4..fbad0456 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
@@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@ -301,5 +301,5 @@ index 1b512cc45c..fbad045675 100644
     public EntityExperienceOrb getHandle() {
         return (EntityExperienceOrb) entity;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From c60aec0eb4548625a800d36c5977d5ba6990a891 Mon Sep 17 00:00:00 2001
+From 6f567dd6ea759b3af52c4ec8096ea256858ba361 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f164844f33..751551f173 100644
+index f164844f..751551f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -322,4 +322,10 @@ public class PaperWorldConfig {
@ -27,7 +27,7 @@ index f164844f33..751551f173 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1c8958d15d..4f8e10b860 100644
+index 1c8958d1..4f8e10b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -39,7 +39,7 @@ index 1c8958d15d..4f8e10b860 100644
     // Spigot end
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2775afc327..74de19bbfb 100644
+index 2775afc3..74de19bb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2623,8 +2623,11 @@ public abstract class EntityLiving extends Entity {
@ -56,5 +56,5 @@ index 2775afc327..74de19bbfb 100644
                 this.C(entity);
             }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
@ -1,4 +1,4 @@
-From 3fdc2eae474660f8156b508c0d68c5988fd2b67e Mon Sep 17 00:00:00 2001
+From a99a62d07c1769b1d7b36d76a0ece98e1bf61f67 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 552daf4376..e102be583c 100644
+index 552daf43..e102be58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
@ -47,5 +47,5 @@ index 552daf4376..e102be583c 100644
 
     @Deprecated
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@ -1,11 +1,11 @@
-From 58d7d22e391562ed715f337910c5dfb6640403a9 Mon Sep 17 00:00:00 2001
+From eaa90acb05f14ba3176d728f736c30c4494c5705 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


 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 291c2a17bb..936fc4f6b9 100644
+index 291c2a17..936fc4f6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -139,7 +139,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -37,5 +37,5 @@ index 291c2a17bb..936fc4f6b9 100644
         }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
@ -1,11 +1,11 @@
-From 15e6df8dfd3a4f2a37cb02e5ca6ad4e533438184 Mon Sep 17 00:00:00 2001
+From 737330b3c9fdebf2fd564107b78244f1aa0a0763 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


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 176af6c889..992d7bfb0f 100644
+index 176af6c8..992d7bfb 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving {
@ -20,7 +20,7 @@ index 176af6c889..992d7bfb0f 100644
     // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 74de19bbfb..b31355f2be 100644
+index 74de19bb..b31355f2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity {
@ -41,5 +41,5 @@ index 74de19bbfb..b31355f2be 100644
                     if (this.getAirTicks() == -20) {
                         this.setAirTicks(0);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
@ -1,4 +1,4 @@
-From c611f29665a3b57b937b835fe497e4a774f7ae38 Mon Sep 17 00:00:00 2001
+From 85980c624cc37bb702630bb277ea5b1e43362a1f 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 ebb41f788..af2fa93d4 100644
+index ebb41f78..af2fa93d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -73,7 +73,7 @@ index ebb41f788..af2fa93d4 100644
     // Spigot Start
     private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 293251988..56266a772 100644
+index 29325198..56266a77 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1029,10 +1029,15 @@ public abstract class PlayerList {
@ -102,7 +102,7 @@ index 293251988..56266a772 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 ccea803f5..aefea3a9a 100644
+index ccea803f..aefea3a9 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -46,86 +46,134 @@ public class RestartCommand extends Command
@ -307,5 +307,5 @@ index ccea803f5..aefea3a9a 100644
 +
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
@ -1,4 +1,4 @@
-From 1eb0a4434d3c302c17871ea36b090195c637d489 Mon Sep 17 00:00:00 2001
+From 29ffd496d5b85c2626fdacb8d144824f45275241 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 08f3a315f3..6ddb133587 100644
+index 08f3a315..6ddb1335 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@ -57,5 +57,5 @@ index 08f3a315f3..6ddb133587 100644
             }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -1,4 +1,4 @@
-From a1610cec97de35b2e2a368aea3eaf1cf1faea507 Mon Sep 17 00:00:00 2001
+From 6f6338882a15f56648c1ea8c9098019162efd864 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 751551f173..eae1690cc6 100644
+index 751551f1..eae1690c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -328,4 +328,10 @@ public class PaperWorldConfig {
@ -26,7 +26,7 @@ index 751551f173..eae1690cc6 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b407d80ae6..5e92f0ddb4 100644
+index b407d80a..5e92f0dd 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -39,7 +39,7 @@ index b407d80ae6..5e92f0ddb4 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f367a76e82..046ef418f8 100644
+index f367a76e..046ef418 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -57,5 +57,5 @@ index f367a76e82..046ef418f8 100644
             case RELEASE_SHIFT_KEY:
                 this.player.setSneaking(false);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From c86f500887327ec327c692597b05d2ad6f14b530 Mon Sep 17 00:00:00 2001
+From d191de1047b34bea36c01e3fc862b9ff3b352822 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,7 +6,7 @@ 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 5a83fc21cb..295b8390cb 100644
+index 5a83fc21..295b8390 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -259,4 +259,9 @@ public class PaperConfig {
@ -20,7 +20,7 @@ index 5a83fc21cb..295b8390cb 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f7b7e67f3..2e0f443d9f 100644
+index 8f7b7e67..2e0f443d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2137,5 +2137,10 @@ public final class CraftServer implements Server {
@ -35,5 +35,5 @@ index 8f7b7e67f3..2e0f443d9f 100644
     // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -1,4 +1,4 @@
-From b0cac0325343f6656dca54c1a48d7fb79176097b Mon Sep 17 00:00:00 2001
+From a47a0f46d7c03f9ce3c5888be99993111aab36de 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
@ -19,7 +19,7 @@ Other changes:
    configuration

 diff --git a/pom.xml b/pom.xml
-index 3dc6c2a3f..b1f008738 100644
+index 3dc6c2a3..b1f00873 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -41,10 +41,27 @@
@ -75,7 +75,7 @@ index 3dc6c2a3f..b1f008738 100644
                 <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..cd6e25923
+index 00000000..cd6e2592
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -0,0 +1,40 @@
@ -121,7 +121,7 @@ index 000000000..cd6e25923
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 00000000..685deaa0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
@@ -0,0 +1,17 @@
@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4b1f8c537..d34f772fa 100644
+index 4b1f8c53..d34f772f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -86,6 +86,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -185,7 +185,7 @@ index 4b1f8c537..d34f772fa 100644
         System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
         System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index af2fa93d4..94f9201fc 100644
+index af2fa93d..94f9201f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate;
@ -244,7 +244,7 @@ index af2fa93d4..94f9201fc 100644
 
     public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d8e74e227..55c2cd05b 100644
+index 56266a77..77f1ddc8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -76,8 +76,7 @@ public abstract class PlayerList {
@ -258,7 +258,7 @@ index d8e74e227..55c2cd05b 100644
 
         this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2e0f443d9..742c21480 100644
+index 2e0f443d..742c2148 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -42,7 +42,6 @@ import java.util.logging.Level;
@ -284,7 +284,7 @@ index 2e0f443d9..742c21480 100644
     @Override
     public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 93fcfd5f3..0e76e3466 100644
+index 93fcfd5f..0e76e346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -13,7 +13,7 @@ import java.util.logging.Logger;
@ -335,7 +335,7 @@ index 93fcfd5f3..0e76e3466 100644
             } catch (Throwable t) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index fdf2f075e..000000000
+index fdf2f075..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
@@ -1,72 +0,0 @@
@ -412,7 +412,7 @@ index fdf2f075e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index befcc19f9..5510266fb 100644
+index befcc19f..5510266f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@@ -4,20 +4,31 @@ import java.util.Collections;
@ -495,7 +495,7 @@ index befcc19f9..5510266fb 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 70f8d4299..449e99d1b 100644
+index 70f8d429..449e99d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread {
@ -509,7 +509,7 @@ index 70f8d4299..449e99d1b 100644
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index 99564fed7..000000000
+index 99564fed..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
@@ -1,58 +0,0 @@
@ -573,13 +573,13 @@ index 99564fed7..000000000
 -}
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..0694b2146
+index 00000000..0694b214
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
@@ -0,0 +1 @@
 +log4j.skipJansi=true
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 722ca8496..620b9490e 100644
+index 722ca849..620b9490 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
@@ -1,17 +1,14 @@
@ -617,5 +617,5 @@ index 722ca8496..620b9490e 100644
     </Loggers>
 </Configuration>
 -- 
-2.26.0
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
@ -1,4 +1,4 @@
-From 3e65aca5cf6438722db5073154a9bffe5c4b16a9 Mon Sep 17 00:00:00 2001
+From a45b8bf015a8d91a39b9780f11c6511dacfe3637 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eae1690cc6..39ab545756 100644
+index eae1690c..39ab5457 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -334,4 +334,10 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index eae1690cc6..39ab545756 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index cc9887d040..374cf28fb4 100644
+index cc9887d0..374cf28f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster {
@ -34,5 +34,5 @@ index cc9887d040..374cf28fb4 100644
 
             entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch
@ -1,11 +1,11 @@
-From 2df124c430e0d7f180c0018523390ce0ab4bf5a5 Mon Sep 17 00:00:00 2001
+From d86bb78367bcdc30f3c49eea150c3d4dcf0562e7 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 1732c1ae95..b5816dc89e 100644
+index 1732c1ae..b5816dc8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -521,6 +521,11 @@ public abstract class EntityInsentient extends EntityLiving {
@ -21,7 +21,7 @@ index 1732c1ae95..b5816dc89e 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 208dad2a34..97c6a8b6bd 100644
+index 208dad2a..97c6a8b6 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -20,6 +20,7 @@ public class EntityItem extends Entity {
@ -33,7 +33,7 @@ index 208dad2a34..97c6a8b6bd 100644
     public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
         super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc99..3f552b5905 100644
+index cc593fbc..3f552b59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
@ -54,5 +54,5 @@ index cc593fbc99..3f552b5905 100644
     public String toString() {
         return "CraftItem";
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
@ -1,11 +1,11 @@
-From 9fde0dfeb5e1a49aba85ebc02f83010db78eb6cc Mon Sep 17 00:00:00 2001
+From 720969ab4cf22fb90dca8adf498dfc3aa28ef74b 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 97c6a8b6bd..8747dc7075 100644
+index 97c6a8b6..8747dc70 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -322,6 +322,7 @@ public class EntityItem extends Entity {
@ -45,5 +45,5 @@ index 97c6a8b6bd..8747dc7075 100644
                     this.die();
                     itemstack.setCount(i);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
@ -1,11 +1,11 @@
-From b8f60aabc6115c141b7cbf45eb4462d31ea3fbdc Mon Sep 17 00:00:00 2001
+From d6e4a66af39be2c669eaaef75688ead046456760 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 8747dc7075..5efcc50ab9 100644
+index 8747dc70..5efcc50a 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@ -40,5 +40,5 @@ index 8747dc7075..5efcc50ab9 100644
                 itemstack.setCount(canHold);
                 // Call legacy event
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
@ -1,11 +1,11 @@
-From d8637d8eaf04e7f109b77ef684fa51fc7c06a206 Mon Sep 17 00:00:00 2001
+From 5b773eb30327f0bf80b195dda85dec7045867fb8 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 742c21480a..1f1af567b4 100644
+index 742c2148..1f1af567 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -79,6 +79,7 @@ import net.minecraft.server.WorldServer;
@ -40,5 +40,5 @@ index 742c21480a..1f1af567b4 100644
         // Spigot end
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
@ -1,4 +1,4 @@
-From 8a13422ca62d64fd310c3be8a5273667bbf4d74e Mon Sep 17 00:00:00 2001
+From 210d72e066a073c2bcce64032a1a0037641c369d 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
@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too

 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 0000000000..b151a13c1b
+index 00000000..b151a13c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
@@ -0,0 +1,280 @@
@ -293,7 +293,7 @@ index 0000000000..b151a13c1b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 0000000000..25836b975b
+index 00000000..25836b97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
@@ -0,0 +1,30 @@
@ -329,7 +329,7 @@ index 0000000000..25836b975b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 0000000000..3bcdb8f93f
+index 00000000..3bcdb8f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
@@ -0,0 +1,17 @@
@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 0000000000..4b2a67423f
+index 00000000..4b2a6742
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
@@ -0,0 +1,29 @@
@ -387,7 +387,7 @@ index 0000000000..4b2a67423f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 0000000000..3aceb0ea8a
+index 00000000..3aceb0ea
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
@@ -0,0 +1,11 @@
@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 48f88eaba4..9d0b0c9fc3 100644
+index 48f88eab..9d0b0c9f 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,7 +1,10 @@
@ -429,7 +429,7 @@ index 48f88eaba4..9d0b0c9fc3 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 94f9201fc4..ae939c9bda 100644
+index 94f9201f..ae939c9b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1299,7 +1299,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -450,7 +450,7 @@ index 94f9201fc4..ae939c9bda 100644
         return this.minecraftSessionService;
     }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 581199e6dc..a072222bc5 100644
+index 581199e6..a072222b 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
@@ -43,7 +43,7 @@ public class UserCache {
@ -486,7 +486,7 @@ index 581199e6dc..a072222bc5 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 1f1af567b4..8d23eb0e7b 100644
+index 1f1af567..8d23eb0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -199,6 +199,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@ -525,5 +525,5 @@ index 1f1af567b4..8d23eb0e7b 100644
     // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
@ -1,11 +1,11 @@
-From 1e1eb3eebc71ab596ea7e07962d7088fe9a00bb4 Mon Sep 17 00:00:00 2001
+From 038221a7da315491055d2512213c6d8b4355cf0c 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


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5e92f0ddb4..3bd5ddba68 100644
+index 5e92f0dd..3bd5ddba 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1901,20 +1901,44 @@ public abstract class EntityHuman extends EntityLiving {
@ -58,7 +58,7 @@ index 5e92f0ddb4..3bd5ddba68 100644
     @Override
     public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 77ee3c293c..ce84885af6 100644
+index 77ee3c29..ce84885a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -513,6 +513,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@ -95,5 +95,5 @@ index 77ee3c293c..ce84885af6 100644
     public boolean discoverRecipe(NamespacedKey recipe) {
         return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
@ -1,4 +1,4 @@
-From b42b5c27a4119a90ee1cc89c9fb4976323c13bdd Mon Sep 17 00:00:00 2001
+From 0b003028c0b8227486c0754b25758d88cb7c3828 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
@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.

 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93f..bb9894318e 100644
+index 3bcdb8f9..bb989431 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
@@ -1,17 +1,68 @@
@ -81,5 +81,5 @@ index 3bcdb8f93f..bb9894318e 100644
     }
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
@ -1,11 +1,11 @@
-From a5bc0e06873b8f934ec73ba308bb2d0d381edf7f Mon Sep 17 00:00:00 2001
+From 5cea1f3c04abb99f31437849696d6c764b1aa611 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 19e72da6d9..234451ebc8 100644
+index 19e72da6..234451eb 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener {
@ -22,5 +22,5 @@ index 19e72da6d9..234451ebc8 100644
             this.c();
         } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
@ -1,11 +1,11 @@
-From 75a0444ae173c51f5eb262f0716845693cd754a6 Mon Sep 17 00:00:00 2001
+From 1c3787786da26275536db40457f0f9693a0813fd 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 4f8e10b860..1de1a10cf0 100644
+index 4f8e10b8..1de1a10c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -37,7 +37,7 @@ index 4f8e10b860..1de1a10cf0 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 b249af20c4..ab5d83d34d 100644
+index b249af20..ab5d83d3 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -140,6 +140,7 @@ public abstract class MobSpawnerAbstract {
@ -49,7 +49,7 @@ index b249af20c4..ab5d83d34d 100644
                         if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
                             Entity vehicle = entity.getVehicle();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bb07dec3c8..495a7c464f 100644
+index bb07dec3..495a7c46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -64,5 +64,5 @@ index bb07dec3c8..495a7c464f 100644
     // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
@ -1,4 +1,4 @@
-From 3363396eb2533f24b7e4408fe9cc3fe2c42fadcc Mon Sep 17 00:00:00 2001
+From e361ca221cfcf1aad706043726600535619007db 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 09016e3547..9952db3eb5 100644
+index 09016e35..9952db3e 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 09016e3547..9952db3eb5 100644
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 63991bf4be..9a47a1adc1 100644
+index 63991bf4..9a47a1ad 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 63991bf4be..9a47a1adc1 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 00000000..99cfbaf9
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
@@ -0,0 +1,15 @@
@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b
 +
 +}
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
@ -1,4 +1,4 @@
-From 28bc2a5976de226d2af3900ba5f40d48df3cc62a Mon Sep 17 00:00:00 2001
+From 5e85d280c3172b657231cc60b3dba12471f8f16c 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
@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 01ab19434a..8b219b5fa2 100644
+index 01ab1943..8b219b5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {
@ -22,5 +22,5 @@ index 01ab19434a..8b219b5fa2 100644
 +    // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
@ -1,4 +1,4 @@
-From 14dff3cabf6f1b60cf87426b00671a5211f7f3f9 Mon Sep 17 00:00:00 2001
+From b7611f2db448f4fb14eb979adf2212d9283adb3b 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
@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.

 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index c0c13798f8..6012739331 100644
+index c0c13798..60127393 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -65,10 +65,12 @@ public class LocaleLanguage {
@ -25,7 +25,7 @@ index c0c13798f8..6012739331 100644
         return this.c(s);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 8b219b5fa2..23d7756456 100644
+index 8b219b5f..23d77564 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory {
@ -48,5 +48,5 @@ index 8b219b5fa2..23d7756456 100644
     // Paper end
 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
@ -1,11 +1,11 @@
-From 1d9d4821b898167d2b6ea80a9655c6838eecf706 Mon Sep 17 00:00:00 2001
+From e4cd3b233ea376d63831b573a85821dfa5ad8d9f 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 77f1ddc8a..a61815c79 100644
+index 77f1ddc8..a61815c7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -509,9 +509,9 @@ public abstract class PlayerList {
@ -48,5 +48,5 @@ index 77f1ddc8a..a61815c79 100644
     public boolean isOp(GameProfile gameprofile) {
         return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
@ -1,4 +1,4 @@
-From ecf6ec4205b6e9d942dd5890913b264c0ce81aa8 Mon Sep 17 00:00:00 2001
+From e772f359fd89943ec103233db8479e790d5e4689 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
@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.

 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0e76e34664..444a6a608b 100644
+index 0e76e346..444a6a60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -218,10 +218,12 @@ public class Main {
@ -29,5 +29,5 @@ index 0e76e34664..444a6a608b 100644
                 }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
@ -1,11 +1,11 @@
-From fd673275e5f2f533af7c23ca18c3a13bbf6cadaf Mon Sep 17 00:00:00 2001
+From 0d3f6d75f7837c2048c4ed5d07861db136f7bb26 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 0624114553..d9a7b8ac1e 100644
+index 06241145..d9a7b8ac 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal {
@ -18,5 +18,5 @@ index 0624114553..d9a7b8ac1e 100644
 
     @Override
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@ -1,11 +1,11 @@
-From cf2f4b1e5981127d40f7acb4f39b34a05271a8a0 Mon Sep 17 00:00:00 2001
+From 0a60c7d137249b42e32668e922eba7d6e637ace7 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 ab5d83d34d..c38295a09d 100644
+index ab5d83d3..c38295a0 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -142,6 +142,7 @@ public abstract class MobSpawnerAbstract {
@ -26,5 +26,5 @@ index ab5d83d34d..c38295a09d 100644
                 }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@ -1,11 +1,11 @@
-From 529e676c1d75d76e73012bc1d0fd5bcd8e42c499 Mon Sep 17 00:00:00 2001
+From c1379fc6595e8463a7e9c7c27c31f24e1f93868f 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 9632839598..14c97a163c 100644
+index 96328395..14c97a16 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -647,7 +647,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -22,5 +22,5 @@ index 9632839598..14c97a163c 100644
             this.tileEntityListUnload.clear();
         }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
@ -1,4 +1,4 @@
-From 8216a8c6dd17b26814884d2e64542a03f3779544 Mon Sep 17 00:00:00 2001
+From 9b4d6efc58a480aea2f77b4bc5805ab81571ea64 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 295b8390cb..5884b04f7e 100644
+index 295b8390..5884b04f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -1,5 +1,6 @@
@ -27,7 +27,7 @@ index 295b8390cb..5884b04f7e 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 234451ebc8..758fe77489 100644
+index 234451eb..758fe774 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener {
@ -42,5 +42,5 @@ index 234451ebc8..758fe77489 100644
                             LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
                         }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
@ -1,11 +1,11 @@
-From 7240dff14641c3f58898416b67cf426b31cc71d4 Mon Sep 17 00:00:00 2001
+From a1835d11de28874c38029a3b057ee27b6818ad23 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


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b31355f2be..c7b62872c4 100644
+index b31355f2..c7b62872 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@ -18,7 +18,7 @@ index b31355f2be..c7b62872c4 100644
     protected int ticksFarFromPlayer;
     protected float aR;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e38f4f6910..23a4819992 100644
+index e38f4f69..23a48199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -318,6 +318,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -39,5 +39,5 @@ index e38f4f6910..23a4819992 100644
     public boolean addPotionEffect(PotionEffect effect) {
         return addPotionEffect(effect, false);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@ -1,4 +1,4 @@
-From b0bb87241e3ca3a38ee92fdcc0260fabedf9363e Mon Sep 17 00:00:00 2001
+From cc7eb34ab0d7d3ed2ac9c1133b0867d3f46c0227 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 b1f008738b..14c4ec250c 100644
+index b1f00873..14c4ec25 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -63,6 +63,11 @@
@ -28,7 +28,7 @@ index b1f008738b..14c4ec250c 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 d34f772fae..ec257ba31f 100644
+index d34f772f..ec257ba3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -155,8 +155,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -45,5 +45,5 @@ index d34f772fae..ec257ba31f 100644
 
         thread.setDaemon(true);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
@ -1,4 +1,4 @@
-From 617fb94e256f7eafc1660a273e40c925fbf98d3a Mon Sep 17 00:00:00 2001
+From d1c079b07d209c70bf52c519ce4b2cfc5a2a9fe0 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 14c4ec250c..5a230592c7 100644
+index 14c4ec25..5a230592 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -61,7 +61,7 @@
@ -28,7 +28,7 @@ index 14c4ec250c..5a230592c7 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 fdca34346a..6d77bbc5aa 100644
+index fdca3434..6d77bbc5 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -286,7 +286,7 @@ public class SpigotConfig
@ -41,7 +41,7 @@ index fdca34346a..6d77bbc5aa 100644
 
     public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 620b9490e5..a8bdaaeaa1 100644
+index 620b9490..a8bdaaea 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
@@ -5,10 +5,22 @@
@ -70,5 +70,5 @@ index 620b9490e5..a8bdaaeaa1 100644
                 <TimeBasedTriggeringPolicy />
                 <OnStartupTriggeringPolicy />
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
@ -1,11 +1,11 @@
-From a0aeb66881e3e84c2a5407d063d82f7de394c5e6 Mon Sep 17 00:00:00 2001
+From a40b48933c0e67d7f6146cf6a40d377a33b54857 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 5a230592c7..6f2fe9c26d 100644
+index 5a230592..6f2fe9c2 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -63,6 +63,12 @@
@ -22,5 +22,5 @@ index 5a230592c7..6f2fe9c26d 100644
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-iostreams</artifactId>
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@ -1,4 +1,4 @@
-From b387c73dbdd9f6418d40c1d290fd1334dc3200ae Mon Sep 17 00:00:00 2001
+From 660ce1760bc0098207da4b3458e9e4bcccba1ce0 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 a8bdaaeaa1..a9bb987652 100644
+index a8bdaaea..a9bb9876 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
@@ -8,7 +8,8 @@
@ -35,5 +35,5 @@ index a8bdaaeaa1..a9bb987652 100644
                 </LoggerNamePatternSelector>
             </PatternLayout>
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
@ -1,11 +1,11 @@
-From c2abf57d9f2f352fdb91ac63edf5966985e3cc6d Mon Sep 17 00:00:00 2001
+From b3f78ad92fa558d6b564b0d5c9b33a043e6e37a5 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


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 046ef418f8..b0651dcfbf 100644
+index 046ef418..b0651dcf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
@ -54,5 +54,5 @@ index 046ef418f8..b0651dcfbf 100644
 
                             this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
@ -1,4 +1,4 @@
-From 0c913b8e40c90661a114f2387020d5967d32eb78 Mon Sep 17 00:00:00 2001
+From cd8cd2fea7a78279d7558e213bfd0c2ccee8745e 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
@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b0651dcfbf..d4a649a83f 100644
+index b0651dcf..d4a649a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2487,14 +2487,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -40,5 +40,5 @@ index b0651dcfbf..d4a649a83f 100644
 
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
@ -1,4 +1,4 @@
-From bb5e450c8154a82323f388c18893110db3d8d1cf Mon Sep 17 00:00:00 2001
+From 58ad26ff9c4f0a9dd0b33e00d751122ae46431f5 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
@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host

 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 0000000000..5caca6439d
+index 00000000..5caca643
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
@@ -0,0 +1,50 @@
@ -61,7 +61,7 @@ index 0000000000..5caca6439d
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d0b9c6e3dc..8928d93e49 100644
+index d0b9c6e3..8928d93e 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@ -84,7 +84,7 @@ index d0b9c6e3dc..8928d93e49 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3ccf166366..e2d8ed88f0 100644
+index 3ccf1663..e2d8ed88 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -99,7 +99,7 @@ index 3ccf166366..e2d8ed88f0 100644
     public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
         this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 4f008e4723..8545146fb1 100644
+index 4f008e47..8545146f 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
@@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@ -111,7 +111,7 @@ index 4f008e4723..8545146fb1 100644
         return this.a;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d1745c4e93..129aefd5e8 100644
+index d1745c4e..129aefd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -183,6 +183,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -136,5 +136,5 @@ index d1745c4e93..129aefd5e8 100644
     public double getEyeHeight(boolean ignorePose) {
         if (ignorePose) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
@ -1,4 +1,4 @@
-From 6aa1944d363b484140359ea7e5a822ab4d00e06b Mon Sep 17 00:00:00 2001
+From 61fd7a176ae3d7230ee00efa5f238370ef29d432 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 d4a649a83f..2a3771d065 100644
+index d4a649a8..2a3771d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -74,5 +74,5 @@ index d4a649a83f..2a3771d065 100644
         this.minecraftServer.getMethodProfiler().exit();
         // CraftBukkit start
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@ -1,4 +1,4 @@
-From 3525cf56eab8d92724da5d7edea7a0419569fab1 Mon Sep 17 00:00:00 2001
+From 6ff7e04ed57eaba5dcacbac55ad5d68de9e82eb0 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
@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3bd5ddba68..c86d22e7ae 100644
+index 3bd5ddba..c86d22e7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving {
@ -72,7 +72,7 @@ index 3bd5ddba68..c86d22e7ae 100644
                             entity.extinguish();
                         }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 14c97a163c..a956dbc3d4 100644
+index 14c97a16..a956dbc3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -584,6 +584,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -88,5 +88,5 @@ index 14c97a163c..a956dbc3d4 100644
 
     public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
@ -1,11 +1,11 @@
-From cab727503baa63f9dd0f50b9bada3ea554a404d5 Mon Sep 17 00:00:00 2001
+From 79780ca45f8bce43fbcdd664e0c3ddd5ff0beca5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 39ab545756..d2582d981f 100644
+index 39ab5457..d2582d98 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -340,4 +340,10 @@ public class PaperWorldConfig {
@ -20,7 +20,7 @@ index 39ab545756..d2582d981f 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c45b7c15fc..dbda8b35aa 100644
+index c45b7c15..dbda8b35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -542,16 +542,32 @@ public class CraftEventFactory {
@ -60,5 +60,5 @@ index c45b7c15fc..dbda8b35aa 100644
         // Spigot end
         } else if (!(entity instanceof EntityPlayer)) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
@ -1,11 +1,11 @@
-From 4971f3493441d4522d32bb68cc230904d169fd37 Mon Sep 17 00:00:00 2001
+From ac291d00f151d73d3d718328ed97714ece0a4de8 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


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c7b62872c4..fe0b082206 100644
+index c7b62872..fe0b0822 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1,5 +1,6 @@
@ -30,7 +30,7 @@ index c7b62872c4..fe0b082206 100644
                     if (!itemstack.isEmpty()) {
                         this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index 02a7ae6785..60b235f16f 100644
+index 02a7ae67..60b235f1 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
@@ -16,6 +16,7 @@ public enum EnumItemSlot {
@ -42,5 +42,5 @@ index 02a7ae6785..60b235f16f 100644
         return this.g;
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
@ -1,4 +1,4 @@
-From 27b2bf36570fce673b15bb60da0050e7cccb364c Mon Sep 17 00:00:00 2001
+From 01a3a6042dd4a983e00627fd7098d0cb6e5a3375 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 758fe77489..1fb609dcfc 100644
+index 758fe774..1fb609dc 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener {
@ -23,5 +23,5 @@ index 758fe77489..1fb609dcfc 100644
             EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
@ -1,4 +1,4 @@
-From acb4e329c24a42d0fa90ca0f05b0a24e885c97c5 Mon Sep 17 00:00:00 2001
+From 92d1e8f03547840bcefbbc9f9bc7edd35b521907 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 a956dbc3d4..2f57c7bc76 100644
+index a956dbc3..2f57c7bc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -58,5 +58,5 @@ index a956dbc3d4..2f57c7bc76 100644
                 return previous.getHandle();
             }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
@ -1,4 +1,4 @@
-From a14f5b0c6cc0718f0811156f67ed304439a657cc Mon Sep 17 00:00:00 2001
+From e1c64c1bb29a3243a08d22459101f338e858ee41 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
@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null

 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 630b279158..958279249f 100644
+index 630b2791..95827924 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -39,7 +39,7 @@ index 630b279158..958279249f 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 eb0201ebe1..1354d949c1 100644
+index eb0201eb..1354d949 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -311,6 +311,20 @@ public class CraftBlock implements Block {
@ -64,7 +64,7 @@ index eb0201ebe1..1354d949c1 100644
 
         switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 17d80b5c6e..f6401e2cde 100644
+index 17d80b5c..f6401e2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@ -114,7 +114,7 @@ index 17d80b5c6e..f6401e2cde 100644
 
     private T createSnapshot(T tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 15022ada0c..af15656cc4 100644
+index 15022ada..af15656c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
@ -131,5 +131,5 @@ index 15022ada0c..af15656cc4 100644
 
     @Override
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
@ -1,4 +1,4 @@
-From 0576e19db0d775933920f1cb9162db2501a793dc Mon Sep 17 00:00:00 2001
+From a21a5ec7909615a49eccd6c6445cc5f16c01df44 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 2a3771d065..64f789d7c4 100644
+index 2a3771d0..64f789d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -72,7 +72,7 @@ index 2a3771d065..64f789d7c4 100644
 
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8d23eb0e7b..b7eaa0fef9 100644
+index 8d23eb0e..b7eaa0fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1709,7 +1709,7 @@ public final class CraftServer implements Server {
@ -85,7 +85,7 @@ index 8d23eb0e7b..b7eaa0fef9 100644
 
         return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 5510266fb1..a51202ed53 100644
+index 5510266f..a51202ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
@@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@ -129,5 +129,5 @@ index 5510266fb1..a51202ed53 100644
         Waitable<List<String>> waitable = new Waitable<List<String>>() {
             @Override
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
@ -1,11 +1,11 @@
-From 2b3b0cbd50b62a4cbb5aefd0b332e23b44e6caef Mon Sep 17 00:00:00 2001
+From 3448dbfbbe909b6309363e11ba5142a39c4b559f 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 eafdcb916a..d37a2fa0ab 100644
+index eafdcb91..d37a2fa0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
@@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@ -18,5 +18,5 @@ index eafdcb916a..d37a2fa0ab 100644
         }
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
@ -1,4 +1,4 @@
-From 0823f1c7545f4e5c4a1ee0ae4f16987b820e34f7 Mon Sep 17 00:00:00 2001
+From a1deab71b1071eb4508794a3d294c966c435e0fa 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 d4275e733d..b3edb69a96 100644
+index d4275e73..b3edb69a 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
@ -19,5 +19,5 @@ index d4275e733d..b3edb69a96 100644
                 entityhuman.receive(this, 1);
                 Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
@ -1,4 +1,4 @@
-From 12dcb77bba6dddc5a70327d0b537909f14e70614 Mon Sep 17 00:00:00 2001
+From 15351f65aacd707684c22266856d744f098de87e 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/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dbda8b35aa..f9b0f39f78 100644
+index dbda8b35..f9b0f39f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -552,7 +552,7 @@ public class CraftEventFactory {
@ -21,5 +21,5 @@ index dbda8b35aa..f9b0f39f78 100644
                             if ((int) newTotal < 0) continue; // Overflow
                             if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
@ -1,4 +1,4 @@
-From 2ddd8eb72ea47d200d3dbd78ecae35a33a76de34 Mon Sep 17 00:00:00 2001
+From 5cfbc50e91161d98eebeef3974b5e40dfd7a4920 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 1822178e8d..d96c03a1a1 100644
+index 1822178e..d96c03a1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -246,6 +246,11 @@ public class EnchantmentManager {
@ -26,7 +26,7 @@ index 1822178e8d..d96c03a1a1 100644
     public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
         Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b3edb69a96..87c6b77ce3 100644
+index b3edb69a..87c6b77c 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity {
@ -43,7 +43,7 @@ index b3edb69a96..87c6b77ce3 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 129aefd5e8..6d46fa23d2 100644
+index 129aefd5..6d46fa23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1018,8 +1018,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -86,5 +86,5 @@ index 129aefd5e8..6d46fa23d2 100644
     }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
@ -1,4 +1,4 @@
-From fede97cace00c5730920e207569e01eb725ed0c0 Mon Sep 17 00:00:00 2001
+From d72d7c2745dafb5a961d0f6ae0d3c5f8e974a669 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2582d981f..92e6891502 100644
+index d2582d98..92e68915 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -346,4 +346,9 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index d2582d981f..92e6891502 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 8c4f3b2c2e..1c1ff2069d 100644
+index 8c4f3b2c..1c1ff206 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
@ -35,5 +35,5 @@ index 8c4f3b2c2e..1c1ff2069d 100644
 
     public void a(float f, float f1, float f2) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
@ -1,4 +1,4 @@
-From 47f642cc207303a6afcdc93b2f5feaa19349a945 Mon Sep 17 00:00:00 2001
+From d82b5b0a49ae6f72dd7d3889eca92c0869e8150e 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 c38295a09d..43c491f71b 100644
+index c38295a0..43c491f7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract {
@ -47,7 +47,7 @@ index c38295a09d..43c491f71b 100644
                             entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch);
                             return entity1;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 02157d051f..224443e03c 100644
+index 02157d05..224443e0 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -38,7 +38,7 @@ public final class SpawnerCreature {
@ -86,5 +86,5 @@ index 02157d051f..224443e03c 100644
                                                             Entity entity = entitytypes.a((World) worldserver);
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
@ -1,4 +1,4 @@
-From f55042716d3ac30f4e1bf608bb667c23eea4047c Mon Sep 17 00:00:00 2001
+From 311435ed23ad169d182172814b2198d4cdd0b124 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/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 554013a98..05534126a 100644
+index 554013a9..05534126 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -587,6 +587,15 @@ public class ChunkProviderServer extends IChunkProvider {
@ -29,7 +29,7 @@ index 554013a98..05534126a 100644
                 Optional<Chunk> optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1296eb04f..625b68428 100644
+index 95e09e35..d8721ab2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1,5 +1,6 @@
@ -48,7 +48,7 @@ index 1296eb04f..625b68428 100644
     public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> cachedSingleHashSet; // Paper
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 936fc4f6b..fcf229ad5 100644
+index 936fc4f6..fcf229ad 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -881,12 +881,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -78,5 +78,5 @@ index 936fc4f6b..fcf229ad5 100644
     }
 
 -- 
-2.26.0
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
@ -1,4 +1,4 @@
-From fc10f8c932094ea48409d91d5b7c286a42adb2bf Mon Sep 17 00:00:00 2001
+From 9f7326144c684306ed2ac5822ef8fa8c82f4d26f 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
@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API

 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index a4bc7f9701..2dd2f476f0 100644
+index a4bc7f97..2dd2f476 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
@@ -1,5 +1,7 @@
@ -48,7 +48,7 @@ index a4bc7f9701..2dd2f476f0 100644
     public BlockFace getRotation() {
         BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 4fb27cc7ed..96d62bbf88 100644
+index 4fb27cc7..96d62bbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory;
@ -89,5 +89,5 @@ index 4fb27cc7ed..96d62bbf88 100644
     public OfflinePlayer getOwningPlayer() {
         if (hasOwner()) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
@ -1,4 +1,4 @@
-From 3f27703850252713fd6574d265c8caad71847b20 Mon Sep 17 00:00:00 2001
+From 1f4c9a9620489ca343683979c02bc5bdf5e33514 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 4b2a6742..61cfdf73 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.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
@ -1,11 +1,11 @@
-From a8c6001fe5db7539f88f646d7d5eb2f696e0c512 Mon Sep 17 00:00:00 2001
+From b7076ba2ea9bf32e67b02aa7d808d3726faf9046 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 ca661f3933..c41e138472 100644
+index ca661f39..c41e1384 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -276,6 +276,12 @@ public class AdvancementDataPlayer {
@ -22,5 +22,5 @@ index ca661f3933..c41e138472 100644
             this.i.add(advancement);
             flag = true;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
@ -1,4 +1,4 @@
-From da394890b3d09b3f04b96db7370d5ab7f5a25f5d Mon Sep 17 00:00:00 2001
+From b5fdde6eeed609cb641c841f2369c8da3ce8f542 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
@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index f700522840..3723faccac 100644
+index f7005228..3723facc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
@@ -8,13 +8,39 @@ import org.bukkit.Material;
@ -267,7 +267,7 @@ index f700522840..3723faccac 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index bd9e09f999..0682c6e859 100644
+index bd9e09f9..0682c6e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -1429,7 +1429,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@ -288,7 +288,7 @@ index bd9e09f999..0682c6e859 100644
             }
             return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 6302339601..3a82bede7c 100644
+index 63023396..3a82bede 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
@ -308,5 +308,5 @@ index 6302339601..3a82bede7c 100644
                     return cleanStack;
                 }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
@ -1,4 +1,4 @@
-From afa8825160769feb030e751d9fc2f2732bf2c42d Mon Sep 17 00:00:00 2001
+From 24136f5fe9c8145e07f6469d31e47687113eb3b7 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 dff3eb1188..e2e5c17c24 100644
+index dff3eb11..e2e5c17c 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -137,6 +137,11 @@ public class PlayerInteractManager {
@ -55,5 +55,5 @@ index dff3eb1188..e2e5c17c24 100644
             enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
         } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
@ -1,4 +1,4 @@
-From 0d7c76b8b8abda694580589ff8aead9247d81c2f Mon Sep 17 00:00:00 2001
+From 876ea6519418b03a17dc24683e90c2d4d655d406 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 9952db3eb5..1aea5f3f05 100644
+index 9952db3e..1aea5f3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
@@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@ -21,7 +21,7 @@ index 9952db3eb5..1aea5f3f05 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 5dfa40dda1..407b95cafd 100644
+index 5dfa40dd..407b95ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
@@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@ -35,5 +35,5 @@ index 5dfa40dda1..407b95cafd 100644
         try {
             return getHandle().getOwnerUUID();
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@ -1,11 +1,11 @@
-From 6c2bfd814f3b7de618aecd0ddb77fabf622d8a7f Mon Sep 17 00:00:00 2001
+From 95800827cdcc7fae8fa36289665c51b72aa4c540 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 92e6891502..77cdbfadf9 100644
+index 92e68915..77cdbfad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -187,6 +187,11 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 92e6891502..77cdbfadf9 100644
     private void allChunksAreSlimeChunks() {
         allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c86d22e7ae..3fe13fe489 100644
+index c86d22e7..3fe13fe4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -33,5 +33,5 @@ index c86d22e7ae..3fe13fe489 100644
                     if (flag2) {
                         f *= 1.5F;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@ -1,4 +1,4 @@
-From d48f8ffe7c980bd2e8c646dfb2c21669f20b2438 Mon Sep 17 00:00:00 2001
+From 2d743a0d990859ae40ffedb1d72a2cc2c9e7f58b 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 5a9ac3960d..fd31b9a6dc 100644
+index 5a9ac396..fd31b9a6 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 5a9ac3960d..fd31b9a6dc 100644
     }
 
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@ -1,11 +1,11 @@
-From 78c923236c7a238eabab0ff9c203ced8c36c26ac Mon Sep 17 00:00:00 2001
+From 5aeca8ddfade5486b63bfe4ada70a48864218d47 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 5e414138e4..638a0aa5ae 100644
+index 5e414138..638a0aa5 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
@@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce {
@ -29,5 +29,5 @@ index 5e414138e4..638a0aa5ae 100644
                     if (j >= i) {
                         boolean flag = false;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
@ -1,4 +1,4 @@
-From 04090444d216cfef3013a9ecb2232fc318c30146 Mon Sep 17 00:00:00 2001
+From 2d02e01cb976c09b298b6191b4fa7b8f6ffbd96d 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 e2d8ed88f0..08e314af7c 100644
+index e2d8ed88..08e314af 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -33,5 +33,5 @@ index e2d8ed88f0..08e314af7c 100644
 
         if (this.t++ % 20 == 0) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
@ -1,4 +1,4 @@
-From dd7f18e4ff17100f5e82d7b83b4037cf8bec4da2 Mon Sep 17 00:00:00 2001
+From eee8827333c0691fa54044406451dd2c626b43a0 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 000000000..c1a8e295b
+index 00000000..c1a8e295
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
@@ -0,0 +1,31 @@
@ -43,7 +43,7 @@ index 000000000..c1a8e295b
 +}
 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 000000000..a2a409e63
+index 00000000..a2a409e6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
@@ -0,0 +1,11 @@
@ -60,7 +60,7 @@ index 000000000..a2a409e63
 +}
 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 000000000..a85466bc7
+index 00000000..a85466bc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
@@ -0,0 +1,112 @@
@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae939c9bd..b292e5046 100644
+index ae939c9b..b292e504 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1,6 +1,9 @@
@ -200,7 +200,7 @@ index ae939c9bd..b292e5046 100644
 
             for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 658ea609c..4bb21c48b 100644
+index 658ea609..4bb21c48 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@ -223,7 +223,7 @@ index 658ea609c..4bb21c48b 100644
         // CraftBukkit end
     }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52d..ea52e89bd 100644
+index aa125a52..ea52e89b 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 {
@ -248,7 +248,7 @@ index aa125a52d..ea52e89bd 100644
             this.c = agameprofile;
         }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6d77bbc5a..1cf214eac 100644
+index 6d77bbc5..1cf214ea 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -285,7 +285,7 @@ public class SpigotConfig
@ -261,5 +261,5 @@ index 6d77bbc5a..1cf214eac 100644
     }
 
 -- 
-2.26.0
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
@ -1,4 +1,4 @@
-From 413d54fe3999269f138ff809b9fa7d9262579593 Mon Sep 17 00:00:00 2001
+From bc4eaad7021910497a2282fb7aadf0e11122e7dd 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 00000000..3c1992e2
 --- /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 e102be583c..5db848de14 100644
+index e102be58..5db848de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler {
@ -365,5 +365,5 @@ index e102be583c..5db848de14 100644
 
     private boolean isReady(final int currentTick) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@ -1,4 +1,4 @@
-From 529f047dbeee3b24b5a426cad9ca6c7a66fd80f1 Mon Sep 17 00:00:00 2001
+From bc462ac9f523431a5b85df4829112a7a80f5bdfa 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 1fb609dcfc..1b43f92164 100644
+index 1fb609dc..1b43f921 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 1fb609dcfc..1b43f92164 100644
                             if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                 final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
@ -1,4 +1,4 @@
-From cb49deb9821891dc3560fac122eed7e326d890b8 Mon Sep 17 00:00:00 2001
+From aea5efe6d3f4aac48a477d0522f1667fb7bffdb7 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 3fe13fe489..60dd8672b1 100644
+index 3fe13fe4..60dd8672 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 3fe13fe489..60dd8672b1 100644
     private final ItemCooldown bW;
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1b43f92164..1c4ac7bf7a 100644
+index 1b43f921..1c4ac7bf 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener {
@ -48,7 +48,7 @@ index 1b43f92164..1c4ac7bf7a 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 6d46fa23d2..ef7fff7545 100644
+index 6d46fa23..ef7fff75 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 @@
@ -141,5 +141,5 @@ index 6d46fa23d2..ef7fff7545 100644
     public void removeDisconnectingPlayer(Player player) {
         hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
@ -1,4 +1,4 @@
-From 9e75b3f1f4d2c1aff58b26be43037c1f1d326b59 Mon Sep 17 00:00:00 2001
+From 88f0ade67220eaabe4886bf7c08328bfbce16f73 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 c42de9771e..40a8beff55 100644
+index c42de977..40a8beff 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
@@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@ -20,5 +20,5 @@ index c42de9771e..40a8beff55 100644
                 if (d3 < 0.0D) {
                     d3 = d2;
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
@ -1,4 +1,4 @@
-From 9f4935fd2dadab6fadb868d1aaa6a5cb61b90c95 Mon Sep 17 00:00:00 2001
+From 884e7260c35a99e7f1bcd59095718c506dd64ec5 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 b7eaa0fef9..bc70d0fc79 100644
+index b7eaa0fe..bc70d0fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1402,6 +1402,26 @@ public final class CraftServer implements Server {
@ -40,5 +40,5 @@ index b7eaa0fef9..bc70d0fc79 100644
     @Deprecated
     public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
@ -1,11 +1,11 @@
-From 198909d1bf40f6a46c179c03261f925a7cbb8e0d Mon Sep 17 00:00:00 2001
+From b13a8729b87f5d82fc1113556483f67ccd77a2e5 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 5884b04f7e..ba341e0174 100644
+index 5884b04f..ba341e01 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -270,4 +270,13 @@ public class PaperConfig {
@ -23,7 +23,7 @@ index 5884b04f7e..ba341e0174 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e51..e60e10c57d 100644
+index a0254d8e..e60e10c5 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@ -35,5 +35,5 @@ index a0254d8e51..e60e10c57d 100644
             NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
             File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp");
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
@ -1,4 +1,4 @@
-From 93a16e281fb254711122b786e4481ff6e88cd527 Mon Sep 17 00:00:00 2001
+From 8e18d5f39b428086b19d00e6e8607447737e2691 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 9ee5a1ff02..063efe9bbe 100644
+index 9ee5a1ff..063efe9b 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
@@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@ -167,5 +167,5 @@ index 9ee5a1ff02..063efe9bbe 100644
         channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
     }
 -- 
-2.25.1
+2.25.1.windows.1

--- a/Mehr anzeigen
+++ b/Mehr anzeigen