diff --git a/build.gradle.kts b/build.gradle.kts
index dd3c556fe..6212fb8f8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -58,7 +58,7 @@ repositories {
 
 dependencies {
     remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
-    decompiler("org.vineflower:vineflower:1.11.0-20240412.144930-14")
+    decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 
@@ -66,10 +66,9 @@ paperweight {
     serverProject = project(":purpur-server")
 
     remapRepo = paperMavenPublicUrl
-    decompileRepo = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+    decompileRepo = paperMavenPublicUrl
 
     usePaperUpstream(providers.gradleProperty("paperCommit")) {
-
         withPaperPatcher {
             apiPatchDir = layout.projectDirectory.dir("patches/api")
             apiOutputDir = layout.projectDirectory.dir("Purpur-API")
diff --git a/gradle.properties b/gradle.properties
index 9c64c10dd..886b5f5ca 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 = 4445d23544e0801fb6f658de98815ce0d8c04f58
+paperCommit = a6b6ecdd221b6ae7687561c84c1850aaa62473b4
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch
index 7cda0661f..a35ae5e97 100644
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0005-Purpur-client-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c6cb4f17469a8f2e60dd3e28d41402851ce5fb21..6692bc3bedf0f78a3b8cd937e1943d1113e51584 100644
+index d048ae07cc33fd77d128cc1ebf88b0804969fa3c..761abf496f8ef400460869d667afe2cf45ffb5f3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3711,4 +3711,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3752,4 +3752,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch
index 769c440e0..b3944044a 100644
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0010-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6692bc3bedf0f78a3b8cd937e1943d1113e51584..654516bb7545d74a9e00efc154b5b75707038c96 100644
+index 761abf496f8ef400460869d667afe2cf45ffb5f3..95669dfc1de917f4d22242ceda94e64741221469 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3719,5 +3719,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3760,5 +3760,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();
diff --git a/patches/api/0038-Add-local-difficulty-api.patch b/patches/api/0038-Add-local-difficulty-api.patch
index 91b4d417b..81e7584d5 100644
--- a/patches/api/0038-Add-local-difficulty-api.patch
+++ b/patches/api/0038-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..bd1ceec96d354ddfeb7f79e6007b79c4da37a8bb 100644
+index e6f66d70d024cf4f0536a5bf8e51bf7b306335df..2d2d8a7494605e465c68b325d3043d334757e9bc 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4222,6 +4222,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4233,6 +4233,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
diff --git a/patches/api/0041-Debug-Marker-API.patch b/patches/api/0041-Debug-Marker-API.patch
index 0efb071b2..4ca4b2bcb 100644
--- a/patches/api/0041-Debug-Marker-API.patch
+++ b/patches/api/0041-Debug-Marker-API.patch
@@ -179,10 +179,10 @@ index e318d4d5a1fec1522ef37aed2ed677952e50943b..c15b0b05870a469ea5d314c9fac6a57a
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index bd1ceec96d354ddfeb7f79e6007b79c4da37a8bb..c2fc3c7158b65a875515afda0d69e2d6529db976 100644
+index 2d2d8a7494605e465c68b325d3043d334757e9bc..07e75978b4fc0e446e8aa46a40be5e371dc1c11b 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4230,6 +4230,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4241,6 +4241,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The local difficulty
       */
      public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,10 +260,10 @@ index bd1ceec96d354ddfeb7f79e6007b79c4da37a8bb..c2fc3c7158b65a875515afda0d69e2d6
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 654516bb7545d74a9e00efc154b5b75707038c96..f2aa9de6b1b6475435f72e9b7939fa7af9583ed3 100644
+index 95669dfc1de917f4d22242ceda94e64741221469..1fce58c500ad37a3f4d0b8a3bf18ccb149058dcd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3739,5 +3739,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3780,5 +3780,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @deprecated Use {@link #resetIdleDuration()} instead
       */
      void resetIdleTimer();
diff --git a/patches/api/0042-Add-death-screen-API.patch b/patches/api/0042-Add-death-screen-API.patch
index cb8d877ed..b0fe2b51a 100644
--- a/patches/api/0042-Add-death-screen-API.patch
+++ b/patches/api/0042-Add-death-screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f2aa9de6b1b6475435f72e9b7939fa7af9583ed3..5d22249f7bc98bc88ee798974f481c37807f7c5e 100644
+index 1fce58c500ad37a3f4d0b8a3bf18ccb149058dcd..8bbbdad40bc6a1932d8f79ec95c0a92037b3dac5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3809,5 +3809,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3850,5 +3850,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index 54c10ae08..40944d98b 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1489,7 +1489,7 @@ index 0af9ed92824ccf30814eceb6a2c2e5c12661c991..67eeb39aede6908d2756e49821ca350e
              } else {
                  this.lastTimeStamp = body.timeStamp();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 27db614d46dffc2d10f18d79cc5a084f3421d86b..c1c97130adf4b7bcb5b2470fc12b79da1d837686 100644
+index 2dc07e5ef249636e85ad9c78e3729e9e066a8fe8..b9e0a32f5829ca15f949effcafcbe2a975f6f690 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1786,7 +1786,7 @@ index 502bdc726b7890b00ee36871d905dea44e8719e3..fbffe3dab1b7812b50df5d6bddf4fbdb
  
              if (this.isRainingAt(blockposition)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 860d33ac56680babd87358b1d7d2216dac3f7865..2ae1d53364da7f0e30c642df4e9a62f9e6581432 100644
+index fe2ef36ab5dc4b933abf24dbfd0e811c53239cf0..e725c1c0496383007ffb94c46fc18340666b5e29 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1135,6 +1135,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2128,7 +2128,7 @@ index e9bb7feb591032904516d1b9374f486d8a7d066c..366121188c5abb550ed0a5f99d25c001
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2439f8d48daca7329049436414f06a36b4b79029..4cf2963fdbe9003fd18ac8c2035ccded57c02abd 100644
+index d2c92df28475f0a32a0134324eb0a5609a9afb99..a6b48b4eab6e0e98205fd9cafc3cde5ad39651af 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -222,14 +222,16 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -2236,10 +2236,10 @@ index 38af5c7280366fd6ec077f3d914ea5f3ee77451a..d78e1f6191738d426968efc24e734f04
      public boolean hasTasks() {
          for (WrappedGoal task : this.availableGoals) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-index de7c3654b5d134e380c0d7e8800beb6c10d8a22a..3e544a1b957e7a9bc2c5548baf7f6499a34151eb 100644
+index aee0147649d458b87d92496eda0c1723ebe570d2..89e9ea999d2fbd81a1d74382ef3fcd675fc8b94e 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-@@ -119,6 +119,7 @@ public abstract class MoveToBlockGoal extends Goal {
+@@ -121,6 +121,7 @@ public abstract class MoveToBlockGoal extends Goal {
                  for (int m = 0; m <= l; m = m > 0 ? -m : 1 - m) {
                      for (int n = m < l && m > -l ? l : 0; n <= l; n = n > 0 ? -n : 1 - n) {
                          mutableBlockPos.setWithOffset(blockPos, m, k - 1, n);
@@ -2745,7 +2745,7 @@ index da7489986848316fed029b71d1bc4e1248c9c9a8..661acdf4b1f33d150b0caf179e925d31
          return new BlockPos(i, l, j);
      }
 diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index b865115dc5a8c000521abf668251ab1bd8104505..42af3888a155f114901a90d4028bafed5789f58f 100644
+index 64076a452a315090d299a7a58a43fd3b5c1b4e0a..0c317b0147a73a8075e0883f0c132f4db0bdfea7 100644
 --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
 +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
 @@ -63,13 +63,18 @@ public final class Biome {
@@ -3171,7 +3171,7 @@ index 37a0002bbe6539648db5219bb373e0404ae48dc0..ca0571d232e102c4b177a1ea44b96f5f
      }
  
 diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
-index 1132658b063c6cd3feb1783ab4d5f5141ab75140..284c76ddb9724b44bb2e93f590685c728e843e6d 100644
+index 88a4a72bb390947dc17e5da09a99b2d1b3ac4621..284c76ddb9724b44bb2e93f590685c728e843e6d 100644
 --- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
 +++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
 @@ -17,50 +17,69 @@ public class EntityCollisionContext implements CollisionContext {
@@ -3258,7 +3258,7 @@ index 1132658b063c6cd3feb1783ab4d5f5141ab75140..284c76ddb9724b44bb2e93f590685c72
  
      @Override
      public boolean isAbove(VoxelShape shape, BlockPos pos, boolean defaultValue) {
--        return this.entityBottom > pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F;
+-        return this.entityBottom > (double)pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F;
 +        return (this.entity == null ? -Double.MAX_VALUE : entity.getY()) > (double)pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F; // Pufferfish
      }
  
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch
index 1fe4bcede..f2cc78bc6 100644
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0005-Purpur-client-support.patch
@@ -43,10 +43,10 @@ index 0306771b8f90dcdd77f151c19c6c2d75c41f8feb..34559eae0ea3f88d7b9a3c9e4a2350c4
              try {
                  String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e77bf7f432387bdfa7f69d31b014e8cd254fd4ca..6a558a7042b78e8de7fc637053468ac9029b4133 100644
+index 44f4665db613c558078df5bb49106e4ca5679dfe..5da7b468af3dd19491f38140f303e55b7cab21db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3425,4 +3425,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3456,4 +3456,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSendViewDistance(final int viewDistance) {
          this.getHandle().setSendViewDistance(viewDistance);
      }
diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch
index db98cb9b3..b26c940c2 100644
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -22,7 +22,7 @@ index 70f9e737b3b9f80395afc3542aafe4a0c774c722..70fa9893c7af6387df9e5c33be21653e
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0405c868facdbe64537ef6be4d65e80cea929af0..276ecc5e497f92be0df386fc594311e630018191 100644
+index 9094dacbdac148062f9f600556fe6588a6ae75f9..4dc2e55fb12c184b0fb8fe1e638f0e082b201192 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1712,6 +1712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -66,7 +66,7 @@ index e10999f90a695ac8399f1089aae6b8c0a225f5da..afca9734927fd003e249972439494c56
  
      public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ae1d53364da7f0e30c642df4e9a62f9e6581432..d9f24bcc2f5eaabc49f6a9ec545afe2d096fc532 100644
+index e725c1c0496383007ffb94c46fc18340666b5e29..ccf2ab27e73903ee4ae5e60838d694ed4ccad79c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2722,6 +2722,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -268,7 +268,7 @@ index 366121188c5abb550ed0a5f99d25c001628685bb..98907fee8d85e7b7dc66807a0717134d
          // Paper end - Add EntityMoveEvent
          if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 4cf2963fdbe9003fd18ac8c2035ccded57c02abd..8b39ea90558dbd5356c038b74fa4037fb69546ac 100644
+index a6b48b4eab6e0e98205fd9cafc3cde5ad39651af..6b8b1f391dac79e9ce3229684e4d198787b92776 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -149,8 +149,8 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -282,7 +282,7 @@ index 4cf2963fdbe9003fd18ac8c2035ccded57c02abd..8b39ea90558dbd5356c038b74fa4037f
          this.jumpControl = new JumpControl(this);
          this.bodyRotationControl = this.createBodyControl();
          this.navigation = this.createNavigation(world);
-@@ -1398,7 +1398,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1399,7 +1399,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
      protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
  
      protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -291,7 +291,7 @@ index 4cf2963fdbe9003fd18ac8c2035ccded57c02abd..8b39ea90558dbd5356c038b74fa4037f
      }
  
      public boolean isWithinRestriction() {
-@@ -1787,4 +1787,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1788,4 +1788,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
          return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
      }
@@ -398,7 +398,7 @@ index c92583b6d1527db32f4a644f30c8f8468e9e2fc2..b8f65dc8f0db4bbe5f9c223e4ba12973
          .put(EntityType.PIGLIN, Piglin.createAttributes().build())
          .put(EntityType.PIGLIN_BRUTE, PiglinBrute.createAttributes().build())
 diff --git a/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java b/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
-index b70295a746b6993f1da0f8669567cd6a955573a6..c3049e6c623949b19fde04a3db8ff057a6d07955 100644
+index ca02566b20dd52a59bc7b150529a1d68bc560ab0..10265fd19c90cea34372a786bb272dbcdd91b993 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
 @@ -29,6 +29,20 @@ public class MoveControl implements Control {
@@ -423,7 +423,7 @@ index b70295a746b6993f1da0f8669567cd6a955573a6..c3049e6c623949b19fde04a3db8ff057
          return this.operation == MoveControl.Operation.MOVE_TO;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java b/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
-index fcb419bc334207216e7cec103fd3a0ac447a0ebe..b33da623d6537ff35930667272f45dcc9090502d 100644
+index fbfc2f2515ad709b2c1212aef9521e795547d66b..e77bd11af62682d5eca41f6c9e1aed30eb6879ce 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
 @@ -3,7 +3,7 @@ package net.minecraft.world.entity.ai.control;
@@ -541,7 +541,7 @@ index 4fba7c2f6ec363846a772ef2a63e9b3fc1037de5..f8c2e2a7065a3ad5b306ebab3d04a12f
          BlockPos blockposition = this.blockPosition();
          BlockPos blockposition1 = blockposition.above();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
-index 9d67c2394be00ed226a3076a3f01ba70423fc29c..b1df01bfc16f548821576c93f9616169314f89d7 100644
+index 401cffccd3c6adedcbd3986cd13733772953b31b..b8f973505b184cf198b6782a6f423c921c3881a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 @@ -94,6 +94,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
@@ -561,7 +561,7 @@ index 9d67c2394be00ed226a3076a3f01ba70423fc29c..b1df01bfc16f548821576c93f9616169
              this.move(MoverType.SELF, this.getDeltaMovement());
              this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
              if (this.getTarget() == null) {
-@@ -167,7 +168,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -168,7 +169,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
      protected void playStepSound(BlockPos pos, BlockState state) {
      }
  
@@ -570,7 +570,7 @@ index 9d67c2394be00ed226a3076a3f01ba70423fc29c..b1df01bfc16f548821576c93f9616169
          private final AbstractFish fish;
  
          FishMoveControl(AbstractFish owner) {
-@@ -175,14 +176,22 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -176,14 +177,22 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
              this.fish = owner;
          }
  
@@ -1476,7 +1476,7 @@ index 24770540c51fe4831040d6b46b27636d25ebac40..ebfa162f172bdad7b17ce153fdee5087
          this.goalSelector.addGoal(3, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(4, new TemptGoal(this, 1.2D, Ingredient.of(Items.CARROT_ON_A_STICK), false));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 17749ddf448ea4f04ed1e1a9c33123e1cd49a46e..c737eea79621d565b5bbd28e22fa0731c3ed6068 100644
+index c9e10d4ce00b711b30de5d346a5ac26e7b441390..a1195a7465883b944bd12a793701e4774944be68 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -59,11 +59,40 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -1830,7 +1830,7 @@ index 9eab1170cb123d3b60a02314702516704f959ab7..c48ceed671e1804756d8a11208e5f7e5
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 051fb9f1e0d91b1cb1e2dec9a03f3b26fe64c82a..423c67f6d0faac7e46bdbe7f5bc3076a687fbb73 100644
+index 36506dc4b99f9de19a23a99c1bccdcb4e7102e72..7b6e1f5a44a5a690dca97693bb053d3186ff1b69 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -48,9 +48,32 @@ public class Squid extends WaterAnimal {
@@ -1905,7 +1905,7 @@ index 051fb9f1e0d91b1cb1e2dec9a03f3b26fe64c82a..423c67f6d0faac7e46bdbe7f5bc3076a
              if (i > 100) {
                  this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index 5247f1134db2cbaf412cfe583b67cfe4d58dc967..fe546baadc2e238667386c494359ddf904dd41e5 100644
+index 6e9e86b6d547d7437c990b65718b95ad0d60f020..3ec6caf965c9a69eb56e507e2c452129064d3c68 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -65,6 +65,18 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
@@ -2446,7 +2446,7 @@ index 8c14f9f2ad383f87c498126f135b460a241da410..5242059484fb5f407a2da2b0c01a8fee
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index f3ba42437e50cd19ad12d00a39c3f92544137fbd..6503f68345d931ac73e8291add6ed108c10ceb60 100644
+index 2181d74ad955197eb4f1925a64914a6197fa9023..5efed70522657c2a02f869affc6755332082cf97 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -40,6 +40,13 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -2462,7 +2462,7 @@ index f3ba42437e50cd19ad12d00a39c3f92544137fbd..6503f68345d931ac73e8291add6ed108
 +
      @Override
      protected void randomizeAttributes(RandomSource random) {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 index 6623674136b0f865d5b3d7a10d3bf05793b82f87..1c6be506804b9622c4d0094814939f894ca857df 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -3056,7 +3056,7 @@ index 586e3e92ccc275446df6dbbff9bf010a37a9aa8f..9d259d7e2aa3e44e350eb5927314cfce
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index 2d4399a4dba754704c873f088fb4fc1a7fc56ef1..929074db505e0838a9b133228f81cad87bdab5fb 100644
+index 58c2b8b8bfd5a40259aa6252243884d14c183ef2..b48bb11029e2726cde2e8f624b8c1ad159740e3a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -32,6 +32,7 @@ public class Blaze extends Monster {
@@ -3779,7 +3779,7 @@ index fb84b35e34063075e69e00e430bc00e7c3b9d62c..4d50d10016a3b574d67bdfec5aee910c
          this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
          this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index 2ae1e5d2b16322136983d6703b770bfc3602b6eb..6c4422adf858595a740f6f8758db18859dc33004 100644
+index c4b4ff79bfdf9e34bf73a7760369e24b28dbbd70..b60e01a6cfce467f2e0a95a52f5ad7379d9fe574 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -25,6 +25,28 @@ public class MagmaCube extends Slime {
@@ -3818,8 +3818,8 @@ index 2ae1e5d2b16322136983d6703b770bfc3602b6eb..6c4422adf858595a740f6f8758db1885
 -    protected void jumpFromGround() {
 +    public void jumpFromGround() { // Purpur - protected -> public
          Vec3 vec3 = this.getDeltaMovement();
-         float f = this.getSize() * 0.1F;
-         this.setDeltaMovement(vec3.x, this.getJumpPower() + f, vec3.z);
+         float f = (float)this.getSize() * 0.1F;
+         this.setDeltaMovement(vec3.x, (double)(this.getJumpPower() + f), vec3.z);
          this.hasImpulse = true;
 +        this.actualJump = false; // Purpur
      }
diff --git a/patches/server/0009-Configurable-entity-base-attributes.patch b/patches/server/0009-Configurable-entity-base-attributes.patch
index 9c9f762d1..821f29b68 100644
--- a/patches/server/0009-Configurable-entity-base-attributes.patch
+++ b/patches/server/0009-Configurable-entity-base-attributes.patch
@@ -299,7 +299,7 @@ index ebfa162f172bdad7b17ce153fdee508748620fc0..fdf5651c7877313437ecd32914823d00
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index c737eea79621d565b5bbd28e22fa0731c3ed6068..5e6941abe1372ea4cba893de36ab20d2a3a42a21 100644
+index a1195a7465883b944bd12a793701e4774944be68..a681042dac350be5f5828508a7eefbc473376a94 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -93,6 +93,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -395,7 +395,7 @@ index c48ceed671e1804756d8a11208e5f7e5094a4bb1..35392365838bd412255777d1a53bc058
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 423c67f6d0faac7e46bdbe7f5bc3076a687fbb73..43bd8c55368d0bb1dca3a16ea4e0b1d6452be0cd 100644
+index 7b6e1f5a44a5a690dca97693bb053d3186ff1b69..9f598ff84b836d10e215c7e8fe79735f7f41e32b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -70,6 +70,11 @@ public class Squid extends WaterAnimal {
@@ -411,7 +411,7 @@ index 423c67f6d0faac7e46bdbe7f5bc3076a687fbb73..43bd8c55368d0bb1dca3a16ea4e0b1d6
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index fe546baadc2e238667386c494359ddf904dd41e5..3d40df730780fcc91c3a352c7572e60458fc5bb0 100644
+index 3ec6caf965c9a69eb56e507e2c452129064d3c68..b8b4ca31ad2fc5292082905c979a974a4ed42dab 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -77,6 +77,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
@@ -587,7 +587,7 @@ index 5242059484fb5f407a2da2b0c01a8feeaf1c3a64..f623586530e9e7783653b95c8c30d07d
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 6503f68345d931ac73e8291add6ed108c10ceb60..5183ac5534b77230f04734264eadbb8d3f0ff7ef 100644
+index 5efed70522657c2a02f869affc6755332082cf97..2971b868210ffb3390d19c7f8079fcc60f7d00b0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -47,6 +47,21 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -611,7 +611,7 @@ index 6503f68345d931ac73e8291add6ed108c10ceb60..5183ac5534b77230f04734264eadbb8d
 +
      @Override
      protected void randomizeAttributes(RandomSource random) {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 index 1c6be506804b9622c4d0094814939f894ca857df..34d87ab749a62c5d897b7bc66b116a801324b6a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -800,7 +800,7 @@ index 8fbfd134005c0813406fecbce8a918cd0376d03e..51ccbf3bd77bbcf77833b39fadc6c01f
  
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index 929074db505e0838a9b133228f81cad87bdab5fb..7b55851008f711a5968fcdf94c0ad18bcd6cf9ee 100644
+index b48bb11029e2726cde2e8f624b8c1ad159740e3a..cfd7d5caeb8bacc5ce314bd700cb21e98a9f667b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -74,6 +74,11 @@ public class Blaze extends Monster {
@@ -1022,7 +1022,7 @@ index 4d50d10016a3b574d67bdfec5aee910cede8ffc3..c00530db0eff302c14dd9c52d1d988cb
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index 6c4422adf858595a740f6f8758db18859dc33004..8cdce384f6d191231012788f27753f0f03753460 100644
+index b60e01a6cfce467f2e0a95a52f5ad7379d9fe574..79264a538b64a473b5a50aa87011f1f6db617525 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -47,6 +47,26 @@ public class MagmaCube extends Slime {
diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch
index 3f2b87fe5..73d14122d 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -78,7 +78,7 @@ index afca9734927fd003e249972439494c561f0c0966..c0c7aca4bc56b59dc0a450bd370cb3c0
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d9f24bcc2f5eaabc49f6a9ec545afe2d096fc532..65e64b69e36d3089589a1ac76dac97694532e9a6 100644
+index ccf2ab27e73903ee4ae5e60838d694ed4ccad79c..cb5fc10f7ca81f608cdbd5a3f2554c3163f88fd4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -324,6 +324,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -177,7 +177,7 @@ index d8cc5614502db7025349e085381b6b32ad32296a..f1b9e83206cc67e6ef29ebe088351b0a
      private EntitySelector() {}
      // Paper start - Affects Spawning API
 diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-index 2848f0562de085c0c934455c12d785194b7a9dbf..cdae57e08d337b5790df3512d3ca0ae1f859e646 100644
+index 28cff997a1b263784e245f692adbff2a888a2d53..13b8141bdb2a1663431be645eb091f9e7638f3d0 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
 @@ -64,6 +64,10 @@ public class TargetingConditions {
@@ -223,10 +223,10 @@ index ea0aee88c7d901034427db201c1b2430f8a1d522..1f28bfb435c1e4d97da713f96c452aba
                  if (range < 0.0 || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6a558a7042b78e8de7fc637053468ac9029b4133..5cb6572563bad1ef5ed755f94c5d0a854867406f 100644
+index 5da7b468af3dd19491f38140f303e55b7cab21db..8fec2e517cc57940348f4bee33212a9aae34b102 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -488,10 +488,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -489,10 +489,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setPlayerListName(String name) {
@@ -240,10 +240,10 @@ index 6a558a7042b78e8de7fc637053468ac9029b4133..5cb6572563bad1ef5ed755f94c5d0a85
          }
 -        this.getHandle().listName = name.equals(this.getName()) ? null : CraftChatMessage.fromStringOrNull(name);
 +        this.getHandle().listName = name.equals(this.getName()) ? null : useMM ? io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name)) : CraftChatMessage.fromStringOrNull(name); // Purpur
+         if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-                 player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -3431,5 +3436,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3462,5 +3467,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
diff --git a/patches/server/0051-Implement-infinite-liquids.patch b/patches/server/0051-Implement-infinite-liquids.patch
index a2c5974bd..8b4792eff 100644
--- a/patches/server/0051-Implement-infinite-liquids.patch
+++ b/patches/server/0051-Implement-infinite-liquids.patch
@@ -49,10 +49,10 @@ index 3bb4a9a1a6249e8ba2de237f801210e7f4fd5825..4c230136d832d50ae16ffa037b0b30ff
      protected boolean canConvertToSource(Level world) {
          return world.getGameRules().getBoolean(GameRules.RULE_LAVA_SOURCE_CONVERSION);
 diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-index ba34aea9db5c3af56f3c7e84424ec91988a2370e..7987279e17db64587aa6d126b46359ccd06f109d 100644
+index 109f71401c65f476ccf6813137386fc9fef10254..9dcdb2f4001115db0c26fdbf86531dbe6098485d 100644
 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-@@ -74,6 +74,13 @@ public abstract class WaterFluid extends FlowingFluid {
+@@ -80,6 +80,13 @@ public abstract class WaterFluid extends FlowingFluid {
          return world.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
      }
  
diff --git a/patches/server/0059-Add-5-second-tps-average-in-tps.patch b/patches/server/0059-Add-5-second-tps-average-in-tps.patch
index d18374a3c..98a1625ec 100644
--- a/patches/server/0059-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0059-Add-5-second-tps-average-in-tps.patch
@@ -18,7 +18,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..308f67d0616e2d6bb135258f1fda53cc
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f541b9e78f365518761fd8d3460277d457d769c0..ea07433bc4ab7ee032cf4eef5190ab932079c84f 100644
+index 62e715755137426ed2bc7abae148fadc247da239..14c349464970f8f9486e62c26854b87833d3df04 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -61,13 +61,13 @@ index f541b9e78f365518761fd8d3460277d457d769c0..ea07433bc4ab7ee032cf4eef5190ab93
                      tickSection = currentTime;
                  }
 diff --git a/src/main/java/net/minecraft/server/gui/StatsComponent.java b/src/main/java/net/minecraft/server/gui/StatsComponent.java
-index a34dc23499a9d55cceb1f2b2907e4d34b0d67616..63be0a9a4436ac9918516f92773fc8186f604545 100644
+index 096c89bd01cec2abd151bf6fffc4847d1bcd548f..cd0a8a6a1be75cab8bbb8ee3ac17bb732b9e7108 100644
 --- a/src/main/java/net/minecraft/server/gui/StatsComponent.java
 +++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java
-@@ -43,7 +43,7 @@ public class StatsComponent extends JComponent {
-         }
-         this.msgs[0] = "Memory use: " + l / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)";
-         this.msgs[1] = "Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms";
+@@ -45,7 +45,7 @@ public class StatsComponent extends JComponent {
+         this.msgs[1] = "Avg tick: "
+             + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double)TimeUtil.NANOSECONDS_PER_MILLISECOND)
+             + " ms";
 -        this.msgs[2] = "TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg);
 +        this.msgs[2] = "TPS from last 5s, 1m, 5m, 15m: " + String.join(", ", tpsAvg); // Purpur
          // Paper end - Improve ServerGUI
diff --git a/patches/server/0072-Entity-lifespan.patch b/patches/server/0072-Entity-lifespan.patch
index 217cfc57d..17c4bafd2 100644
--- a/patches/server/0072-Entity-lifespan.patch
+++ b/patches/server/0072-Entity-lifespan.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1cc86f8dd63802b7227de56b44c859c253a80756..b9a4815d6f942d78851213224a475b154c264d86 100644
+index 4e403c3738844374de3f6e40fbadbbaf88d9d231..104070f091b5aab94af2378ca7acb796799f869b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2749,6 +2749,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -17,7 +17,7 @@ index 1cc86f8dd63802b7227de56b44c859c253a80756..b9a4815d6f942d78851213224a475b15
                      private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                          ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b30292dcc9bbfc0ded94ee8a0f4a5e949327da54..20e8c3c88891f0fe20556b700fab5122682b2bdb 100644
+index 04d7d3193c9380769b0043c53eac579cca88f72a..0d1e4099548a907375ef1b225cfe646bfbe3073f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -137,6 +137,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -85,7 +85,7 @@ index b30292dcc9bbfc0ded94ee8a0f4a5e949327da54..20e8c3c88891f0fe20556b700fab5122
      }
  
      @Override
-@@ -1717,6 +1745,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1718,6 +1746,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
              this.setLastHurtMob(target);
          }
  
diff --git a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch b/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
index c4c4f842e..ffdc78a93 100644
--- a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
@@ -22,7 +22,7 @@ index 10a0f2b4968600f088677103b0bfbe5f69aa4428..c02c75620e256e4c129a7966a73f2d5a
          if (false && this.touchingUnloadedChunk()) { // Pufferfish - cost of a lookup here is the same cost as below, so skip
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 43bd8c55368d0bb1dca3a16ea4e0b1d6452be0cd..8d5f5e5ed5bc3d0d8c9403a473dff03f2b8e724f 100644
+index 9f598ff84b836d10e215c7e8fe79735f7f41e32b..bed42fe33d3788151188075f8969442555263492 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -75,6 +75,12 @@ public class Squid extends WaterAnimal {
@@ -39,10 +39,10 @@ index 43bd8c55368d0bb1dca3a16ea4e0b1d6452be0cd..8d5f5e5ed5bc3d0d8c9403a473dff03f
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
 diff --git a/src/main/java/net/minecraft/world/phys/AABB.java b/src/main/java/net/minecraft/world/phys/AABB.java
-index ba29de4a759644acdfce9c2e3672f20b200b7b50..a8589f1f9c4c678d90d7dffec1926f67f614e160 100644
+index 92394960fc76886f393cba02ac33c57739a4b383..494808b7bc2fb296b78e229ce138a937b7ac2c59 100644
 --- a/src/main/java/net/minecraft/world/phys/AABB.java
 +++ b/src/main/java/net/minecraft/world/phys/AABB.java
-@@ -495,4 +495,10 @@ public class AABB {
+@@ -502,4 +502,10 @@ public class AABB {
      public static AABB ofSize(Vec3 center, double dx, double dy, double dz) {
          return new AABB(center.x - dx / 2.0, center.y - dy / 2.0, center.z - dz / 2.0, center.x + dx / 2.0, center.y + dy / 2.0, center.z + dz / 2.0);
      }
diff --git a/patches/server/0102-Make-entity-breeding-times-configurable.patch b/patches/server/0102-Make-entity-breeding-times-configurable.patch
index a01051acb..76a904098 100644
--- a/patches/server/0102-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0102-Make-entity-breeding-times-configurable.patch
@@ -220,7 +220,7 @@ index 77147698154dfa6221a979ba170671d60da048ff..d858d4c94fb17d14367672813b506aea
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 5db17e4fc120e32e66a3a5c6313471ce5b090346..545e0bfcd602752ad514443917f3015a09a4adcc 100644
+index aef0268b187ab1975829370f733cf49cf3ed180a..95c85ddd8008f2d87000f1580287533656a8f0ca 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -119,6 +119,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -378,7 +378,7 @@ index f623586530e9e7783653b95c8c30d07d5eea896f..5b0b7c6bcd01d86552f1967489c55387
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 5183ac5534b77230f04734264eadbb8d3f0ff7ef..9ed68d07590b6371b6a6ffdd0be39d7a3fa41fd4 100644
+index 2971b868210ffb3390d19c7f8079fcc60f7d00b0..02748a7fdf41529fb86e916ae421a1317e1c3c7f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -62,6 +62,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -392,7 +392,7 @@ index 5183ac5534b77230f04734264eadbb8d3f0ff7ef..9ed68d07590b6371b6a6ffdd0be39d7a
 +
      @Override
      protected void randomizeAttributes(RandomSource random) {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 index b9b66f22ef39cb38bfb4dcbf4e73a0a7da596660..e11fc274f893d501235422839301a5128268199d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
diff --git a/patches/server/0123-Add-EntityTeleportHinderedEvent.patch b/patches/server/0123-Add-EntityTeleportHinderedEvent.patch
index df326836f..1c27d45f5 100644
--- a/patches/server/0123-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0123-Add-EntityTeleportHinderedEvent.patch
@@ -89,10 +89,10 @@ index 85d154f18e240cac77e023b4b5983ad7a95912b5..cac42202295b16de0466216f64be4fdf
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5cb6572563bad1ef5ed755f94c5d0a854867406f..aad02ebc0df97e6e7024add8fce149b54124a58b 100644
+index 8fec2e517cc57940348f4bee33212a9aae34b102..4e999cec1a004529a4bcd2f0ae63b3731bcac8f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1356,6 +1356,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1358,6 +1358,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
diff --git a/patches/server/0127-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0127-Toggle-for-water-sensitive-mob-damage.patch
index 4b99e223d..49eeb9bf2 100644
--- a/patches/server/0127-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0127-Toggle-for-water-sensitive-mob-damage.patch
@@ -254,7 +254,7 @@ index d858d4c94fb17d14367672813b506aea9e2e4ee1..f32cc2884696db956e10d350f9737602
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 545e0bfcd602752ad514443917f3015a09a4adcc..a1747c6495286dfa13543d698d00d4cf410f74c1 100644
+index 95c85ddd8008f2d87000f1580287533656a8f0ca..a3043a46b291b22c0e93ed680e4f455f47ae74be 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -124,6 +124,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -347,7 +347,7 @@ index 1d70a108293a61b7813b70cc9ce600a3e7b167d5..d46ab4d56e4c34b4dbe7a3df0785ab87
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 65d0e602a9cab5d51d1a27f690524ddad72bd2a5..ad2a3e593d2376556ca44ebf4539efe7382e1483 100644
+index 871f9a47247ba8134ecc39cd98a35011a5b009e4..daa4931c934c792b3c4ff32b730506762c4cf481 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -90,6 +90,11 @@ public class Squid extends WaterAnimal {
@@ -363,7 +363,7 @@ index 65d0e602a9cab5d51d1a27f690524ddad72bd2a5..ad2a3e593d2376556ca44ebf4539efe7
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index 3d40df730780fcc91c3a352c7572e60458fc5bb0..9c860b3091c991b0c1447860311097a5fc1df685 100644
+index b8b4ca31ad2fc5292082905c979a974a4ed42dab..1f83844da76ee6e158f1ba3656ba90d6eff1895c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -82,6 +82,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
@@ -459,7 +459,7 @@ index 5b0b7c6bcd01d86552f1967489c5538780b69525..92fccfde550f4a01f860e3bcfcf953d3
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 9ed68d07590b6371b6a6ffdd0be39d7a3fa41fd4..13c2fe236661c42b5b45e2870d0cb59a890196cd 100644
+index 02748a7fdf41529fb86e916ae421a1317e1c3c7f..8e4c3c01613a8944095a099427eb12ced32987a1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -67,6 +67,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -473,7 +473,7 @@ index 9ed68d07590b6371b6a6ffdd0be39d7a3fa41fd4..13c2fe236661c42b5b45e2870d0cb59a
 +
      @Override
      protected void randomizeAttributes(RandomSource random) {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 index e11fc274f893d501235422839301a5128268199d..fb2b0ebd9314ab7fc911e842767bd60b1db92b96 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -587,7 +587,7 @@ index 3cc47b0e05621c913a3e8d04c653bafab4a86744..db5a8b93b9cefca4566d3abc2b4c55d4
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index 7b55851008f711a5968fcdf94c0ad18bcd6cf9ee..e8427b486efdea67079a40e2e001c0a3401711b2 100644
+index cfd7d5caeb8bacc5ce314bd700cb21e98a9f667b..8c6f5dcd2135873da7d58066c63a2b8378f81d31 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -33,7 +33,7 @@ public class Blaze extends Monster {
@@ -807,7 +807,7 @@ index c00530db0eff302c14dd9c52d1d988cbdd93e5a1..43d4cea02ae94a8842cd4c1370d1b80e
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index 8cdce384f6d191231012788f27753f0f03753460..f3925c70fc9f1fd0764058b1f2b1f050394c20ce 100644
+index 79264a538b64a473b5a50aa87011f1f6db617525..607ca8389746062ffba29b25ddab4ac02685b506 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -67,6 +67,11 @@ public class MagmaCube extends Slime {
diff --git a/patches/server/0172-API-for-any-mob-to-burn-daylight.patch b/patches/server/0172-API-for-any-mob-to-burn-daylight.patch
index 961e0b2d3..f5ee53f14 100644
--- a/patches/server/0172-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0172-API-for-any-mob-to-burn-daylight.patch
@@ -92,10 +92,10 @@ index ef830481a816c743aa3b0feee5c0f2cf51fea7fa..cd87e7c52b75c6ba40343557ba12c789
  
      public boolean isSensitiveToWater() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 56ba7ac3d9d1f65de84f98eb724761d6bb374d47..380834677c93a23879a9e53173fa835ebd22f584 100644
+index a7d475b69bc9f15cf32f297f808246ff69402fb5..4182a146dcad83d141cd5bacdbfc39d912360c40 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1766,17 +1766,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1767,17 +1767,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
      }
  
      public boolean isSunBurnTick() {
diff --git a/patches/server/0205-Extended-OfflinePlayer-API.patch b/patches/server/0205-Extended-OfflinePlayer-API.patch
index 4a56ad7ab..1f61bcad4 100644
--- a/patches/server/0205-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0205-Extended-OfflinePlayer-API.patch
@@ -243,10 +243,10 @@ index 4a875bce9563f3b9351ebecde9b0eb1287beb50e..42d83cfd9318d6ebe9a5392edef3b667
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aad02ebc0df97e6e7024add8fce149b54124a58b..b90774a6c6041b3317b33d18a31ec2ab4eee1725 100644
+index 4e999cec1a004529a4bcd2f0ae63b3731bcac8f2..4a04c56371a2d9772fb542ffac5b9b98cbf1e86a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2668,6 +2668,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2670,6 +2670,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0222-Mobs-always-drop-experience.patch b/patches/server/0222-Mobs-always-drop-experience.patch
index 0ab90ff1b..2f040e2da 100644
--- a/patches/server/0222-Mobs-always-drop-experience.patch
+++ b/patches/server/0222-Mobs-always-drop-experience.patch
@@ -245,7 +245,7 @@ index f32cc2884696db956e10d350f97376025e32e673..10d6361077a74c5685eca72d12f99e33
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index a1747c6495286dfa13543d698d00d4cf410f74c1..20b969764c0552a1f44eaf187390cf37bf8bfe3b 100644
+index a3043a46b291b22c0e93ed680e4f455f47ae74be..2fecdd574b407eeb1d0cd4f1b34ff7931e620540 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -129,6 +129,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -341,7 +341,7 @@ index 81a88d510d7f52ca6a1c9cca991c22c3bdaf6b0d..df8e19a3adfa7dcc065160e8305d0f12
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index ad2a3e593d2376556ca44ebf4539efe7382e1483..a6b24a042bd75555895d5404b155154c1d994d57 100644
+index daa4931c934c792b3c4ff32b730506762c4cf481..fa15e43d19482125e1793e049d1a1380aced906c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -95,6 +95,11 @@ public class Squid extends WaterAnimal {
@@ -357,7 +357,7 @@ index ad2a3e593d2376556ca44ebf4539efe7382e1483..a6b24a042bd75555895d5404b155154c
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index 9c860b3091c991b0c1447860311097a5fc1df685..bb0c18cea03e238d49312e428373cd3186756bd3 100644
+index 1f83844da76ee6e158f1ba3656ba90d6eff1895c..98205d89aa0cca82863257abfad46ab834385a20 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -87,6 +87,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
@@ -453,7 +453,7 @@ index 92fccfde550f4a01f860e3bcfcf953d3e6ae02e3..42efd14b59a2b7da3409895bdff49e83
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 13c2fe236661c42b5b45e2870d0cb59a890196cd..a77ffe2bd6ecce5433a72f96ba43c2a9401a1378 100644
+index 8e4c3c01613a8944095a099427eb12ced32987a1..eab6efcae632a393924d7245a71c40b57c6e316d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -72,6 +72,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -467,7 +467,7 @@ index 13c2fe236661c42b5b45e2870d0cb59a890196cd..a77ffe2bd6ecce5433a72f96ba43c2a9
 +
      @Override
      protected void randomizeAttributes(RandomSource random) {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 index 30493e675d6308d65a4d4fa3fea601b6d7e4fa76..22abcf70f51a6752ab6d3f421366adb196e50dfc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -565,7 +565,7 @@ index 461247f3424b854032ccd45855c877aa85dd2e88..1d896c6c49705acd87416dc11a1d8ce2
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index e8427b486efdea67079a40e2e001c0a3401711b2..efc25f256134f812d0a7ccd63ecdda899cba14dc 100644
+index 8c6f5dcd2135873da7d58066c63a2b8378f81d31..c31d2ab0ed3693cd8334b5bbde1f565fff7c9162 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -79,6 +79,11 @@ public class Blaze extends Monster {
@@ -773,7 +773,7 @@ index 43d4cea02ae94a8842cd4c1370d1b80e45d2b13c..a8b3431c67442c5440b063426a1adc42
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index f3925c70fc9f1fd0764058b1f2b1f050394c20ce..aae0bc60befb0504ee39bdd363f81686927483d6 100644
+index 607ca8389746062ffba29b25ddab4ac02685b506..1bfd5ef9ce8a07375ff215d092368c3f5104ab13 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -72,6 +72,11 @@ public class MagmaCube extends Slime {
diff --git a/patches/server/0257-Add-local-difficulty-api.patch b/patches/server/0257-Add-local-difficulty-api.patch
index 93b6068bc..d33da05e7 100644
--- a/patches/server/0257-Add-local-difficulty-api.patch
+++ b/patches/server/0257-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 01797d9791f19dfda4b168218eadeaae97f11eab..6084fe6fd3fa2c122cb3d764a4a61287b9a20375 100644
+index 00357d78182b3ff87e3d9a45705b072af56739c8..06abe25b335606b42ac2a7b5551f0c9e7143a474 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2408,6 +2408,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2416,6 +2416,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
  
diff --git a/patches/server/0258-Add-toggle-for-RNG-manipulation.patch b/patches/server/0258-Add-toggle-for-RNG-manipulation.patch
index 538ac6444..0fd9e65a7 100644
--- a/patches/server/0258-Add-toggle-for-RNG-manipulation.patch
+++ b/patches/server/0258-Add-toggle-for-RNG-manipulation.patch
@@ -20,15 +20,15 @@ index 2cac12d2b788b0962b719a83b43dc23177b76ac6..ec6187bc3f445acb86e69161ab1b8224
          this.fluidHeight = new Object2DoubleArrayMap(2);
          this.fluidOnEyes = new HashSet();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index a6b24a042bd75555895d5404b155154c1d994d57..4c607abf5e6235b2f325cf9eff1676f565d251f5 100644
+index fa15e43d19482125e1793e049d1a1380aced906c..38d1eb5680281b2812f2396677ffb959a6e089ce 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -44,7 +44,7 @@ public class Squid extends WaterAnimal {
  
      public Squid(EntityType<? extends Squid> type, Level world) {
          super(type, world);
--        //this.random.setSeed(this.getId()); // Paper - Share random for entities to make them more random
-+        if (!world.purpurConfig.entitySharedRandom) this.random.setSeed(this.getId()); // Paper - Share random for entities to make them more random // Purpur
+-        //this.random.setSeed((long)this.getId()); // Paper - Share random for entities to make them more random
++        if (!world.purpurConfig.entitySharedRandom) this.random.setSeed((long)this.getId()); // Paper - Share random for entities to make them more random // Purpur
          this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
      }
  
diff --git a/patches/server/0260-Allow-custom-ChatDecorators.patch b/patches/server/0260-Allow-custom-ChatDecorators.patch
deleted file mode 100644
index 09fd7fd7e..000000000
--- a/patches/server/0260-Allow-custom-ChatDecorators.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Mon, 11 Jul 2022 20:44:19 -0500
-Subject: [PATCH] Allow custom ChatDecorators
-
-Requires NMS to utilize. I'll write an API for this once our upstreams calm down with the changes.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1e017c7c33fd70803312efdd61e090cb8aaf2254..98c49c3844edfb52d5b1ff32fa5e49d46fa8a20c 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2859,6 +2859,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper
- 
-     public ChatDecorator getChatDecorator() {
-+        // Purpur start
-+        return this.chatDecorator;
-+    }
-+    public void setChatDecorator(ChatDecorator chatDecorator) {
-+        this.chatDecorator = chatDecorator;
-+    }
-+    private ChatDecorator chatDecorator = getPaperHardcodedChatDecorator();
-+    public ChatDecorator getPaperHardcodedChatDecorator() {
-+        // Purpur end
-         // Paper start - moved to ChatPreviewProcessor
-         return ChatDecorator.create((sender, commandSourceStack, message) -> {
-             final io.papermc.paper.adventure.ChatDecorationProcessor processor = new io.papermc.paper.adventure.ChatDecorationProcessor(this, sender, commandSourceStack, message);
diff --git a/patches/server/0261-Remove-Timings.patch b/patches/server/0260-Remove-Timings.patch
similarity index 98%
rename from patches/server/0261-Remove-Timings.patch
rename to patches/server/0260-Remove-Timings.patch
index 5de534ff1..d63b5a6c6 100644
--- a/patches/server/0261-Remove-Timings.patch
+++ b/patches/server/0260-Remove-Timings.patch
@@ -56,7 +56,7 @@ index 83302c252f54481f239522e5c6861ccfe233070a..620edb63cacd15e38f7fc859efd4095b
                      } catch (Exception exception) {
                          label25:
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 98c49c3844edfb52d5b1ff32fa5e49d46fa8a20c..ff08e054d3ea168011a9f7f01e106721449d5e21 100644
+index 71fca0aae67c632198625cbec4381afeff7771be..0b1f9a51aaf97c3fb8a68bb7141ff76430d3b1a5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1439,7 +1439,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -447,7 +447,7 @@ index 1cf8c819c0d7776c3b33d6594ca81abe3c2a719d..bbc3153379d7da8b4d91c49a3ba83d44
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b9ca61e2ec4318c55997840f33fc8eae926fda73..a4f097eaefaede35b35852bec080d3b322c59300 100644
+index 8caa45d3bdf1a7b576427f6e3ae976bbfcb911f6..0d9ac7d3248686780b7482afab3059a09bba649a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -866,7 +866,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -630,7 +630,7 @@ index b9ca61e2ec4318c55997840f33fc8eae926fda73..a4f097eaefaede35b35852bec080d3b3
  
          } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index db42bf7c5604f32b9b06accb4bbc004ed264a3c2..54c5eb489e27524c58e1dbc589f5f545d6d46fdd 100644
+index 716377ce3236c9ae012b9bbcf432251ca06a9342..fdbdaa1d8d5760c5c661cbeca803e8ff8ec46aac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2456,7 +2456,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -683,13 +683,13 @@ index 1b8b0bafce3352bd65d570ac7cb4ea3acdfe991d..ac1e0c66f167218306504db6037cc1d6
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
-index 0a2e894d8bd1268fcbd4460745304816be46beff..1387930c5d3ecb430d73f3bdc0968fd0f028629d 100644
+index 03092417cd8ab5c6d266f3af9f20f47b34cfaba3..8f7d9f8a5138bcd572691d66c814aaa7c308b317 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
 @@ -59,9 +59,9 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
              this.status = Behavior.Status.RUNNING;
              int i = this.minDuration + world.getRandom().nextInt(this.maxDuration + 1 - this.minDuration);
-             this.endTimestamp = time + i;
+             this.endTimestamp = time + (long)i;
 -            this.timing.startTiming(); // Paper - behavior timings
 +            //this.timing.startTiming(); // Paper - behavior timings // Purpur
              this.start(world, entity, time);
@@ -715,7 +715,7 @@ index 0a2e894d8bd1268fcbd4460745304816be46beff..1387930c5d3ecb430d73f3bdc0968fd0
  
      protected void tick(ServerLevel world, E entity, long time) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-index de2dfaf3cb41bafd48fa4699096a0a7304cd3201..f5ee1a4cc4aa85d14008900efb48204917259b09 100644
+index 9e90cb2f51d1bacacb287e912d14ab9152523205..e553f52de2e0b30511ac1b73cb436374017cd7d7 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
 @@ -53,10 +53,10 @@ public abstract class Sensor<E extends LivingEntity> {
@@ -732,7 +732,7 @@ index de2dfaf3cb41bafd48fa4699096a0a7304cd3201..f5ee1a4cc4aa85d14008900efb482049
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 02b2cd49c2db6ba1688f6862e2c791947cec2fcf..c5bd99e63925ec27b89b3ca00583b5c8a8a74628 100644
+index 9e896ede9f84568b5675e04294bb9b6a8d016324..ea9b33eb48d8610943d122811cc49d211bc22d86 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1317,15 +1317,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0262-Remove-Mojang-Profiler.patch b/patches/server/0261-Remove-Mojang-Profiler.patch
similarity index 99%
rename from patches/server/0262-Remove-Mojang-Profiler.patch
rename to patches/server/0261-Remove-Mojang-Profiler.patch
index 75986b086..3f5796f0f 100644
--- a/patches/server/0262-Remove-Mojang-Profiler.patch
+++ b/patches/server/0261-Remove-Mojang-Profiler.patch
@@ -83,7 +83,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..684f7f202305c09b1037c5d38a52a5ea
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff08e054d3ea168011a9f7f01e106721449d5e21..5a736a99e97003506cedc697d7b33105d6fe40be 100644
+index 0b1f9a51aaf97c3fb8a68bb7141ff76430d3b1a5..4611116f3328c0f8d5b37c8765feca36b2448ffe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -341,13 +341,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -608,7 +608,7 @@ index bbc3153379d7da8b4d91c49a3ba83d4415a7671a..7b3ba500f465b999ce11964b0e4e30f3
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a4f097eaefaede35b35852bec080d3b322c59300..ec5d2b572d614d710dcbfbd39a08fbf7c2288659 100644
+index 0d9ac7d3248686780b7482afab3059a09bba649a..00ac2902be93327c7dd1bf78ee5922d7954f1b26 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -824,16 +824,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -905,7 +905,7 @@ index f14113eef226e906c0d21641e74a27471254909d..0c25f3ed0a8a538edc7cadd3476100c9
      }
  
 diff --git a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java b/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
-index ce3c3a29152ae6cc91d30c807eb5ffc7105dc485..aefc896b5e85f96f9014697debf75952e4b97874 100644
+index bce2dac613d29083dd5fbb68739304cc5a6d4d27..600a7036b503f60cc9c95f189f73c2dbf020e2e1 100644
 --- a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
 +++ b/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
 @@ -55,7 +55,7 @@ public class ActiveProfiler implements ProfileCollector {
@@ -1326,7 +1326,7 @@ index 839f280eeb18e01712a18b595b1a13abfab6f45b..e64d2425f6b5cec9a72bcbf451284fcb
          // 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 380834677c93a23879a9e53173fa835ebd22f584..1d1688fafc438a5957096118790d44fbd55476bb 100644
+index 4182a146dcad83d141cd5bacdbfc39d912360c40..dd275ece5887f5215cb785564af27152b29b370e 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -368,13 +368,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1483,7 +1483,7 @@ index d78e1f6191738d426968efc24e734f04b0fc7edb..a2cca3d528625d49411a94e2b6ec578f
  
      public Set<WrappedGoal> getAvailableGoals() {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index dafacdb43de86d328194dcfef284286fceb3754f..8a6d716706bfcd551125ac1e69dfec6989196e82 100644
+index e3a7eaf31ab19cc9f23a0c87649b74bb42976cb4..e12cf130678bda7c1f5873cb03172a698e18fc85 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 @@ -172,12 +172,12 @@ public abstract class PathNavigation {
@@ -1493,7 +1493,7 @@ index dafacdb43de86d328194dcfef284286fceb3754f..8a6d716706bfcd551125ac1e69dfec69
 -            this.level.getProfiler().push("pathfind");
 +            //this.level.getProfiler().push("pathfind"); // Purpur
              BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
-             int i = (int)(followRange + range);
+             int i = (int)(followRange + (float)range);
              PathNavigationRegion pathNavigationRegion = new PathNavigationRegion(this.level, blockPos.offset(-i, -i, -i), blockPos.offset(i, i, i));
              Path path = this.pathFinder.findPath(pathNavigationRegion, this.mob, positions, followRange, distance, this.maxVisitedNodesMultiplier);
 -            this.level.getProfiler().pop();
@@ -1686,7 +1686,7 @@ index c1125279b80bad8d7b6b273e709c412a0a578318..abafb15ab1294e11810798795bd103fb
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
-index 6b410d03e1fbba233a0cb2b9d1bfab6d0311230e..a1fd6f9cf367c8eb8c3def24262908778c3a4cbc 100644
+index b5ef8d9e55656100085a4d9858c3530bb08d3c16..aa27c014ce53e2dd49f02d413d5c4d763261a803 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
 @@ -202,10 +202,10 @@ public class Breeze extends Monster {
@@ -1816,7 +1816,7 @@ index 90a82bd7977ebe520bdcc2ab99e11452d5cf4a21..5dcfb077fc58a92f32425aaafb82d6b4
  
          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 c5bd99e63925ec27b89b3ca00583b5c8a8a74628..597f49fb213899c4da654d83557d2a18ef256288 100644
+index ea9b33eb48d8610943d122811cc49d211bc22d86..311c853f2150247350ab6ccb2dd92d58dbfc645c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1314,9 +1314,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1930,7 +1930,7 @@ index 8b1f5d290efbebe5fb6fc90b6031356ea3e4cef3..97724cbd6c1bf172379e98d4a3f6e8cd
                          if (throwable instanceof ThreadDeath) throw throwable; // Paper
                          // Paper start - Prevent block entity and entity crashes
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-index c4d6b145d54aaf415dd4b08811c024255092e1b8..7bdcbfa4fcefb7d8230756a55b774e3834290e64 100644
+index d1e1f12451058f7f276f8277536a4c0a4d736601..2046ac397f5c46cc45f233e36abbdbe717753fc7 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 @@ -53,8 +53,8 @@ public class PathFinder {
@@ -1954,7 +1954,7 @@ index c4d6b145d54aaf415dd4b08811c024255092e1b8..7bdcbfa4fcefb7d8230756a55b774e38
          // Paper end - Perf: remove streams and optimize collection
      }
 diff --git a/src/main/java/net/minecraft/world/ticks/LevelTicks.java b/src/main/java/net/minecraft/world/ticks/LevelTicks.java
-index d411753b50544c2a949eb71e86fc7aa811cf9f71..fb8f0168aa878708e2910fa651140ce49eaf0475 100644
+index 7a69564572357a7acc043e35b9c113beeb738951..a6d62abd3102770652f914b9d697c6d3c2533cfc 100644
 --- a/src/main/java/net/minecraft/world/ticks/LevelTicks.java
 +++ b/src/main/java/net/minecraft/world/ticks/LevelTicks.java
 @@ -81,20 +81,20 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
diff --git a/patches/server/0263-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0262-Add-more-logger-output-for-invalid-movement-kicks.patch
similarity index 96%
rename from patches/server/0263-Add-more-logger-output-for-invalid-movement-kicks.patch
rename to patches/server/0262-Add-more-logger-output-for-invalid-movement-kicks.patch
index 877965d2c..38adc0de0 100644
--- a/patches/server/0263-Add-more-logger-output-for-invalid-movement-kicks.patch
+++ b/patches/server/0262-Add-more-logger-output-for-invalid-movement-kicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 54c5eb489e27524c58e1dbc589f5f545d6d46fdd..8a935e5dec455250dbb967275648f51042288f48 100644
+index fdbdaa1d8d5760c5c661cbeca803e8ff8ec46aac..872be72e24017fdcb3060f6e4e9a92c342d59fc1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -733,6 +733,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0264-Add-Bee-API.patch b/patches/server/0263-Add-Bee-API.patch
similarity index 100%
rename from patches/server/0264-Add-Bee-API.patch
rename to patches/server/0263-Add-Bee-API.patch
diff --git a/patches/server/0265-Debug-Marker-API.patch b/patches/server/0264-Debug-Marker-API.patch
similarity index 95%
rename from patches/server/0265-Debug-Marker-API.patch
rename to patches/server/0264-Debug-Marker-API.patch
index 9a9aa213f..d677dbccf 100644
--- a/patches/server/0265-Debug-Marker-API.patch
+++ b/patches/server/0264-Debug-Marker-API.patch
@@ -52,10 +52,10 @@ index 14e60675d23f9696fd8f64eb026fcd0b82b498f0..659450d3538cc1499fd427868159e8c3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6084fe6fd3fa2c122cb3d764a4a61287b9a20375..b5222519f646b303ea7f2b914f749df815489937 100644
+index 06abe25b335606b42ac2a7b5551f0c9e7143a474..69c12d9049af908380c48c7f13d3d5c7220f8e39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2412,6 +2412,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2420,6 +2420,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public float getLocalDifficultyAt(Location location) {
          return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
      }
@@ -99,10 +99,10 @@ index 6084fe6fd3fa2c122cb3d764a4a61287b9a20375..b5222519f646b303ea7f2b914f749df8
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b90774a6c6041b3317b33d18a31ec2ab4eee1725..df29cf6f856f7560500f8bca39e9b12a64663b7a 100644
+index 4a04c56371a2d9772fb542ffac5b9b98cbf1e86a..9d2b39e871c83ab7af9c2cbde08e560006fcb005 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3477,5 +3477,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3508,5 +3508,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0266-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0265-mob-spawning-option-to-ignore-creative-players.patch
similarity index 100%
rename from patches/server/0266-mob-spawning-option-to-ignore-creative-players.patch
rename to patches/server/0265-mob-spawning-option-to-ignore-creative-players.patch
diff --git a/patches/server/0267-Add-skeleton-bow-accuracy-option.patch b/patches/server/0266-Add-skeleton-bow-accuracy-option.patch
similarity index 100%
rename from patches/server/0267-Add-skeleton-bow-accuracy-option.patch
rename to patches/server/0266-Add-skeleton-bow-accuracy-option.patch
diff --git a/patches/server/0268-Allay-respect-item-NBT.patch b/patches/server/0267-Allay-respect-item-NBT.patch
similarity index 100%
rename from patches/server/0268-Allay-respect-item-NBT.patch
rename to patches/server/0267-Allay-respect-item-NBT.patch
diff --git a/patches/server/0269-Add-death-screen-API.patch b/patches/server/0268-Add-death-screen-API.patch
similarity index 87%
rename from patches/server/0269-Add-death-screen-API.patch
rename to patches/server/0268-Add-death-screen-API.patch
index d1e21874d..d8f90eb6d 100644
--- a/patches/server/0269-Add-death-screen-API.patch
+++ b/patches/server/0268-Add-death-screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index df29cf6f856f7560500f8bca39e9b12a64663b7a..f3ae9a2d594a90c128402af57bc9536a136e7395 100644
+index 9d2b39e871c83ab7af9c2cbde08e560006fcb005..fb2d05e43df3bfb72b1f6e325736dd3cbc6c3096 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3515,5 +3515,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3546,5 +3546,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (this.getHandle().connection == null) return;
          this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(new net.minecraft.network.protocol.common.custom.GameTestClearMarkersDebugPayload()));
      }
diff --git a/patches/server/0270-Make-pufferfish-config-relocatable.patch b/patches/server/0269-Make-pufferfish-config-relocatable.patch
similarity index 96%
rename from patches/server/0270-Make-pufferfish-config-relocatable.patch
rename to patches/server/0269-Make-pufferfish-config-relocatable.patch
index e3a3ff88f..c81d41c1e 100644
--- a/patches/server/0270-Make-pufferfish-config-relocatable.patch
+++ b/patches/server/0269-Make-pufferfish-config-relocatable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make pufferfish config relocatable
 
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 8b8fe02b9db5192a3adb8d4a3bb3c2105f90544d..7178a742e5a9d65e6438ae338541848684f1f480 100644
+index 5a73aa17a963ae2d57e9bd5b5e3e5b0030d06216..8afc58f35deb49084a20b803e91ce4692ce6e4d6 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -28,6 +28,7 @@ public class PufferfishConfig {
diff --git a/patches/server/0271-Implement-ram-and-rambar-commands.patch b/patches/server/0270-Implement-ram-and-rambar-commands.patch
similarity index 100%
rename from patches/server/0271-Implement-ram-and-rambar-commands.patch
rename to patches/server/0270-Implement-ram-and-rambar-commands.patch
diff --git a/patches/server/0272-Add-item-packet-serialize-event.patch b/patches/server/0271-Add-item-packet-serialize-event.patch
similarity index 94%
rename from patches/server/0272-Add-item-packet-serialize-event.patch
rename to patches/server/0271-Add-item-packet-serialize-event.patch
index 9a7f225ca..81f4367ab 100644
--- a/patches/server/0272-Add-item-packet-serialize-event.patch
+++ b/patches/server/0271-Add-item-packet-serialize-event.patch
@@ -36,7 +36,7 @@ index b863249ff7e13cf4939c8961601f0564c62fd661..bdcfd80f937c34956911373905d66424
  
              this.writeId(BuiltInRegistries.ITEM, item);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5a736a99e97003506cedc697d7b33105d6fe40be..a1876ec72ff38f465662aded3608c588be34ca2d 100644
+index 4611116f3328c0f8d5b37c8765feca36b2448ffe..60b5e0643d933393b5473681ac9261db29fe2416 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1731,6 +1731,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -48,10 +48,10 @@ index 5a736a99e97003506cedc697d7b33105d6fe40be..a1876ec72ff38f465662aded3608c588
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8a935e5dec455250dbb967275648f51042288f48..9ba9356260d54ec318f07a8af221e9567ee03b12 100644
+index 872be72e24017fdcb3060f6e4e9a92c342d59fc1..f7ac60e1aa188ec25a4c5d326cdd4a109a54101c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3369,6 +3369,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3382,6 +3382,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      }
                  }
              }
diff --git a/patches/server/0273-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0272-Add-an-option-to-fix-MC-3304-projectile-looting.patch
similarity index 100%
rename from patches/server/0273-Add-an-option-to-fix-MC-3304-projectile-looting.patch
rename to patches/server/0272-Add-an-option-to-fix-MC-3304-projectile-looting.patch
diff --git a/patches/server/0274-Configurable-block-blast-resistance.patch b/patches/server/0273-Configurable-block-blast-resistance.patch
similarity index 100%
rename from patches/server/0274-Configurable-block-blast-resistance.patch
rename to patches/server/0273-Configurable-block-blast-resistance.patch
diff --git a/patches/server/0275-Configurable-block-fall-damage-modifiers.patch b/patches/server/0274-Configurable-block-fall-damage-modifiers.patch
similarity index 100%
rename from patches/server/0275-Configurable-block-fall-damage-modifiers.patch
rename to patches/server/0274-Configurable-block-fall-damage-modifiers.patch
diff --git a/patches/server/0276-Language-API.patch b/patches/server/0275-Language-API.patch
similarity index 100%
rename from patches/server/0276-Language-API.patch
rename to patches/server/0275-Language-API.patch
diff --git a/patches/server/0277-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0276-Milk-Keeps-Beneficial-Effects.patch
similarity index 100%
rename from patches/server/0277-Milk-Keeps-Beneficial-Effects.patch
rename to patches/server/0276-Milk-Keeps-Beneficial-Effects.patch
diff --git a/patches/server/0278-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0277-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
similarity index 91%
rename from patches/server/0278-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
rename to patches/server/0277-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
index a85f85c19..e539f8454 100644
--- a/patches/server/0278-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
+++ b/patches/server/0277-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] MC-121706 - Fix mobs not looking up and down when strafing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
-index bdf1339e965ac8543c2cd9b05190bcf9e3b8096d..94f33b5d7b73d9d0f78a7d1b12f2c57ef80fda5a 100644
+index 515c1f671cb2c3a7cc23053aedf404bbbe77af3e..42a1e5b9c08a9245dd0ce6d4025e3bb5d60feb62 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/RangedBowAttackGoal.java
 @@ -116,9 +116,9 @@ public class RangedBowAttackGoal<T extends Monster & RangedAttackMob> extends Go
diff --git a/patches/server/0279-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0278-Add-log-suppression-for-LibraryLoader.patch
similarity index 100%
rename from patches/server/0279-Add-log-suppression-for-LibraryLoader.patch
rename to patches/server/0278-Add-log-suppression-for-LibraryLoader.patch
diff --git a/patches/server/0280-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0279-Add-option-to-allow-creeper-to-encircle-target-when-.patch
similarity index 100%
rename from patches/server/0280-Add-option-to-allow-creeper-to-encircle-target-when-.patch
rename to patches/server/0279-Add-option-to-allow-creeper-to-encircle-target-when-.patch
diff --git a/patches/server/0281-Fire-Immunity-API.patch b/patches/server/0280-Fire-Immunity-API.patch
similarity index 100%
rename from patches/server/0281-Fire-Immunity-API.patch
rename to patches/server/0280-Fire-Immunity-API.patch
diff --git a/patches/server/0282-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0281-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
similarity index 100%
rename from patches/server/0282-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
rename to patches/server/0281-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
diff --git a/patches/server/0283-Added-got-ram-event.patch b/patches/server/0282-Added-got-ram-event.patch
similarity index 100%
rename from patches/server/0283-Added-got-ram-event.patch
rename to patches/server/0282-Added-got-ram-event.patch
diff --git a/patches/server/0284-Log-skipped-entity-s-position.patch b/patches/server/0283-Log-skipped-entity-s-position.patch
similarity index 100%
rename from patches/server/0284-Log-skipped-entity-s-position.patch
rename to patches/server/0283-Log-skipped-entity-s-position.patch
diff --git a/patches/server/0285-End-Crystal-Cramming.patch b/patches/server/0284-End-Crystal-Cramming.patch
similarity index 100%
rename from patches/server/0285-End-Crystal-Cramming.patch
rename to patches/server/0284-End-Crystal-Cramming.patch
diff --git a/patches/server/0286-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0285-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
similarity index 100%
rename from patches/server/0286-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
rename to patches/server/0285-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
diff --git a/patches/server/0287-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0286-Add-attribute-clamping-and-armor-limit-config.patch
similarity index 100%
rename from patches/server/0287-Add-attribute-clamping-and-armor-limit-config.patch
rename to patches/server/0286-Add-attribute-clamping-and-armor-limit-config.patch
diff --git a/patches/server/0288-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0287-Config-to-remove-explosion-radius-clamp.patch
similarity index 100%
rename from patches/server/0288-Config-to-remove-explosion-radius-clamp.patch
rename to patches/server/0287-Config-to-remove-explosion-radius-clamp.patch
diff --git a/patches/server/0289-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0288-bonemealable-sugarcane-cactus-and-netherwart.patch
similarity index 100%
rename from patches/server/0289-bonemealable-sugarcane-cactus-and-netherwart.patch
rename to patches/server/0288-bonemealable-sugarcane-cactus-and-netherwart.patch
diff --git a/patches/server/0290-Add-PreExplodeEvents.patch b/patches/server/0289-Add-PreExplodeEvents.patch
similarity index 100%
rename from patches/server/0290-Add-PreExplodeEvents.patch
rename to patches/server/0289-Add-PreExplodeEvents.patch
diff --git a/patches/server/0291-Improve-output-of-plugins-command.patch b/patches/server/0290-Improve-output-of-plugins-command.patch
similarity index 100%
rename from patches/server/0291-Improve-output-of-plugins-command.patch
rename to patches/server/0290-Improve-output-of-plugins-command.patch
diff --git a/patches/server/0292-Add-mending-multiplier.patch b/patches/server/0291-Add-mending-multiplier.patch
similarity index 100%
rename from patches/server/0292-Add-mending-multiplier.patch
rename to patches/server/0291-Add-mending-multiplier.patch
diff --git a/patches/server/0293-Make-GUI-Great-Again.patch b/patches/server/0292-Make-GUI-Great-Again.patch
similarity index 100%
rename from patches/server/0293-Make-GUI-Great-Again.patch
rename to patches/server/0292-Make-GUI-Great-Again.patch
diff --git a/patches/server/0294-Stored-Bee-API.patch b/patches/server/0293-Stored-Bee-API.patch
similarity index 100%
rename from patches/server/0294-Stored-Bee-API.patch
rename to patches/server/0293-Stored-Bee-API.patch
diff --git a/patches/server/0295-Shears-can-defuse-TNT.patch b/patches/server/0294-Shears-can-defuse-TNT.patch
similarity index 100%
rename from patches/server/0295-Shears-can-defuse-TNT.patch
rename to patches/server/0294-Shears-can-defuse-TNT.patch
diff --git a/patches/server/0296-Explorer-Map-API.patch b/patches/server/0295-Explorer-Map-API.patch
similarity index 100%
rename from patches/server/0296-Explorer-Map-API.patch
rename to patches/server/0295-Explorer-Map-API.patch
diff --git a/patches/server/0297-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0296-Option-Ocelot-Spawn-Under-Sea-Level.patch
similarity index 100%
rename from patches/server/0297-Option-Ocelot-Spawn-Under-Sea-Level.patch
rename to patches/server/0296-Option-Ocelot-Spawn-Under-Sea-Level.patch
diff --git a/patches/server/0298-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0297-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
similarity index 100%
rename from patches/server/0298-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
rename to patches/server/0297-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
diff --git a/patches/server/0299-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0298-Add-option-for-always-showing-item-in-player-death-m.patch
similarity index 100%
rename from patches/server/0299-Add-option-for-always-showing-item-in-player-death-m.patch
rename to patches/server/0298-Add-option-for-always-showing-item-in-player-death-m.patch
diff --git a/patches/server/0300-place-end-crystal-on-any-block.patch b/patches/server/0299-place-end-crystal-on-any-block.patch
similarity index 100%
rename from patches/server/0300-place-end-crystal-on-any-block.patch
rename to patches/server/0299-place-end-crystal-on-any-block.patch
diff --git a/patches/server/0301-Add-hover-lines-API.patch b/patches/server/0300-Add-hover-lines-API.patch
similarity index 100%
rename from patches/server/0301-Add-hover-lines-API.patch
rename to patches/server/0300-Add-hover-lines-API.patch
diff --git a/patches/server/0302-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0301-Add-option-to-disable-the-copper-oxidation-proximity.patch
similarity index 100%
rename from patches/server/0302-Add-option-to-disable-the-copper-oxidation-proximity.patch
rename to patches/server/0301-Add-option-to-disable-the-copper-oxidation-proximity.patch
diff --git a/patches/server/0303-register-minecraft-debug-commands.patch b/patches/server/0302-register-minecraft-debug-commands.patch
similarity index 100%
rename from patches/server/0303-register-minecraft-debug-commands.patch
rename to patches/server/0302-register-minecraft-debug-commands.patch
diff --git a/patches/server/0304-Configurable-villager-search-radius.patch b/patches/server/0303-Configurable-villager-search-radius.patch
similarity index 95%
rename from patches/server/0304-Configurable-villager-search-radius.patch
rename to patches/server/0303-Configurable-villager-search-radius.patch
index 3c5168260..8f9e628a1 100644
--- a/patches/server/0304-Configurable-villager-search-radius.patch
+++ b/patches/server/0303-Configurable-villager-search-radius.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable-villager-search-radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index 984e3cc48f93f4f036689a269562f12ebd7bdef1..6e65bc6bd198abf8c60016696d7851a1e8e080ec 100644
+index e1b6fe9ecda25f86431baf414f1bfd3a26a8b2bd..6499e3fe49e453db11e51eaf717ca8b3b682056b 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 @@ -73,7 +73,7 @@ public class AcquirePoi {
@@ -18,7 +18,7 @@ index 984e3cc48f93f4f036689a269562f12ebd7bdef1..6e65bc6bd198abf8c60016696d7851a1
                                      // Paper end - optimise POI access
                                      Path path = findPathToPois(entity, set);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
-index a2e02881f90a93f067301b63eb84dfad476bedbd..3c8b9ef3f55f4511f062b03822c8056c40dd7c92 100644
+index 92731b6b593289e9f583c9b705b219e81fcd8e73..9104d7010bda6f9f73b478c11490ef9c53f76da2 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java
 @@ -56,7 +56,7 @@ public class NearestBedSensor extends Sensor<Mob> {