Remove death message color fix. It no longer works

patches/server/0064-Fix-reloading-paper.yml.patch

@@ -1,4 +1,4 @@
-From c16950236ff5a5b2cccdd3cb8c8a6bfd69dc36b0 Mon Sep 17 00:00:00 2001
+From 123b61894938ade2049cf6b6c799bb0a670bdaa4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jun 2020 21:36:16 -0500
 Subject: [PATCH] Fix reloading paper.yml

patches/server/0065-Fix-the-dead-lagging-the-server.patch

@@ -1,4 +1,4 @@
-From c266a969a6ad3581ec51a0815b2eef864c3ac0b7 Mon Sep 17 00:00:00 2001
+From db4865d3be7d0d2ea790637854a9db73e7c98d42 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e72975ff6..a219443b3 100644
+index 3950842a8..5bedd61ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1345,7 +1345,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0066-Skip-events-if-there-s-no-listeners.patch

@@ -1,4 +1,4 @@
-From 333eaf6ecdb008426410030c2c27f5ce006d6c35 Mon Sep 17 00:00:00 2001
+From 8ded3a0a3455852f77e406fc37e2d54b150ccf1e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Skip events if there's no listeners

patches/server/0067-Add-permission-for-F3-N-debug.patch

@@ -1,4 +1,4 @@
-From 606a4d55a58761fdd9882c0da7bf710359c8eb8f Mon Sep 17 00:00:00 2001
+From 62ee2b84a56861dd16a6e684bffb679081cd8a06 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug

patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -1,4 +1,4 @@
-From 4f2a4bdb16c57bde9625687d6052f2fc09914ae1 Mon Sep 17 00:00:00 2001
+From fb4c424b01c1ae79cab705b551aa965039459b6c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option

patches/server/0069-Configurable-TPS-Catchup.patch

@@ -1,4 +1,4 @@
-From 02da1438e3d0845b34082ffe6a80bf7471790dc9 Mon Sep 17 00:00:00 2001
+From ebcd9fce18fd418afbe8a58d9aa7a70f7c3d49b4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable TPS Catchup
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 822798741..b7915d2ff 100644
+index ae747377b..d052811a8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1002,7 +1002,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch

@@ -1,4 +1,4 @@
-From fc59b25635b9730071385322ad04b1e168272c12 Mon Sep 17 00:00:00 2001
+From 6db8e092f6a943b155e352555e804af2d89765a8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Mar 2020 19:39:34 -0500
 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void

patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch

@@ -1,4 +1,4 @@
-From cb1c37ea2302e7d0dd55ce91ecbac3e3ebe561fb Mon Sep 17 00:00:00 2001
+From 11b683a401f03df22f26d56faf452f07e3b29f6b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Apr 2020 16:28:38 -0500
 Subject: [PATCH] Add enderman and creeper griefing controls

patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch

@@ -1,4 +1,4 @@
-From ed8fe7b9c7b1da77811da03d30016b39f0268a5a Mon Sep 17 00:00:00 2001
+From f916325e8ddfdd78b0fb4f1e0613660cfc161bbf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Apr 2020 09:33:11 -0500
 Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule

patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch

@@ -1,4 +1,4 @@
-From e041a3ff936aea8dc97bc6ddbac5b9e0dd52fef8 Mon Sep 17 00:00:00 2001
+From 9aec3455d54c7df3b2f008deefa7ad8e4bfab3ed Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Apr 2020 09:37:29 -0500
 Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule

patches/server/0074-Villagers-follow-emerald-blocks.patch

@@ -1,4 +1,4 @@
-From ba294b5f9e120d06131cd1642e2bb0a80d6bfcff Mon Sep 17 00:00:00 2001
+From ffabf3305ff6809847d0cdf2d6d6f61bf6410d94 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks

patches/server/0075-Allow-leashing-villagers.patch

@@ -1,4 +1,4 @@
-From 48558630bb0b0715005ce6ef0345f82de1a7c875 Mon Sep 17 00:00:00 2001
+From df78ae333134e0b0076279dd1e27283b446974ba Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers

patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From d50f653f50d0cbbaf6f220714631338bfa8732fd Mon Sep 17 00:00:00 2001
+From 792d04191d5573257e7fba9a2f099e95c1de2455 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn

patches/server/0077-Implement-infinite-lava.patch

@@ -1,4 +1,4 @@
-From 8f7a8f71e03e9518cbb906145f2632db03b87447 Mon Sep 17 00:00:00 2001
+From 1bd7b866f1033ae011212fba5ca8d0b08f5cd460 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 23 Nov 2019 17:55:42 -0600
 Subject: [PATCH] Implement infinite lava

patches/server/0078-Make-lava-flow-speed-configurable.patch

@@ -1,4 +1,4 @@
-From a55981acf82a6eb09645fe19574b2752bc306d3d Mon Sep 17 00:00:00 2001
+From d644b319f649206fa33e833e2c1cd5879cc12c7a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable

patches/server/0079-Add-player-death-exp-control-options.patch

@@ -1,4 +1,4 @@
-From 7197feebf806f4be952a0d70efc4b3bd6bcb1493 Mon Sep 17 00:00:00 2001
+From 8ef47fffdb2f3ef8a37da0cb8b565a8e9615a76c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options

patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -1,4 +1,4 @@
-From 9282eae4be5cd0125c1e71e4038064cf433c7596 Mon Sep 17 00:00:00 2001
+From 7adbe0af58e15202ba8f2318eedccd53692984e6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -24,7 +24,7 @@ index ac58fcb79..0041027ec 100644
                      // Paper start
                      if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a219443b3..35edfaa15 100644
+index 5bedd61ee..2037fb1e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -303,6 +303,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0081-Configurable-void-damage-height.patch

@@ -1,4 +1,4 @@
-From 58399a97e089d56caecfb268af8d625cf188f27e Mon Sep 17 00:00:00 2001
+From bac3a683e9956c339388e5ae5b926fbc550ef49a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable void damage height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 35edfaa15..dca384ea2 100644
+index 2037fb1e1..656413254 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -526,7 +526,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 58e263369c31fa15ebbd365150e7a40e948b595c Mon Sep 17 00:00:00 2001
+From 5f7046fc2452c524155f338f6fefa7fe48506ada Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombies targetting turtle eggs
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index ad8b1f0e4..7182c0ead 100644
+index b66059836..00b89746f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -46,7 +46,7 @@ public class EntityZombie extends EntityMonster {

patches/server/0083-Dispenser-curse-of-binding-protection.patch

@@ -1,4 +1,4 @@
-From 59a413ca970256d86c354a148e96f31c124c73da Mon Sep 17 00:00:00 2001
+From b227fee4191c35e86ea54f3781c1dcf77fb41027 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection

patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch

@@ -1,4 +1,4 @@
-From b98930c63332989ba65c906fa2a7ac85e255034d Mon Sep 17 00:00:00 2001
+From cc30d1a1a73f35e5eb72d8a6ce0e3709ac602f66 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land

patches/server/0085-Add-obfhelpers-for-plugin-use.patch

@@ -1,4 +1,4 @@
-From 6a57aa27852f1b9af9b4794172996ba6e0c6ef50 Mon Sep 17 00:00:00 2001
+From 269d558f5c6e572d3e4e96ecd3910a92b98d975d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Jan 2020 20:12:39 -0600
 Subject: [PATCH] Add obfhelpers for plugin use

patches/server/0086-Mending-mends-most-damages-equipment-first.patch

@@ -1,4 +1,4 @@
-From 56d87207ff10970b820cc21e05f8e5f566965b62 Mon Sep 17 00:00:00 2001
+From 72cdf58c8e3cb29c4963d77d10ddfac3ebb9d9c2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first

patches/server/0087-Implement-bamboo-growth-settings.patch

@@ -1,4 +1,4 @@
-From b5225a87d8287f91f4e06ce13c54f98cb0118c78 Mon Sep 17 00:00:00 2001
+From 6f93a87b376c43f64fafd766f320df8ff60d4260 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings

patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From eb936e62ffd83c845bc3d376837703b27aa556bc Mon Sep 17 00:00:00 2001
+From 46ca01a03fcc265bdc9bfa748cbc17a1082a0c97 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -18,7 +18,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
  11 files changed, 27 insertions(+), 13 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 656413254e..2efb8a9759 100644
+index 656413254..2efb8a975 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1525,6 +1525,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 656413254e..2efb8a9759 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7543f2ceeb..c3cde15686 100644
+index 7543f2cee..c3cde1568 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -48,7 +48,7 @@ index 7543f2ceeb..c3cde15686 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 3dd3b8913e..99bae2dcb7 100644
+index 3dd3b8913..99bae2dcb 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient {
@@ -61,7 +61,7 @@ index 3dd3b8913e..99bae2dcb7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index a20d6feb8c..92c1d1794a 100644
+index a20d6feb8..92c1d1794 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -104,7 +104,7 @@ public class EntityBoat extends Entity {
@@ -74,7 +74,7 @@ index a20d6feb8c..92c1d1794a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index ee7a2fedde..c9ab80ccd1 100644
+index ee7a2fedd..c9ab80ccd 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -87,7 +87,7 @@ index ee7a2fedde..c9ab80ccd1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f86499c87e..bc9e2e0c75 100644
+index f86499c87..bc9e2e0c7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2852,7 +2852,7 @@ public abstract class EntityLiving extends Entity {
@@ -111,7 +111,7 @@ index f86499c87e..bc9e2e0c75 100644
  
      // CraftBukkit start - collidable API
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index cdbe1a32e0..c33b5c950d 100644
+index cdbe1a32e..c33b5c950 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -108,7 +108,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -124,7 +124,7 @@ index cdbe1a32e0..c33b5c950d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 2172fcefbc..7afdb30603 100644
+index 2172fcefb..7afdb3060 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -139,7 +139,7 @@ index 2172fcefbc..7afdb30603 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b224ff153d..d1d5601dbe 100644
+index 42f3ef1ee..b0e45790d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1805,8 +1805,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -154,7 +154,7 @@ index b224ff153d..d1d5601dbe 100644
      // Purpur end
  
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 9b4795f3bd..192d9798c4 100644
+index 9b4795f3b..192d9798c 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -45,11 +45,17 @@ public final class IEntitySelector {
@@ -177,7 +177,7 @@ index 9b4795f3bd..192d9798c4 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f21b015657..39163634c5 100644
+index f21b01565..39163634c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -119,6 +119,7 @@ public class PurpurWorldConfig {

patches/server/0089-Add-5-second-tps-average-in-tps.patch

@@ -1,4 +1,4 @@
-From 22cdb2e6b0d2cd0f9d0903a8b85afd7e113e3a22 Mon Sep 17 00:00:00 2001
+From f8672129e3f1be70b1b81222c01520ecb5a6eaaa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index da0c2d529..a156fe255 100644
+index d052811a8..46231e01d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -165,7 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,7 +52,7 @@ index da0c2d529..a156fe255 100644
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bca0487ad..f8f059bb6 100644
+index 1a6fa4059..044547786 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2162,6 +2162,7 @@ public final class CraftServer implements Server {

patches/server/0090-Implement-elytra-settings.patch

@@ -1,4 +1,4 @@
-From 01778cab614b676ab4f3057404351c395d605e11 Mon Sep 17 00:00:00 2001
+From 377ef9fe1e7908ea97333883ba00f761aa400dc5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings

patches/server/0091-Add-item-entity-options.patch

@@ -1,4 +1,4 @@
-From 76f7a1f6f82f246c6c01016a1750dc9693e566de Mon Sep 17 00:00:00 2001
+From 6699495e47994aba3b94784c943b9a3a99a67742 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,7 +10,7 @@ Subject: [PATCH] Add item entity options
  3 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7f209e26f..3ae0cf87a 100644
+index 2efb8a975..3e95af4ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0092-Add-ping-command.patch

@@ -1,4 +1,4 @@
-From 45840d21a9b5121e6d790b947b56c73b06987daa Mon Sep 17 00:00:00 2001
+From 0f1675c1fdc97b547706065d14be2f74aa04677d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add /ping command

patches/server/0093-Configurable-jockey-options.patch

@@ -1,4 +1,4 @@
-From da4438dfd9163481bd950221235e8617d3b9ca69 Mon Sep 17 00:00:00 2001
+From a849d8c181f2b69e71ed8cf8357082fea30b9b32 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 21:39:32 -0500
 Subject: [PATCH] Configurable jockey options
@@ -69,7 +69,7 @@ index 19f585022..4f89e2f4f 100644
      protected boolean eO() {
          return false;
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 7182c0ead..6084cb84c 100644
+index 00b89746f..307a20860 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;

patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From d913c34bd6b7fd8188c09bc53a25c05ca0ad8af3 Mon Sep 17 00:00:00 2001
+From 7f5d7e8cb23ae79cd833edb1c8e00dbd99b928aa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -24,7 +24,7 @@ index 6fe5678cf..bd0267ee4 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3ae0cf87a..7f01b3274 100644
+index 3e95af4ee..a5d4ca51a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1401,6 +1401,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0095-Convert-legacy-item-text.patch

@@ -1,4 +1,4 @@
-From 8a6ecc99e34b55613d6cfdd89d93dcf4c8ecaaa6 Mon Sep 17 00:00:00 2001
+From 1f13524432c259a3d5b2e876b3dc204435fa14f4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 29 Jun 2020 08:56:53 -0500
 Subject: [PATCH] Convert legacy item text
@@ -8,7 +8,7 @@ Subject: [PATCH] Convert legacy item text
  1 file changed, 40 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 54421c56c1..54dc3e0600 100644
+index 54421c56c..54dc3e060 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -127,6 +127,7 @@ public final class ItemStack {

patches/server/0096-PaperPR-Remove-some-streams-from-structures.patch

@@ -1,4 +1,4 @@
-From 314e2af953442df9adfe337fa7a6e526db2e22e3 Mon Sep 17 00:00:00 2001
+From ae05c0006b43c2b1663a8f3cd1caf54fa23d2b4c Mon Sep 17 00:00:00 2001
 From: JRoy <joshroy126@gmail.com>
 Date: Mon, 29 Jun 2020 17:03:06 -0400
 Subject: [PATCH] PaperPR - Remove some streams from structures