diff --git a/patches/server/0184-Configurable-sprint-interruption-on-attack.patch b/patches/server/0184-Configurable-sprint-interruption-on-attack.patch
index a57cf17454..be219944ad 100644
--- a/patches/server/0184-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0184-Configurable-sprint-interruption-on-attack.patch
@@ -6,16 +6,16 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 92ff2ccfbcc554281a70337a0a759bf6f2e2bca0..6ff215c3d6db1627eda20ba09a3e10eaba589d99 100644
+index 92ff2ccfbcc554281a70337a0a759bf6f2e2bca0..b85838c24c94b282f1f0fe55fa20a2c1f80363a6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1307,6 +1307,11 @@ public abstract class Player extends LivingEntity {
+@@ -1306,7 +1306,11 @@ public abstract class Player extends LivingEntity {
+                             }
  
                              this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
-                             this.setSprinting(false);
 +                            // Paper start - Configurable sprint interruption on attack
 +                            if (!this.level().paperConfig().misc.disableSprintInterruptionOnAttack) {
-+                                this.setSprinting(false);
+                             this.setSprinting(false);
 +                            }
 +                            // Paper end - Configurable sprint interruption on attack
                          }
diff --git a/patches/server/0202-PlayerReadyArrowEvent.patch b/patches/server/0202-PlayerReadyArrowEvent.patch
index 2182853d2f..47da866dfb 100644
--- a/patches/server/0202-PlayerReadyArrowEvent.patch
+++ b/patches/server/0202-PlayerReadyArrowEvent.patch
@@ -7,10 +7,10 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6ff215c3d6db1627eda20ba09a3e10eaba589d99..d20389c6d73114810ab8dc20a02b09db4f1971f1 100644
+index b85838c24c94b282f1f0fe55fa20a2c1f80363a6..3897bbbaeb9d425525668f0daef42fb141605c6d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2233,18 +2233,29 @@ public abstract class Player extends LivingEntity {
+@@ -2232,18 +2232,29 @@ public abstract class Player extends LivingEntity {
          return ImmutableList.of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING);
      }
  
diff --git a/patches/server/0203-Add-entity-knockback-events.patch b/patches/server/0203-Add-entity-knockback-events.patch
index 49e4a45db5..8b9eb72761 100644
--- a/patches/server/0203-Add-entity-knockback-events.patch
+++ b/patches/server/0203-Add-entity-knockback-events.patch
@@ -199,7 +199,7 @@ index a6c33abcbbfc0851c8fa979163de145a578f97a6..18389b3befe31b224010e55244fbcb7c
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d20389c6d73114810ab8dc20a02b09db4f1971f1..d4077e88910347fb332996ce88262a1a0577818f 100644
+index 3897bbbaeb9d425525668f0daef42fb141605c6d..6fc92c90afa3288256cc7cbf75d35b4fafff0e88 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1300,9 +1300,9 @@ public abstract class Player extends LivingEntity {
@@ -214,7 +214,7 @@ index d20389c6d73114810ab8dc20a02b09db4f1971f1..d4077e88910347fb332996ce88262a1a
                              }
  
                              this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
-@@ -1328,7 +1328,7 @@ public abstract class Player extends LivingEntity {
+@@ -1327,7 +1327,7 @@ public abstract class Player extends LivingEntity {
  
                                      // CraftBukkit start - Only apply knockback if the damage hits
                                      if (entityliving2.hurt(this.damageSources().playerAttack(this).sweep(), f7)) {
diff --git a/patches/server/0209-InventoryCloseEvent-Reason-API.patch b/patches/server/0209-InventoryCloseEvent-Reason-API.patch
index b6a91e355d..8e238ffe8f 100644
--- a/patches/server/0209-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0209-InventoryCloseEvent-Reason-API.patch
@@ -109,7 +109,7 @@ index 9019e25f61d4fdb7c5d12ea7630b0bc23827ab6e..38cf3cf1cc7ebae4b6ca8a89dc026b5b
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d4077e88910347fb332996ce88262a1a0577818f..28cbe9ac2b8d5a21dba11b4162d187a9333e1ddb 100644
+index 6fc92c90afa3288256cc7cbf75d35b4fafff0e88..bba645d2dda293da441c6901967896636fd06ce2 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -278,7 +278,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0269-force-entity-dismount-during-teleportation.patch b/patches/server/0269-force-entity-dismount-during-teleportation.patch
index 0f859b2a2c..f8814dba6d 100644
--- a/patches/server/0269-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0269-force-entity-dismount-during-teleportation.patch
@@ -146,7 +146,7 @@ index 882236c8ebad90ed2adc873de4dda3b7f3f869d9..632b74e84d6ee58da8806e30b75e16fb
              this.clientOldAttachPosition = this.blockPosition();
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 28cbe9ac2b8d5a21dba11b4162d187a9333e1ddb..e8fb36582430332e511c2d7ac1e604763f4052e3 100644
+index bba645d2dda293da441c6901967896636fd06ce2..2d1eed692740dcab4fc9ab31e9b14a975e8239df 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1160,7 +1160,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0336-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0336-Dead-Player-s-shouldn-t-be-able-to-move.patch
index bcbd0c7040..e507baaede 100644
--- a/patches/server/0336-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0336-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e8fb36582430332e511c2d7ac1e604763f4052e3..1d8aa3b3c3deba7d04dd115d1f0b70b078111f1e 100644
+index 2d1eed692740dcab4fc9ab31e9b14a975e8239df..90974926cdc45f1455a0dc755338dac184c2f412 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1172,7 +1172,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0449-Expose-LivingEntity-hurt-direction.patch b/patches/server/0449-Expose-LivingEntity-hurt-direction.patch
index de27c1fb39..6135b758eb 100644
--- a/patches/server/0449-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0449-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 1d8aa3b3c3deba7d04dd115d1f0b70b078111f1e..5abd72b1a80967bd2502537978d8f5456075f357 100644
+index 90974926cdc45f1455a0dc755338dac184c2f412..2d9ed78daae9ef2fec8c11a998117d8299dff42d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -187,7 +187,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0520-Add-PlayerDeepSleepEvent.patch b/patches/server/0520-Add-PlayerDeepSleepEvent.patch
index 34cc1de399..ad6406c3c7 100644
--- a/patches/server/0520-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0520-Add-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5abd72b1a80967bd2502537978d8f5456075f357..6ce03f49f5085cf468ae2114f08f1faa1b099aaa 100644
+index 2d9ed78daae9ef2fec8c11a998117d8299dff42d..25964fa6a0502dda0e5a228707bfc157a97da5a6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -261,6 +261,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0561-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0561-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 148874452d..2385118bdc 100644
--- a/patches/server/0561-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0561-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -44,7 +44,7 @@ index 04c9fe154a72804d7bb817bf3bbfccd8be96a6ee..d413c4d445f42f6a923a49ce4f04b13c
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6ce03f49f5085cf468ae2114f08f1faa1b099aaa..c89b7cf63d067895bbd07f43eef467ff1861f625 100644
+index 25964fa6a0502dda0e5a228707bfc157a97da5a6..deb0dcf9777084c29f07170432bb8976e089d26d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -744,6 +744,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0593-Add-critical-damage-API.patch b/patches/server/0593-Add-critical-damage-API.patch
index 8310fc11a1..9c3103e228 100644
--- a/patches/server/0593-Add-critical-damage-API.patch
+++ b/patches/server/0593-Add-critical-damage-API.patch
@@ -28,7 +28,7 @@ index c1d121d83591ca1b5bf9d9406c9622b4f24eafef..aee26dd78953ff43306aaa64161f5b9e
 +    // Paper end - add critical damage API
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c89b7cf63d067895bbd07f43eef467ff1861f625..536a4e3c26e83f359083bde19832a962628244fa 100644
+index deb0dcf9777084c29f07170432bb8976e089d26d..6ff490bc9e0f0a820060d8b5cda7a4ef2ddaaf4e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1292,6 +1292,7 @@ public abstract class Player extends LivingEntity {
@@ -39,7 +39,7 @@ index c89b7cf63d067895bbd07f43eef467ff1861f625..536a4e3c26e83f359083bde19832a962
                          f *= 1.5F;
                      }
  
-@@ -1352,7 +1353,7 @@ public abstract class Player extends LivingEntity {
+@@ -1351,7 +1352,7 @@ public abstract class Player extends LivingEntity {
                                      float f7 = this.getEnchantedDamage(entityliving2, f6, damagesource) * f2;
  
                                      // CraftBukkit start - Only apply knockback if the damage hits
diff --git a/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index c1d628caf8..4c5c9ef42d 100644
--- a/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -51,7 +51,7 @@ index ce894b31e391786fe98742b9bf22d653df018570..ecd43bbca7ea0e74f506f49fd14f2dd5
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 536a4e3c26e83f359083bde19832a962628244fa..538c530ce9a2ce94dc013d8237b68b66bfcaa610 100644
+index 6ff490bc9e0f0a820060d8b5cda7a4ef2ddaaf4e..3cc67435ea3407865da8ca2c04c25fa18f101534 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -509,6 +509,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0768-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0768-Add-PrePlayerAttackEntityEvent.patch
index da2cbed41e..5a6cc1ba2a 100644
--- a/patches/server/0768-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0768-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 538c530ce9a2ce94dc013d8237b68b66bfcaa610..4ff41cc3e2ff69c6f0c3cd7be3e22d6948010599 100644
+index 3cc67435ea3407865da8ca2c04c25fa18f101534..b89a1f42283fbc7699b6c85bbb7efbd9cd9646ed 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1256,8 +1256,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0793-Flying-Fall-Damage.patch b/patches/server/0793-Flying-Fall-Damage.patch
index 021a59a960..bc6cbef85f 100644
--- a/patches/server/0793-Flying-Fall-Damage.patch
+++ b/patches/server/0793-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4ff41cc3e2ff69c6f0c3cd7be3e22d6948010599..9706b0df7d0c617a181ba9f78b010e2e58c84454 100644
+index b89a1f42283fbc7699b6c85bbb7efbd9cd9646ed..52d1af74b5b19e21eb8761e795c32b96cb8cf2f8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -195,6 +195,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index 4ff41cc3e2ff69c6f0c3cd7be3e22d6948010599..9706b0df7d0c617a181ba9f78b010e2e
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -1694,7 +1695,7 @@ public abstract class Player extends LivingEntity {
+@@ -1693,7 +1694,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
diff --git a/patches/server/0923-Add-experience-points-API.patch b/patches/server/0923-Add-experience-points-API.patch
index 9844f2f32a..66b13e7fd3 100644
--- a/patches/server/0923-Add-experience-points-API.patch
+++ b/patches/server/0923-Add-experience-points-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9706b0df7d0c617a181ba9f78b010e2e58c84454..a77c2847a3bc161f0bf25eb4c78305ce18afd904 100644
+index 52d1af74b5b19e21eb8761e795c32b96cb8cf2f8..fa7410e2a64c42ca7df5b340e4e5a4d03c46dd9b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1870,7 +1870,7 @@ public abstract class Player extends LivingEntity {
+@@ -1869,7 +1869,7 @@ public abstract class Player extends LivingEntity {
      }
  
      public int getXpNeededForNextLevel() {
diff --git a/patches/server/0925-Add-PlayerShieldDisableEvent.patch b/patches/server/0925-Add-PlayerShieldDisableEvent.patch
index f9d5404f63..8834fc9c02 100644
--- a/patches/server/0925-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0925-Add-PlayerShieldDisableEvent.patch
@@ -16,7 +16,7 @@ sideeffects, meaning the disable event cannot share a handlerlist with
 the cooldown event
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a77c2847a3bc161f0bf25eb4c78305ce18afd904..ffb888262ba81073062f6f513c36108688d0f158 100644
+index fa7410e2a64c42ca7df5b340e4e5a4d03c46dd9b..631d2e064d07169c8895b05ff6ecf66c8f5f9b65 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1004,7 +1004,7 @@ public abstract class Player extends LivingEntity {
@@ -28,7 +28,7 @@ index a77c2847a3bc161f0bf25eb4c78305ce18afd904..ffb888262ba81073062f6f513c361086
          }
  
      }
-@@ -1499,8 +1499,21 @@ public abstract class Player extends LivingEntity {
+@@ -1498,8 +1498,21 @@ public abstract class Player extends LivingEntity {
          this.attack(target);
      }
  
diff --git a/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 2e20e3b8c6..cd1f39b248 100644
--- a/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -25,7 +25,7 @@ index 73c33582eac01cbc6bf3728a78f9e1ee76b2b043..b65927095e36451c53cdae770701a334
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index ffb888262ba81073062f6f513c36108688d0f158..0526f4c701b4d945f26c5f382e9efac86cc568fa 100644
+index 631d2e064d07169c8895b05ff6ecf66c8f5f9b65..3f397423f023deaf4d8545201088b23ee3cc1cdd 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -807,6 +807,14 @@ public abstract class Player extends LivingEntity {