diff --git a/Paper b/Paper
index fc4c0bc42..a98d389d1 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit fc4c0bc42e32809eabf37bf378f16b394a71eae0
+Subproject commit a98d389d1fca55b32d2e1b575aaa3803177e80b1
diff --git a/patches/AirplaneLite/patches/server/0003-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/AirplaneLite/patches/server/0003-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index f80f237e6..ecb849977 100644
--- a/patches/AirplaneLite/patches/server/0003-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/AirplaneLite/patches/server/0003-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -27,10 +27,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8bceb152d9c7a3227c4bd3bb47964cf69abea0b4..c86f947a4c9843beec08f2b2ac52c0021063c285 100644
+index edc7cd59167ad713e178ec5fc565615240b45a9c..07d23711cdb49c663859e3c0376dc5b08b479b0a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -3046,7 +3046,7 @@ public abstract class EntityLiving extends Entity {
+@@ -3045,7 +3045,7 @@ public abstract class EntityLiving extends Entity {
          Vec3D vec3d = new Vec3D(this.locX(), this.getHeadY(), this.locZ());
          Vec3D vec3d1 = new Vec3D(entity.locX(), entity.getHeadY(), entity.locZ());
  
diff --git a/patches/AirplaneLite/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch b/patches/AirplaneLite/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch
index 2b7173e82..d64b4ecd9 100644
--- a/patches/AirplaneLite/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch
+++ b/patches/AirplaneLite/patches/server/0010-Don-t-get-entity-equipment-if-not-needed.patch
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c86f947a4c9843beec08f2b2ac52c0021063c285..0dbd3e0cf72881b766b624621f8dcd0fff3b66b4 100644
+index 07d23711cdb49c663859e3c0376dc5b08b479b0a..51bd0e6a5b0de30ebc8e9160c99d568c65b57d40 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -819,11 +819,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Origami/patches/server/0008-Don-t-wake-up-entities-when-damage-event-is-cancelle.patch b/patches/Origami/patches/server/0008-Don-t-wake-up-entities-when-damage-event-is-cancelle.patch
index 16398efc9..f0ca146a9 100644
--- a/patches/Origami/patches/server/0008-Don-t-wake-up-entities-when-damage-event-is-cancelle.patch
+++ b/patches/Origami/patches/server/0008-Don-t-wake-up-entities-when-damage-event-is-cancelle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't wake up entities when damage event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0dbd3e0cf72881b766b624621f8dcd0fff3b66b4..93a5c897e9154c26b201177a4372bb6e5af42a78 100644
+index 51bd0e6a5b0de30ebc8e9160c99d568c65b57d40..266174436b0fad60087afb86458fdc705577523c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1117,9 +1117,12 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0011-LivingEntity-safeFallDistance.patch b/patches/Purpur/patches/server/0011-LivingEntity-safeFallDistance.patch
index 689d65621..27a3c02a3 100644
--- a/patches/Purpur/patches/server/0011-LivingEntity-safeFallDistance.patch
+++ b/patches/Purpur/patches/server/0011-LivingEntity-safeFallDistance.patch
@@ -30,7 +30,7 @@ index 2a91f07ca9c4dc0cb3b5aef5c9c1db7f69773530..7604fd83de9cfe93d427a9a1f6bbbee7
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4fe5a8d0201d662c68dd58eeb8cf1d304787edb4..279662570c0bbd6c00b5732881cd35dfe694b25d 100644
+index 365066cd7844261c5d437db17ebd61d0631ca140..59f0088eaa7f6682b2ddf34a2d5363b49738fdbe 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0016-EntityMoveEvent.patch b/patches/Purpur/patches/server/0016-EntityMoveEvent.patch
index 188733b60..2f0151f2b 100644
--- a/patches/Purpur/patches/server/0016-EntityMoveEvent.patch
+++ b/patches/Purpur/patches/server/0016-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 279662570c0bbd6c00b5732881cd35dfe694b25d..50cb2551598101d1c12007c53421b6c2f59ce2aa 100644
+index 59f0088eaa7f6682b2ddf34a2d5363b49738fdbe..fdc0df2b08a586a584f9cfd0075aa68f129e4055 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2813,6 +2813,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2812,6 +2812,20 @@ public abstract class EntityLiving extends Entity {
  
          this.collideNearby();
          this.world.getMethodProfiler().exit();
diff --git a/patches/Purpur/patches/server/0026-Giants-AI-settings.patch b/patches/Purpur/patches/server/0026-Giants-AI-settings.patch
index 526966743..636bc7aa0 100644
--- a/patches/Purpur/patches/server/0026-Giants-AI-settings.patch
+++ b/patches/Purpur/patches/server/0026-Giants-AI-settings.patch
@@ -118,7 +118,7 @@ index 7582a3a0955db2bc79daeced8e9c869f4276815a..7d9027d881e6e3eb0d1f8478ac7a1501
          float f = difficultydamagescaler.d();
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 50cb2551598101d1c12007c53421b6c2f59ce2aa..02a49d9ddc58f44471f92cd40b8b968fc7984e73 100644
+index fdc0df2b08a586a584f9cfd0075aa68f129e4055..f975fcf0acd80a0a6bdf9bd6fe5b15c013e4f09f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -165,6 +165,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0033-Dont-send-useless-entity-packets.patch b/patches/Purpur/patches/server/0033-Dont-send-useless-entity-packets.patch
index 858e7ec03..13089abe0 100644
--- a/patches/Purpur/patches/server/0033-Dont-send-useless-entity-packets.patch
+++ b/patches/Purpur/patches/server/0033-Dont-send-useless-entity-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send useless entity packets
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index f322dccd834ff56b99f8796309709b5b6ac01456..228236bce14bfdf930570b453862dcfaae9e4823 100644
+index 526c1419af7bd0b6098a8f9a0a24a64ba61c6ebc..81a82a1fa811956a8b5233677981c2d3783b34fb 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -172,6 +172,7 @@ public class EntityTrackerEntry {
diff --git a/patches/Purpur/patches/server/0037-Add-option-to-set-armorstand-step-height.patch b/patches/Purpur/patches/server/0037-Add-option-to-set-armorstand-step-height.patch
index 069dba0b8..cef5e3517 100644
--- a/patches/Purpur/patches/server/0037-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/Purpur/patches/server/0037-Add-option-to-set-armorstand-step-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index bf932bf0eea4e52603b3b4ec41013df7c930773d..41a36ce6d446b78bdd7a4739ad372a2ee19da116 100644
+index 0ef9516fbe9283cb1aca71eb9dbdbec0d98c8fa4..9e37bf25689691f9640b294c482978e8e3b6e627 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -625,6 +625,7 @@ public class EntityArmorStand extends EntityLiving {
diff --git a/patches/Purpur/patches/server/0040-Cows-eat-mushrooms.patch b/patches/Purpur/patches/server/0040-Cows-eat-mushrooms.patch
index d77f9afd4..b292374b5 100644
--- a/patches/Purpur/patches/server/0040-Cows-eat-mushrooms.patch
+++ b/patches/Purpur/patches/server/0040-Cows-eat-mushrooms.patch
@@ -110,7 +110,7 @@ index 42e6761c8b18b79ffd3f4d5e853ea87a2c153c23..cfb009c811bd2908d38da1b0007cb7aa
      public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a((World) worldserver);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 02a49d9ddc58f44471f92cd40b8b968fc7984e73..65a54b6bf113ca6e88929e23c5d5cbfc6cfc7bad 100644
+index f975fcf0acd80a0a6bdf9bd6fe5b15c013e4f09f..403bac8d8f921eab4bc0d60fb082eadd6996602b 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 {
diff --git a/patches/Purpur/patches/server/0048-Controllable-Minecarts.patch b/patches/Purpur/patches/server/0048-Controllable-Minecarts.patch
index 18413e705..9026d6733 100644
--- a/patches/Purpur/patches/server/0048-Controllable-Minecarts.patch
+++ b/patches/Purpur/patches/server/0048-Controllable-Minecarts.patch
@@ -22,7 +22,7 @@ index 2291135eaef64c403183724cb6e413cd7e472672..bc61aaff65a7dc1e7534452b285953b8
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 65a54b6bf113ca6e88929e23c5d5cbfc6cfc7bad..4bd1322892e1c46addd795254d9ae6d3e7dc1e5b 100644
+index 403bac8d8f921eab4bc0d60fb082eadd6996602b..49ba80902868574c6f4efcc3f80ad46fb762e4be 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch b/patches/Purpur/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
index 0dd0d1273..19258e5b1 100644
--- a/patches/Purpur/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/Purpur/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4bd1322892e1c46addd795254d9ae6d3e7dc1e5b..bef80c83c551abe2cc23cf73e6c737313ad399c9 100644
+index 49ba80902868574c6f4efcc3f80ad46fb762e4be..04bfc8cabaf0ffdb6834e01ae02cbd7b46cb4c4a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1493,8 +1493,10 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0053-Fix-the-dead-lagging-the-server.patch b/patches/Purpur/patches/server/0053-Fix-the-dead-lagging-the-server.patch
index 667098371..444cb5cfd 100644
--- a/patches/Purpur/patches/server/0053-Fix-the-dead-lagging-the-server.patch
+++ b/patches/Purpur/patches/server/0053-Fix-the-dead-lagging-the-server.patch
@@ -17,7 +17,7 @@ index 4ed4f31c8e34279f9aa9fd7bbddbb36239ea36ef..f18941c7c740959181b728ab9da06c7e
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bef80c83c551abe2cc23cf73e6c737313ad399c9..9b1ecf6101e146843b4d2eeabc3e0e3c4fde54b5 100644
+index 04bfc8cabaf0ffdb6834e01ae02cbd7b46cb4c4a..dc054574289cde53acc9eef34ac1d7c89b789d34 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2492,7 +2492,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0075-Implement-elytra-settings.patch b/patches/Purpur/patches/server/0075-Implement-elytra-settings.patch
index 8eb6cbdc8..b333ed4c2 100644
--- a/patches/Purpur/patches/server/0075-Implement-elytra-settings.patch
+++ b/patches/Purpur/patches/server/0075-Implement-elytra-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9b1ecf6101e146843b4d2eeabc3e0e3c4fde54b5..82ef4c9c534f4a0840a61d33c7727bd4770c7511 100644
+index dc054574289cde53acc9eef34ac1d7c89b789d34..878199d01161953811d535ae49c817c82adf9776 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2851,7 +2851,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2850,7 +2850,16 @@ public abstract class EntityLiving extends Entity {
              if (itemstack.getItem() == Items.ELYTRA && ItemElytra.d(itemstack)) {
                  flag = true;
                  if (!this.world.isClientSide && (this.be + 1) % 20 == 0) {
diff --git a/patches/Purpur/patches/server/0076-Item-entity-immunities.patch b/patches/Purpur/patches/server/0076-Item-entity-immunities.patch
index 7989478b4..e4a4a42a4 100644
--- a/patches/Purpur/patches/server/0076-Item-entity-immunities.patch
+++ b/patches/Purpur/patches/server/0076-Item-entity-immunities.patch
@@ -74,7 +74,7 @@ index d99cecc4075338d7b8f154ab94d8ac04190ba371..ec37d2c3b0393c43097bdfc6064ebe3a
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f4b5a11a5 100644
+index 81a82a1fa811956a8b5233677981c2d3783b34fb..a9d60e5dc2f3b38a192a68d79bcf78e4873664a2 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -106,6 +106,15 @@ public class EntityTrackerEntry {
diff --git a/patches/Purpur/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/Purpur/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index ca5851d79..01b14c2dc 100644
--- a/patches/Purpur/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/Purpur/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 82ef4c9c534f4a0840a61d33c7727bd4770c7511..bfbe9b82c14a525bffa96a8dfa071e8805ce6006 100644
+index 878199d01161953811d535ae49c817c82adf9776..9f3b9b42c1509bfd71206702799421dd716e61e4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -280,6 +280,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0093-Totems-work-in-inventory.patch b/patches/Purpur/patches/server/0093-Totems-work-in-inventory.patch
index 56ec94807..d0fb3cff7 100644
--- a/patches/Purpur/patches/server/0093-Totems-work-in-inventory.patch
+++ b/patches/Purpur/patches/server/0093-Totems-work-in-inventory.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bfbe9b82c14a525bffa96a8dfa071e8805ce6006..c22fa35197ae23526a29bcbf69f3022ffc0701e1 100644
+index 9f3b9b42c1509bfd71206702799421dd716e61e4..7e3acb424720c2bdac3d5c5da034087cb15dab23 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1327,6 +1327,19 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0106-Ridables.patch b/patches/Purpur/patches/server/0106-Ridables.patch
index a8815f72c..991f5bd27 100644
--- a/patches/Purpur/patches/server/0106-Ridables.patch
+++ b/patches/Purpur/patches/server/0106-Ridables.patch
@@ -2372,7 +2372,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c22fa35197ae23526a29bcbf69f3022ffc0701e1..618739799bc5dc2550198465b1e46e494f473ad9 100644
+index 7e3acb424720c2bdac3d5c5da034087cb15dab23..8182fe994179a7344ff2657a328e7d91e40a7673 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -462,7 +462,7 @@ public abstract class EntityLiving extends Entity {
@@ -2406,7 +2406,7 @@ index c22fa35197ae23526a29bcbf69f3022ffc0701e1..618739799bc5dc2550198465b1e46e49
      public void q(float f) {
          this.bu = f;
      }
-@@ -2846,6 +2848,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2845,6 +2847,20 @@ public abstract class EntityLiving extends Entity {
              }
          }
          // Purpur end
diff --git a/patches/Purpur/patches/server/0130-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/Purpur/patches/server/0130-Apply-display-names-from-item-forms-of-entities-to-e.patch
index 20499eb24..c1ce8cc61 100644
--- a/patches/Purpur/patches/server/0130-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/Purpur/patches/server/0130-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 41a36ce6d446b78bdd7a4739ad372a2ee19da116..e6de89e7f57c3c130dedb8407cd4cd577d394b9a 100644
+index 9e37bf25689691f9640b294c482978e8e3b6e627..759a8f95038778aead2f33a65a2d8f2d6b26a765 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -553,7 +553,13 @@ public class EntityArmorStand extends EntityLiving {
diff --git a/patches/Purpur/patches/server/0152-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/Purpur/patches/server/0152-Configurable-chance-for-wolves-to-spawn-rabid.patch
index 5fa585159..36e28182e 100644
--- a/patches/Purpur/patches/server/0152-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/Purpur/patches/server/0152-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 618739799bc5dc2550198465b1e46e494f473ad9..3836d772d07efb7e9a9e7ecc7141330f0cd15801 100644
+index 8182fe994179a7344ff2657a328e7d91e40a7673..d4098a382b2cd4deb64c4bff007aed41fae7e7fc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2094,6 +2094,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/Purpur/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch
index 66d153100..571fed52a 100644
--- a/patches/Purpur/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/Purpur/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -146,7 +146,7 @@ index d12de20cf4bb2345c616d3cc0b9f50bddb5135ee..3f3be1b2ded6ad118ae7860c1231c7af
              // CraftBukkit start - fire ExplosionPrimeEvent
              ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3836d772d07efb7e9a9e7ecc7141330f0cd15801..8bceb152d9c7a3227c4bd3bb47964cf69abea0b4 100644
+index d4098a382b2cd4deb64c4bff007aed41fae7e7fc..edc7cd59167ad713e178ec5fc565615240b45a9c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1472,7 +1472,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/Purpur/patches/server/0167-Movement-options-for-armour-stands.patch b/patches/Purpur/patches/server/0167-Movement-options-for-armour-stands.patch
index 31ca29cf4..9322086b5 100644
--- a/patches/Purpur/patches/server/0167-Movement-options-for-armour-stands.patch
+++ b/patches/Purpur/patches/server/0167-Movement-options-for-armour-stands.patch
@@ -30,7 +30,7 @@ index cb4856e3bbb25e1077f5b4832f359549d57acd7e..41844f30a2a98eb14559b3ab0885ae73
              this.inWater = false;
          } else if (this.a((Tag) TagsFluid.WATER, 0.014D)) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index e6de89e7f57c3c130dedb8407cd4cd577d394b9a..91df44d2e4f09fb612ae7bcb6c6a3dbb99aaba41 100644
+index 759a8f95038778aead2f33a65a2d8f2d6b26a765..74fda434ed7beb6612f46ed75fdccad59f394b60 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -52,10 +52,12 @@ public class EntityArmorStand extends EntityLiving {
diff --git a/patches/Tuinity/patches/server/0008-Add-soft-async-catcher.patch b/patches/Tuinity/patches/server/0008-Add-soft-async-catcher.patch
index c79d3f577..252b30883 100644
--- a/patches/Tuinity/patches/server/0008-Add-soft-async-catcher.patch
+++ b/patches/Tuinity/patches/server/0008-Add-soft-async-catcher.patch
@@ -232,7 +232,7 @@ index a4bbf3d9520db9911a5709d8d8c60322ee2fb8e2..a61a9e71c435000eab1b906026767a45
          try {
              boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 4efc40c01ec12b80bd7cf9d35cf0ea0df973baf7..f322dccd834ff56b99f8796309709b5b6ac01456 100644
+index 3960a975e74ed81c45819fe5e0f01c6c18252982..526c1419af7bd0b6098a8f9a0a24a64ba61c6ebc 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -74,6 +74,7 @@ public class EntityTrackerEntry {
diff --git a/patches/Tuinity/patches/server/0026-Reduce-allocation-rate-from-crammed-entities.patch b/patches/Tuinity/patches/server/0026-Reduce-allocation-rate-from-crammed-entities.patch
index f1b819f97..bfbbc9850 100644
--- a/patches/Tuinity/patches/server/0026-Reduce-allocation-rate-from-crammed-entities.patch
+++ b/patches/Tuinity/patches/server/0026-Reduce-allocation-rate-from-crammed-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce allocation rate from crammed entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d417878a1584c9e5ec33b94fc65b29f84fb3a5e9..4fe5a8d0201d662c68dd58eeb8cf1d304787edb4 100644
+index 7b5bb97d410e20d3aa6b9222e4f8ad878e667bc8..365066cd7844261c5d437db17ebd61d0631ca140 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2858,7 +2858,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2857,7 +2857,11 @@ public abstract class EntityLiving extends Entity {
              return;
          }
          // Paper - end don't run getEntities if we're not going to use its result
@@ -21,7 +21,7 @@ index d417878a1584c9e5ec33b94fc65b29f84fb3a5e9..4fe5a8d0201d662c68dd58eeb8cf1d30
  
          if (!list.isEmpty()) {
              // Paper - move up
-@@ -2887,6 +2891,9 @@ public abstract class EntityLiving extends Entity {
+@@ -2886,6 +2890,9 @@ public abstract class EntityLiving extends Entity {
                  this.C(entity);
              }
          }
diff --git a/patches/server/0006-Yatopia-configuration.patch b/patches/server/0006-Yatopia-configuration.patch
index 4d30c2ae6..bcd1f7eb5 100644
--- a/patches/server/0006-Yatopia-configuration.patch
+++ b/patches/server/0006-Yatopia-configuration.patch
@@ -47,7 +47,7 @@ index 3ee8d31c453105eca7b96bede39a9ebbf40e1c2c..0a9f03526abf0638ada15d9810b94988
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
          this.setResourcePack(dedicatedserverproperties.resourcePack, this.ba());
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 93a5c897e9154c26b201177a4372bb6e5af42a78..41027a01aa331315e8c17a100f29fa6f00f85988 100644
+index 266174436b0fad60087afb86458fdc705577523c..05e1cbfa603ec6910b2565fb98513b6b366f2379 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -270,6 +270,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0007-Per-entity-type-collision-settings.patch b/patches/server/0007-Per-entity-type-collision-settings.patch
index b0cfb94ae..d69c32bec 100644
--- a/patches/server/0007-Per-entity-type-collision-settings.patch
+++ b/patches/server/0007-Per-entity-type-collision-settings.patch
@@ -59,10 +59,10 @@ index f452cc575adf9137f3b9f1eef1904f8116c7a7ec..15aa603a771c327879a4088609850fb8
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 41027a01aa331315e8c17a100f29fa6f00f85988..ab873b37a818b304d097dbe1958885235ba7077f 100644
+index 05e1cbfa603ec6910b2565fb98513b6b366f2379..0985a4498fbfaa3652041627b8a4d7d6bb8165fc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2932,7 +2932,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2931,7 +2931,7 @@ public abstract class EntityLiving extends Entity {
          // Paper - end don't run getEntities if we're not going to use its result
          // Tuinity start - reduce memory allocation from collideNearby
          List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();
diff --git a/patches/server/0013-lithium-enum_values.patch b/patches/server/0013-lithium-enum_values.patch
index 34cb0be0d..269ac6bb2 100644
--- a/patches/server/0013-lithium-enum_values.patch
+++ b/patches/server/0013-lithium-enum_values.patch
@@ -39,10 +39,10 @@ index 5d3bb5f393a1e0e4a2e8b9a466530a91279697a9..7f084e7f11a829c10d113c7fb39eec0b
                  if (enumdirection2 != EnumDirection.DOWN && world.isBlockFacePowered(blockposition1.shift(enumdirection2), enumdirection2)) {
                      return true;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ab873b37a818b304d097dbe1958885235ba7077f..62948f586e298d711fbe893ab29d6d61dc6bb62f 100644
+index 0985a4498fbfaa3652041627b8a4d7d6bb8165fc..5727981e59f8ebe5ae2a955313e19080fce6ecd6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2616,10 +2616,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2615,10 +2615,12 @@ public abstract class EntityLiving extends Entity {
  
      }
  
diff --git a/upstream/Purpur b/upstream/Purpur
index d72b22863..f3644e18a 160000
--- a/upstream/Purpur
+++ b/upstream/Purpur
@@ -1 +1 @@
-Subproject commit d72b22863d0e9d2eb25f0d001d2de6123ff7d755
+Subproject commit f3644e18a2dd656fea2e3de5bd8e020252c5fc78
diff --git a/upstreamCommits/Purpur b/upstreamCommits/Purpur
index 7baae73ee..16c70e421 100644
--- a/upstreamCommits/Purpur
+++ b/upstreamCommits/Purpur
@@ -1 +1 @@
-d72b22863d0e9d2eb25f0d001d2de6123ff7d755
\ No newline at end of file
+f3644e18a2dd656fea2e3de5bd8e020252c5fc78
\ No newline at end of file