diff --git a/gradle.properties b/gradle.properties
index 0730f213d..ac9bee77e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = c6ea84c7fae8d2974820333505a39c7b01c39b90
+paperCommit = 90788a556c6fb4a39919da2c440080b5daffe950
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 82ce8bc7f..45dcd48c8 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -2185,7 +2185,7 @@ index e28e09aae1d95d9bed50a137e999e6d457e62478..27e90ca03275a42271bbe97ee1a63a35
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d93eb2d0f38598a8939048de16dc7f14f2d39302..5a1a0ccf163488d5c4ec377821afaa95abebddcb 100644
+index edc6235288f0843608dae4552e05915e4067cbf2..d13b53c5497cece27ce06d43401e4f3b85652ceb 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -457,7 +457,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2197,7 +2197,7 @@ index d93eb2d0f38598a8939048de16dc7f14f2d39302..5a1a0ccf163488d5c4ec377821afaa95
          // Paper start - use distance map to optimise entity tracker
          this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
          this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
-@@ -2370,8 +2370,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -2369,8 +2369,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  
@@ -2226,7 +2226,7 @@ index d93eb2d0f38598a8939048de16dc7f14f2d39302..5a1a0ccf163488d5c4ec377821afaa95
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
  
              while (iterator.hasNext()) {
-@@ -2383,6 +2403,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -2382,6 +2402,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      i = j;
                  }
              }
diff --git a/patches/server/0068-Item-entity-immunities.patch b/patches/server/0068-Item-entity-immunities.patch
index 141dcdc90..016073deb 100644
--- a/patches/server/0068-Item-entity-immunities.patch
+++ b/patches/server/0068-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 5a1a0ccf163488d5c4ec377821afaa95abebddcb..f8713a8b5abbb246a13646f05ece7438f6151a79 100644
+index d13b53c5497cece27ce06d43401e4f3b85652ceb..2d686bc5ff086ecaead2eb6f1461ab5277982baf 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2242,7 +2242,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -2241,7 +2241,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      public class TrackedEntity {
  
diff --git a/patches/server/0259-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0259-Dont-eat-blocks-in-non-ticking-chunks.patch
index 432e5e5e9..7a090b121 100644
--- a/patches/server/0259-Dont-eat-blocks-in-non-ticking-chunks.patch
+++ b/patches/server/0259-Dont-eat-blocks-in-non-ticking-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dont eat blocks in non ticking chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f8713a8b5abbb246a13646f05ece7438f6151a79..705bfea2c58091bae0a63f0b86b5c55571a4af6a 100644
+index 2d686bc5ff086ecaead2eb6f1461ab5277982baf..78c9640a9e456436160c201378cf1b77b5db094b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1793,7 +1793,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1792,7 +1792,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange);
      }