diff --git a/gradle.properties b/gradle.properties
index f19229b44..8a8cb335a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.4-R0.1-SNAPSHOT
 
 mcVersion = 1.20.4
-paperCommit = 5e978d3a3d2c8068ea152ea5a38938f1f8c15d94
+paperCommit = 0ae58c09a15ee1ad307a2b8ef7e8ad735d336651
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch
index 97e319742..ff21b79ee 100644
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0007-Component-related-conveniences.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 393edc13408ed8b3aad36121891eddf75ea321ff..ae9dfb2719ff2372e3a73adc2163330db886dfbe 100644
+index 95240bee8f76fd651166ecabe80885ac6601c34e..257675e0f3d44dec2d532161713609502b2ae868 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1883,6 +1883,26 @@ public class ServerPlayer extends Player {
+@@ -1884,6 +1884,26 @@ public class ServerPlayer extends Player {
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch
index 68154b749..eb563d9b0 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f709667d2efab5f7dac22bb6e4b0bf32917f71e4..387e2423d820e4df1d226ce6159a361d6a808fd9 100644
+index a3b4ed70b7d7012a72d5997c04821871d029d18b..e20f86d9167929e463b0e179db7e22e72fa6a1b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2233,8 +2233,68 @@ public class ServerPlayer extends Player {
+@@ -2234,8 +2234,68 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
diff --git a/patches/server/0040-Minecart-settings-and-WASD-controls.patch b/patches/server/0040-Minecart-settings-and-WASD-controls.patch
index cccdbf951..d3b4fa832 100644
--- a/patches/server/0040-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0040-Minecart-settings-and-WASD-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 387e2423d820e4df1d226ce6159a361d6a808fd9..e2e25a4ac86156f0915a0b9886a6f62b2812920b 100644
+index e20f86d9167929e463b0e179db7e22e72fa6a1b3..5156368507e56ec423a04e02e3cdcd8de502bc18 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1111,6 +1111,7 @@ public class ServerPlayer extends Player {
+@@ -1112,6 +1112,7 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {
diff --git a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index 260e98fd4..fb74fb3dc 100644
--- a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e2e25a4ac86156f0915a0b9886a6f62b2812920b..47cc6799f0d48debe4b63280a6814eadf9aecb7d 100644
+index 5156368507e56ec423a04e02e3cdcd8de502bc18..fd48f333747ec79083adea4053e643d93efca714 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2847,4 +2847,26 @@ public class ServerPlayer extends Player {
+@@ -2848,4 +2848,26 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -36,7 +36,7 @@ index e2e25a4ac86156f0915a0b9886a6f62b2812920b..47cc6799f0d48debe4b63280a6814ead
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 57ffb039cf27117ec1ec1c822f9693a8ef03f6b7..f3d882c889fc6eab2ced0efd0f17404ca6905a5d 100644
+index aac03f78f88ff0b7ace9694093d4fbc649cd0cd5..e10a96335d9534a7c0a17d20d6563bf3e157f494 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -426,6 +426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0108-Add-boat-fall-damage-config.patch b/patches/server/0108-Add-boat-fall-damage-config.patch
index 36ecd720c..921c35c1e 100644
--- a/patches/server/0108-Add-boat-fall-damage-config.patch
+++ b/patches/server/0108-Add-boat-fall-damage-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 47cc6799f0d48debe4b63280a6814eadf9aecb7d..82a551caa75fbd50d75a5109cf7e897e829acf19 100644
+index fd48f333747ec79083adea4053e643d93efca714..ea37e30846c496f92ceab7cee0cb19ffd82cfc0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1111,7 +1111,16 @@ public class ServerPlayer extends Player {
+@@ -1112,7 +1112,16 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {
diff --git a/patches/server/0117-Implement-TPSBar.patch b/patches/server/0117-Implement-TPSBar.patch
index 5215c5c12..7ef88c6dc 100644
--- a/patches/server/0117-Implement-TPSBar.patch
+++ b/patches/server/0117-Implement-TPSBar.patch
@@ -41,7 +41,7 @@ index 5ebe7e5c4f12ccb8a91a1e6a0f029d0f54b09e15..68d607dfed0130f1003951b4ac56d91b
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b77114483f0e58bd 100644
+index ea37e30846c496f92ceab7cee0cb19ffd82cfc0a..e7b654c1991348a7f73ca8bc950d776e4e708779 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -282,6 +282,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b7711448
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2877,5 +2880,13 @@ public class ServerPlayer extends Player {
+@@ -2878,5 +2881,13 @@ public class ServerPlayer extends Player {
              this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
          }
      }
@@ -83,7 +83,7 @@ index 82a551caa75fbd50d75a5109cf7e897e829acf19..448394f5ff2d55b099549b49b7711448
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e46fcb5c8bf1047e3f330fd525166aee5f0b646b..61a34f3e49b21254984011bc470d72c86d55dba1 100644
+index 0ced4627e0374d7e9fcbff256505b190021efd3f..3b5102017258339cda813e105dd2141b067b9f5d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -486,6 +486,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0127-Fix-stuck-in-portals.patch b/patches/server/0127-Fix-stuck-in-portals.patch
index e376d7c68..0143f85fd 100644
--- a/patches/server/0127-Fix-stuck-in-portals.patch
+++ b/patches/server/0127-Fix-stuck-in-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 448394f5ff2d55b099549b49b77114483f0e58bd..f2c388370be9765c15982f522a13cb21ad0f3f1d 100644
+index e7b654c1991348a7f73ca8bc950d776e4e708779..487e4ab76e255e10369f7968d73d41956e99ae66 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1270,6 +1270,7 @@ public class ServerPlayer extends Player {
+@@ -1271,6 +1271,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
diff --git a/patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch
index f7118d8fe..316190c6c 100644
--- a/patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f2c388370be9765c15982f522a13cb21ad0f3f1d..6ae52065abb4559ee53e2603224f2555952e50af 100644
+index 487e4ab76e255e10369f7968d73d41956e99ae66..8f3d2257a5be732883e18c821844d1ebb5a72f7d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1427,7 +1427,7 @@ public class ServerPlayer extends Player {
+@@ -1428,7 +1428,7 @@ public class ServerPlayer extends Player {
                              return entitymonster.isPreventingPlayerRest(this);
                          });
  
diff --git a/patches/server/0161-Configurable-broadcast-settings.patch b/patches/server/0161-Configurable-broadcast-settings.patch
index ba2051c39..7f20f9dda 100644
--- a/patches/server/0161-Configurable-broadcast-settings.patch
+++ b/patches/server/0161-Configurable-broadcast-settings.patch
@@ -17,10 +17,10 @@ index fcb5965ff0a9623a8e63a4b7413ad55416d269d9..9abce8a22246f449e1e508dc9972d14c
                          // Paper end
                      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ae52065abb4559ee53e2603224f2555952e50af..d846b4c0cd204ed2a17b883f37a83e2e049f7561 100644
+index 8f3d2257a5be732883e18c821844d1ebb5a72f7d..386a74f8a6f61fb745a1e36d8955d26bfc2ad78a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1011,6 +1011,7 @@ public class ServerPlayer extends Player {
+@@ -1012,6 +1012,7 @@ public class ServerPlayer extends Player {
              }));
              PlayerTeam scoreboardteam = this.getTeam();
  
diff --git a/patches/server/0191-Customizable-sleeping-actionbar-messages.patch b/patches/server/0191-Customizable-sleeping-actionbar-messages.patch
index ea14e617c..bbf9ad68a 100644
--- a/patches/server/0191-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0191-Customizable-sleeping-actionbar-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 735be788e584152bd2c33eaf9c08ebb21769a1db..64a56285c32fa70454371db366982f2530df0df5 100644
+index 5b6511f2394adce6785f5d8d6914c37b4e5fdedc..77b80dfd5409a6de848430e14cbc8d457ebccf83 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1242,11 +1242,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -38,10 +38,10 @@ index 735be788e584152bd2c33eaf9c08ebb21769a1db..64a56285c32fa70454371db366982f25
                  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d846b4c0cd204ed2a17b883f37a83e2e049f7561..852d773149782f052da7e1937d955ba1d19c7f20 100644
+index 386a74f8a6f61fb745a1e36d8955d26bfc2ad78a..71dc8baa9eb93728c982139dde16f1c4567d1925 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1468,7 +1468,19 @@ public class ServerPlayer extends Player {
+@@ -1469,7 +1469,19 @@ public class ServerPlayer extends Player {
                      });
  
                      if (!this.serverLevel().canSleepThroughNights()) {
diff --git a/patches/server/0196-Add-compass-command.patch b/patches/server/0196-Add-compass-command.patch
index 0489a835c..16b251891 100644
--- a/patches/server/0196-Add-compass-command.patch
+++ b/patches/server/0196-Add-compass-command.patch
@@ -17,7 +17,7 @@ index bf51f5e414ab45e33efa4057ab251120290b43e1..428dd75450bdd5daf902a1fbaca7031a
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 852d773149782f052da7e1937d955ba1d19c7f20..fd44606db9581ec93487c51a955b58cb7f3066da 100644
+index 71dc8baa9eb93728c982139dde16f1c4567d1925..cd449e35bbc689ce6d2595693a4fbe1f226998c8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -283,6 +283,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 852d773149782f052da7e1937d955ba1d19c7f20..fd44606db9581ec93487c51a955b58cb
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2902,5 +2905,13 @@ public class ServerPlayer extends Player {
+@@ -2903,5 +2906,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }
diff --git a/patches/server/0223-Signs-allow-color-codes.patch b/patches/server/0223-Signs-allow-color-codes.patch
index dc5dd088f..31dfa7987 100644
--- a/patches/server/0223-Signs-allow-color-codes.patch
+++ b/patches/server/0223-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fd44606db9581ec93487c51a955b58cb7f3066da..2b8f739cb69a67a2926b74fa36ad94f667b836dd 100644
+index cd449e35bbc689ce6d2595693a4fbe1f226998c8..943e864d7e25f77023337d7c719fc3d9a4b3ac55 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1588,6 +1588,7 @@ public class ServerPlayer extends Player {
+@@ -1589,6 +1589,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void openTextEdit(SignBlockEntity sign, boolean front) {
diff --git a/patches/server/0266-Remove-Mojang-Profiler.patch b/patches/server/0266-Remove-Mojang-Profiler.patch
index 81a068032..f1a288f3c 100644
--- a/patches/server/0266-Remove-Mojang-Profiler.patch
+++ b/patches/server/0266-Remove-Mojang-Profiler.patch
@@ -626,7 +626,7 @@ index 9f438b41b61ee1174d8f23bcb7d93380ad932e9c..c3c47857515a7f75d69c718f352d8bae
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1d8d1c4499c901f2675ef9a0e6f9dcb851217680..dd0ef00d29d4caa3a1fe8513ec82d72f64fc308f 100644
+index 3e00aec02b36ed62424f7271c4d1ab5382437dc0..76fd80b1d5674b89f9b13df5b5d70fbc822296e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -825,16 +825,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -848,10 +848,10 @@ index 1d8d1c4499c901f2675ef9a0e6f9dcb851217680..dd0ef00d29d4caa3a1fe8513ec82d72f
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2b8f739cb69a67a2926b74fa36ad94f667b836dd..b44dbc0b989658c82aa68e83b094e295dc4e5fe5 100644
+index 943e864d7e25f77023337d7c719fc3d9a4b3ac55..f152066b6b19b6c5d7f4f7c4eb66ed0b440342c5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1239,7 +1239,7 @@ public class ServerPlayer extends Player {
+@@ -1240,7 +1240,7 @@ public class ServerPlayer extends Player {
              PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
  
              if (shapedetectorshape != null) {
@@ -860,7 +860,7 @@ index 2b8f739cb69a67a2926b74fa36ad94f667b836dd..b44dbc0b989658c82aa68e83b094e295
                  worldserver = shapedetectorshape.world; // CraftBukkit
                  if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
                  if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
-@@ -1262,8 +1262,8 @@ public class ServerPlayer extends Player {
+@@ -1263,8 +1263,8 @@ public class ServerPlayer extends Player {
              worldserver = ((CraftWorld) exit.getWorld()).getHandle();
              // CraftBukkit end
  
@@ -871,7 +871,7 @@ index 2b8f739cb69a67a2926b74fa36ad94f667b836dd..b44dbc0b989658c82aa68e83b094e295
              if (true) { // CraftBukkit
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
-@@ -1281,7 +1281,7 @@ public class ServerPlayer extends Player {
+@@ -1282,7 +1282,7 @@ public class ServerPlayer extends Player {
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
                  worldserver.addDuringPortalTeleport(this);
@@ -1233,7 +1233,7 @@ index 67ebbf6005cdef280d62e2150287f18699b2fe6a..386259c78d134814479427b0591f0c6f
              }
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 139f0f8b04c743df6c0534d09493d4f46407006e..ae8efb754e89c925647aa515f2e5bfc4c75a3857 100644
+index 6e7ed46a3a10a1ec69d0b69ee49be304760e419b..f9e035405c42fbe0a8c0dca2157798d69214914b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -409,7 +409,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1344,7 +1344,7 @@ index 139f0f8b04c743df6c0534d09493d4f46407006e..ae8efb754e89c925647aa515f2e5bfc4
          // Purpur start
          if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 31f1a485fc3e8d40f7181a5f8af4f56d9c25e2fc..2b57be8b158ab9736a2ab4a454edfe38f2ff6785 100644
+index 4328b688b8ef5d44d4ca5501e090c943e8d598b3..5fe8838b4512ba6676a5fe7f3ab412ff87f07667 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -367,13 +367,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1833,7 +1833,7 @@ index 9442f58dff89ec843c321533965fbee2727d02f8..17abd085b3faf88e10a44a6c98af9968
  
          if (this.fire) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5777e5e31b1a7a7911c183db990f16fe7fc9b9ef..3c7cc1cba00df45296155bdd1430a64a94945f6c 100644
+index 54ceb622d9588ccd8df3cba849571aa3fdbb364a..2bf34cf58f7de58b113e6f325d16b5bd13bc3dbf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1310,9 +1310,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0275-Implement-ram-and-rambar-commands.patch b/patches/server/0275-Implement-ram-and-rambar-commands.patch
index 7f4064a92..f0e5e0658 100644
--- a/patches/server/0275-Implement-ram-and-rambar-commands.patch
+++ b/patches/server/0275-Implement-ram-and-rambar-commands.patch
@@ -18,7 +18,7 @@ index c1202a56b560269e132eafd8bb12383473d4d33e..815af29d1aae935264a400bdb9c3d676
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b44dbc0b989658c82aa68e83b094e295dc4e5fe5..8e36b261a4f8ea82bab778d3abd3326aa347d19a 100644
+index f152066b6b19b6c5d7f4f7c4eb66ed0b440342c5..37a3ce5da2cb89675e0180c4ed937e5851cd002b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -284,6 +284,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index b44dbc0b989658c82aa68e83b094e295dc4e5fe5..8e36b261a4f8ea82bab778d3abd3326a
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
          nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
      }
-@@ -2914,5 +2917,13 @@ public class ServerPlayer extends Player {
+@@ -2915,5 +2918,13 @@ public class ServerPlayer extends Player {
      public void compassBar(boolean compassBar) {
          this.compassBar = compassBar;
      }
diff --git a/patches/server/0276-Add-item-packet-serialize-event.patch b/patches/server/0276-Add-item-packet-serialize-event.patch
index ad237b51d..d961628b5 100644
--- a/patches/server/0276-Add-item-packet-serialize-event.patch
+++ b/patches/server/0276-Add-item-packet-serialize-event.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add item packet serialize event
 
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..0cdc68722552a464fb828016eb93f865bc8bde54 100644
+index a5bcad412fb1ac3b6a3eee3f4618dc6c1ca66936..3b301945a08dc2162bfae76ea8c3b04bb65f53dd 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 @@ -95,6 +95,8 @@ public class FriendlyByteBuf extends ByteBuf {
@@ -17,7 +17,7 @@ index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..0cdc68722552a464fb828016eb93f865
      public FriendlyByteBuf(ByteBuf parent) {
          this.source = parent;
      }
-@@ -635,6 +637,17 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -640,6 +642,17 @@ public class FriendlyByteBuf extends ByteBuf {
              this.writeBoolean(false);
          } else {
              this.writeBoolean(true);