diff --git a/gradle.properties b/gradle.properties
index 8537a518c..13f4d89af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 2cd4bcfba17affba734619682800fa47ed8e2c7f
+paperCommit = 2973e1c56e52d28f259b25d685deb59fa3a3fe1f
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch
index 93dfbba79..9c37db8ae 100644
--- a/patches/server/0001-Airplane-Server-Changes.patch
+++ b/patches/server/0001-Airplane-Server-Changes.patch
@@ -1694,10 +1694,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..8242200f073aee40482b190c7c0aafd5
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b556c1ef5d9f4667fa755ae843f4f50719c5013c..1312a4d7a6f77d4b9812edd44ed27a6ca7cd7977 100644
+index 730d569bd657049c8165d931ac62bf21c65a3b29..a8dfee5fb36d4fdf90bdd429476427866b2b052d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2403,8 +2403,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2412,8 +2412,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  
@@ -1726,7 +1726,7 @@ index b556c1ef5d9f4667fa755ae843f4f50719c5013c..1312a4d7a6f77d4b9812edd44ed27a6c
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
  
              while (iterator.hasNext()) {
-@@ -2416,6 +2436,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2425,6 +2445,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
                      i = j;
                  }
              }
diff --git a/patches/server/0073-Item-entity-immunities.patch b/patches/server/0073-Item-entity-immunities.patch
index 1bd90c92f..dc741b2a8 100644
--- a/patches/server/0073-Item-entity-immunities.patch
+++ b/patches/server/0073-Item-entity-immunities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1312a4d7a6f77d4b9812edd44ed27a6ca7cd7977..f3252dbb7f081b7f47a0e28e74a1da6c42cdd788 100644
+index a8dfee5fb36d4fdf90bdd429476427866b2b052d..b99a0d754d2becd429d5b38f4aa36ddaa6a00443 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2273,7 +2273,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2282,7 +2282,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
  
      public class TrackedEntity {