Remove "Fire EntityCombustEvent for phantoms" patch as it is fixed in Spigot (#1805)

It is fixed here: 438556243d
2024-10-05 09:57:37 +02:00 · 2019-01-16 19:06:39 +01:00 · 2019-01-16 19:06:39 +01:00 · f64dce2719
commit f64dce2719
parent 54dd19b818
34 changed files with 138 additions and 165 deletions
--- a/Spigot-Server-Patches/0383-Fire-EntityCombustEvent-for-phantoms.patch
+++ b/Spigot-Server-Patches/0383-Fire-EntityCombustEvent-for-phantoms.patch
@ -1,27 +0,0 @@
-From 60efbfb73f94b2855adf910e7c5d5617ad4bf4a9 Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Sat, 13 Oct 2018 22:29:17 +0200
-Subject: [PATCH] Fire EntityCombustEvent for phantoms
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index f576264a8..7db0d62df 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
-+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
-@@ -104,7 +104,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
- 
-     public void movementTick() {
-         if (this.dq()) {
-            this.setOnFire(8);
-+            // Paper start - fire EntityCombustEvent
-+            org.bukkit.event.entity.EntityCombustEvent event = new org.bukkit.event.entity.EntityCombustEvent(this.getBukkitEntity(), 8);
-+            if (event.callEvent()) {
-+                this.setOnFire(event.getDuration());
-+            }
-+            // Paper end
-         }
- 
-         super.movementTick();
-- 
-2.20.1
-
--- a/Spigot-Server-Patches/0383-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0383-Limit-lightning-strike-effect-distance.patch
@ -1,11 +1,11 @@
-From 19d69edcb1c593fee7bad9621ee962348a263945 Mon Sep 17 00:00:00 2001
+From 8c24d844718c866d1bb5029c3699d8713f36c9c3 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 94c544714..48920b045 100644
+index d8897e59f..575281991 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -237,6 +237,28 @@ public class PaperWorldConfig {
@ -82,5 +82,5 @@ index 19ce77c4a..8e23d060d 100644
         } else {
             return false;
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0384-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0384-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@ -1,4 +1,4 @@
-From c817217093eab4f213b32058356b047824c256d1 Mon Sep 17 00:00:00 2001
+From 386b6cc86e089cfdfc2bbf70781c5c23253d8005 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@ -78,5 +78,5 @@ index 6036592f7..4128ba4c0 100644
 
     @Override
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0385-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0385-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@ -1,4 +1,4 @@
-From 0f2bde13961395f66bdd2c1b0542e28246c950a9 Mon Sep 17 00:00:00 2001
+From 0244182ccc7ad034077f148f983110b5b21f65ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
@ -38,5 +38,5 @@ index 62b5b6ece..60ab1c751 100644
         }
 
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0386-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0386-Call-player-spectator-target-events.patch
@ -1,4 +1,4 @@
-From 47a84d9836f0c27cec91c4ccfbc9414979c2f73d Mon Sep 17 00:00:00 2001
+From dc5af06257e0c557abfdb7d774a13b0e6ef9c3b9 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
@ -59,5 +59,5 @@ index 00c2072d7..bd768e170 100644
 
     protected void E() {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0387-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0387-Add-Velocity-IP-Forwarding-Support.patch
@ -1,4 +1,4 @@
-From 9b6d8f241cdc61db42937a7942d56c6bbe50890a Mon Sep 17 00:00:00 2001
+From b980e21362028ef6fafe9d3625d80d3bb2ec9f1a Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5663a6517..fef899ae0 100644
+index 7f9845d92..52ce8f89e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -8,6 +8,7 @@ import java.io.IOException;
@ -278,5 +278,5 @@ index 345843a7f..23c96f44b 100644
         this.a = packetdataserializer.g();
         this.b = packetdataserializer.l();
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0388-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0388-Add-more-Witch-API.patch
@ -1,4 +1,4 @@
-From 9321bb9b26dc46f4124ed1ba74390294558533c5 Mon Sep 17 00:00:00 2001
+From c839cb3a0a06dcbb7ab8554e5cf60649c534100f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
@ -136,5 +136,5 @@ index f25998eb6..ac465bda2 100644
 +    // Paper end
 }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0389-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0389-Fix-MC-93764.patch
@ -1,4 +1,4 @@
-From f6792a4755e3b3f72790db6413d73cd6700eeada Mon Sep 17 00:00:00 2001
+From 87f36b5bf6229e9f028b2b3f874f368fd68202a8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
@ -18,5 +18,5 @@ index 99191f09f..4d692b7e0 100644
 
     public boolean canRespawn() {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0390-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0390-Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -1,4 +1,4 @@
-From b56464eae03f77828a947abd8cb7afdf93ad4aed Mon Sep 17 00:00:00 2001
+From 7930d7bd5878635f80f342c5600c45878d7893f0 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@ -64,5 +64,5 @@ index 0bcb9c1ab..c1f47701c 100644
                                 float f2 = this.player.dc() ? 300.0F : 100.0F;
 
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0391-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0391-Reset-players-airTicks-on-respawn.patch
@ -1,11 +1,11 @@
-From 8b820548136c25c0c0e890907bc9fa2415b81608 Mon Sep 17 00:00:00 2001
+From 692430048fa0efc50b1079db791a2a416c5fa10c Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2f27af7f6e..e448f08930 100644
+index 2f27af7f6..e448f0893 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2348,7 +2348,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -18,7 +18,7 @@ index 2f27af7f6e..e448f08930 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bd768e170c..71c4ed8fa6 100644
+index bd768e170..71c4ed8fa 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1620,6 +1620,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -30,5 +30,5 @@ index bd768e170c..71c4ed8fa6 100644
         this.fallDistance = 0;
         this.foodData = new FoodMetaData(this);
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0392-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0392-Strip-private-area-unicode-characters-from-signs.patch
@ -1,4 +1,4 @@
-From 54b96c7ea2c69eb51a3decdf721943bec037bf80 Mon Sep 17 00:00:00 2001
+From 6f20d9f7b5e9104a0551dcc48d547b106514dcc7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@ -89,5 +89,5 @@ index 458d1561d..c2bcbbbab 100644
 
     public void a(int i, IChatBaseComponent ichatbasecomponent) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0393-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0393-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@ -1,4 +1,4 @@
-From 2dda9fa6e36c192311963e21356e6af463a87d64 Mon Sep 17 00:00:00 2001
+From 7cc50b23768cde36a244fc3c18a089ffd8a1dbdb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@ -7,30 +7,30 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup

 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 26a743722..6ed3199c3 100644
+index 71e48e87b..23f1447cf 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
@@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
-         }
- 
-         final int page = 0;
+         }
+ 
+         final int page = 0;
 +        boolean hasRequested = false; // Paper
- 
-         for (final List<String> request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) {
-             int failCount = 0;
+ 
+         for (final List<String> request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) {
+             int failCount = 0;
@@ -67,6 +68,12 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
-                         LOGGER.debug("Couldn't find profile {}", name);
-                         callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile"));
-                     }
+                         LOGGER.debug("Couldn't find profile {}", name);
+                         callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile"));
+                     }
 +                    // Paper start
 +                    if (!hasRequested) {
 +                        hasRequested = true;
 +                        continue;
 +                    }
 +                    // Paper end
- 
-                     try {
-                         Thread.sleep(DELAY_BETWEEN_PAGES);
+ 
+                     try {
+                         Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0394-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0394-Use-more-reasonable-thread-count-default-for-bootstr.patch
@ -1,4 +1,4 @@
-From 90145191418bebaa18678e1c7172ca505326f227 Mon Sep 17 00:00:00 2001
+From 4e0a7885c7da60f4553d7f8d81702e4f1b9248fd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
@ -18,5 +18,5 @@ index ee40bccf6..db9af361d 100644
         pool.shutdown();
         return fixer;
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0395-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0395-Use-EntityTypes-for-living-entities.patch
@ -1,11 +1,11 @@
-From 645b315ae59d67507f97c647929076ef982fb12e Mon Sep 17 00:00:00 2001
+From 5e1fa3233998b14424f465003f1040e595785184 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities


 diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
-index 5a0cc6d058..d385f647e7 100644
+index 5a0cc6d05..d385f647e 100644
 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
@@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@ -18,7 +18,7 @@ index 5a0cc6d058..d385f647e7 100644
             entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
             world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index 75622fbdf8..2653699840 100644
+index 75622fbdf..265369984 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
@@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@ -40,7 +40,7 @@ index 75622fbdf8..2653699840 100644
                 entityirongolem.setPlayerCreated(true);
                 entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index d2cc6bbe25..b180772ae8 100644
+index d2cc6bbe2..b180772ae 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block {
@ -53,7 +53,7 @@ index d2cc6bbe25..b180772ae8 100644
                         entityturtle.setAgeRaw(-24000);
                         entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 93bf32dc1a..e6063bb462 100644
+index 93bf32dc1..e6063bb46 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
@@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@ -66,7 +66,7 @@ index 93bf32dc1a..e6063bb462 100644
 
                 entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index aad7ce93f6..09eabf1235 100644
+index aad7ce93f..09eabf123 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -412,7 +412,7 @@ public class EnderDragonBattle {
@ -79,7 +79,7 @@ index aad7ce93f6..09eabf1235 100644
         entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.HOLDING_PATTERN);
         entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index ee159e0a81..070a9e7b14 100644
+index ee159e0a8..070a9e7b1 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@ -92,7 +92,7 @@ index ee159e0a81..070a9e7b14 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5874d2993c..cc53e915d7 100644
+index 5874d2993..cc53e915d 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@ -105,7 +105,7 @@ index 5874d2993c..cc53e915d7 100644
 
     public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 961afa5c42..a372f6508f 100644
+index 961afa5c4..a372f6508 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
@@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@ -118,7 +118,7 @@ index 961afa5c42..a372f6508f 100644
                             entityendermite.setPlayerSpawned(true);
                             entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 963b6fbb9c..fc20bbe272 100644
+index 963b6fbb9..fc20bbe27 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -188,8 +188,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@ -132,7 +132,7 @@ index 963b6fbb9c..fc20bbe272 100644
                 entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
                 entityvex.a((EntityInsentient) EntityEvoker.this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 4e8a97c557..1b9425f3e6 100644
+index 4e8a97c55..1b9425f3e 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -208,11 +208,11 @@ public class EntityHorse extends EntityHorseAbstract {
@ -150,7 +150,7 @@ index 4e8a97c557..1b9425f3e6 100644
             int j;
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 72eed22eb9..65c40e72bf 100644
+index 72eed22eb..65c40e72b 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
@@ -33,7 +33,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@ -163,7 +163,7 @@ index 72eed22eb9..65c40e72bf 100644
         this.a(entityageable, (EntityHorseAbstract) object);
         return (EntityAgeable) object;
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index eae2b26655..0a092acdfe 100644
+index eae2b2665..0a092acdf 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@ -176,7 +176,7 @@ index eae2b26655..0a092acdfe 100644
 
     public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index c23bc72fc8..a1873f557c 100644
+index c23bc72fc..a1873f557 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -41,7 +41,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@ -189,7 +189,7 @@ index c23bc72fc8..a1873f557c 100644
 
     public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 5e19768710..82a32c61ed 100644
+index 5e1976871..82a32c61e 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -285,7 +285,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@ -202,7 +202,7 @@ index 5e19768710..82a32c61ed 100644
         this.a(entityageable, (EntityHorseAbstract) entityllama);
         EntityLlama entityllama1 = (EntityLlama) entityageable;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index dde9f1e61e..638dbe978d 100644
+index dde9f1e61..638dbe978 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -40,7 +40,7 @@ public class EntityMushroomCow extends EntityCow {
@ -224,7 +224,7 @@ index dde9f1e61e..638dbe978d 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index ba074c10c6..13c84bda84 100644
+index ba074c10c..13c84bda8 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -246,7 +246,7 @@ index ba074c10c6..13c84bda84 100644
                 entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                 entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 9dc2d8be27..d1689dc33a 100644
+index 9dc2d8be2..d1689dc33 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -153,7 +153,7 @@ public class EntityPig extends EntityAnimal {
@ -268,7 +268,7 @@ index 9dc2d8be27..d1689dc33a 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index a02020d5fc..dbb534c9cd 100644
+index a02020d5f..dbb534c9c 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -18,7 +18,7 @@ public class EntityPolarBear extends EntityAnimal {
@ -281,7 +281,7 @@ index a02020d5fc..dbb534c9cd 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index e545b1c9b3..d6bac06a7a 100644
+index e545b1c9b..d6bac06a7 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@ -294,7 +294,7 @@ index e545b1c9b3..d6bac06a7a 100644
 
         if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index f7a25c1483..c35d1eef43 100644
+index f7a25c148..c35d1eef4 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -247,7 +247,7 @@ public class EntitySheep extends EntityAnimal {
@ -307,7 +307,7 @@ index f7a25c1483..c35d1eef43 100644
         entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
         return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index a42b8d554f..9ef1c9baf2 100644
+index a42b8d554..9ef1c9baf 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@ -320,7 +320,7 @@ index a42b8d554f..9ef1c9baf2 100644
             entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
             entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index a533e0eb5b..270b950820 100644
+index a533e0eb5..270b95082 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@ -333,7 +333,7 @@ index a533e0eb5b..270b950820 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index d74bfa1201..24ca351194 100644
+index d74bfa120..24ca35119 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@ -345,7 +345,7 @@ index d74bfa1201..24ca351194 100644
     public T a(World world) {
         return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f01e776fe5..40b3ffd8ca 100644
+index f01e776fe..40b3ffd8c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -592,7 +592,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -367,7 +367,7 @@ index f01e776fe5..40b3ffd8ca 100644
             // Paper start
             if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 4f1696d018..46d8e0a1f4 100644
+index 4f1696d01..46d8e0a1f 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -342,7 +342,7 @@ public class EntityWolf extends EntityTameableAnimal {
@ -380,7 +380,7 @@ index 4f1696d018..46d8e0a1f4 100644
 
         if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 7998b80c17..81cc0c3b33 100644
+index 7998b80c1..81cc0c3b3 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -208,7 +208,7 @@ public class EntityZombie extends EntityMonster {
@ -420,7 +420,7 @@ index 7998b80c17..81cc0c3b33 100644
                     entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                     entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 85d402965b..0cca7b6d51 100644
+index 85d402965..0cca7b6d5 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@ -433,7 +433,7 @@ index 85d402965b..0cca7b6d51 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 86e5fbcdab..fb96743af2 100644
+index 86e5fbcda..fb96743af 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie {
@ -446,7 +446,7 @@ index 86e5fbcdab..fb96743af2 100644
         entityvillager.u(this);
         entityvillager.setProfession(this.getProfession());
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index 576b3c5650..4dd0e39ec3 100644
+index 576b3c565..4dd0e39ec 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
@@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@ -459,7 +459,7 @@ index 576b3c5650..4dd0e39ec3 100644
 
                         entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 5ddf66eef5..bb7e072ee1 100644
+index 5ddf66eef..bb7e072ee 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
@@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@ -472,7 +472,7 @@ index 5ddf66eef5..bb7e072ee1 100644
                                                 entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
                                                 groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index d4fdcbdfd6..887e4461f3 100644
+index d4fdcbdfd..887e4461f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
@@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@ -494,7 +494,7 @@ index d4fdcbdfd6..887e4461f3 100644
         entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
         entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 0ac1fb53a4..509d62f6b6 100644
+index 0ac1fb53a..509d62f6b 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -134,7 +134,7 @@ public class VillageSiege {
@ -507,7 +507,7 @@ index 0ac1fb53a4..509d62f6b6 100644
             } catch (Exception exception) {
                 exception.printStackTrace();
 diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
-index 94b21693e2..0a223cfe5a 100644
+index 94b21693e..0a223cfe5 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
@@ -270,7 +270,7 @@ public class WorldGenEndCityPieces {
@ -520,7 +520,7 @@ index 94b21693e2..0a223cfe5a 100644
                 entityshulker.setPosition((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
                 entityshulker.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 2def56b067..abeb4aa025 100644
+index 2def56b06..abeb4aa02 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
@@ -154,8 +154,7 @@ public class WorldGenFeatureOceanRuinPieces {
@ -534,7 +534,7 @@ index 2def56b067..abeb4aa025 100644
                 entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
                 entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
-index 0e7aed09d1..493a86e1bf 100644
+index 0e7aed09d..493a86e1b 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
@@ -1800,7 +1800,7 @@ public class WorldGenMonumentPieces {
@ -556,7 +556,7 @@ index 0e7aed09d1..493a86e1bf 100644
                 entityguardianelder.heal(entityguardianelder.getMaxHealth());
                 entityguardianelder.setPositionRotation((double) l + 0.5D, (double) i1, (double) j1 + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index 5fa2987d2a..967e33b3d7 100644
+index 5fa2987d2..967e33b3d 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
@@ -1640,7 +1640,7 @@ public class WorldGenVillagePieces {
@ -578,7 +578,7 @@ index 5fa2987d2a..967e33b3d7 100644
                         entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                         entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index efb0379ce3..3d8193c477 100644
+index efb0379ce..3d8193c47 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
@@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@ -591,7 +591,7 @@ index efb0379ce3..3d8193c477 100644
                     entitywitch.di();
                     entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
-index 11010d8e12..4eb746ebb0 100644
+index 11010d8e1..4eb746ebb 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
@@ -23,14 +23,14 @@ public class WorldGenWoodlandMansionPieces {
@ -639,7 +639,7 @@ index 11010d8e12..4eb746ebb0 100644
                 entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                 entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8e23d060d0..6671d71802 100644
+index 8e23d060d..6671d7180 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -494,7 +494,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -652,7 +652,7 @@ index 8e23d060d0..6671d71802 100644
                             entityhorseskeleton.s(true);
                             entityhorseskeleton.setAgeRaw(0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e33135adaa..6ed7c93550 100644
+index e33135ada..6ed7c9355 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1181,153 +1181,153 @@ public class CraftWorld implements World {
@ -868,5 +868,5 @@ index e33135adaa..6ed7c93550 100644
 
             if (entity != null) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0396-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0396-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@ -1,4 +1,4 @@
-From 7c192da4b6d660d3996c2eef25e28c2903f39fd1 Mon Sep 17 00:00:00 2001
+From e607873dd0bfd306dbc848e7ec040bbcd33bfcee Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.

 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index cf5392311..843644933 100644
+index 22574a184..74dcbc74f 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -384,10 +384,11 @@ public class PlayerInteractManager {
@ -30,5 +30,5 @@ index cf5392311..843644933 100644
                         iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
                     }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0397-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0397-Optimize-World-Time-Updates.patch
@ -1,4 +1,4 @@
-From 73b95e741441136bd840b8242fdf0dc56b405046 Mon Sep 17 00:00:00 2001
+From 95b4e432788d2388e96c6d0d77b6a11c63c8392a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@ -41,5 +41,5 @@ index 1dbb03a9a..4e648ee73 100644
 
         // WorldServer worldserver; // CraftBukkit - dropped down
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0398-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0398-Restore-custom-InventoryHolder-support.patch
@ -1,4 +1,4 @@
-From 55da0eab5c79e39f665f25ab9da248c0254237bd Mon Sep 17 00:00:00 2001
+From 2e9cde9a0ca3e1d0be107e1b234b0bd28fa63820 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@ -42,5 +42,5 @@ index 23389743d..d25928e09 100644
     }
 
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0399-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0399-Use-Vanilla-Minecart-Speeds.patch
@ -1,4 +1,4 @@
-From 8308b09b9bb2beff783b4fe3d720ea3f2ad68c19 Mon Sep 17 00:00:00 2001
+From e09424c5c195e7c29b27daaaf649a00c24f7162a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@ -23,5 +23,5 @@ index a8a64d054..41e8a4b50 100644
     // CraftBukkit end
 
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0400-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0400-Fix-SpongeAbsortEvent-handling.patch
@ -1,4 +1,4 @@
-From 101e3e47728ee3d81dc82b202cc04a2add518284 Mon Sep 17 00:00:00 2001
+From 4006a9e53a0b6437105e6e56b6afa1d1e678452c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@ -40,5 +40,5 @@ index 08a5acb0a..aa3547690 100644
         this.dropNaturally(world, blockposition, 1.0F, i);
     }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0401-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0401-Don-t-allow-digging-into-unloaded-chunks.patch
@ -1,11 +1,11 @@
-From 7b2629a0ea0b289abbcbce57a17b262d9b9e82de Mon Sep 17 00:00:00 2001
+From 53a515250b753d7f8af244eff4f1597edcd25221 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f78c6e991..7ae374085 100644
+index c1f47701c..cb6d1deb8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1222,6 +1222,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -21,5 +21,5 @@ index f78c6e991..7ae374085 100644
             double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
             double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0402-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0402-Optimize-redstone-algorithm.patch
@ -1,4 +1,4 @@
-From 8f9fb49ad68cc9a5482ff0c2c1be8b1f4579f079 Mon Sep 17 00:00:00 2001
+From 9b6caf78c5b7fa16e573dca1ab0cbd1ab4adcb23 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@ -1142,5 +1142,5 @@ index a186637f5..589d3efa7 100644
         int i = 0;
         EnumDirection[] aenumdirection = World.a;
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0403-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0403-force-entity-dismount-during-teleportation.patch
@ -1,4 +1,4 @@
-From 4b29a71b56032b53f2088e48fc9f50b86f212151 Mon Sep 17 00:00:00 2001
+From 9403e28b74eb83372d343ce7b48564188d9cb26f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e448f08930..88298680fb 100644
+index e448f0893..88298680f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2110,12 +2110,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -72,7 +72,7 @@ index e448f08930..88298680fb 100644
             if (event.isCancelled()) {
                 return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 82684dd688..dab958a042 100644
+index 82684dd68..dab958a04 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -991,8 +991,11 @@ public abstract class EntityHuman extends EntityLiving {
@ -90,7 +90,7 @@ index 82684dd688..dab958a042 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 710ad8b176..4acbc17aed 100644
+index 710ad8b17..4acbc17ae 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2478,10 +2478,13 @@ public abstract class EntityLiving extends Entity {
@ -110,7 +110,7 @@ index 710ad8b176..4acbc17aed 100644
             this.A(entity);
         }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 71c4ed8fa6..1c90f2f85a 100644
+index 71c4ed8fa..1c90f2f85 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -778,10 +778,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -130,5 +130,5 @@ index 71c4ed8fa6..1c90f2f85a 100644
 
         if (entity1 != entity && this.playerConnection != null) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0404-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0404-Book-Size-Limits.patch
@ -1,4 +1,4 @@
-From 74ffd7f2292be3294d8d8c5f75525b6960266933 Mon Sep 17 00:00:00 2001
+From 7623137520234c8714abf84ebf41ad121fc05703 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fef899ae0..468aff713 100644
+index 52ce8f89e..07f0b4529 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -449,4 +449,11 @@ public class PaperConfig {
@ -78,5 +78,5 @@ index cb6d1deb8..8d06b23ea 100644
         PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
         if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0405-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0405-Make-the-default-permission-message-configurable.patch
@ -1,11 +1,11 @@
-From d77f851a59177e0d3d150f6983d237823487e51f Mon Sep 17 00:00:00 2001
+From 1ff5f985f5dd9a7ea98fbfc6aad4e578d12a9a1e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 468aff713..241992f59 100644
+index 07f0b4529..a7673dd49 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@ -29,7 +29,7 @@ index 468aff713..241992f59 100644
     private static void savePlayerData() {
         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eb4b3c7a2..7c344ffa2 100644
+index 007cc6438..92c429dde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2147,6 +2147,10 @@ public final class CraftServer implements Server {
@ -44,5 +44,5 @@ index eb4b3c7a2..7c344ffa2 100644
         return createProfile(uuid, null);
     }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0406-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0406-Add-more-Zombie-API.patch
@ -1,11 +1,11 @@
-From d90d25bc0160de90c5444cee72415fce8679a627 Mon Sep 17 00:00:00 2001
+From 13c1f4753dddbf0e6e46677d09b310f9b093203f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API


 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 81cc0c3b33..24bc3e0f08 100644
+index 81cc0c3b3..24bc3e0f0 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -21,8 +21,8 @@ public class EntityZombie extends EntityMonster {
@ -105,7 +105,7 @@ index 81cc0c3b33..24bc3e0f08 100644
 
     public void b(EntityLiving entityliving) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index e93ecb076b..c516d34759 100644
+index e93ecb076..c516d3475 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
@@ -77,4 +77,34 @@ public class CraftZombie extends CraftMonster implements Zombie {
@ -144,5 +144,5 @@ index e93ecb076b..c516d34759 100644
 +    // Paper end
 }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0407-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0407-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@ -1,4 +1,4 @@
-From df79681e61de0e0b39a7dedabf80675fab54f7c7 Mon Sep 17 00:00:00 2001
+From 417c56224750636541260725b50ed6e37751ecc0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
@ -31,5 +31,5 @@ index 589d3efa7..c5960cf4c 100644
 
                 if (entityhuman1.isSneaking()) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0408-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0408-Prevent-rayTrace-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From 1305364a9428e1a3824ac6907f8994c1318327eb Mon Sep 17 00:00:00 2001
+From 52c7cca32fd1cec519b9b300049ac347f4ab27b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@ -31,5 +31,5 @@ index c5960cf4c..e11e22836 100644
 
                     if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0409-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0409-Handle-Large-Packets-disconnecting-client.patch
@ -1,4 +1,4 @@
-From c72cb660f626dbea7a13f7d28bd330fe3fc82486 Mon Sep 17 00:00:00 2001
+From 37f0fba5cfd2e991e81d17622aff9a868143d588 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@ -113,5 +113,5 @@ index 706d84385..c0d8f8b42 100644
 
     public PacketPlayOutWindowItems(int i, NonNullList<ItemStack> nonnulllist) {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0410-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0410-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@ -1,4 +1,4 @@
-From 43e58dd2a1f747e766ac1959bb974d5d1d28c860 Mon Sep 17 00:00:00 2001
+From 4cc4515d691743ac31e780e395aa7a5ad01b7bdc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@ -61,5 +61,5 @@ index 698cfb918..fbdb2df27 100644
 
     public long getFirstPlayed() {
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0411-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0411-Add-PlayerConnectionCloseEvent.patch
@ -1,4 +1,4 @@
-From 22767c6eca4402921e1f3b9618785d31b21256a5 Mon Sep 17 00:00:00 2001
+From 022b84a2165e2f606e0a5957052ca7bbb89a577a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@ -89,5 +89,5 @@ index 0b8796d0a..553637239 100644
 
         }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0412-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0412-Prevent-Enderman-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From 07b22524ef76ae62ffdff157ba2dc5d630a709fe Mon Sep 17 00:00:00 2001
+From 39afde38725cbe76eb0c828b06220f802e0dcc07 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
@ -29,5 +29,5 @@ index e4aba0e0a..945040442 100644
             IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
 
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0413-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0413-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@ -1,4 +1,4 @@
-From 06889ceca87d5076316d608d9a8c6e2f2eae8394 Mon Sep 17 00:00:00 2001
+From bdb90b71eec7ce6794a5b3a89861691486fea505 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1c90f2f85a..32557caf2b 100644
+index 1c90f2f85..32557caf2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -28,7 +28,7 @@ index 1c90f2f85a..32557caf2b 100644
     public boolean queueHealthUpdatePacket = false;
     public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ec760325ba..135d25abd2 100644
+index ec760325b..135d25abd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -95,6 +95,7 @@ public abstract class PlayerList {
@ -40,7 +40,7 @@ index ec760325ba..135d25abd2 100644
         UserCache usercache = this.server.getUserCache();
         GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index fbdb2df27d..e1973c5d67 100644
+index fbdb2df27..e1973c5d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -245,6 +245,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@ -106,7 +106,7 @@ index fbdb2df27d..e1973c5d67 100644
         NBTTagCompound data = getData();
         if (data == null) return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5e3f30f52f..7fb7aa5c37 100644
+index a2eae5d10..36a387137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -163,5 +163,5 @@ index 5e3f30f52f..7fb7aa5c37 100644
 
     @Override
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0414-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0414-Fix-PlayerEditBookEvent.patch
@ -1,4 +1,4 @@
-From 73b51681652bfcf42e775aaff54db6c4d29b6ce9 Mon Sep 17 00:00:00 2001
+From 3be7b85aa061b33408a7766503e24e7721f44be1 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@ -31,5 +31,5 @@ index 8d06b23ea..a8a6e236e 100644
 
                 }
 -- 
-2.20.1
+2.16.1.windows.1

--- a/Spigot-Server-Patches/0415-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0415-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@ -1,4 +1,4 @@
-From 4e5047aa15ef2bd2dcd40434ef0b97a2bdc8d7d4 Mon Sep 17 00:00:00 2001
+From 0e14a48302de67fb42ba8db81c391e223be86f54 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
@ -23,5 +23,5 @@ index 32557caf2..596478120 100644
             this.a(true, false, false);
         }
 -- 
-2.20.1
+2.16.1.windows.1