diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9399b666c..fa85615bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,13 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.commits[0].message, '[ci-skip]')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3.6.0
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
+      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/actions/setup-gradle@v3
       - name: Configure Git
         run: git config --global user.email "no-reply@github.com" && git config --global user.name "Github Actions"
       - name: Apply Patches
diff --git a/.gitignore b/.gitignore
index dcb2438fd..1fd301e1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,6 @@ build-data/
 Purpur-API
 Purpur-MojangAPI
 Purpur-Server
+paper-api-generator
 *.jar
+test-plugin.settings.gradle.kts
diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
index 00aa84396..05a5aa732 100644
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.20.2-R0.1-SNAPSHOT-reobf.jar" />
+    <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar" />
     <option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [createReobfPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
+      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createMojmapPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Upstream_Paper__createReobfPaperclipJar_.xml b/.idea/runConfigurations/Upstream_Paper__createMojmapPaperclipJar_.xml
similarity index 82%
rename from .idea/runConfigurations/Upstream_Paper__createReobfPaperclipJar_.xml
rename to .idea/runConfigurations/Upstream_Paper__createMojmapPaperclipJar_.xml
index 8911b6115..4145189fc 100644
--- a/.idea/runConfigurations/Upstream_Paper__createReobfPaperclipJar_.xml
+++ b/.idea/runConfigurations/Upstream_Paper__createMojmapPaperclipJar_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Upstream Paper [createReobfPaperclipJar]" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Upstream Paper [createMojmapPaperclipJar]" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="createReobfPaperclipJar" />
+          <option value="createMojmapPaperclipJar" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -23,4 +23,4 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [build]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 118d9bc9f..6538e3a35 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,11 +4,11 @@ Purpur is happy you're willing to contribute to our projects. We are usually
 very lenient with all submitted PRs, but there are still some guidelines you
 can follow to make the approval process go more smoothly.
 
-## Use a Personal Fork and not Organization
+## Use a Personal Fork and not an Organization
 
 Purpur will routinely modify your PR, whether it's a quick rebase or to take care
 of any minor nitpicks we might have. Often, it's better for us to solve these
-problems for you than make you go back and forth trying to fix it yourself.
+problems for you than make you go back and forth trying to fix them yourself.
 
 Unfortunately, if you use an organization for your PR, it prevents Purpur from
 modifying it. This requires us to manually merge your PR, resulting in us
@@ -27,12 +27,12 @@ which can be obtained in (most) package managers such as `apt` (Debian / Ubuntu;
 you will most likely use this for WSL), `homebrew` (macOS / Linux), and more:
 
 - `git` (package `git` everywhere);
-- A Java 16 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
+- A Java 21 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
     - [Adoptium](https://adoptium.net/) has builds for most operating systems.
-    - Purpur requires JDK 16 to build, however makes use of Gradle's
+    - Purpur requires JDK 21 to build, however, makes use of Gradle's
       [Toolchains](https://docs.gradle.org/current/userguide/toolchains.html)
-      feature to allow building with only JRE 8 or later installed. (Gradle will
-      automatically provision JDK 16 for compilation if it cannot find an existing
+      feature to allow building with only JRE 11 or later installed. (Gradle will
+      automatically provision JDK 21 for compilation if it cannot find an existing
       install).
 
 If you're on Windows, check
@@ -42,16 +42,16 @@ If you're compiling with Docker, you can use Adoptium's
 [`eclipse-temurin`](https://hub.docker.com/_/eclipse-temurin/) images like so:
 
 ```console
-# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:16.0.2_7-jdk bash
+# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:21.0.3_9-jdk bash
 Pulling image...
 
 root@abcdefg1234:/# javac -version
-javac 16.0.2
+javac 21.0.3
 ```
 
 ## Understanding Patches
 
-Purpur is mostly patches and extensions to Paper/Spigot. These patches/extensions are
+Paper is mostly patches and extensions to Spigot. These patches/extensions are
 split into different directories which target certain parts of the code. These
 directories are:
 
@@ -66,7 +66,7 @@ Assuming you have already forked the repository:
 
 1. Clone your fork to your local machine;
 2. Type `./gradlew applyPatches` in a terminal to apply the changes from upstream.
-   On Windows, leave out the `./` at the beginning for all `gradlew` commands;
+   On Windows, replace the `./` with `.\` at the beginning for all `gradlew` commands;
 3. cd into `Purpur-Server` for server changes, and `Purpur-API` for API changes.
 <!--You can also run `./paper server` or `./paper api` for these same directories
 respectively.
@@ -167,7 +167,7 @@ messing with your HEADs.
       assist you too.
     - Alternatively, if you only know the name of the patch, you can do
       `git commit -a --fixup "Subject of Patch name"`.
-1. Rebase with autosquash: `git rebase --autosquash -i base`.
+1. Rebase with autosquash: `git rebase -i --autosquash base`.
    This will automatically move your fixup commit to the right place, and you just
    need to "save" the changes.
 1. Type `./gradlew rebuildPatches` in the root directory;
@@ -183,7 +183,7 @@ These steps assume the `origin` remote is your fork of this repository and `upst
 1. Checkout feature/fix branch and rebase on master: `git checkout patch-branch && git rebase master`.
 1. Apply updated patches: `./gradlew applyPatches`.
 1. If there are conflicts, fix them.
-1. If your PR creates new patches instead of modifying exist ones, in both the `Purpur-Server` and `Purpur-API` directories, ensure your newly-created patch is the last commit by either:
+1. If your PR creates new patches instead of modifying existing ones, in both the `Purpur-Server` and `Purpur-API` directories, ensure your newly-created patch is the last commit by either:
     * Renaming the patch file with a large 4-digit number in front (e.g. 9999-Patch-to-add-some-new-stuff.patch), and re-applying patches.
     * Running `git rebase --interactive base` and moving the commits to the end.
 1. Rebuild patches: `./gradlew rebuildPatches`.
@@ -203,37 +203,58 @@ when making and submitting changes.
 
 ## Formatting
 
-All modifications to non-Purpur files should be marked.
+All modifications to non-Purpur files should be marked. The one exception to this is
+when modifying javadoc comments, which should not have these markers.
 
-- Multi-line changes start with `// Purpur start` and end with `// Purpur end`;
-- You can put a comment with an explanation if it isn't obvious, like this:
-  `// Purpur start - reason`.
+- You need to add a comment with a short and identifiable description of the patch:
+  `// Purpur start - <COMMIT DESCRIPTION>`
     - The comments should generally be about the reason the change was made, what
       it was before, or what the change is.
-    - Multi-line messages should start with `// Purpur start` and use `/* Multi
-      line message here */` for the message itself.
-- One-line changes should have `// Purpur` or `// Purpur - reason`.
+    - After the general commit description, you can add additional information either
+      after a `;` or in the next line.
+- Multi-line changes start with `// Purpur start - <COMMIT DESCRIPTION>` and end
+  with `// Purpur end - <COMMIT DESCRIPTION>`.
+- One-line changes should have `// Purpur - <COMMIT DESCRIPTION>` at the end of the line.
 
 Here's an example of how to mark changes by Purpur:
 
 ```java
-entity.getWorld().dontbeStupid(); // Purpur - was beStupid() which is bad
+entity.getWorld().dontBeStupid(); // Purpur - Was beStupid(), which is bad
 entity.getFriends().forEach(Entity::explode);
-entity.a();
-entity.b();
-// Purpur start - use plugin-set spawn
+entity.updateFriends();
+
+// Purpur start - Use plugin-set spawn
 // entity.getWorld().explode(entity.getWorld().getSpawn());
 Location spawnLocation = ((CraftWorld)entity.getWorld()).getSpawnLocation();
 entity.getWorld().explode(new BlockPosition(spawnLocation.getX(), spawnLocation.getY(), spawnLocation.getZ()));
-// Purpur end
+// Purpur end - Use plugin-set spawn
 ```
 
-We generally follow usual Java style (aka. Oracle style), or what is programmed
+We generally follow the usual Java style (aka. Oracle style), or what is programmed
 into most IDEs and formatters by default. There are a few notes, however:
 - It is fine to go over 80 lines as long as it doesn't hurt readability.  
   There are exceptions, especially in Spigot-related files
 - When in doubt or the code around your change is in a clearly different style,
   use the same style as the surrounding code.
+- `var` usage is heavily discouraged, as it makes reading patch files a lot harder
+  and can lead to confusion during updates due to changed return types. The only
+  exception to this is if a line would otherwise be way too long/filled with hard
+  to parse generics in a case where the base type itself is already obvious
+
+### Imports
+When adding new imports to a class in a file not created by the current patch, use the fully qualified class name
+instead of adding a new import to the top of the file. If you are using a type a significant number of times, you
+can add an import with a comment. However, if its only used a couple of times, the FQN is preferred to prevent future
+patch conflicts in the import section of the file.
+
+```java
+import org.bukkit.event.Event;
+// don't add import here, use FQN like below
+
+public class SomeEvent extends Event {
+    public final org.bukkit.Location newLocation; // Purpur - add location
+}
+```
 
 ## Patch Notes
 
@@ -269,7 +290,7 @@ Subject: [PATCH] revert serverside behavior of keepalives
 
 This patch intends to bump up the time that a client has to reply to the
 server back to 30 seconds as per pre 1.12.2, which allowed clients
-more than enough time to reply, potentially allowing them to be less
+more than enough time to reply potentially allowing them to be less
 temperamental due to lag spikes on the network thread, e.g. that caused
 by plugins that are interacting with netty.
 
@@ -359,6 +380,12 @@ object:
 return this.level.purpurConfig.useInhabitedTime ? this.inhabitedTime : 0;
 ```
 
+#### Committing changes
+All changes to the `PurpurConfig` and `PurpurWorldConfig` files
+should be done in the commit that created them. So do an interactive rebase
+or fixup to apply just those changes to that commit, then add a new commit
+that includes the logic that uses that option in the server somewhere.
+
 ## Testing API changes
 
 ### Using the Purpur Test Plugin
@@ -401,7 +428,7 @@ patching process.
 1. Identify the name(s) of the file(s) you want to import.
     - A complete list of all possible file names can be found at
       `./Purpur-Server/.gradle/caches/paperweight/mc-dev-sources/net/minecraft/`. You might find
-      [MiniMappingViewer] useful if you need to translate between Mojang and Spigot mapped names.
+      [MappingViewer] useful if you need to translate between Mojang and Spigot mapped names.
 1. Open the file at `./build-data/dev-imports.txt` and add the name of your file to
    the script. Follow the instructions there;
 1. Re-patch the server `./gradlew applyPatches`;
@@ -426,16 +453,16 @@ file (`CONTRIBUTING.md`), the `LICENSE.md` file, and so forth.
 ### Patching and building is *really* slow, what can I do?
 
 This only applies if you're running Windows. If you're running a prior Windows
-release, either update to Windows 10 or move to macOS/Linux/BSD.
+release, either update to Windows 10/11 or move to macOS/Linux/BSD.
 
-In order to speed up patching process on Windows, it's recommended you get WSL.
+In order to speed up patching process on Windows, it's recommended you get WSL
 2. This is available in Windows 10 v2004, build 19041 or higher. (You can check
    your version by running `winver` in the run window (Windows key + R)). If you're
-   out of date, update your system with the
-   [Windows Update Assistant](https://www.microsoft.com/en-us/software-download/windows10).
+   using an out of date version of Windows 10, update your system with the
+   [Windows 10 Update Assistant](https://www.microsoft.com/en-us/software-download/windows10) or [Windows 11 Update Assistant](https://www.microsoft.com/en-us/software-download/windows11).
 
 To set up WSL 2, follow the information here:
-<https://docs.microsoft.com/en-us/windows/wsl/install-win10>
+<https://docs.microsoft.com/en-us/windows/wsl/install>
 
 You will most likely want to use the Ubuntu apps. Once it's set up, install the
 required tools with `sudo apt-get update && sudo apt-get install $TOOL_NAMES
@@ -445,6 +472,6 @@ everything like usual.
 
 > ❗ Do not use the `/mnt/` directory in WSL! Instead, mount the WSL directories
 > in Windows like described here:
-> <https://www.howtogeek.com/426749/how-to-access-your-linux-wsl-files-in-windows-10/>
+> <https://docs.microsoft.com/en-us/windows/wsl/filesystems#view-your-current-directory-in-windows-file-explorer>
 
-[MiniMappingViewer]: https://minidigger.github.io/MiniMappingViewer/
+[MappingViewer]: https://mappings.cephx.dev/
diff --git a/LICENSE b/LICENSE
index 424cc2f1c..4cffc22ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 PurpurMC
+Copyright (c) 2019-2024 PurpurMC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index af9ed877c..74d937f47 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 ## Purpur
 
 [![MIT License](https://img.shields.io/github/license/PurpurMC/Purpur?&logo=github)](LICENSE)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/PurpurMC/Purpur/build.yml?branch=ver%2F1.20.2&event=push&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMWBjFhOpnxAAACyklEQVQ4y32TXWgdZRCGn8k5Z3e/bzcJRFuoDRqIIPGniaSl1qgXKYhiLUgleFESW1qQ4g94oVKQJmga0ILRBuvfheJFIbY3SmzRFsWgQrTQFlRoKSVXgcMxJiS7++1ukvHiNKGU6FzNDO8MMw8zwn9Yz5c6anKeChxiMk599aq8sZ5Obk3sGNd7G5aZCHJ+Oj8gAwD9I3rSJmyvzLHz+HG5frO+vOaNa3NXiUkKQj9hQ1jQgWrlyCCV6gIdtmBjoJwbPqgL+R08PDQkCUADwD0TerqzxFTJY++vz0l7c0q/F7P5+aNUqyvM2CU2RAV7hsek3XPs3/QHF7/YrSfrDVQrxrErdESNNTYByAp3NmWUTYaGGSuho+QltAGYRdqilChMeKbO4Ijang5+CVJmbcr20PG3n9NiY6ZOvCW9ACMHdDLIeDDIqTWmtAQJV6OMyhOTsqWBQQo/hvP7pFcWeDxwtAQxGqbEq3isI7EOjRy3NyuPPHtOur0UXWMQZXgAX78uP3sJpTBmyHfsGDmotdF+rQWObq/gnSCm9PQ3chnA3qgRgL5jmjXlTM/n7Ny8yJXRY2IA3tur0yaHF8blLoAzj2kaNNBpZvk2iGntuiZBHWLOtXJC3hbzV5SxtDq6yZmzCXOrsRezHNa4YBzlKGN6bQXryD96W+4PU14zGbw/oLMf79EPbAI2g7M9+smP3fqPKVAT81LnFWnzM1y9gYC9gWtwTD6MEsq+Y8Lm7DMZ7cZxt5/T5xd8Fy5SfuC6fA4QZjdd8eEX9eLwAZ1StHKiT1MARStnHtWZH7bpjKIVgKutmipq50O94Mr6+9oKR8ekyy7x5qd9/NmYslynK4WfUjWOqiAFgElZmY+41BTzcrAkW9d9ptO9etgU7I8S3vVyDtkY/JzPwoxXzCJjt6Uy+r/fuGq/3affezkPRSniJ0y2zsqT6+n+BfRHKWgwbKNIAAAAAElFTkSuQmCC)](https://purpurmc.org/downloads/)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/PurpurMC/Purpur/build.yml?branch=ver%2F1.20.6&event=push&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMWBjFhOpnxAAACyklEQVQ4y32TXWgdZRCGn8k5Z3e/bzcJRFuoDRqIIPGniaSl1qgXKYhiLUgleFESW1qQ4g94oVKQJmga0ILRBuvfheJFIbY3SmzRFsWgQrTQFlRoKSVXgcMxJiS7++1ukvHiNKGU6FzNDO8MMw8zwn9Yz5c6anKeChxiMk599aq8sZ5Obk3sGNd7G5aZCHJ+Oj8gAwD9I3rSJmyvzLHz+HG5frO+vOaNa3NXiUkKQj9hQ1jQgWrlyCCV6gIdtmBjoJwbPqgL+R08PDQkCUADwD0TerqzxFTJY++vz0l7c0q/F7P5+aNUqyvM2CU2RAV7hsek3XPs3/QHF7/YrSfrDVQrxrErdESNNTYByAp3NmWUTYaGGSuho+QltAGYRdqilChMeKbO4Ijang5+CVJmbcr20PG3n9NiY6ZOvCW9ACMHdDLIeDDIqTWmtAQJV6OMyhOTsqWBQQo/hvP7pFcWeDxwtAQxGqbEq3isI7EOjRy3NyuPPHtOur0UXWMQZXgAX78uP3sJpTBmyHfsGDmotdF+rQWObq/gnSCm9PQ3chnA3qgRgL5jmjXlTM/n7Ny8yJXRY2IA3tur0yaHF8blLoAzj2kaNNBpZvk2iGntuiZBHWLOtXJC3hbzV5SxtDq6yZmzCXOrsRezHNa4YBzlKGN6bQXryD96W+4PU14zGbw/oLMf79EPbAI2g7M9+smP3fqPKVAT81LnFWnzM1y9gYC9gWtwTD6MEsq+Y8Lm7DMZ7cZxt5/T5xd8Fy5SfuC6fA4QZjdd8eEX9eLwAZ1StHKiT1MARStnHtWZH7bpjKIVgKutmipq50O94Mr6+9oKR8ekyy7x5qd9/NmYslynK4WfUjWOqiAFgElZmY+41BTzcrAkW9d9ptO9etgU7I8S3vVyDtkY/JzPwoxXzCJjt6Uy+r/fuGq/3affezkPRSniJ0y2zsqT6+n+BfRHKWgwbKNIAAAAAElFTkSuQmCC)](https://purpurmc.org/downloads/)
 [![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/PurpurMC/Purpur?logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx%2BLVQcXZ10dXAVB8APE0clJ0UVK%2FF9SaBHjwXE%2F3t173L0D%2FPUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5%2Fi6h4%2BvdzGe5X3uz9Gj5EwG%2BATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6%2FcS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q%2BUqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId%2FwPGL5JLJVQIjxwIqUCE5fvA%2F%2BN2tmZ8Yd5NCcaDzxbY%2FhoGuXaBRs%2B3vY9tunACBZ%2BBKa%2FkrdWD6k%2FRaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0%2Ffk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO%2Ft3zPN%2Fn4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVKAA5pS6%2BAAABlElEQVQ4y82PP2gVQRDGf7N3t%2Bvdixpi0N5OELFKJ1iohBciKlgYJLX6YkBbC0sVooVFBAvBPw%2BFZzrJs7DR2iYHRhBsxNI8VLwUx92MRXJGxKCp9AfL7DfDfPutFO3z5wy5DuRlWU2OvLj7hduLYXh0ZSEkOh4SjUKiBK%2BEZP34Gu%2FtbebLE86Qa8BO4FDwyWmAbPjzMWACiNgEMdun6macwfJ6z2qxZYBI6ndAxR%2BRN%2FL1ZGeXlDqFkm%2Fv33nZjHZ0u2OZrw%2F7pBYf16Re8UEJ8VpNE33fP3BxgX%2BOFOOdtjmuGpoPtT51pNcrMZORx4%2FmslQnslAlWahItymZrz%2Bmqc4%2B2z%2B71BjE5uwesEeQsaLY%2FQp42LrfPUqwy2DNO03ZK9hN4Ehj4IDBjzjKCoC5aMDG9q%2BhBz%2BrWCN3KqptBtG89Xx%2BEWB1%2Bszr8OTBFMgkSLKWQAA%2BVCU3%2BK%2BQb%2B0LB4FLGHmrP39LNv3773Ei9IBphLnVduf4VhM4M9JGqGzc%2F5bYnDsrqlcQloaK0adbNfgOUn6NRlZZ46YAAAAASUVORK5CYII%3D)](https://www.codefactor.io/repository/github/PurpurMC/Purpur)
 [![Join us on Discord](https://discord.com/api/guilds/685683385313919172/widget.png?style=shield)](https://purpurmc.org/discord)
 
@@ -27,7 +27,7 @@ Join us on Discord:
 ## Downloads
 Downloads can be obtained from the [downloads page](https://purpurmc.org/downloads/) or the [downloads API](https://api.purpurmc.org).
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/PurpurMC/Purpur/build.yml?branch=ver%2F1.20.2&event=push&label=Downloads&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMWBjFhOpnxAAACyklEQVQ4y32TXWgdZRCGn8k5Z3e/bzcJRFuoDRqIIPGniaSl1qgXKYhiLUgleFESW1qQ4g94oVKQJmga0ILRBuvfheJFIbY3SmzRFsWgQrTQFlRoKSVXgcMxJiS7++1ukvHiNKGU6FzNDO8MMw8zwn9Yz5c6anKeChxiMk599aq8sZ5Obk3sGNd7G5aZCHJ+Oj8gAwD9I3rSJmyvzLHz+HG5frO+vOaNa3NXiUkKQj9hQ1jQgWrlyCCV6gIdtmBjoJwbPqgL+R08PDQkCUADwD0TerqzxFTJY++vz0l7c0q/F7P5+aNUqyvM2CU2RAV7hsek3XPs3/QHF7/YrSfrDVQrxrErdESNNTYByAp3NmWUTYaGGSuho+QltAGYRdqilChMeKbO4Ijang5+CVJmbcr20PG3n9NiY6ZOvCW9ACMHdDLIeDDIqTWmtAQJV6OMyhOTsqWBQQo/hvP7pFcWeDxwtAQxGqbEq3isI7EOjRy3NyuPPHtOur0UXWMQZXgAX78uP3sJpTBmyHfsGDmotdF+rQWObq/gnSCm9PQ3chnA3qgRgL5jmjXlTM/n7Ny8yJXRY2IA3tur0yaHF8blLoAzj2kaNNBpZvk2iGntuiZBHWLOtXJC3hbzV5SxtDq6yZmzCXOrsRezHNa4YBzlKGN6bQXryD96W+4PU14zGbw/oLMf79EPbAI2g7M9+smP3fqPKVAT81LnFWnzM1y9gYC9gWtwTD6MEsq+Y8Lm7DMZ7cZxt5/T5xd8Fy5SfuC6fA4QZjdd8eEX9eLwAZ1StHKiT1MARStnHtWZH7bpjKIVgKutmipq50O94Mr6+9oKR8ekyy7x5qd9/NmYslynK4WfUjWOqiAFgElZmY+41BTzcrAkW9d9ptO9etgU7I8S3vVyDtkY/JzPwoxXzCJjt6Uy+r/fuGq/3affezkPRSniJ0y2zsqT6+n+BfRHKWgwbKNIAAAAAElFTkSuQmCC)](https://purpurmc.org/downloads/)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/PurpurMC/Purpur/build.yml?branch=ver%2F1.20.6&event=push&label=Downloads&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bxSIVh1YQcYhQnSyIiuimVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE0clJ0UVK/F9SaBHjwXE/3t173L0D/PUyU82OMUDVLCOViAuZ7KrQ9YogwujDEGYkZupzopiE5/i6h4+vdzGe5X3uz9Gj5EwG+ATiWaYbFvEG8dSmpXPeJ46woqQQnxOPGnRB4keuyy6/cS447OeZESOdmieOEAuFNpbbmBUNlXiSOKqoGuX7My4rnLc4q+Uqa96TvzCU01aWuU5zEAksYgkiBMioooQyLMRo1UgxkaL9uId/wPGL5JLJVQIjxwIqUCE5fvA/+N2tmZ8Yd5NCcaDzxbY/hoGuXaBRs+3vY9tunACBZ+BKa/krdWD6k/RaS4seAb3bwMV1S5P3gMsdoP9JlwzJkQI0/fk88H5G35QFwrdA95rbW3Mfpw9AmrpK3gAHh8BIgbLXPd4dbO/t3zPN/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMWBjFhOpnxAAACyklEQVQ4y32TXWgdZRCGn8k5Z3e/bzcJRFuoDRqIIPGniaSl1qgXKYhiLUgleFESW1qQ4g94oVKQJmga0ILRBuvfheJFIbY3SmzRFsWgQrTQFlRoKSVXgcMxJiS7++1ukvHiNKGU6FzNDO8MMw8zwn9Yz5c6anKeChxiMk599aq8sZ5Obk3sGNd7G5aZCHJ+Oj8gAwD9I3rSJmyvzLHz+HG5frO+vOaNa3NXiUkKQj9hQ1jQgWrlyCCV6gIdtmBjoJwbPqgL+R08PDQkCUADwD0TerqzxFTJY++vz0l7c0q/F7P5+aNUqyvM2CU2RAV7hsek3XPs3/QHF7/YrSfrDVQrxrErdESNNTYByAp3NmWUTYaGGSuho+QltAGYRdqilChMeKbO4Ijang5+CVJmbcr20PG3n9NiY6ZOvCW9ACMHdDLIeDDIqTWmtAQJV6OMyhOTsqWBQQo/hvP7pFcWeDxwtAQxGqbEq3isI7EOjRy3NyuPPHtOur0UXWMQZXgAX78uP3sJpTBmyHfsGDmotdF+rQWObq/gnSCm9PQ3chnA3qgRgL5jmjXlTM/n7Ny8yJXRY2IA3tur0yaHF8blLoAzj2kaNNBpZvk2iGntuiZBHWLOtXJC3hbzV5SxtDq6yZmzCXOrsRezHNa4YBzlKGN6bQXryD96W+4PU14zGbw/oLMf79EPbAI2g7M9+smP3fqPKVAT81LnFWnzM1y9gYC9gWtwTD6MEsq+Y8Lm7DMZ7cZxt5/T5xd8Fy5SfuC6fA4QZjdd8eEX9eLwAZ1StHKiT1MARStnHtWZH7bpjKIVgKutmipq50O94Mr6+9oKR8ekyy7x5qd9/NmYslynK4WfUjWOqiAFgElZmY+41BTzcrAkW9d9ptO9etgU7I8S3vVyDtkY/JzPwoxXzCJjt6Uy+r/fuGq/3affezkPRSniJ0y2zsqT6+n+BfRHKWgwbKNIAAAAAElFTkSuQmCC)](https://purpurmc.org/downloads/)
 
 Downloads API endpoints:
  * List versions of Minecraft with builds available:
@@ -67,7 +67,7 @@ Maven
 <dependency>
     <groupId>org.purpurmc.purpur</groupId>
     <artifactId>purpur-api</artifactId>
-    <version>1.20.2-R0.1-SNAPSHOT</version>
+    <version>1.20.6-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -80,7 +80,7 @@ repositories {
 ```
 ```kotlin
 dependencies {
-    compileOnly("org.purpurmc.purpur:purpur-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("org.purpurmc.purpur:purpur-api:1.20.5-R0.1-SNAPSHOT")
 }
 ```
 
@@ -114,7 +114,7 @@ Use the command `./gradlew build` to build the API and server. Compiled JARs
 will be placed under `Purpur-API/build/libs` and `Purpur-Server/build/libs`.
 **These JARs are not used to start a server.**
 
-To compile a server-ready purpurclip jar, run `./gradlew createReobfPaperclipJar`.
+To compile a server-ready purpurclip jar, run `./gradlew createMojmapBundlerJar`.
 To install the `purpur-api` and `purpur` dependencies to your local Maven repo, run `./gradlew publishToMavenLocal`. The compiled purpurclip jar will be in `build/libs/` not `Purpur-Server/build/libs`.
 
 Special Thanks To:
diff --git a/build.gradle.kts b/build.gradle.kts
index 67e3a89b8..44d772656 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,8 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.8"
+    id("io.papermc.paperweight.patcher") version "1.6.3"
 }
 
 allprojects {
@@ -14,7 +13,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
 }
@@ -24,7 +23,7 @@ val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 subprojects {
     tasks.withType<JavaCompile>().configureEach {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.release = 21
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -43,6 +42,7 @@ subprojects {
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") // TODO - Adventure snapshot
         maven("https://jitpack.io")
     }
 }
@@ -57,37 +57,43 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
+    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
+    decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 
 paperweight {
-    serverProject.set(project(":purpur-server"))
+    serverProject = project(":purpur-server")
 
-    remapRepo.set(paperMavenPublicUrl)
-    decompileRepo.set(paperMavenPublicUrl)
+    remapRepo = paperMavenPublicUrl
+    decompileRepo = paperMavenPublicUrl
 
     usePaperUpstream(providers.gradleProperty("paperCommit")) {
         withPaperPatcher {
-            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("Purpur-API"))
+            apiPatchDir = layout.projectDirectory.dir("patches/api")
+            apiOutputDir = layout.projectDirectory.dir("Purpur-API")
 
-            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
+            serverPatchDir = layout.projectDirectory.dir("patches/server")
+            serverOutputDir = layout.projectDirectory.dir("Purpur-Server")
+        }
+
+        patchTasks.register("generatedApi") {
+            isBareDirectory = true
+            upstreamDirPath = "paper-api-generator/generated"
+            patchDir = layout.projectDirectory.dir("patches/generated-api")
+            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
         }
     }
 }
 
 tasks.generateDevelopmentBundle {
-    apiCoordinates.set("org.purpurmc.purpur:purpur-api")
-    mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
-    libraryRepositories.set(
-        listOf(
-            "https://repo.maven.apache.org/maven2/",
-            paperMavenPublicUrl,
-            "https://repo.purpurmc.org/snapshots",
-        )
+    apiCoordinates = "org.purpurmc.purpur:purpur-api"
+    mojangApiCoordinates = "io.papermc.paper:paper-mojangapi"
+    libraryRepositories = listOf(
+        "https://repo.maven.apache.org/maven2/",
+        paperMavenPublicUrl,
+        "https://repo.purpurmc.org/snapshots",
+        "https://s01.oss.sonatype.org/content/repositories/snapshots/", // TODO - Adventure snapshot
     )
 }
 
diff --git a/gradle.properties b/gradle.properties
index a9302329e..84f8a3a7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group = org.purpurmc.purpur
-version = 1.20.2-R0.1-SNAPSHOT
+version = 1.20.6-R0.1-SNAPSHOT
 
-mcVersion = 1.20.2
-paperCommit = 4b0bc74c90582f2d52d720c795228130545cd103
+mcVersion = 1.20.6
+paperCommit = eee55d019fe80372c2e08ccd1d0a94c066cda926
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba771..e6441136f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c30b486a8..b82aa23a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f1..25da30dbd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/patches/api/0003-Purpur-config-files.patch b/patches/api/0001-Purpur-config-files.patch
similarity index 85%
rename from patches/api/0003-Purpur-config-files.patch
rename to patches/api/0001-Purpur-config-files.patch
index 52ccd2d70..d175ac5a8 100644
--- a/patches/api/0003-Purpur-config-files.patch
+++ b/patches/api/0001-Purpur-config-files.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..c71576fea7e0e7c3ad54912ed61d1ff20aaea4c2 100644
+index 30cbe3bdc7142769019765b03cc4fe1f9ba1ddb4..f5c3c1a0c11dd3518981ce3b86dba8ced8578d9c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2121,6 +2121,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2257,6 +2257,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
diff --git a/patches/api/0004-Build-System-Changes.patch b/patches/api/0002-Build-System-Changes.patch
similarity index 85%
rename from patches/api/0004-Build-System-Changes.patch
rename to patches/api/0002-Build-System-Changes.patch
index 2b261b1d6..75f91f3eb 100644
--- a/patches/api/0004-Build-System-Changes.patch
+++ b/patches/api/0002-Build-System-Changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0330a20576c372c29ca4d98a2bc5b01e28303ac3..67f31886a0e5025c1a66b6fb04b44430a9a103fc 100644
+index 65e67b8726f1e19a6bcb1fe2f448e4ab68df11d1..892e78b1d2d29dc54def03fcb6d85a93ad56d84c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -109,6 +109,8 @@ tasks.jar {
+@@ -121,6 +121,8 @@ tasks.jar {
  }
  
  tasks.withType<Javadoc> {
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0003-Purpur-client-support.patch
similarity index 82%
rename from patches/api/0005-Purpur-client-support.patch
rename to patches/api/0003-Purpur-client-support.patch
index e3e3bdc4e..c5e33fa12 100644
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0003-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 5c7a73ea74efe256c695080ba92b8cf698e4cd86..776c271631a2cb519d411892715c1dfa57e2489e 100644
+index 6c327a07bf8a6aa11a2d7dad12b2830acc539484..d972cb242102a3ee7c017299aed64340628c79d8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3278,4 +3278,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3806,4 +3806,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0006-Default-permissions.patch b/patches/api/0004-Default-permissions.patch
similarity index 100%
rename from patches/api/0006-Default-permissions.patch
rename to patches/api/0004-Default-permissions.patch
diff --git a/patches/api/0007-Ridables.patch b/patches/api/0005-Ridables.patch
similarity index 80%
rename from patches/api/0007-Ridables.patch
rename to patches/api/0005-Ridables.patch
index 615a3a165..fb93dd846 100644
--- a/patches/api/0007-Ridables.patch
+++ b/patches/api/0005-Ridables.patch
@@ -4,28 +4,11 @@ Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables
 
 
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..4160e968e7d7e8e2a953534a981a7330916ece2e 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -198,6 +198,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Mob> CLIMB_ON_TOP_OF_POWDER_SNOW = GoalKey.of(Mob.class, NamespacedKey.minecraft("climb_on_top_of_powder_snow"));
-     GoalKey<Wolf> WOLF_PANIC = GoalKey.of(Wolf.class, NamespacedKey.minecraft("wolf_panic"));
- 
-+    // Purpur start
-+    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
-+    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
-+    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
-+    // Purpur end
-+
-     /**
-      * @deprecated removed in 1.20.2
-      */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d340ddcf6924cc834455de3acbbac91ab9c66e39..656ea43ec614e5bf4d3474b9f02dafb970f33656 100644
+index 62e3793903905b94eb1a120345015149abb33713..50344412a04f3008439e337ecf9dd09c7f853bc9 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1065,4 +1065,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1155,4 +1155,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name
diff --git a/patches/api/0008-Allow-inventory-resizing.patch b/patches/api/0006-Allow-inventory-resizing.patch
similarity index 83%
rename from patches/api/0008-Allow-inventory-resizing.patch
rename to patches/api/0006-Allow-inventory-resizing.patch
index a93bb8a10..6b3fad2ac 100644
--- a/patches/api/0008-Allow-inventory-resizing.patch
+++ b/patches/api/0006-Allow-inventory-resizing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow inventory resizing
 
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index cbce826add9dc2b3187c7bea00c27b785d7517df..3a98de6407d9a6307f89c207be1f09e639385ebe 100644
+index 59b375569a75cb1e1f7c610f96078e102ec0d3ed..a3f74891abbdc51dbbddaeb511f2754e0603c904 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -151,7 +151,7 @@ public enum InventoryType {
+@@ -166,7 +166,7 @@ public enum InventoryType {
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
diff --git a/patches/api/0009-Llama-API.patch b/patches/api/0007-Llama-API.patch
similarity index 100%
rename from patches/api/0009-Llama-API.patch
rename to patches/api/0007-Llama-API.patch
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0008-AFK-API.patch
similarity index 93%
rename from patches/api/0010-AFK-API.patch
rename to patches/api/0008-AFK-API.patch
index 2996d7e49..d805660fb 100644
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0008-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 776c271631a2cb519d411892715c1dfa57e2489e..53f509afb6bd7e8afe2d25ec6de23ece8d1c2c18 100644
+index d972cb242102a3ee7c017299aed64340628c79d8..972cca3e02296f94099f965a4f7662ec63a067ea 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3286,5 +3286,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3814,5 +3814,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();
@@ -29,6 +29,7 @@ index 776c271631a2cb519d411892715c1dfa57e2489e..53f509afb6bd7e8afe2d25ec6de23ece
 +
 +    /**
 +     * Reset the idle timer back to 0
++     * @deprecated Use {@link #resetIdleDuration()} instead
 +     */
 +    void resetIdleTimer();
      // Purpur end
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch
similarity index 79%
rename from patches/api/0011-Bring-back-server-name.patch
rename to patches/api/0009-Bring-back-server-name.patch
index 19d0443a9..32c20281f 100644
--- a/patches/api/0011-Bring-back-server-name.patch
+++ b/patches/api/0009-Bring-back-server-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f78b5fd3c3347d28da58777bff88903d2eb140f6..7338dad470cd75814cce5be40f82058554484607 100644
+index 5d1b55fdbcbe63f6b42b694d05211a3cc691a09d..54f11593f4acfb89623cf1fad58819e001505fd1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2756,4 +2756,15 @@ public final class Bukkit {
+@@ -2910,4 +2910,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index f78b5fd3c3347d28da58777bff88903d2eb140f6..7338dad470cd75814cce5be40f820585
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c71576fea7e0e7c3ad54912ed61d1ff20aaea4c2..fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f 100644
+index f5c3c1a0c11dd3518981ce3b86dba8ced8578d9c..1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2416,4 +2416,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2552,4 +2552,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API
diff --git a/patches/api/0012-ExecuteCommandEvent.patch b/patches/api/0010-ExecuteCommandEvent.patch
similarity index 100%
rename from patches/api/0012-ExecuteCommandEvent.patch
rename to patches/api/0010-ExecuteCommandEvent.patch
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0011-Lagging-threshold.patch
similarity index 79%
rename from patches/api/0014-Lagging-threshold.patch
rename to patches/api/0011-Lagging-threshold.patch
index 23b7d9905..428bbf5fb 100644
--- a/patches/api/0014-Lagging-threshold.patch
+++ b/patches/api/0011-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7338dad470cd75814cce5be40f82058554484607..a32155e0cc63d4e4714a953edbae0b19544ff3ef 100644
+index 54f11593f4acfb89623cf1fad58819e001505fd1..215647d7f5cc8487d6a173bc0160fec6db1971eb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2766,5 +2766,14 @@ public final class Bukkit {
+@@ -2920,5 +2920,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 7338dad470cd75814cce5be40f82058554484607..a32155e0cc63d4e4714a953edbae0b19
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f..5b8ce8a5658021c6fdfeabca6c7bb31ebc58e71d 100644
+index 1299cab5a4a0a017e0a1b792539d9b6fb8ef6c54..7f9dc209c88a66bd2ee82cc62b948e827c6b1060 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2424,5 +2424,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2560,5 +2560,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0012-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/api/0012-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/api/0016-Anvil-API.patch b/patches/api/0013-Anvil-API.patch
similarity index 100%
rename from patches/api/0016-Anvil-API.patch
rename to patches/api/0013-Anvil-API.patch
diff --git a/patches/api/0017-ItemStack-convenience-methods.patch b/patches/api/0014-ItemStack-convenience-methods.patch
similarity index 88%
rename from patches/api/0017-ItemStack-convenience-methods.patch
rename to patches/api/0014-ItemStack-convenience-methods.patch
index 05bc102c9..979571e73 100644
--- a/patches/api/0017-ItemStack-convenience-methods.patch
+++ b/patches/api/0014-ItemStack-convenience-methods.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 8a948a61d0bdb06b0b9a6eac8a27baeb35a7d36c..f6e0b39ba9ea34613ecb22c55d5c38d5dcad9a82 100644
+index 7a337fe908915f8ea487a0b9236c511cb07d5e66..1dd02e2782364bf25521088cf8858d3443643447 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -11050,4 +11050,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -11657,4 +11657,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public boolean isEnabledByFeature(@NotNull World world) {
          return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
      }
@@ -50,10 +50,10 @@ index 8a948a61d0bdb06b0b9a6eac8a27baeb35a7d36c..f6e0b39ba9ea34613ecb22c55d5c38d5
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a129033b7 100644
+index 84a7bf0936d35bf42b5ed038d295d5c31740f472..6e9b4cbc81878616b1c48add5db534286d267b05 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
+@@ -17,6 +17,17 @@ import org.bukkit.inventory.meta.ItemMeta;
  import org.bukkit.material.MaterialData;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
@@ -67,15 +67,14 @@ index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a
 +import org.bukkit.inventory.meta.Repairable;
 +import org.bukkit.persistence.PersistentDataContainer;
 +import org.bukkit.persistence.PersistentDataHolder;
-+import com.destroystokyo.paper.Namespaced;
 +// Purpur end
  
  /**
   * Represents a stack of items.
-@@ -1005,4 +1017,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-         return type.isAir() || amount <= 0;
+@@ -1073,4 +1084,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+         return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
-     // Paper end
+     // Paper end - expose itemstack tooltip lines
 +
 +    // Purpur start
 +    /**
@@ -557,67 +556,6 @@ index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a
 +    }
 +
 +    /**
-+     * Gets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @return Set of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    @NotNull
-+    public java.util.Set<Namespaced> getDestroyableKeys() {
-+        return getItemMeta().getDestroyableKeys();
-+    }
-+
-+    /**
-+     * Sets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @param canDestroy Collection of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    public void setDestroyableKeys(@NotNull Collection<Namespaced> canDestroy) {
-+        ItemMeta itemMeta = getItemMeta();
-+        itemMeta.setDestroyableKeys(canDestroy);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Gets the collection of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @return Set of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    @NotNull
-+    public java.util.Set<Namespaced> getPlaceableKeys() {
-+        return getItemMeta().getPlaceableKeys();
-+    }
-+
-+    /**
-+     * Sets the set of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE}
-+     *
-+     * @param canPlaceOn Collection of {@link com.destroystokyo.paper.Namespaced}
-+     */
-+    @NotNull
-+    public void setPlaceableKeys(@NotNull Collection<Namespaced> canPlaceOn) {
-+        ItemMeta itemMeta = getItemMeta();
-+        itemMeta.setPlaceableKeys(canPlaceOn);
-+        setItemMeta(itemMeta);
-+    }
-+
-+    /**
-+     * Checks for the existence of any keys that the item can be placed on
-+     *
-+     * @return true if this item has placeable keys
-+     */
-+    public boolean hasPlaceableKeys() {
-+        return hasItemMeta() && getItemMeta().hasPlaceableKeys();
-+    }
-+
-+    /**
-+     * Checks for the existence of any keys that the item can destroy
-+     *
-+     * @return true if this item has destroyable keys
-+     */
-+    public boolean hasDestroyableKeys() {
-+        return hasItemMeta() && getItemMeta().hasDestroyableKeys();
-+    }
-+
-+    /**
 +     * Repairs this item by 1 durability
 +     */
 +    public void repair() {
@@ -662,7 +600,7 @@ index 0af73cc04edb93b9772136d4d808f657ea40e733..c733206b769d7a55076d863757fcac1a
 +    public boolean damage(int amount, boolean ignoreUnbreaking) {
 +        Damageable damageable = (Damageable) getItemMeta();
 +        if (amount > 0) {
-+            int unbreaking = getEnchantLevel(Enchantment.DURABILITY);
++            int unbreaking = getEnchantLevel(Enchantment.UNBREAKING);
 +            int reduce = 0;
 +            for (int i = 0; unbreaking > 0 && i < amount; ++i) {
 +                if (reduceDamage(java.util.concurrent.ThreadLocalRandom.current(), unbreaking)) {
diff --git a/patches/api/0020-LivingEntity-broadcastItemBreak.patch b/patches/api/0015-LivingEntity-broadcastItemBreak.patch
similarity index 72%
rename from patches/api/0020-LivingEntity-broadcastItemBreak.patch
rename to patches/api/0015-LivingEntity-broadcastItemBreak.patch
index ebc874b8b..439fc7df5 100644
--- a/patches/api/0020-LivingEntity-broadcastItemBreak.patch
+++ b/patches/api/0015-LivingEntity-broadcastItemBreak.patch
@@ -5,19 +5,20 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index c5dcfd380206603c2979aa02e7094fef27348eab..accefccca9993edd00f72b4e5779fce0b3ee628f 100644
+index b777e530122549455dcce6fac8d4a151c1c0af42..aba9952b2256b058eb413ce93f3305c861a200db 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1207,5 +1207,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      * @param safeFallDistance Safe fall distance
+@@ -1447,4 +1447,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
-     void setSafeFallDistance(float safeFallDistance);
+     void setBodyYaw(float bodyYaw);
+     // Paper end - body yaw API
 +
++    // Purpur start
 +    /**
 +     * Play item break animation for the item in specified equipment slot
 +     *
 +     * @param slot Equipment slot to play break animation for
 +     */
 +    void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);
-     // Purpur end
++    // Purpur end
  }
diff --git a/patches/api/0019-ChatColor-conveniences.patch b/patches/api/0016-ChatColor-conveniences.patch
similarity index 100%
rename from patches/api/0019-ChatColor-conveniences.patch
rename to patches/api/0016-ChatColor-conveniences.patch
diff --git a/patches/api/0021-Item-entity-immunities.patch b/patches/api/0017-Item-entity-immunities.patch
similarity index 95%
rename from patches/api/0021-Item-entity-immunities.patch
rename to patches/api/0017-Item-entity-immunities.patch
index 9fd92a3af..dd689e3cd 100644
--- a/patches/api/0021-Item-entity-immunities.patch
+++ b/patches/api/0017-Item-entity-immunities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index 58017fce436cdbda255f7172fbdadb726d4b113c..05600fc8bf2a61aca8094029bc4c208a710da952 100644
+index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e641149ea5960 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -153,4 +153,62 @@ public interface Item extends Entity, io.papermc.paper.entity.Frictional { // Pa
diff --git a/patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0018-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 95%
rename from patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/api/0018-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
index af1641fb8..e6dd23224 100644
--- a/patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/api/0018-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
 
 
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d48ecd051 100644
+index db8bcc66bdc4bedfffb4705db6338eda4c0ad29a..feda3ddfaaf37b6ee218a0e0b1fbc199899bd364 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -10,6 +10,7 @@ import java.util.function.Predicate;
diff --git a/patches/api/0019-Rabid-Wolf-API.patch b/patches/api/0019-Rabid-Wolf-API.patch
new file mode 100644
index 000000000..fa9743084
--- /dev/null
+++ b/patches/api/0019-Rabid-Wolf-API.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Encode42 <me@encode42.dev>
+Date: Tue, 8 Dec 2020 17:15:15 -0500
+Subject: [PATCH] Rabid Wolf API
+
+
+diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
+index 4b84c04675775e2a606630b00de8afe51665cebc..ccbaf40a3131f477b4be2264401ad893725c1162 100644
+--- a/src/main/java/org/bukkit/entity/Wolf.java
++++ b/src/main/java/org/bukkit/entity/Wolf.java
+@@ -112,4 +112,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
+             return variant;
+         }
+     }
++
++    // Purpur start
++    /**
++     * Checks if this wolf is rabid
++     *
++     * @return whether the wolf is rabid
++     */
++    public boolean isRabid();
++
++    /**
++     * Sets this wolf to be rabid or not
++     *
++     * @param rabid whether the wolf should be rabid
++     */
++    public void setRabid(boolean rabid);
++    // Purpur end
+ }
diff --git a/patches/api/0025-PlayerBookTooLargeEvent.patch b/patches/api/0020-PlayerBookTooLargeEvent.patch
similarity index 100%
rename from patches/api/0025-PlayerBookTooLargeEvent.patch
rename to patches/api/0020-PlayerBookTooLargeEvent.patch
diff --git a/patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0021-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/api/0021-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/api/0027-Add-EntityTeleportHinderedEvent.patch b/patches/api/0022-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/api/0027-Add-EntityTeleportHinderedEvent.patch
rename to patches/api/0022-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0023-Add-enchantment-target-for-bows-and-crossbows.patch
similarity index 100%
rename from patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch
rename to patches/api/0023-Add-enchantment-target-for-bows-and-crossbows.patch
diff --git a/patches/api/0030-API-for-any-mob-to-burn-daylight.patch b/patches/api/0024-API-for-any-mob-to-burn-daylight.patch
similarity index 82%
rename from patches/api/0030-API-for-any-mob-to-burn-daylight.patch
rename to patches/api/0024-API-for-any-mob-to-burn-daylight.patch
index 6343a7bd2..eb412045f 100644
--- a/patches/api/0030-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/api/0024-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 656ea43ec614e5bf4d3474b9f02dafb970f33656..ee3ca27a5406024ed71cce14b0891266b64e6fdf 100644
+index 50344412a04f3008439e337ecf9dd09c7f853bc9..f482467ae784b134da97eb38afb7f12585520297 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1095,5 +1095,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1185,5 +1185,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();
@@ -23,10 +23,10 @@ index 656ea43ec614e5bf4d3474b9f02dafb970f33656..ee3ca27a5406024ed71cce14b0891266
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index accefccca9993edd00f72b4e5779fce0b3ee628f..994e026d68fcda9a4c34a8b161a06623f4437dff 100644
+index aba9952b2256b058eb413ce93f3305c861a200db..61a046584acf48693489ff551a0dd4c4b16af9ff 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1214,5 +1214,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1455,5 +1455,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param slot Equipment slot to play break animation for
       */
      void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);
diff --git a/patches/api/0024-Rabid-Wolf-API.patch b/patches/api/0024-Rabid-Wolf-API.patch
deleted file mode 100644
index 6814613b5..000000000
--- a/patches/api/0024-Rabid-Wolf-API.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Encode42 <me@encode42.dev>
-Date: Tue, 8 Dec 2020 17:15:15 -0500
-Subject: [PATCH] Rabid Wolf API
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index ce2eb58b86cd638d91f2bf9a8da60db499685fc9..8671b9042df2e219921615144a6ca868fa346d77 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -206,6 +206,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
-     GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
-     GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
-+    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
-     // Purpur end
- 
-     /**
-diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 84db38388bf7a58e66d6cd29620b4fe64b0a897e..82ebd99549ce9f9e6427a50cef424e9007735708 100644
---- a/src/main/java/org/bukkit/entity/Wolf.java
-+++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -69,4 +69,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
-      * @param interested Whether the wolf is interested
-      */
-     public void setInterested(boolean interested);
-+
-+    // Purpur start
-+    /**
-+     * Checks if this wolf is rabid
-+     *
-+     * @return whether the wolf is rabid
-+     */
-+    public boolean isRabid();
-+
-+    /**
-+     * Sets this wolf to be rabid or not
-+     *
-+     * @param rabid whether the wolf should be rabid
-+     */
-+    public void setRabid(boolean rabid);
-+    // Purpur end
- }
diff --git a/patches/api/0031-Add-back-player-spawned-endermite-API.patch b/patches/api/0025-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/api/0031-Add-back-player-spawned-endermite-API.patch
rename to patches/api/0025-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/api/0032-Fix-default-permission-system.patch b/patches/api/0026-Fix-default-permission-system.patch
similarity index 100%
rename from patches/api/0032-Fix-default-permission-system.patch
rename to patches/api/0026-Fix-default-permission-system.patch
diff --git a/patches/api/0033-Summoner-API.patch b/patches/api/0027-Summoner-API.patch
similarity index 100%
rename from patches/api/0033-Summoner-API.patch
rename to patches/api/0027-Summoner-API.patch
diff --git a/patches/api/0034-Clean-up-version-command-output.patch b/patches/api/0028-Clean-up-version-command-output.patch
similarity index 100%
rename from patches/api/0034-Clean-up-version-command-output.patch
rename to patches/api/0028-Clean-up-version-command-output.patch
diff --git a/patches/api/0035-Extended-OfflinePlayer-API.patch b/patches/api/0029-Extended-OfflinePlayer-API.patch
similarity index 90%
rename from patches/api/0035-Extended-OfflinePlayer-API.patch
rename to patches/api/0029-Extended-OfflinePlayer-API.patch
index 467cdf300..af97d3dd0 100644
--- a/patches/api/0035-Extended-OfflinePlayer-API.patch
+++ b/patches/api/0029-Extended-OfflinePlayer-API.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Extended OfflinePlayer API
 
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a322acadecc 100644
+index 30298a629b39bd43ce14b414fc697b2dfcbea89c..ce00af9121de7a910aaea4e0685a06d4cf31b4e3 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -522,4 +522,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -557,4 +557,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
-     public Location getLastDeathLocation();
+     public Location getLocation();
 +
 +    // Purpur start - OfflinePlayer API
 +    /**
@@ -79,14 +79,6 @@ index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a32
 +    public float getWalkSpeed();
 +
 +    /**
-+     * Gets the entity's current position
-+     *
-+     * @return a new copy of Location containing the position of this offline player
-+     */
-+    @Nullable
-+    public Location getLocation();
-+
-+    /**
 +     * Sets OfflinePlayer's location. If player is online, it falls back to the Player#teleport implementation.
 +     *
 +     * @param destination
diff --git a/patches/api/0036-Added-the-ability-to-add-combustible-items.patch b/patches/api/0030-Added-the-ability-to-add-combustible-items.patch
similarity index 85%
rename from patches/api/0036-Added-the-ability-to-add-combustible-items.patch
rename to patches/api/0030-Added-the-ability-to-add-combustible-items.patch
index 58ef1ffd8..597454cba 100644
--- a/patches/api/0036-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0030-Added-the-ability-to-add-combustible-items.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a32155e0cc63d4e4714a953edbae0b19544ff3ef..222dcb75a850d224ac22b2e06895233527cffc76 100644
+index 215647d7f5cc8487d6a173bc0160fec6db1971eb..7bc4e5e9947ab646707a5c0b39c70c0cc6606bd8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2775,5 +2775,24 @@ public final class Bukkit {
+@@ -2929,5 +2929,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index a32155e0cc63d4e4714a953edbae0b19544ff3ef..222dcb75a850d224ac22b2e068952335
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5b8ce8a5658021c6fdfeabca6c7bb31ebc58e71d..3bc9fa8b68b284516ddbf0ace0c1dc52768307cb 100644
+index 7f9dc209c88a66bd2ee82cc62b948e827c6b1060..fa926319ff033768d78508491e072efec1dcbc9f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2431,5 +2431,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2567,5 +2567,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();
diff --git a/patches/api/0038-Grindstone-API.patch b/patches/api/0031-Grindstone-API.patch
similarity index 100%
rename from patches/api/0038-Grindstone-API.patch
rename to patches/api/0031-Grindstone-API.patch
diff --git a/patches/api/0039-Shears-can-have-looting-enchantment.patch b/patches/api/0032-Shears-can-have-looting-enchantment.patch
similarity index 100%
rename from patches/api/0039-Shears-can-have-looting-enchantment.patch
rename to patches/api/0032-Shears-can-have-looting-enchantment.patch
diff --git a/patches/api/0040-Lobotomize-stuck-villagers.patch b/patches/api/0033-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from patches/api/0040-Lobotomize-stuck-villagers.patch
rename to patches/api/0033-Lobotomize-stuck-villagers.patch
diff --git a/patches/api/0041-Add-local-difficulty-api.patch b/patches/api/0034-Add-local-difficulty-api.patch
similarity index 84%
rename from patches/api/0041-Add-local-difficulty-api.patch
rename to patches/api/0034-Add-local-difficulty-api.patch
index d4313c3d9..46e1e1486 100644
--- a/patches/api/0041-Add-local-difficulty-api.patch
+++ b/patches/api/0034-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 8d861f5522a33669f67b3e41dfbc5234637114b4..d12443e6e1f71354dcfab9cf2f166a1097b589b5 100644
+index 97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e..099516b90c504205b894b387542221e8c0c98b40 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4010,6 +4010,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4249,6 +4249,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
diff --git a/patches/api/0042-Remove-Timings.patch b/patches/api/0035-Remove-Timings.patch
similarity index 100%
rename from patches/api/0042-Remove-Timings.patch
rename to patches/api/0035-Remove-Timings.patch
diff --git a/patches/api/0043-Add-Bee-API.patch b/patches/api/0036-Add-Bee-API.patch
similarity index 100%
rename from patches/api/0043-Add-Bee-API.patch
rename to patches/api/0036-Add-Bee-API.patch
diff --git a/patches/api/0044-Debug-Marker-API.patch b/patches/api/0037-Debug-Marker-API.patch
similarity index 95%
rename from patches/api/0044-Debug-Marker-API.patch
rename to patches/api/0037-Debug-Marker-API.patch
index 5613ac07f..8541e74ea 100644
--- a/patches/api/0044-Debug-Marker-API.patch
+++ b/patches/api/0037-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 222dcb75a850d224ac22b2e06895233527cffc76..584e3b08935f43beb27f478cc72229b6a5f40689 100644
+index 7bc4e5e9947ab646707a5c0b39c70c0cc6606bd8..70ef8f63ab79e102cb4326c21cc344488f4fbdd3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2794,5 +2794,89 @@ public final class Bukkit {
+@@ -2948,5 +2948,89 @@ public final class Bukkit {
      public static void removeFuel(@NotNull Material material) {
          server.removeFuel(material);
      }
@@ -99,10 +99,10 @@ index 222dcb75a850d224ac22b2e06895233527cffc76..584e3b08935f43beb27f478cc72229b6
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd3fbddddd 100644
+index fa926319ff033768d78508491e072efec1dcbc9f..320422ff95773efa01e8205edcc5c6c9a84d5ecd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2446,5 +2446,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2582,5 +2582,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param material The material that will no longer be a fuel
       */
      public void removeFuel(@NotNull Material material);
@@ -179,10 +179,10 @@ index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d12443e6e1f71354dcfab9cf2f166a1097b589b5..9a1526d3da2052815404328c2022119b98db7aa4 100644
+index 099516b90c504205b894b387542221e8c0c98b40..83a5b68c785a88594e6e3824ed282844086f7f1a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4018,6 +4018,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4257,6 +4257,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The local difficulty
       */
      public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,11 +260,11 @@ index d12443e6e1f71354dcfab9cf2f166a1097b589b5..9a1526d3da2052815404328c2022119b
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c2ab25febe558b9653cd740c477dfd7ffd9b0318..b72415a388862736af005bb2bf8d283bacfb90d9 100644
+index 972cca3e02296f94099f965a4f7662ec63a067ea..ec49be86fa9b2612ae2853f06f503bffa3a1271d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3305,5 +3305,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * Reset the idle timer back to 0
+@@ -3834,5 +3834,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @deprecated Use {@link #resetIdleDuration()} instead
       */
      void resetIdleTimer();
 +
diff --git a/patches/api/0045-Add-death-screen-API.patch b/patches/api/0038-Add-death-screen-API.patch
similarity index 89%
rename from patches/api/0045-Add-death-screen-API.patch
rename to patches/api/0038-Add-death-screen-API.patch
index 5e935d4ae..68f89598e 100644
--- a/patches/api/0045-Add-death-screen-API.patch
+++ b/patches/api/0038-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 460b8d831049e1bff94b87eaeeabb38e2cc3462e..b9a2001eaf83ab3445f3e44631c60705ac858b98 100644
+index ec49be86fa9b2612ae2853f06f503bffa3a1271d..d057743b8f6a463434c1f76398c7a98614b19d47 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3375,5 +3375,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3904,5 +3904,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();
diff --git a/patches/api/0047-Language-API.patch b/patches/api/0039-Language-API.patch
similarity index 100%
rename from patches/api/0047-Language-API.patch
rename to patches/api/0039-Language-API.patch
diff --git a/patches/api/0048-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0040-Add-log-suppression-for-LibraryLoader.patch
similarity index 87%
rename from patches/api/0048-Add-log-suppression-for-LibraryLoader.patch
rename to patches/api/0040-Add-log-suppression-for-LibraryLoader.patch
index 95e4cd2ac..d1a85cb9d 100644
--- a/patches/api/0048-Add-log-suppression-for-LibraryLoader.patch
+++ b/patches/api/0040-Add-log-suppression-for-LibraryLoader.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5 100644
+index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d0a67e8be 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -17,10 +17,10 @@ index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c
      /**
       * This class was not meant to be constructed explicitly
 diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a0a9ec796 100644
+index 8e1b6be2462aaa692efa1f72986921a6dc357196..b6e18b12fd4d61ce92203582906d24b4d14e6cc5 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-@@ -65,6 +65,7 @@ public class LibraryLoader
+@@ -68,6 +68,7 @@ public class LibraryLoader
              @Override
              public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
              {
@@ -28,7 +28,7 @@ index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a
                  logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
              }
          } );
-@@ -80,6 +81,7 @@ public class LibraryLoader
+@@ -88,6 +89,7 @@ public class LibraryLoader
          {
              return null;
          }
@@ -36,7 +36,7 @@ index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a
          logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
          {
              java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
-@@ -118,6 +120,7 @@ public class LibraryLoader
+@@ -135,6 +137,7 @@ public class LibraryLoader
              }
  
              jarFiles.add( url );
diff --git a/patches/api/0049-Fire-Immunity-API.patch b/patches/api/0041-Fire-Immunity-API.patch
similarity index 84%
rename from patches/api/0049-Fire-Immunity-API.patch
rename to patches/api/0041-Fire-Immunity-API.patch
index d40117288..d84da08f3 100644
--- a/patches/api/0049-Fire-Immunity-API.patch
+++ b/patches/api/0041-Fire-Immunity-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index ee3ca27a5406024ed71cce14b0891266b64e6fdf..f21a0fa8420b3fd0a3655a0af998da8f8a66c4b1 100644
+index f482467ae784b134da97eb38afb7f12585520297..07b8c0dd049ff783fd2e408be634642479bf8b1e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1102,5 +1102,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1192,5 +1192,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if in daylight
       */
      boolean isInDaylight();
diff --git a/patches/api/0050-Added-goat-ram-event.patch b/patches/api/0042-Added-goat-ram-event.patch
similarity index 100%
rename from patches/api/0050-Added-goat-ram-event.patch
rename to patches/api/0042-Added-goat-ram-event.patch
diff --git a/patches/api/0051-Add-PreExplodeEvents.patch b/patches/api/0043-Add-PreExplodeEvents.patch
similarity index 93%
rename from patches/api/0051-Add-PreExplodeEvents.patch
rename to patches/api/0043-Add-PreExplodeEvents.patch
index 5ba7e435d..db26aac79 100644
--- a/patches/api/0051-Add-PreExplodeEvents.patch
+++ b/patches/api/0043-Add-PreExplodeEvents.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add PreExplodeEvents
 
 diff --git a/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..32602b398ede24a35ed8a996faa2b23455615a7b
+index 0000000000000000000000000000000000000000..8ea97ddceedb7c719e8a50a0dd8f3f0919ca1647
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,53 @@
 +package org.purpurmc.purpur.event;
 +
 +import org.bukkit.block.Block;
@@ -18,7 +18,6 @@ index 0000000000000000000000000000000000000000..32602b398ede24a35ed8a996faa2b234
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.block.BlockExplodeEvent;
 +import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
 +import java.util.Collections;
 +
 +/**
@@ -29,8 +28,8 @@ index 0000000000000000000000000000000000000000..32602b398ede24a35ed8a996faa2b234
 +    private boolean cancelled;
 +    private final float yield;
 +
-+    public PreBlockExplodeEvent(@NotNull final Block what, final float yield, @Nullable BlockState explodedBlockState) {
-+        super(what, Collections.emptyList(), yield, explodedBlockState);
++    public PreBlockExplodeEvent(@NotNull final Block what, final float yield, @NotNull BlockState explodedBlockState) {
++        super(what, explodedBlockState, Collections.emptyList(), yield);
 +        this.yield = yield;
 +        this.cancelled = false;
 +    }
diff --git a/patches/api/0052-Stored-Bee-API.patch b/patches/api/0044-Stored-Bee-API.patch
similarity index 100%
rename from patches/api/0052-Stored-Bee-API.patch
rename to patches/api/0044-Stored-Bee-API.patch
diff --git a/patches/api/0053-Explorer-Map-API.patch b/patches/api/0045-Explorer-Map-API.patch
similarity index 100%
rename from patches/api/0053-Explorer-Map-API.patch
rename to patches/api/0045-Explorer-Map-API.patch
diff --git a/patches/api/0046-Stonecutter-damage.patch b/patches/api/0046-Stonecutter-damage.patch
new file mode 100644
index 000000000..8d0888381
--- /dev/null
+++ b/patches/api/0046-Stonecutter-damage.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: granny <contact@granny.dev>
+Date: Sun, 11 Feb 2024 23:07:47 -0800
+Subject: [PATCH] Stonecutter damage
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+@@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
+         WORLD_BORDER,
+         /**
+          * Damage caused when an entity contacts a block such as a Cactus,
+-         * Dripstone (Stalagmite) or Berry Bush.
++         * Dripstone (Stalagmite) or Berry Bush. (Stonecutters too if you
++         * have the Stonecutter damage Purpur feature enabled)
+          * <p>
+          * Damage: variable
+          */
diff --git a/patches/api/0013-LivingEntity-safeFallDistance.patch b/patches/dropped-api/0011-LivingEntity-safeFallDistance.patch
similarity index 69%
rename from patches/api/0013-LivingEntity-safeFallDistance.patch
rename to patches/dropped-api/0011-LivingEntity-safeFallDistance.patch
index dc208aa25..a858bf887 100644
--- a/patches/api/0013-LivingEntity-safeFallDistance.patch
+++ b/patches/dropped-api/0011-LivingEntity-safeFallDistance.patch
@@ -5,27 +5,31 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 19e58e62ae442ef9be02ca7fa2f55e370a54afa4..c5dcfd380206603c2979aa02e7094fef27348eab 100644
+index b777e530122549455dcce6fac8d4a151c1c0af42..57a3e330043077f042a284c99e2631e1582cb32c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1192,4 +1192,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1447,4 +1447,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
-     // Paper end
+     // Paper end - body yaw API
 +
 +    // Purpur start
 +    /**
 +     * Gets the distance (in blocks) this entity can safely fall without taking damage
 +     *
 +     * @return Safe fall distance
++     * @deprecated use {@link org.bukkit.attribute.Attribute#GENERIC_SAFE_FALL_DISTANCE} instead
 +     */
++    @Deprecated
 +    float getSafeFallDistance();
 +
 +    /**
 +     * Set the distance (in blocks) this entity can safely fall without taking damage
 +     *
 +     * @param safeFallDistance Safe fall distance
++     * @deprecated use {@link org.bukkit.attribute.Attribute#GENERIC_SAFE_FALL_DISTANCE} instead
 +     */
++    @Deprecated
 +    void setSafeFallDistance(float safeFallDistance);
 +    // Purpur end
  }
diff --git a/patches/api/0037-Potion-NamespacedKey.patch b/patches/dropped-api/0032-Potion-NamespacedKey.patch
similarity index 66%
rename from patches/api/0037-Potion-NamespacedKey.patch
rename to patches/dropped-api/0032-Potion-NamespacedKey.patch
index 0f9acc882..b26f1772c 100644
--- a/patches/api/0037-Potion-NamespacedKey.patch
+++ b/patches/dropped-api/0032-Potion-NamespacedKey.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Potion NamespacedKey
 
 
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf235eba7e89 100644
+index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5b582290c 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
-@@ -32,12 +32,14 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -33,6 +33,7 @@ public class PotionEffect implements ConfigurationSerializable {
      private static final String AMBIENT = "ambient";
      private static final String PARTICLES = "has-particles";
      private static final String ICON = "has-icon";
@@ -16,34 +16,46 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      private final int amplifier;
      private final int duration;
      private final PotionEffectType type;
-     private final boolean ambient;
+@@ -40,6 +41,7 @@ public class PotionEffect implements ConfigurationSerializable {
      private final boolean particles;
      private final boolean icon;
+     private final PotionEffect hiddenEffect; // Paper
 +    @Nullable private final NamespacedKey key; // Purpur
  
      /**
       * Creates a potion effect.
-@@ -50,6 +52,36 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -50,11 +52,12 @@ public class PotionEffect implements ConfigurationSerializable {
+      * @param ambient the ambient status, see {@link PotionEffect#isAmbient()}
+      * @param particles the particle status, see {@link PotionEffect#hasParticles()}
+      * @param icon the icon status, see {@link PotionEffect#hasIcon()}
++     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
+      * @param hiddenEffect the hidden PotionEffect
+      * @hidden Internal-- hidden effects are only shown internally
+      */
+     @org.jetbrains.annotations.ApiStatus.Internal // Paper
+-    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable PotionEffect hiddenEffect) { // Paper
++    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable PotionEffect hiddenEffect, @Nullable NamespacedKey key) { // Paper // Purpur
+         Preconditions.checkArgument(type != null, "effect type cannot be null");
+         this.type = type;
+         this.duration = duration;
+@@ -62,6 +65,7 @@ public class PotionEffect implements ConfigurationSerializable {
+         this.ambient = ambient;
+         this.particles = particles;
+         this.icon = icon;
++        this.key = key; // Purpur
+         // Paper start
+         this.hiddenEffect = hiddenEffect;
+     }
+@@ -77,10 +81,27 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param icon the icon status, see {@link PotionEffect#hasIcon()}
       */
      public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon) {
-+        // Purpur start
-+        this(type, duration, amplifier, ambient, particles, icon, null);
-+    }
-+
-+    /**
-+     * Create a potion effect.
-+     * @param duration measured in ticks, see {@link
-+     *     PotionEffect#getDuration()}
-+     * @param amplifier the amplifier, see {@link PotionEffect#getAmplifier()}
-+     * @param ambient the ambient status, see {@link PotionEffect#isAmbient()}
-+     * @param particles the particle status, see {@link PotionEffect#hasParticles()}
-+     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
-+     */
-+    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, @Nullable NamespacedKey key) {
-+        this(type, duration, amplifier, ambient, particles, particles, key);
-+    }
-+
+-        this(type, duration, amplifier, ambient, particles, icon, null);
++        this(type, duration, amplifier, ambient, particles, icon, null, null); // Purpur
+         // Paper end
+     }
+ 
++    // Purpur start
 +    /**
 +     * Creates a potion effect.
 +     * @param type effect type
@@ -56,24 +68,19 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
 +     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
 +     */
 +    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable NamespacedKey key) {
-+        // Purpur end
-         Preconditions.checkArgument(type != null, "effect type cannot be null");
-         this.type = type;
-         this.duration = duration;
-@@ -57,6 +89,7 @@ public class PotionEffect implements ConfigurationSerializable {
-         this.ambient = ambient;
-         this.particles = particles;
-         this.icon = icon;
-+        this.key = key; // Purpur - add key
-     }
- 
++        this(type, duration, amplifier, ambient, particles, icon, null, key);
++    }
++    // Purpur end
++
      /**
-@@ -104,36 +137,43 @@ public class PotionEffect implements ConfigurationSerializable {
+      * Creates a potion effect with no defined color.
+      *
+@@ -126,33 +147,33 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param map the map to deserialize from
       */
      public PotionEffect(@NotNull Map<String, Object> map) {
--        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)));
-+        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), getKey(map)); // Purpur - getKey
+-        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), (PotionEffect) map.get(HIDDEN_EFFECT)); // Paper
++        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), (PotionEffect) map.get(HIDDEN_EFFECT), getKey(map)); // Paper // Purpur - getKey
      }
  
      // Paper start
@@ -107,6 +114,10 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
 -        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
 +        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon, key); // Purpur - add key
      }
+ 
+     /**
+@@ -169,6 +190,13 @@ public class PotionEffect implements ConfigurationSerializable {
+     }
      // Paper end
  
 +    // Purpur start
@@ -119,7 +130,7 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      @NotNull
      private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
          PotionEffectType effect;
-@@ -166,17 +206,33 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -201,6 +229,17 @@ public class PotionEffect implements ConfigurationSerializable {
          return def;
      }
  
@@ -137,35 +148,28 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      @Override
      @NotNull
      public Map<String, Object> serialize() {
--        return ImmutableMap.<String, Object>builder()
-+        // Purpur start - add key, don't serialize if null.
-+        ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder()
-             .put(TYPE, type.getKey().toString())
-             .put(DURATION, duration)
-             .put(AMPLIFIER, amplifier)
-             .put(AMBIENT, ambient)
-             .put(PARTICLES, particles)
--            .put(ICON, icon)
--            .build();
-+            .put(ICON, icon);
-+        if(key != null) {
+@@ -215,6 +254,11 @@ public class PotionEffect implements ConfigurationSerializable {
+         if (this.hiddenEffect != null) {
+             builder.put(HIDDEN_EFFECT, this.hiddenEffect);
+         }
++        // Purpur start
++        if (key != null) {
 +            builder.put(KEY, key.toString());
 +        }
-+        return builder.build();
 +        // Purpur end
+         return builder.build();
+         // Paper end
      }
- 
-     /**
-@@ -200,7 +256,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -243,7 +287,7 @@ public class PotionEffect implements ConfigurationSerializable {
              return false;
          }
          PotionEffect that = (PotionEffect) obj;
--        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon;
-+        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && this.key == that.key; // Purpur - add key
+-        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && java.util.Objects.equals(this.hiddenEffect, that.hiddenEffect); // Paper
++        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && java.util.Objects.equals(this.hiddenEffect, that.hiddenEffect) && this.key == that.key; // Paper // Purpur - add key
      }
  
      /**
-@@ -296,6 +352,24 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -339,6 +383,24 @@ public class PotionEffect implements ConfigurationSerializable {
          return icon;
      }
  
@@ -190,11 +194,11 @@ index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf23
      @Override
      public int hashCode() {
          int hash = 1;
-@@ -310,6 +384,6 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -354,6 +416,6 @@ public class PotionEffect implements ConfigurationSerializable {
  
      @Override
      public String toString() {
--        return type.getName() + (ambient ? ":(" : ":") + duration + "t-x" + amplifier + (ambient ? ")" : "");
-+        return type.getName() + (ambient ? ":(" : ":") + duration + "t-x" + amplifier + (ambient ? ")" : "") + (hasKey() ? "(" + key + ")" : ""); // Purpur - add key if not null
+-        return "PotionEffect{" + "amplifier=" + amplifier + ", duration=" + duration + ", type=" + type + ", ambient=" + ambient + ", particles=" + particles + ", icon=" + icon + ", hiddenEffect=" + hiddenEffect + '}'; // Paper
++        return "PotionEffect{" + "amplifier=" + amplifier + ", duration=" + duration + ", type=" + type + ", ambient=" + ambient + ", particles=" + particles + ", icon=" + icon + ", hiddenEffect=" + hiddenEffect + ", key=" + key + '}'; // Paper // Purpur - add key
      }
  }
diff --git a/patches/api/0046-Add-item-packet-serialize-event.patch b/patches/dropped-api/0041-Add-item-packet-serialize-event.patch
similarity index 100%
rename from patches/api/0046-Add-item-packet-serialize-event.patch
rename to patches/dropped-api/0041-Add-item-packet-serialize-event.patch
diff --git a/patches/api/0054-Add-hover-lines-API.patch b/patches/dropped-api/0049-Add-hover-lines-API.patch
similarity index 73%
rename from patches/api/0054-Add-hover-lines-API.patch
rename to patches/dropped-api/0049-Add-hover-lines-API.patch
index 4cb7789bf..052712ac8 100644
--- a/patches/api/0054-Add-hover-lines-API.patch
+++ b/patches/dropped-api/0049-Add-hover-lines-API.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Add hover lines API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index ab73893656932f54009340df59293df2a732be51..9448709716e0b91dd9e2c7ff4060ec0d33d77d24 100644
+index 98a970a6582dca22e719a31559c7becea4725cb2..1cd2962ceb4fa0a0a3e28a09fa4ccef5802cd5c4 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -298,4 +298,14 @@ public interface ItemFactory {
-     @Deprecated
-     net.md_5.bungee.api.chat.hover.content.Content hoverContentOf(@NotNull org.bukkit.entity.Entity entity, @NotNull net.md_5.bungee.api.chat.BaseComponent[] customName);
-     // Paper end - bungee hover events
+@@ -353,4 +353,14 @@ public interface ItemFactory {
+      */
+     @NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, boolean allowTreasure, @NotNull java.util.Random random);
+     // Paper end - enchantWithLevels API
 +
 +    // Purpur start
 +    /**
@@ -24,10 +24,10 @@ index ab73893656932f54009340df59293df2a732be51..9448709716e0b91dd9e2c7ff4060ec0d
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c733206b769d7a55076d863757fcac1a129033b7..ed168cba3692f55ac976c6ef31525e83ae36f5f9 100644
+index 6e9b4cbc81878616b1c48add5db534286d267b05..e497575b2f44bb8b3bb6fdda3ae2f5247cbb4679 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1638,5 +1638,14 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1644,5 +1644,14 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          }
          return random.nextInt(unbreaking + 1) > 0;
      }
diff --git a/patches/dropped-server/0013-LivingEntity-safeFallDistance.patch b/patches/dropped-server/0013-LivingEntity-safeFallDistance.patch
new file mode 100644
index 000000000..4991196f6
--- /dev/null
+++ b/patches/dropped-server/0013-LivingEntity-safeFallDistance.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 5 May 2019 12:58:45 -0500
+Subject: [PATCH] LivingEntity safeFallDistance
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index aa351df679f300018367244c7ccb3e5a59e9276f..39c2a9f732b8e2452fd2dca07193a173d0c2ba1c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -1173,4 +1173,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         this.getHandle().setYBodyRot(bodyYaw);
+     }
+     // Paper end - body yaw API
++
++    // Purpur start
++    @Override
++    public float getSafeFallDistance() {
++        return (float) getHandle().getAttributeValue(Attributes.SAFE_FALL_DISTANCE);
++    }
++
++    @Override
++    public void setSafeFallDistance(float safeFallDistance) {
++        getHandle().getAttribute(Attributes.SAFE_FALL_DISTANCE).setBaseValue(safeFallDistance);
++    }
++    // Purpur end
+ }
diff --git a/patches/dropped-server/0220-Potion-NamespacedKey.patch b/patches/dropped-server/0220-Potion-NamespacedKey.patch
new file mode 100644
index 000000000..7b8d0b15e
--- /dev/null
+++ b/patches/dropped-server/0220-Potion-NamespacedKey.patch
@@ -0,0 +1,223 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Racci <tangentmoons@gmail.com>
+Date: Sat, 4 Dec 2021 00:07:05 +1100
+Subject: [PATCH] Potion NamespacedKey
+
+
+diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
+index 32cf6ea96aaa2e6bd0cc28fa88492ceea3d34052..9787dd4fc6ca2ed8aba3db7674ad2dc26a529a7a 100644
+--- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
++++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
+@@ -53,6 +53,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+     private boolean showIcon;
+     @Nullable
+     public MobEffectInstance hiddenEffect;
++    private org.bukkit.NamespacedKey key; // Purpur - add key
+     private final MobEffectInstance.BlendState blendState = new MobEffectInstance.BlendState();
+ 
+     public MobEffectInstance(Holder<MobEffect> effect) {
+@@ -71,8 +72,14 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+         this(effect, duration, amplifier, ambient, visible, visible);
+     }
+ 
++    // Purpur start
++    public MobEffectInstance(Holder<MobEffect> effect, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon, @Nullable org.bukkit.NamespacedKey key) {
++        this(effect, duration, amplifier, ambient, showParticles, showIcon, null, key);
++    // Purpur end
++    }
++
+     public MobEffectInstance(Holder<MobEffect> effect, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon) {
+-        this(effect, duration, amplifier, ambient, showParticles, showIcon, null);
++        this(effect, duration, amplifier, ambient, showParticles, showIcon, null, null); // Purpur
+     }
+ 
+     public MobEffectInstance(
+@@ -82,7 +89,8 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+         boolean ambient,
+         boolean showParticles,
+         boolean showIcon,
+-        @Nullable MobEffectInstance hiddenEffect
++        @Nullable MobEffectInstance hiddenEffect,
++        @Nullable org.bukkit.NamespacedKey key // Purpur
+     ) {
+         this.effect = effect;
+         this.duration = duration;
+@@ -90,6 +98,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+         this.ambient = ambient;
+         this.visible = showParticles;
+         this.showIcon = showIcon;
++        this.key = key; // Purpur - add key
+         this.hiddenEffect = hiddenEffect;
+     }
+ 
+@@ -135,6 +144,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+         this.ambient = that.ambient;
+         this.visible = that.visible;
+         this.showIcon = that.showIcon;
++        this.key = that.key; // Purpur - add key
+     }
+ 
+     public boolean update(MobEffectInstance that) {
+@@ -179,6 +189,13 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+             bl = true;
+         }
+ 
++        // Purpur start
++        if (that.key != this.key) {
++            this.key = that.key;
++            bl = true;
++        }
++        // Purpur end
++
+         return bl;
+     }
+ 
+@@ -222,6 +239,17 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+         return this.showIcon;
+     }
+ 
++    // Purpur start
++    public boolean hasKey() {
++        return this.key != null;
++    }
++
++    @Nullable
++    public org.bukkit.NamespacedKey getKey() {
++        return this.key;
++    }
++    // Purpur end
++
+     public boolean tick(LivingEntity entity, Runnable overwriteCallback) {
+         if (this.hasRemainingDuration()) {
+             int i = this.isInfiniteDuration() ? entity.tickCount : this.duration;
+@@ -286,6 +314,12 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+             string = string + ", Show Icon: false";
+         }
+ 
++        // Purpur start
++        if (this.hasKey()) {
++            string = string + ", Key: " + this.key;
++        }
++        // Purpur end
++
+         return string;
+     }
+ 
+@@ -300,6 +334,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
+                 && this.duration == mobEffectInstance.duration
+                 && this.amplifier == mobEffectInstance.amplifier
+                 && this.ambient == mobEffectInstance.ambient
++                && this.key == mobEffectInstance.key // Purpur - add key
+                 && this.effect.equals(mobEffectInstance.effect);
+     }
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
+index 4a9e6a679530025caa710a152c5249299ceffdf9..ea4f3f606aad69965384c73eb1273ed0644297b8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
+@@ -42,6 +42,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
+     static final ItemMetaKey POTION_EFFECTS = new ItemMetaKey("custom-effects");
+     static final ItemMetaKey POTION_COLOR = new ItemMetaKey("custom-color");
+     static final ItemMetaKey DEFAULT_POTION = new ItemMetaKey("potion-type");
++    static final ItemMetaKey KEY = new ItemMetaKey("key", "namespacedkey"); // Purpur - add key
+ 
+     private PotionType type;
+     private List<PotionEffect> customEffects;
+@@ -91,7 +92,13 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
+                 boolean ambient = effect.isAmbient();
+                 boolean particles = effect.isVisible();
+                 boolean icon = effect.showIcon();
+-                this.customEffects.add(new PotionEffect(type, duration, amp, ambient, particles, icon));
++                // Purpur start
++                NamespacedKey key = null;
++                if (tag.contains(CraftMetaPotion.KEY.NBT)) {
++                    key = NamespacedKey.fromString(effect.getString(CraftMetaPotion.KEY.NBT));
++                }
++                this.customEffects.add(new PotionEffect(type, duration, amp, ambient, particles, icon, key));
++                // Purpur end
+             }
+         });
+     }
+@@ -130,6 +137,11 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
+         if (this.customEffects != null) {
+             for (PotionEffect effect : this.customEffects) {
+                 effectList.add(new MobEffectInstance(CraftPotionEffectType.bukkitToMinecraftHolder(effect.getType()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()));
++                // Purpur start
++                if (effect.hasKey()) {
++                    effectData.putString(CraftMetaPotion.KEY.NBT, effect.getKey().toString());
++                }
++                // Purpur end
+             }
+         }
+ 
+@@ -196,7 +208,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
+         if (index != -1) {
+             if (overwrite) {
+                 PotionEffect old = this.customEffects.get(index);
+-                if (old.getAmplifier() == effect.getAmplifier() && old.getDuration() == effect.getDuration() && old.isAmbient() == effect.isAmbient()) {
++                if (old.getAmplifier() == effect.getAmplifier() && old.getDuration() == effect.getDuration() && old.isAmbient() == effect.isAmbient() && old.getKey() == effect.getKey()) { // Purpur - add key
+                     return false;
+                 }
+                 this.customEffects.set(index, effect);
+diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
+index 14c58cf8d255c51473fd3d0092faeaf5a3c1ae0c..3ee9c14440046872b83de628b7f460d0782e9315 100644
+--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
++++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
+@@ -11,7 +11,7 @@ public class CraftPotionUtil {
+     public static MobEffectInstance fromBukkit(PotionEffect effect) {
+         Holder<MobEffect> type = CraftPotionEffectType.bukkitToMinecraftHolder(effect.getType());
+         // Paper - Note: do not copy over the hidden effect, as this method is only used for applying to entities which we do not want to convert over.
+-        return new MobEffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()); // Paper
++        return new MobEffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon(), effect.getKey()); // Paper // Purpur - add key
+     }
+ 
+     public static PotionEffect toBukkit(MobEffectInstance effect) {
+@@ -20,7 +20,7 @@ public class CraftPotionUtil {
+         int duration = effect.getDuration();
+         boolean ambient = effect.isAmbient();
+         boolean particles = effect.isVisible();
+-        return new PotionEffect(type, duration, amp, ambient, particles, effect.showIcon(), effect.hiddenEffect == null ? null : toBukkit(effect.hiddenEffect)); // Paper
++        return new PotionEffect(type, duration, amp, ambient, particles, effect.showIcon(), effect.hiddenEffect == null ? null : toBukkit(effect.hiddenEffect), effect.getKey()); // Paper // Purpur - add key
+     }
+ 
+     public static boolean equals(Holder<MobEffect> mobEffect, PotionEffectType type) {
+diff --git a/src/test/java/org/bukkit/potion/PotionTest.java b/src/test/java/org/bukkit/potion/PotionTest.java
+index cbcd1c21646308b2a9706095e2e12177ca06734d..b3ccaea713e858e334cc91d1ae498e589e3daafa 100644
+--- a/src/test/java/org/bukkit/potion/PotionTest.java
++++ b/src/test/java/org/bukkit/potion/PotionTest.java
+@@ -10,6 +10,7 @@ import net.minecraft.world.effect.MobEffect;
+ import net.minecraft.world.effect.MobEffectInstance;
+ import net.minecraft.world.item.alchemy.Potion;
+ import org.bukkit.craftbukkit.legacy.FieldRename;
++import org.bukkit.NamespacedKey; // Purpur
+ import org.bukkit.craftbukkit.potion.CraftPotionEffectType;
+ import org.bukkit.support.AbstractTestingBase;
+ import org.junit.jupiter.api.Test;
+@@ -47,4 +48,27 @@ public class PotionTest extends AbstractTestingBase {
+             assertEquals(bukkit, byName, "Same type not returned by name " + key);
+         }
+     }
++
++    // Purpur start
++    @Test
++    public void testNamespacedKey() {
++        NamespacedKey key = new NamespacedKey("testnamespace", "testkey");
++        PotionEffect namedSpacedEffect = new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 20, 0, true, true, true, key);
++        assertNotNull(namedSpacedEffect.getKey());
++        assertTrue(namedSpacedEffect.hasKey());
++        assertFalse(namedSpacedEffect.withKey(null).hasKey());
++
++        PotionEffect effect = new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 20, 0, true, true, true);
++        assertNull(effect.getKey());
++        assertFalse(effect.hasKey());
++        assertTrue(namedSpacedEffect.withKey(key).hasKey());
++
++        Map<String, Object> s1 = namedSpacedEffect.serialize();
++        Map<String, Object> s2 = effect.serialize();
++        assertTrue(s1.containsKey("namespacedKey"));
++        assertFalse(s2.containsKey("namespacedKey"));
++        assertNotNull(new PotionEffect(s1).getKey());
++        assertNull(new PotionEffect(s2).getKey());
++    }
++    // Purpur end
+ }
diff --git a/patches/server/0241-Configurable-food-attributes.patch b/patches/dropped-server/0236-Configurable-food-attributes.patch
similarity index 90%
rename from patches/server/0241-Configurable-food-attributes.patch
rename to patches/dropped-server/0236-Configurable-food-attributes.patch
index f13cde73e..cc0c5a94c 100644
--- a/patches/server/0241-Configurable-food-attributes.patch
+++ b/patches/dropped-server/0236-Configurable-food-attributes.patch
@@ -37,24 +37,23 @@ index 9967ba762567631f2bdb1e4f8fe16a13ea927b46..6c945ae8fe8b1517e312c688f829fab4
  
      FoodProperties(int hunger, float saturationModifier, boolean meat, boolean alwaysEdible, boolean snack, List<Pair<MobEffectInstance, Float>> statusEffects) {
 diff --git a/src/main/java/net/minecraft/world/food/Foods.java b/src/main/java/net/minecraft/world/food/Foods.java
-index b16d9e2eaa589f19c563ee70b1a56d67dbcdecb0..71beab673f04cd051c46ea37f8c847316885d38d 100644
+index 4569cf30b33167a415256a8542820557ad38f89e..9c65eefa855f3622b6c9ae2a698cf332ba225c7f 100644
 --- a/src/main/java/net/minecraft/world/food/Foods.java
 +++ b/src/main/java/net/minecraft/world/food/Foods.java
-@@ -4,6 +4,9 @@ import net.minecraft.world.effect.MobEffectInstance;
+@@ -4,6 +4,8 @@ import net.minecraft.world.effect.MobEffectInstance;
  import net.minecraft.world.effect.MobEffects;
  
  public class Foods {
 +    public static final java.util.Map<String, FoodProperties> ALL_PROPERTIES = new java.util.HashMap<>(); // Purpur
 +    public static final java.util.Map<String, FoodProperties> DEFAULT_PROPERTIES = new java.util.HashMap<>(); // Purpur
-+
-     public static final FoodProperties APPLE = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.3F).build();
-     public static final FoodProperties BAKED_POTATO = (new FoodProperties.Builder()).nutrition(5).saturationMod(0.6F).build();
-     public static final FoodProperties BEEF = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.3F).meat().build();
+     public static final FoodProperties APPLE = new FoodProperties.Builder().nutrition(4).saturationMod(0.3F).build();
+     public static final FoodProperties BAKED_POTATO = new FoodProperties.Builder().nutrition(5).saturationMod(0.6F).build();
+     public static final FoodProperties BEEF = new FoodProperties.Builder().nutrition(3).saturationMod(0.3F).meat().build();
 diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
-index 31f5ed9dd1727eee24804a384817d2b76a45676b..5fbb13ebef0ca66419f3e5006d19e4a5918a038a 100644
+index bb2103a488964f25335393fa91e8ae5749eca333..249c887af68f56739c3609bad2405ba2cbe11762 100644
 --- a/src/main/java/net/minecraft/world/item/Items.java
 +++ b/src/main/java/net/minecraft/world/item/Items.java
-@@ -1309,6 +1309,13 @@ public class Items {
+@@ -1715,6 +1715,13 @@ public class Items {
              ((BlockItem)item).registerBlocks(Item.BY_BLOCK, item);
          }
  
@@ -69,10 +68,10 @@ index 31f5ed9dd1727eee24804a384817d2b76a45676b..5fbb13ebef0ca66419f3e5006d19e4a5
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 730a4a2e46aeb233d8036e8d7e1749dcb397e6c0..fa81039056af14c37426a508b7b2da77e8b50737 100644
+index 0e28cf20a870f3f3662bd1d8f7a4f2cbf13c48bf..ce3ab604e6ed6669f38abf83d40b500148277b9d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -461,4 +461,75 @@ public class PurpurConfig {
+@@ -466,4 +466,75 @@ public class PurpurConfig {
          String setPattern = getString("settings.username-valid-characters", defaultPattern);
          usernameValidCharactersPattern = java.util.regex.Pattern.compile(setPattern == null || setPattern.isBlank() ? defaultPattern : setPattern);
      }
diff --git a/patches/server/0264-Send-client-custom-name-of-BE.patch b/patches/dropped-server/0255-Send-client-custom-name-of-BE.patch
similarity index 82%
rename from patches/server/0264-Send-client-custom-name-of-BE.patch
rename to patches/dropped-server/0255-Send-client-custom-name-of-BE.patch
index 792957da9..30f7486ef 100644
--- a/patches/server/0264-Send-client-custom-name-of-BE.patch
+++ b/patches/dropped-server/0255-Send-client-custom-name-of-BE.patch
@@ -3,12 +3,13 @@ From: Ben Kerllenevich <ben@omega24.dev>
 Date: Wed, 13 Jul 2022 16:27:43 -0400
 Subject: [PATCH] Send client custom name of BE
 
+https://modrinth.com/mod/know-my-name
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 2f19f6ac5de454845f5d13a3ebb93af625b2afc8..3431f1a00ae2918b91a6b7a449e613e6e12ff6d4 100644
+index 4ea15e17a1393864422edb6d5c57962651abf69a..a78ed43288cfefaeb2592ed0a33fd11565dea2b2 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -205,10 +205,24 @@ public abstract class BlockEntity {
+@@ -256,10 +256,24 @@ public abstract class BlockEntity {
  
      @Nullable
      public Packet<ClientGamePacketListener> getUpdatePacket() {
@@ -22,7 +23,7 @@ index 2f19f6ac5de454845f5d13a3ebb93af625b2afc8..3431f1a00ae2918b91a6b7a449e613e6
          return null;
      }
  
-     public CompoundTag getUpdateTag() {
+     public CompoundTag getUpdateTag(HolderLookup.Provider registryLookup) {
 +        // Purpur start
 +        if (this instanceof net.minecraft.world.Nameable nameable && nameable.hasCustomName()) {
 +            CompoundTag nbt = this.saveWithoutMetadata();
diff --git a/patches/server/0273-Allay-respect-item-NBT.patch b/patches/dropped-server/0263-Allay-respect-item-NBT.patch
similarity index 88%
rename from patches/server/0273-Allay-respect-item-NBT.patch
rename to patches/dropped-server/0263-Allay-respect-item-NBT.patch
index f0b8b115c..4e5e97b5e 100644
--- a/patches/server/0273-Allay-respect-item-NBT.patch
+++ b/patches/dropped-server/0263-Allay-respect-item-NBT.patch
@@ -3,12 +3,13 @@ From: BillyGalbreath <blake.galbreath@gmail.com>
 Date: Tue, 20 Sep 2022 17:56:21 -0500
 Subject: [PATCH] Allay respect item NBT
 
+https://github.com/PurpurMC/Purpur/discussions/1127
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 9bf06cf7b3706f8883e1a0ceac8b1aebb52ba475..c783ce59ea766e6c46a3313628b961f27e01ee8b 100644
+index bca7b7192debb3a34a08047010a2438e7b7e2a78..53765198483e137d411e227119e4f912964aefe3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -406,9 +406,31 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+@@ -399,9 +399,31 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
  
      @Override
      public boolean wantsToPickUp(ItemStack stack) {
@@ -44,10 +45,10 @@ index 9bf06cf7b3706f8883e1a0ceac8b1aebb52ba475..c783ce59ea766e6c46a3313628b961f2
  
      private boolean allayConsidersItemEqual(ItemStack stack, ItemStack stack2) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 86340e782bbc125ec672eea855de29f90ac127de..1a8a1a9bca5c2f92b87fb1a21bdff194718caa8e 100644
+index 5b12c08a1d8e6f62c5653c95071a1d36d735d039..94e29919ddc7f507d54e14c3360f7a3e8bb831a7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1083,10 +1083,13 @@ public class PurpurWorldConfig {
+@@ -1138,10 +1138,13 @@ public class PurpurWorldConfig {
      public boolean allayRidable = false;
      public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
diff --git a/patches/server/0277-Add-item-packet-serialize-event.patch b/patches/dropped-server/0271-Add-item-packet-serialize-event.patch
similarity index 81%
rename from patches/server/0277-Add-item-packet-serialize-event.patch
rename to patches/dropped-server/0271-Add-item-packet-serialize-event.patch
index af1c75a4d..81f4367ab 100644
--- a/patches/server/0277-Add-item-packet-serialize-event.patch
+++ b/patches/dropped-server/0271-Add-item-packet-serialize-event.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add item packet serialize event
 
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 2e395962b555bef0ce1a98e1d768e7738f011535..40f51062624161892c780ddae05e22859e2cd021 100644
+index b863249ff7e13cf4939c8961601f0564c62fd661..bdcfd80f937c34956911373905d66424bbff8e1d 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -94,6 +94,8 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -95,6 +95,8 @@ public class FriendlyByteBuf extends ByteBuf {
      private static final int MAX_PUBLIC_KEY_LENGTH = 512;
      private static final Gson GSON = new Gson();
  
@@ -17,7 +17,7 @@ index 2e395962b555bef0ce1a98e1d768e7738f011535..40f51062624161892c780ddae05e2285
      public FriendlyByteBuf(ByteBuf parent) {
          this.source = parent;
      }
-@@ -632,6 +634,17 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -640,6 +642,17 @@ public class FriendlyByteBuf extends ByteBuf {
              this.writeBoolean(false);
          } else {
              this.writeBoolean(true);
@@ -36,22 +36,22 @@ index 2e395962b555bef0ce1a98e1d768e7738f011535..40f51062624161892c780ddae05e2285
  
              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 306195a8a57dc62379ffd856b214a651fd60e483..bc0dfdad161936d1881066f61de02e6c9a7ed8a7 100644
+index 4611116f3328c0f8d5b37c8765feca36b2448ffe..60b5e0643d933393b5473681ac9261db29fe2416 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1549,6 +1549,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1731,6 +1731,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          //MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper // Purpur
  
-         this.isIteratingOverLevels = true; // Paper
+         this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
 +        net.minecraft.network.FriendlyByteBuf.hasItemSerializeEvent = org.purpurmc.purpur.event.packet.NetworkItemSerializeEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
-         Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
+         Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
          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 165623f5abc237e63b236489af6375bb43daeaca..6638d769a34287d54b22e4416003556915e153f1 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
-@@ -3362,6 +3362,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3382,6 +3382,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      }
                  }
              }
@@ -65,10 +65,10 @@ index 165623f5abc237e63b236489af6375bb43daeaca..6638d769a34287d54b22e44160035569
              boolean flag1 = packet.getSlotNum() >= 1 && packet.getSlotNum() <= 45;
              boolean flag2 = itemstack.isEmpty() || itemstack.getDamageValue() >= 0 && itemstack.getCount() <= 64 && !itemstack.isEmpty();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 568bb53e91dda4804cd328a81ba12ce735c52603..62aabfc021fa3349b0ab46744a9ec78d57f058b0 100644
+index 5313ba91ffc625b27d5bb99395f0e719829f6bda..5329ad6493950a561bd46045e35a9bd70ac4405f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -563,4 +563,9 @@ public class PurpurConfig {
+@@ -568,4 +568,9 @@ public class PurpurConfig {
              }
          });
      }
diff --git a/patches/server/0306-Add-hover-lines-API.patch b/patches/dropped-server/0292-Add-hover-lines-API.patch
similarity index 79%
rename from patches/server/0306-Add-hover-lines-API.patch
rename to patches/dropped-server/0292-Add-hover-lines-API.patch
index d3e3da02a..47c1dd61e 100644
--- a/patches/server/0306-Add-hover-lines-API.patch
+++ b/patches/dropped-server/0292-Add-hover-lines-API.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Add hover lines API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 57f4cf40359fe9bb427eb0134660d00839a63c86..ab510e5917081bd8750a2cd7465e7823687e94bf 100644
+index 6e2a6ce5cf456bd9f6c8c18a58f08e2285dc77ed..b27d16e74c3f99aa693b38590c1fb62db8204509 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -559,4 +559,17 @@ public final class CraftItemFactory implements ItemFactory {
-         return eggItem == null ? null : new net.minecraft.world.item.ItemStack(eggItem).asBukkitMirror();
+@@ -619,4 +619,17 @@ public final class CraftItemFactory implements ItemFactory {
+         return CraftItemStack.asCraftMirror(enchanted);
      }
-     // Paper end
+     // Paper end - enchantWithLevels API
 +
 +    // Purpur start
 +    @Override
diff --git a/patches/generated-api/0001-Ridables.patch b/patches/generated-api/0001-Ridables.patch
new file mode 100644
index 000000000..4a9d76ce8
--- /dev/null
+++ b/patches/generated-api/0001-Ridables.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sat, 4 May 2019 00:57:16 -0500
+Subject: [PATCH] Ridables
+
+
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 069f2668f5229b0368b796e65eef1648fba0a097..50dc058cd8ecade74be30c75907d07f349c4df87 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
++++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -442,6 +442,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+ 
+     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
+ 
++    // Purpur start
++    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
++    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
++    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
++    // Purpur end
++
+     /**
+      * Removed in 1.20.2
+      */
diff --git a/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 64%
rename from patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index a25cc3934..ddfb8fbce 100644
--- a/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/generated-api/0002-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -4,11 +4,11 @@ Date: Sun, 28 Jun 2020 21:50:55 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 4160e968e7d7e8e2a953534a981a7330916ece2e..68326105d2e11bd2d94315c0da35a32d1510de08 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -202,6 +202,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 50dc058cd8ecade74be30c75907d07f349c4df87..b3a1325786fffb1a585b3911c75c03d184e8a848 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
++++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -446,6 +446,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
      GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
      GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
diff --git a/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 66%
rename from patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index bcfee5bb1..fef774bc6 100644
--- a/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/generated-api/0003-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
  when lagging
 
 
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 68326105d2e11bd2d94315c0da35a32d1510de08..ce2eb58b86cd638d91f2bf9a8da60db499685fc9 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -204,6 +204,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index b3a1325786fffb1a585b3911c75c03d184e8a848..31c4d5da936f88e68c67c6e464b94563a47a0f34 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
++++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -448,6 +448,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
      GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
      GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
diff --git a/patches/generated-api/0004-Rabid-Wolf-API.patch b/patches/generated-api/0004-Rabid-Wolf-API.patch
new file mode 100644
index 000000000..82e3b3a72
--- /dev/null
+++ b/patches/generated-api/0004-Rabid-Wolf-API.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Encode42 <me@encode42.dev>
+Date: Tue, 8 Dec 2020 17:15:15 -0500
+Subject: [PATCH] Rabid Wolf API
+
+
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 31c4d5da936f88e68c67c6e464b94563a47a0f34..a41aa6c187d60373630eb803cb69d58b85eacc98 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
++++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -450,6 +450,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+     GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
+     GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
+     GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
++    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
+     // Purpur end
+ 
+     /**
diff --git a/patches/api/0029-Iron-golem-poppy-calms-anger.patch b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
similarity index 62%
rename from patches/api/0029-Iron-golem-poppy-calms-anger.patch
rename to patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
index 0f9201a9e..d85e4e893 100644
--- a/patches/api/0029-Iron-golem-poppy-calms-anger.patch
+++ b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
@@ -4,11 +4,11 @@ Date: Thu, 13 May 2021 21:38:01 -0500
 Subject: [PATCH] Iron golem poppy calms anger
 
 
-diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 8671b9042df2e219921615144a6ca868fa346d77..b347224c223569297ee67ac630a710fdf28748ea 100644
---- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -207,6 +207,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index a41aa6c187d60373630eb803cb69d58b85eacc98..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644
+--- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
++++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -451,6 +451,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
      GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
      GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0001-Rebrand.patch
similarity index 93%
rename from patches/server/0003-Rebrand.patch
rename to patches/server/0001-Rebrand.patch
index 334447aa1..07e65c2f1 100644
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -5,47 +5,45 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f8b27b3992f1d59bf0e95bba0961540e88345754..e372110a189857056e4fae3cd1d996ce8cb69493 100644
+index 5d448d8a7cf6626a11791f30ad52baf41a099272..81996f00384674b29368e8bea944bdd14d631da3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,12 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+@@ -12,8 +12,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
  val alsoShade: Configuration by configurations.creating
  
  dependencies {
--    implementation(project(":pufferfish-api")) // Pufferfish // Paper
--    // Pufferfish start
--    implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
+-    implementation(project(":paper-api"))
+-    implementation(project(":paper-mojangapi"))
 +    // Purpur start
 +    implementation(project(":purpur-api"))
 +    implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
-         exclude("io.papermc.paper", "paper-api")
-     }
--    // Pufferfish end
++        exclude("io.papermc.paper", "paper-api")
++    }
 +    // Purpur end
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -63,6 +63,10 @@ dependencies {
-     }
-     // Pufferfish end
+@@ -47,6 +51,10 @@ dependencies {
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
 +    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
 +    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
 +    implementation("dev.omega24:upnp4j:1.0") // Purpur
 +
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
      testImplementation("org.hamcrest:hamcrest:2.2")
-@@ -89,7 +93,7 @@ tasks.jar {
+@@ -79,7 +87,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Pufferfish-$implementationVersion", // Pufferfish
+-            "Implementation-Version" to "git-Paper-$implementationVersion",
 +            "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -173,7 +177,7 @@ fun TaskContainer.registerRunTask(
+@@ -138,7 +146,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -162,10 +160,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..3cb56595822799926a8141e60a42f5d1
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index 1d714d3eff11ed14f218656008190017494d4830..ed3527612315e6e0649182ce4e1ae2834b0918a9 100644
+index 4f3cc14d48690bb183d09bb7a5ba1e23e8a0c08a..c366d84518979e842a6f10f969a5951539ecac93 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -123,6 +123,10 @@ public class CrashReport {
+@@ -125,6 +125,10 @@ public class CrashReport {
          StringBuilder stringbuilder = new StringBuilder();
  
          stringbuilder.append("---- Minecraft Crash Report ----\n");
@@ -177,10 +175,10 @@ index 1d714d3eff11ed14f218656008190017494d4830..ed3527612315e6e0649182ce4e1ae283
          stringbuilder.append(CrashReport.getErrorComment());
          stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 371049c1236c6443384c0ce184e99d5b9f8e57c2..ebcd6c821379f4feb3b2c094266645ae552972db 100644
+index 8dc2f9df367c849ca333bf1a1fd92ff91617b548..57e6aaa63c1308baa5e2863b82b7521d5f4a4f31 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -910,7 +910,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -960,7 +960,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
@@ -189,24 +187,24 @@ index 371049c1236c6443384c0ce184e99d5b9f8e57c2..ebcd6c821379f4feb3b2c094266645ae
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
                  try {
-@@ -1699,7 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1924,7 +1924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Pufferfish"; // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Purpur"; // Purpur - Purpur > Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Paper"; // Paper
++        return "Purpur"; // Purpur - Purpur > // Pufferfish > // Paper
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5a95dcc02241d6036ee520a6a7a05e8713c6081f..ff9a2122fa26a1238660dcb1bc64e3fc778ddd8d 100644
+index 05e304f9fc8d0291fa779da589bd060ef4165b49..62c18b61ee58e76a90938976e9ec96ef28a7106c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
+@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
--    private final String serverName = "Pufferfish"; // Paper // Pufferfish
+-    private final String serverName = "Paper"; // Paper
 +    private final String serverName = "Purpur"; // Paper // Pufferfish // Purpur
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
@@ -237,25 +235,12 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee
 +        this.sendMessage(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(message)); // Purpur
      }
  
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index daadfec2d86f7957072a639e1e36d4082448f35f..3579715faa33a722cccb13d8d7c86a3de740d6fc 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -912,7 +912,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-             return EntityCategory.WATER;
-         }
- 
--        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot.");
-+        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Purpur."); // Purpur
-     }
- 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03..5a47a8785bc2e251d041f80a79295c43459de3bc 100644
+index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler {
                  this.parsePending();
              } else {
                  // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
@@ -265,33 +250,33 @@ index d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03..5a47a8785bc2e251d041f80a79295c43
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 3298aac109e08da4801a6f08aa6f7acfc5e6bf16..33ea5172bb7fe1018bc39acc16963f4998ac52b2 100644
+index a1c9989df460d7ae3666fffe7968750832a30b85..ad7f21566271260270db452e2f15c32f8a829d28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -507,7 +507,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
--        return new gg.pufferfish.pufferfish.PufferfishVersionFetcher(); // Pufferfish
-+        return new com.destroystokyo.paper.PaperVersionFetcher(); // Pufferfish // Purpur
+-        return new com.destroystokyo.paper.PaperVersionFetcher();
++        return new com.destroystokyo.paper.PaperVersionFetcher(); // Purpur - TODO: Pufferfish
      }
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 80553face9c70c2a3d897681e7761df85b22d464..99597258e8e88cd9e2c901c4ac3ff7faeeabee2b 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..99597258e8e88cd9e2c901c4ac3ff7faeeabee2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
      public static String getBukkitVersion() {
          String result = "Unknown-Version";
  
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
 +        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
          Properties properties = new Properties();
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 50c72e5db369a180f425eaaa0411cb8871bc3463..dbd502761ff6e6efb252bb41376a7ff028c73895 100644
+index 6db566e3111ec08a99aa429624979cb83a85e272..a353eb9f45af7b7f9bfd92a4a89403335b841840 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -96,7 +96,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -321,7 +306,7 @@ index 50c72e5db369a180f425eaaa0411cb8871bc3463..dbd502761ff6e6efb252bb41376a7ff0
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -185,12 +185,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -184,12 +184,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                  // Paper end
                  } else
                  {
@@ -333,10 +318,10 @@ index 50c72e5db369a180f425eaaa0411cb8871bc3463..dbd502761ff6e6efb252bb41376a7ff0
                  log.log( Level.SEVERE, "------------------------------" );
 -                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
 +                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
                  this.dumpTickingInfo(); // Paper - log detailed tick information
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-@@ -206,7 +206,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -205,7 +205,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      WatchdogThread.dumpThread( thread, log );
                  }
                  } else {
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
similarity index 91%
rename from patches/server/0004-Purpur-config-files.patch
rename to patches/server/0002-Purpur-config-files.patch
index 47fa0eb0e..d0887d441 100644
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 692c962193cf9fcc6801fc93f3220bdc673d527b..8cde30544e14f8fc2dac32966ae3c21f8cf3a551 100644
+index 4b002e8b75d117b726b0de274a76d3596fce015b..8cde30544e14f8fc2dac32966ae3c21f8cf3a551 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,7 @@ public class Metrics {
              boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
--                Metrics metrics = new Metrics("Pufferfish", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish
+-                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
 +                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
@@ -26,21 +26,21 @@ index 692c962193cf9fcc6801fc93f3220bdc673d527b..8cde30544e14f8fc2dac32966ae3c21f
 -                final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
 -                if (implVersion != null) {
 -                    final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
--                    paperVersion = "git-Pufferfish-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Pufferfish
+-                    paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
 -                } else {
 -                    paperVersion = "unknown";
 -                }
--                metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> paperVersion)); // Pufferfish
+-                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
 +                metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
 +                metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 56ae02aab93b9a698e9d2f07a0448aa4767169d9..756651db912068c837197a972e95bc66ab9d4a70 100644
+index e6c7f62ed379a78645933670299e4fcda8540ed1..edb94e5601acc38994dac20a167b145de778d426 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -332,6 +332,30 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -331,6 +331,30 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
          }
      }
  
@@ -72,13 +72,13 @@ index 56ae02aab93b9a698e9d2f07a0448aa4767169d9..756651db912068c837197a972e95bc66
          boolean flag1 = this.source.acceptsSuccess() && !this.silent;
          boolean flag2 = broadcastToOps && this.source.shouldInformAdmins() && !this.silent;
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 66aeb0ea388a8c8a08cf33728921061a0c74552f..6908e2165c4e4b43408a93963b4585d7cabf41dd 100644
+index eb4fc900164d1fb3a78653ae8bc42ea30323f5b7..6d47aa73788eef78aa6714384db879b4e907de9b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -218,6 +218,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
-         io.papermc.paper.command.PaperCommands.registerCommands(this);
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
+@@ -232,6 +232,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
+         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
 +        // Purpur start
 +        try {
 +            org.purpurmc.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
@@ -88,42 +88,42 @@ index 66aeb0ea388a8c8a08cf33728921061a0c74552f..6908e2165c4e4b43408a93963b4585d7
 +        }
 +        org.purpurmc.purpur.PurpurConfig.registerCommands();
 +        // Purpur end
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         // Paper end
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+ 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6c0e33323922de72dcb941a10883a07c72808b5f..eccc55372a7a52a92dd9418a47ece0fd2adcd6ed 100644
+index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..04f7f6743aabdca54892b2b155386f86032cf807 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -176,6 +176,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     // Paper end
+@@ -170,6 +170,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     // Paper end - add paper world config
  
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
 +    public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -215,6 +216,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
+@@ -216,6 +217,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
-         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
+         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
 +        this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ff9a2122fa26a1238660dcb1bc64e3fc778ddd8d..2674aede815f8c6d0fbaf22895ccb7ed05f9a714 100644
+index 467ef4ffd6ee13b247ac9e453b006ec3d89362c9..d97f33d654086c892f01e47a59be7e37f6e03ae7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1039,6 +1039,7 @@ public final class CraftServer implements Server {
+@@ -1054,6 +1054,7 @@ public final class CraftServer implements Server {
  
-         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
+         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
 +        org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1054,6 +1055,7 @@ public final class CraftServer implements Server {
+@@ -1069,6 +1070,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -131,7 +131,7 @@ index ff9a2122fa26a1238660dcb1bc64e3fc778ddd8d..2674aede815f8c6d0fbaf22895ccb7ed
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1069,6 +1071,7 @@ public final class CraftServer implements Server {
+@@ -1084,6 +1086,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -139,7 +139,7 @@ index ff9a2122fa26a1238660dcb1bc64e3fc778ddd8d..2674aede815f8c6d0fbaf22895ccb7ed
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2919,6 +2922,18 @@ public final class CraftServer implements Server {
+@@ -3048,6 +3051,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -159,10 +159,10 @@ index ff9a2122fa26a1238660dcb1bc64e3fc778ddd8d..2674aede815f8c6d0fbaf22895ccb7ed
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e4cacb17f56c618bef19e1165c07aac86af61150..a6b1c83e289bd0a9ad59288ed2da88ac3e607c0f 100644
+index c988afa496d25314451435eedd64079a0d87cef0..45a33086e1bb8a70e0fa01090731d27a0474da41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -173,6 +173,14 @@ public class Main {
+@@ -175,6 +175,14 @@ public class Main {
                          .describedAs("Jar file");
                  // Paper end
  
@@ -179,7 +179,7 @@ index e4cacb17f56c618bef19e1165c07aac86af61150..a6b1c83e289bd0a9ad59288ed2da88ac
                          .withRequiredArg()
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..61d193d8ddd87817bf2c560037d42366cff1eca9
+index 0000000000000000000000000000000000000000..4f015144be0a7a448c6c2b0765232c02ad405d09
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -0,0 +1,175 @@
@@ -260,8 +260,8 @@ index 0000000000000000000000000000000000000000..61d193d8ddd87817bf2c560037d42366
 +        commands = new HashMap<>();
 +        commands.put("purpur", new PurpurCommand("purpur"));
 +
-+        version = getInt("config-version", 33);
-+        set("config-version", 33);
++        version = getInt("config-version", 35);
++        set("config-version", 35);
 +
 +        readConfig(PurpurConfig.class, null);
 +
@@ -332,7 +332,7 @@ index 0000000000000000000000000000000000000000..61d193d8ddd87817bf2c560037d42366
 +        return config.getInt(path, config.getInt(path));
 +    }
 +
-+    private static <T> List getList(String path, T def) {
++    private static <T> List<?> getList(String path, T def) {
 +        config.addDefault(path, def);
 +        return config.getList(path, config.getList(path));
 +    }
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch
similarity index 70%
rename from patches/server/0005-Purpur-client-support.patch
rename to patches/server/0003-Purpur-client-support.patch
index d2813bee5..c6be6a65a 100644
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0003-Purpur-client-support.patch
@@ -5,30 +5,30 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ba972d1661426d7e30f6f61bad3b9608e66ea721..5fe10d6d8590ef5997a4f8f6af01ec16bf20e00a 100644
+index 8437316888c6056060a2780652147590b6fe7443..8b07eb1c428bc70b8ee07ea2209f1898d6034809 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -274,6 +274,7 @@ public class ServerPlayer extends Player {
-     public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
-     public @Nullable String clientBrandName = null; // Paper - Brand name
-     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
+@@ -298,6 +298,7 @@ public class ServerPlayer extends Player {
+     public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
+     public @Nullable String clientBrandName = null; // Paper - Brand support
+     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
 +    public boolean purpurClient = false; // Purpur
  
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 20122bf191ebc74c223310aea1f004fdbb163e57..9226fadcf53da5f7d55f4434a660d3e091c0775f 100644
+index 8ac5d8ccf731100a1be690cb2ed1be82cadba8ed..4228fd441f8350d43bd545e31c920304f07968bc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -55,6 +55,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     private volatile boolean suspendFlushingOnServerThread = false;
+@@ -78,6 +78,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
      protected static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
 +    protected static final ResourceLocation PURPUR_CLIENT = new ResourceLocation("purpur", "client"); // Purpur
  
      public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
          this.server = minecraftserver;
-@@ -137,6 +138,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -170,6 +171,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
                  this.disconnect("Invalid payload REGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
@@ -39,17 +39,17 @@ index 20122bf191ebc74c223310aea1f004fdbb163e57..9226fadcf53da5f7d55f4434a660d3e0
 +            } catch (Exception ignore) {
 +            }
 +        // Purpur end
-         } else if (identifier.equals(CUSTOM_UNREGISTER)) {
+         } else if (identifier.equals(ServerCommonPacketListenerImpl.CUSTOM_UNREGISTER)) {
              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 604ed1f6742a6b028b9db2809f7bd4b9a3b38f4d..16c05edcd94d8a7ea166a4ab8c72cdeb09f26a73 100644
+index 5f896948d158651cd9837364759dbfbcce6b7d21..7f78db4e0331d0f4801807ed1242642ee940d0f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3283,4 +3283,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         return this.spigot;
+@@ -3522,4 +3522,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     public void setSendViewDistance(final int viewDistance) {
+         this.getHandle().setSendViewDistance(viewDistance);
      }
-     // Spigot end
 +
 +    // Purpur start
 +    @Override
diff --git a/patches/server/0004-Fix-decompile-errors.patch b/patches/server/0004-Fix-decompile-errors.patch
new file mode 100644
index 000000000..f16d294f4
--- /dev/null
+++ b/patches/server/0004-Fix-decompile-errors.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Sun, 12 Jun 2022 06:20:21 -0500
+Subject: [PATCH] Fix decompile errors
+
+
+diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+index b0d26b0eadb2a43924629424a6c13198aace8f69..9f5c3ec2eae9b30bdb8dbcb328d7f701cb7aeb9d 100644
+--- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
++++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+@@ -52,7 +52,7 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
+                     }
+ 
+                     RedirectModifier<T> redirectModifier = commandContext.getRedirectModifier();
+-                    if (redirectModifier instanceof CustomModifierExecutor<T> customModifierExecutor) {
++                    if (redirectModifier instanceof CustomModifierExecutor customModifierExecutor) { // Purpur - decompile error
+                         customModifierExecutor.apply(baseSource, list, contextChain, chainModifiers, ExecutionControl.create(context, frame));
+                         return;
+                     }
+@@ -92,11 +92,11 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
+ 
+         if (list.isEmpty()) {
+             if (chainModifiers.isReturn()) {
+-                context.queueNext(new CommandQueueEntry<>(frame, FallthroughTask.instance()));
++                context.queueNext(new CommandQueueEntry<>(frame, (EntryAction<T>) FallthroughTask.instance())); // Purpur - decompile error
+             }
+         } else {
+             CommandContext<T> commandContext2 = contextChain.getTopContext();
+-            if (commandContext2.getCommand() instanceof CustomCommandExecutor<T> customCommandExecutor) {
++            if (commandContext2.getCommand() instanceof CustomCommandExecutor customCommandExecutor) { // Purpur - decompile error
+                 ExecutionControl<T> executionControl = ExecutionControl.create(context, frame);
+ 
+                 for (T executionCommandSource2 : list) {
+diff --git a/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java b/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
+index 7b118a92a6eb779f800ae8f5d8f6e3c861fc4f6a..057a038e8dcacd7496a0b2373de2c20255a5c297 100644
+--- a/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
++++ b/src/main/java/net/minecraft/commands/synchronization/ArgumentTypeInfos.java
+@@ -119,10 +119,10 @@ public class ArgumentTypeInfos {
+         register(registry, "dimension", DimensionArgument.class, SingletonArgumentInfo.contextFree(DimensionArgument::dimension));
+         register(registry, "gamemode", GameModeArgument.class, SingletonArgumentInfo.contextFree(GameModeArgument::gameMode));
+         register(registry, "time", TimeArgument.class, new TimeArgument.Info());
+-        register(registry, "resource_or_tag", fixClassType(ResourceOrTagArgument.class), new ResourceOrTagArgument.Info());
+-        register(registry, "resource_or_tag_key", fixClassType(ResourceOrTagKeyArgument.class), new ResourceOrTagKeyArgument.Info());
+-        register(registry, "resource", fixClassType(ResourceArgument.class), new ResourceArgument.Info());
+-        register(registry, "resource_key", fixClassType(ResourceKeyArgument.class), new ResourceKeyArgument.Info());
++        register(registry, "resource_or_tag", fixClassType(ResourceOrTagArgument.class), new ResourceOrTagArgument.Info<>()); // Purpur - decompile error
++        register(registry, "resource_or_tag_key", fixClassType(ResourceOrTagKeyArgument.class), new ResourceOrTagKeyArgument.Info<>()); // Purpur - decompile error
++        register(registry, "resource", fixClassType(ResourceArgument.class), new ResourceArgument.Info<>()); // Purpur - decompile error
++        register(registry, "resource_key", fixClassType(ResourceKeyArgument.class), new ResourceKeyArgument.Info<>()); // Purpur - decompile error
+         register(registry, "template_mirror", TemplateMirrorArgument.class, SingletonArgumentInfo.contextFree(TemplateMirrorArgument::templateMirror));
+         register(registry, "template_rotation", TemplateRotationArgument.class, SingletonArgumentInfo.contextFree(TemplateRotationArgument::templateRotation));
+         register(registry, "heightmap", HeightmapTypeArgument.class, SingletonArgumentInfo.contextFree(HeightmapTypeArgument::heightmap));
diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0005-Component-related-conveniences.patch
similarity index 86%
rename from patches/server/0007-Component-related-conveniences.patch
rename to patches/server/0005-Component-related-conveniences.patch
index 97d3e4a1c..934ea5bc3 100644
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0005-Component-related-conveniences.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5fe10d6d8590ef5997a4f8f6af01ec16bf20e00a..75faac7c8009672c733033c5aabb4e1974ce5790 100644
+index 8b07eb1c428bc70b8ee07ea2209f1898d6034809..0b9c85adaf5c7b5dcb23ab74a4fd02e6c0798851 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1784,6 +1784,26 @@ public class ServerPlayer extends Player {
+@@ -1978,6 +1978,26 @@ public class ServerPlayer extends Player {
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
@@ -36,10 +36,10 @@ index 5fe10d6d8590ef5997a4f8f6af01ec16bf20e00a..75faac7c8009672c733033c5aabb4e19
      public void displayClientMessage(Component message, boolean overlay) {
          this.sendSystemMessage(message, overlay);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 48d1444fbad1c57738807d0128b94160a5a17a4d..09b111dd0189b8764569e24fb6de862b1bb3bc89 100644
+index a2142930b4d4b05987c90496fb9d733d99040aa0..2d6b6795703431939005aa09d1ed590c3f755163 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1039,6 +1039,20 @@ public abstract class PlayerList {
+@@ -1063,6 +1063,20 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
  
@@ -61,10 +61,10 @@ index 48d1444fbad1c57738807d0128b94160a5a17a4d..09b111dd0189b8764569e24fb6de862b
          Iterator iterator = this.players.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 25a5a3b949a0eb632611355e74ccd4865be108ca..14fcfd7c1d3a62833978e163f4e0d6f9b2203042 100644
+index 160dc3216e8f5db5f9b3cce5e2d655f2b35b208a..43b9a7e8ed9043c4d3f8295258a27209ddb4474b 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -126,6 +126,15 @@ public class DamageSource {
+@@ -177,6 +177,15 @@ public class DamageSource {
          }
      }
  
@@ -81,10 +81,10 @@ index 25a5a3b949a0eb632611355e74ccd4865be108ca..14fcfd7c1d3a62833978e163f4e0d6f9
          return this.type().msgId();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 505ed0f8f933428192f5fc806ff52d84acea7f99..8bc26cc6af27ba4c13940d61154786d47cb5aaf3 100644
+index 2bc85351e6e52f90da5fdb29d8d042a06132d742..6c7f80723d67baf0ca036e0a12c3007144352edf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4066,6 +4066,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4190,6 +4190,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return SlotAccess.NULL;
      }
  
diff --git a/patches/server/0006-Fix-decompile-errors.patch b/patches/server/0006-Fix-decompile-errors.patch
deleted file mode 100644
index 828fc95cc..000000000
--- a/patches/server/0006-Fix-decompile-errors.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Sun, 12 Jun 2022 06:20:21 -0500
-Subject: [PATCH] Fix decompile errors
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-index d9016807bc21c38a5c38170e1335c79b39355bcb..03c065d0ad97d29f3586ba2bf3cd207b867ed634 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-@@ -121,7 +121,7 @@ public class Painting extends HangingEntity implements VariantHolder<Holder<Pain
- 
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
--        Holder<PaintingVariant> holder = loadVariant(nbt).orElseGet(Painting::getDefaultVariant);
-+        Holder<PaintingVariant> holder = loadVariant(nbt).orElseGet(() -> (Holder.Reference<PaintingVariant>) getDefaultVariant()); // Purpur - decompile error TODO: still needed?
-         this.setVariant(holder);
-         this.direction = Direction.from2DDataValue(nbt.getByte("facing"));
-         super.readAdditionalSaveData(nbt);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index b79c86272f12c4b1173ea494cbe09e1ecdc23533..11275a9ec6faa69c9f054683cb47312e443ba883 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-@@ -184,7 +184,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
- 
-     @Override
-     public Brain<Zoglin> getBrain() {
--        return super.getBrain();
-+        return (Brain<Zoglin>) super.getBrain(); // Purpur - decompile error
-     }
- 
-     protected void updateActivity() {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index d02ee11066fc4f07ccb110b09b86d895ff90d4f2..e1be4a77fae0b9120781f460079269b85c993930 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -70,7 +70,7 @@ public class PiglinBrute extends AbstractPiglin {
- 
-     @Override
-     public Brain<PiglinBrute> getBrain() {
--        return super.getBrain();
-+        return (Brain<PiglinBrute>) super.getBrain(); // Purpur - decompile error
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
-index d5654cfe37bd82f1290b280990a8502432491ae1..b49e02ac7b3db9a5b79ce3f106ead19af4e7cfa6 100644
---- a/src/main/java/net/minecraft/world/level/block/Blocks.java
-+++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
-@@ -1160,7 +1160,7 @@ public class Blocks {
-     }
- 
-     private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType<?> type) {
--        return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT;
-+        return type == EntityType.OCELOT || type == EntityType.PARROT; // Purpur - decompile error
-     }
- 
-     private static BedBlock bed(DyeColor color) {
diff --git a/patches/server/0008-Ridables.patch b/patches/server/0006-Ridables.patch
similarity index 83%
rename from patches/server/0008-Ridables.patch
rename to patches/server/0006-Ridables.patch
index a6e75dc7f..ab339717c 100644
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0006-Ridables.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Ridables
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 83cab746d1d6fe25c043c8aee28c39412b90c127..ec6b58dae525c81bbb1c0e2d96fbded6f00a45b5 100644
+index 665e88b2dedf9d5bb50914d5f3d377f2d19f40b0..f70a80b496bd1498778e82fc221c3b1b39308b75 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -48,6 +48,12 @@ public class BlockPos extends Vec3i {
+@@ -61,6 +61,12 @@ public class BlockPos extends Vec3i {
      private static final int X_OFFSET = 38;
-     // Paper end
+     // Paper end - Optimize Bit Operations by inlining
  
 +    // Purpur start
 +    public BlockPos(net.minecraft.world.entity.Entity entity) {
@@ -22,36 +22,36 @@ index 83cab746d1d6fe25c043c8aee28c39412b90c127..ec6b58dae525c81bbb1c0e2d96fbded6
          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 ebcd6c821379f4feb3b2c094266645ae552972db..edd53077098cfaaa5987dc7df7163b83a5ed3b26 100644
+index 57e6aaa63c1308baa5e2863b82b7521d5f4a4f31..73b77367039eb6a4445d1ef2d66fb3410e91f4b8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1531,6 +1531,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-             net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
-             worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
+@@ -1762,6 +1762,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
+             net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
+             worldserver.updateLagCompensationTick(); // Paper - lag compensation
 +            worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
  
              this.profiler.push(() -> {
-                 return worldserver + " " + worldserver.dimension().location();
+                 String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cf2fd8eba6aa4cf15cac924577507a700f7f72b5..19698f13530183b3580a7a6ad720d078b6c791ba 100644
+index 0981d440d0dbfe4df668d1f3f1b5706a93bc4434..fc791a66d299905798c2c1ca542467e4c7933caf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     public boolean hasPhysicsEvent = true; // Paper
-     public boolean hasEntityMoveEvent = false; // Paper
+@@ -229,6 +229,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+     public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
+     public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
      private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current)
 +    public boolean hasRidableMoveEvent = false; // Purpur
-     public static Throwable getAddToWorldStackTrace(Entity entity) {
-         final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
-         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
+ 
+     public LevelChunk getChunkIfLoaded(int x, int z) {
+         return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 75faac7c8009672c733033c5aabb4e1974ce5790..3f5d87ccdee1309ae8240a3d181e268d8c022f56 100644
+index 0b9c85adaf5c7b5dcb23ab74a4fd02e6c0798851..2820333cbcd2cb972c4408cb0d9cc1be37a844cf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -756,6 +756,15 @@ public class ServerPlayer extends Player {
-         this.trackStartFallingPosition();
+@@ -814,6 +814,15 @@ public class ServerPlayer extends Player {
          this.trackEnteredOrExitedLavaOnVehicle();
+         this.updatePlayerAttributes();
          this.advancements.flushDirty(this);
 +
 +        // Purpur start
@@ -64,25 +64,25 @@ index 75faac7c8009672c733033c5aabb4e1974ce5790..3f5d87ccdee1309ae8240a3d181e268d
 +        // Purpur end
      }
  
-     public void doTick() {
+     private void updatePlayerAttributes() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ef6d8f787cba0db53270adedd923f9a47d435852..675e6e7246d84195dc027c0209744896bd2b7224 100644
+index 5e9202bc7fc649764568b55d66ba0d684118c00c..1377d7abfe024b8ac977aa1a071b401836c3c048 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2713,6 +2713,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2789,6 +2789,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
-                             cserver.getPluginManager().callEvent(event);
+                             ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
  
 +                            player.processClick(enumhand); // Purpur
 +
                              // Entity in bucket - SPIGOT-4048 and SPIGOT-6859a
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
-                                 entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
+                                 entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8bc26cc6af27ba4c13940d61154786d47cb5aaf3..5eb10b5f75b55f66a002745d016b88e0366d1301 100644
+index 6c7f80723d67baf0ca036e0a12c3007144352edf..9c99a3df80c5f0a0d81e1f6a6516d088438a0b1e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -375,7 +375,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -381,7 +381,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private final Set<String> tags;
      private final double[] pistonDeltas;
      private long pistonDeltasGameTime;
@@ -91,7 +91,7 @@ index 8bc26cc6af27ba4c13940d61154786d47cb5aaf3..5eb10b5f75b55f66a002745d016b88e0
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2946,6 +2946,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3080,6 +3080,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -105,10 +105,10 @@ index 8bc26cc6af27ba4c13940d61154786d47cb5aaf3..5eb10b5f75b55f66a002745d016b88e0
              this.gameEvent(GameEvent.ENTITY_MOUNT, passenger);
          }
      }
-@@ -2986,6 +2993,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3119,6 +3126,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  return false;
              }
-             // Spigot end
+             // CraftBukkit end
 +
 +            // Purpur start
 +            if (this.rider != null && this.passengers.get(0) == this.rider) {
@@ -120,12 +120,11 @@ index 8bc26cc6af27ba4c13940d61154786d47cb5aaf3..5eb10b5f75b55f66a002745d016b88e0
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4914,4 +4929,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -5009,4 +5024,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
-     // Paper end
-+
-+        // Purpur start
+     // Paper end - Expose entity id counter
++    // Purpur start
 +    @Nullable
 +    private Player rider = null;
 +
@@ -167,7 +166,7 @@ index 8bc26cc6af27ba4c13940d61154786d47cb5aaf3..5eb10b5f75b55f66a002745d016b88e0
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 1bb8b6e91c44cd13411d96d749fa64835c75a267..75c278b67ad2b78766efd8f89c4c2ca7eb7cdcb2 100644
+index 09fdea983772612ef3fff6b2da3cf469a34e4ec0..aa76a24421cdb3908a3544d92eb3d1e3c2ebedc4 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -23,6 +23,19 @@ public class GlowSquid extends Squid {
@@ -191,10 +190,10 @@ index 1bb8b6e91c44cd13411d96d749fa64835c75a267..75c278b67ad2b78766efd8f89c4c2ca7
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451..cc82a506e0da0bf4318a37326924d71ca3340d5e 100644
+index 6e043457a29a890bcefd27fc5bb07c1a7e4e30f7..72bd60f691a639a0e7b6b5a98e5a3816305cfdaf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -218,9 +218,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -229,9 +229,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
      protected int deathScore;
      public float lastHurt;
      public boolean jumping;
@@ -207,36 +206,36 @@ index 2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451..cc82a506e0da0bf4318a37326924d71c
      protected int lerpSteps;
      protected double lerpX;
      protected double lerpY;
-@@ -286,7 +286,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         this.effectsDirty = true;
+@@ -300,7 +300,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.useItem = ItemStack.EMPTY;
          this.lastClimbablePos = Optional.empty();
+         this.appliedScale = 1.0F;
 -        this.attributes = new AttributeMap(DefaultAttributes.getSupplier(type));
 +        this.attributes = new AttributeMap(DefaultAttributes.getSupplier(type), this); // Purpur
          this.craftAttributes = new CraftAttributeMap(this.attributes); // CraftBukkit
          // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor
          this.entityData.set(LivingEntity.DATA_HEALTH_ID, (float) this.getAttribute(Attributes.MAX_HEALTH).getValue());
-@@ -337,6 +337,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -350,6 +350,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public static AttributeSupplier.Builder createLivingAttributes() {
-         return AttributeSupplier.builder().add(Attributes.MAX_HEALTH).add(Attributes.KNOCKBACK_RESISTANCE).add(Attributes.MOVEMENT_SPEED).add(Attributes.ARMOR).add(Attributes.ARMOR_TOUGHNESS).add(Attributes.MAX_ABSORPTION);
+         return AttributeSupplier.builder().add(Attributes.MAX_HEALTH).add(Attributes.KNOCKBACK_RESISTANCE).add(Attributes.MOVEMENT_SPEED).add(Attributes.ARMOR).add(Attributes.ARMOR_TOUGHNESS).add(Attributes.MAX_ABSORPTION).add(Attributes.STEP_HEIGHT).add(Attributes.SCALE).add(Attributes.GRAVITY).add(Attributes.SAFE_FALL_DISTANCE).add(Attributes.FALL_DAMAGE_MULTIPLIER).add(Attributes.JUMP_STRENGTH);
      }
 +    public boolean shouldSendAttribute(Attribute attribute) { return true; } // Purpur
  
      @Override
      protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
-@@ -2725,7 +2726,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2781,7 +2782,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
-     protected long lastJumpTime = 0L; // Paper
+     protected long lastJumpTime = 0L; // Paper - Prevent excessive velocity through repeated crits
 -    protected void jumpFromGround() {
 +    public void jumpFromGround() { // Purpur - protected -> public
-         Vec3 vec3d = this.getDeltaMovement();
-         // Paper start
-         long time = System.nanoTime();
-@@ -3498,8 +3499,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         float f = this.getJumpPower();
+ 
+         if (f > 1.0E-5F) {
+@@ -3494,8 +3495,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.pushEntities();
          this.level().getProfiler().pop();
-         // Paper start
+         // Paper start - Add EntityMoveEvent
 -        if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
 -            if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
 +        // Purpur start
@@ -244,9 +243,9 @@ index 2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451..cc82a506e0da0bf4318a37326924d71c
 +            if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
 +                // Purpur end
                  Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
-                 Location to = new Location (this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
+                 Location to = new Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3509,6 +3512,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3505,6 +3508,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                  }
              }
@@ -266,13 +265,13 @@ index 2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451..cc82a506e0da0bf4318a37326924d71c
 +            }
 +            // Purpur end
          }
-         // Paper end
+         // 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 4cb836dfa7cbd2e634d4a3a567da0305aac0da4d..785421bc26d86c91983ab501fbc7484bbb389112 100644
+index e89f9c3e887601d8461eb967ae0bf582b672f631..26b03594b6ccd69ca35156472e27543d11ba2077 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -147,8 +147,8 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -165,8 +165,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
          this.restrictRadius = -1.0F;
          this.goalSelector = new GoalSelector(world.getProfilerSupplier());
          this.targetSelector = new GoalSelector(world.getProfilerSupplier());
@@ -283,7 +282,7 @@ index 4cb836dfa7cbd2e634d4a3a567da0305aac0da4d..785421bc26d86c91983ab501fbc7484b
          this.jumpControl = new JumpControl(this);
          this.bodyRotationControl = this.createBodyControl();
          this.navigation = this.createNavigation(world);
-@@ -1391,7 +1391,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1525,7 +1525,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
      protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
  
      protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -292,7 +291,7 @@ index 4cb836dfa7cbd2e634d4a3a567da0305aac0da4d..785421bc26d86c91983ab501fbc7484b
      }
  
      public boolean isWithinRestriction() {
-@@ -1775,4 +1775,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1902,4 +1902,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
  
          return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
      }
@@ -350,13 +349,13 @@ index 4cb836dfa7cbd2e634d4a3a567da0305aac0da4d..785421bc26d86c91983ab501fbc7484b
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 3087f8359b098682a345399c85395de8a15b6eed..6b0855cffb901dbc7dcc5fd44506275206bc9a2d 100644
+index 9ef8f014af332da129bfcd3370da983ec035ecc6..c51b429822d56761f69c49ecd4addfab7b90bad8 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-@@ -24,14 +24,21 @@ public class AttributeMap {
-     private final Set<AttributeInstance> dirtyAttributes = Sets.newHashSet();
+@@ -22,13 +22,20 @@ public class AttributeMap {
+     private final Map<Holder<Attribute>, AttributeInstance> attributes = new Object2ObjectOpenHashMap<>();
+     private final Set<AttributeInstance> dirtyAttributes = new ObjectOpenHashSet<>();
      private final AttributeSupplier supplier;
-     private final java.util.function.Function<Attribute, AttributeInstance> createInstance; // Pufferfish
 +    private final net.minecraft.world.entity.LivingEntity entity; // Purpur
  
      public AttributeMap(AttributeSupplier defaultAttributes) {
@@ -367,120 +366,38 @@ index 3087f8359b098682a345399c85395de8a15b6eed..6b0855cffb901dbc7dcc5fd445062752
 +        this.entity = entity;
 +        // Purpur end
          this.supplier = defaultAttributes;
-         this.createInstance = attribute -> this.supplier.createInstance(this::onAttributeModified, attribute); // Pufferfish
      }
  
      private void onAttributeModified(AttributeInstance instance) {
--        if (instance.getAttribute().isClientSyncable()) {
-+        if (instance.getAttribute().isClientSyncable() && (entity == null || entity.shouldSendAttribute(instance.getAttribute()))) { // Purpur
+-        if (instance.getAttribute().value().isClientSyncable()) {
++        if (instance.getAttribute().value().isClientSyncable() && (entity == null || entity.shouldSendAttribute(instance.getAttribute().value()))) { // Purpur
              this.dirtyAttributes.add(instance);
          }
- 
-@@ -43,7 +50,7 @@ public class AttributeMap {
- 
-     public Collection<AttributeInstance> getSyncableAttributes() {
-         return this.attributes.values().stream().filter((attribute) -> {
--            return attribute.getAttribute().isClientSyncable();
-+            return attribute.getAttribute().isClientSyncable() && (entity == null || entity.shouldSendAttribute(attribute.getAttribute())); // Purpur
-         }).collect(Collectors.toList());
+     }
+@@ -38,7 +45,7 @@ public class AttributeMap {
      }
  
+     public Collection<AttributeInstance> getSyncableAttributes() {
+-        return this.attributes.values().stream().filter(attribute -> attribute.getAttribute().value().isClientSyncable()).collect(Collectors.toList());
++        return this.attributes.values().stream().filter(attribute -> attribute.getAttribute().value().isClientSyncable() && (entity == null || entity.shouldSendAttribute(attribute.getAttribute().value()))).collect(Collectors.toList()); // Purpur
+     }
+ 
+     @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-index 8a720f9ae81d7ea856e28cb27a66adcf04bcb0eb..e0b70d9732a2b7d96999b7e4a497ffa1d8cf86a7 100644
+index 10a1434313b11dae8210484583c6bf3b627416f7..35af18f371b3beaf81fcdca79fefe85e0a862b50 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/DefaultAttributes.java
-@@ -80,7 +80,88 @@ import org.slf4j.Logger;
- 
- public class DefaultAttributes {
-     private static final Logger LOGGER = LogUtils.getLogger();
--    private static final Map<EntityType<? extends LivingEntity>, AttributeSupplier> SUPPLIERS = ImmutableMap.<EntityType<? extends LivingEntity>, AttributeSupplier>builder().put(EntityType.ALLAY, Allay.createAttributes().build()).put(EntityType.ARMOR_STAND, LivingEntity.createLivingAttributes().build()).put(EntityType.AXOLOTL, Axolotl.createAttributes().build()).put(EntityType.BAT, Bat.createAttributes().build()).put(EntityType.BEE, Bee.createAttributes().build()).put(EntityType.BLAZE, Blaze.createAttributes().build()).put(EntityType.CAT, Cat.createAttributes().build()).put(EntityType.CAMEL, Camel.createAttributes().build()).put(EntityType.CAVE_SPIDER, CaveSpider.createCaveSpider().build()).put(EntityType.CHICKEN, Chicken.createAttributes().build()).put(EntityType.COD, AbstractFish.createAttributes().build()).put(EntityType.COW, Cow.createAttributes().build()).put(EntityType.CREEPER, Creeper.createAttributes().build()).put(EntityType.DOLPHIN, Dolphin.createAttributes().build()).put(EntityType.DONKEY, AbstractChestedHorse.createBaseChestedHorseAttributes().build()).put(EntityType.DROWNED, Zombie.createAttributes().build()).put(EntityType.ELDER_GUARDIAN, ElderGuardian.createAttributes().build()).put(EntityType.ENDERMAN, EnderMan.createAttributes().build()).put(EntityType.ENDERMITE, Endermite.createAttributes().build()).put(EntityType.ENDER_DRAGON, EnderDragon.createAttributes().build()).put(EntityType.EVOKER, Evoker.createAttributes().build()).put(EntityType.FOX, Fox.createAttributes().build()).put(EntityType.FROG, Frog.createAttributes().build()).put(EntityType.GHAST, Ghast.createAttributes().build()).put(EntityType.GIANT, Giant.createAttributes().build()).put(EntityType.GLOW_SQUID, GlowSquid.createAttributes().build()).put(EntityType.GOAT, Goat.createAttributes().build()).put(EntityType.GUARDIAN, Guardian.createAttributes().build()).put(EntityType.HOGLIN, Hoglin.createAttributes().build()).put(EntityType.HORSE, AbstractHorse.createBaseHorseAttributes().build()).put(EntityType.HUSK, Zombie.createAttributes().build()).put(EntityType.ILLUSIONER, Illusioner.createAttributes().build()).put(EntityType.IRON_GOLEM, IronGolem.createAttributes().build()).put(EntityType.LLAMA, Llama.createAttributes().build()).put(EntityType.MAGMA_CUBE, MagmaCube.createAttributes().build()).put(EntityType.MOOSHROOM, Cow.createAttributes().build()).put(EntityType.MULE, AbstractChestedHorse.createBaseChestedHorseAttributes().build()).put(EntityType.OCELOT, Ocelot.createAttributes().build()).put(EntityType.PANDA, Panda.createAttributes().build()).put(EntityType.PARROT, Parrot.createAttributes().build()).put(EntityType.PHANTOM, Monster.createMonsterAttributes().build()).put(EntityType.PIG, Pig.createAttributes().build()).put(EntityType.PIGLIN, Piglin.createAttributes().build()).put(EntityType.PIGLIN_BRUTE, PiglinBrute.createAttributes().build()).put(EntityType.PILLAGER, Pillager.createAttributes().build()).put(EntityType.PLAYER, Player.createAttributes().build()).put(EntityType.POLAR_BEAR, PolarBear.createAttributes().build()).put(EntityType.PUFFERFISH, AbstractFish.createAttributes().build()).put(EntityType.RABBIT, Rabbit.createAttributes().build()).put(EntityType.RAVAGER, Ravager.createAttributes().build()).put(EntityType.SALMON, AbstractFish.createAttributes().build()).put(EntityType.SHEEP, Sheep.createAttributes().build()).put(EntityType.SHULKER, Shulker.createAttributes().build()).put(EntityType.SILVERFISH, Silverfish.createAttributes().build()).put(EntityType.SKELETON, AbstractSkeleton.createAttributes().build()).put(EntityType.SKELETON_HORSE, SkeletonHorse.createAttributes().build()).put(EntityType.SLIME, Monster.createMonsterAttributes().build()).put(EntityType.SNIFFER, Sniffer.createAttributes().build()).put(EntityType.SNOW_GOLEM, SnowGolem.createAttributes().build()).put(EntityType.SPIDER, Spider.createAttributes().build()).put(EntityType.SQUID, Squid.createAttributes().build()).put(EntityType.STRAY, AbstractSkeleton.createAttributes().build()).put(EntityType.STRIDER, Strider.createAttributes().build()).put(EntityType.TADPOLE, Tadpole.createAttributes().build()).put(EntityType.TRADER_LLAMA, Llama.createAttributes().build()).put(EntityType.TROPICAL_FISH, AbstractFish.createAttributes().build()).put(EntityType.TURTLE, Turtle.createAttributes().build()).put(EntityType.VEX, Vex.createAttributes().build()).put(EntityType.VILLAGER, Villager.createAttributes().build()).put(EntityType.VINDICATOR, Vindicator.createAttributes().build()).put(EntityType.WARDEN, Warden.createAttributes().build()).put(EntityType.WANDERING_TRADER, Mob.createMobAttributes().build()).put(EntityType.WITCH, Witch.createAttributes().build()).put(EntityType.WITHER, WitherBoss.createAttributes().build()).put(EntityType.WITHER_SKELETON, AbstractSkeleton.createAttributes().build()).put(EntityType.WOLF, Wolf.createAttributes().build()).put(EntityType.ZOGLIN, Zoglin.createAttributes().build()).put(EntityType.ZOMBIE, Zombie.createAttributes().build()).put(EntityType.ZOMBIE_HORSE, ZombieHorse.createAttributes().build()).put(EntityType.ZOMBIE_VILLAGER, Zombie.createAttributes().build()).put(EntityType.ZOMBIFIED_PIGLIN, ZombifiedPiglin.createAttributes().build()).build();
-+    private static final Map<EntityType<? extends LivingEntity>, AttributeSupplier> SUPPLIERS = ImmutableMap.<EntityType<? extends LivingEntity>, AttributeSupplier>builder()
-+            .put(EntityType.ALLAY, Allay.createAttributes().build())
-+            .put(EntityType.ARMOR_STAND, LivingEntity.createLivingAttributes().build())
-+            .put(EntityType.AXOLOTL, Axolotl.createAttributes().build())
-+            .put(EntityType.BAT, Bat.createAttributes().build())
-+            .put(EntityType.BEE, Bee.createAttributes().build())
-+            .put(EntityType.BLAZE, Blaze.createAttributes().build())
-+            .put(EntityType.CAT, Cat.createAttributes().build())
-+            .put(EntityType.CAMEL, Camel.createAttributes().build())
-+            .put(EntityType.CAVE_SPIDER, CaveSpider.createCaveSpider().build())
-+            .put(EntityType.CHICKEN, Chicken.createAttributes().build())
-+            .put(EntityType.COD, AbstractFish.createAttributes().build())
-+            .put(EntityType.COW, Cow.createAttributes().build())
-+            .put(EntityType.CREEPER, Creeper.createAttributes().build())
-+            .put(EntityType.DOLPHIN, Dolphin.createAttributes().build())
-+            .put(EntityType.DONKEY, AbstractChestedHorse.createBaseChestedHorseAttributes().build())
-+            .put(EntityType.DROWNED, Zombie.createAttributes().build())
-+            .put(EntityType.ELDER_GUARDIAN, ElderGuardian.createAttributes().build())
-+            .put(EntityType.ENDERMAN, EnderMan.createAttributes().build())
-+            .put(EntityType.ENDERMITE, Endermite.createAttributes().build())
-+            .put(EntityType.ENDER_DRAGON, EnderDragon.createAttributes().build())
-+            .put(EntityType.EVOKER, Evoker.createAttributes().build())
-+            .put(EntityType.FOX, Fox.createAttributes().build())
-+            .put(EntityType.FROG, Frog.createAttributes().build())
-+            .put(EntityType.GHAST, Ghast.createAttributes().build())
-+            .put(EntityType.GIANT, Giant.createAttributes().build())
-+            .put(EntityType.GLOW_SQUID, GlowSquid.createAttributes().build())
-+            .put(EntityType.GOAT, Goat.createAttributes().build())
-+            .put(EntityType.GUARDIAN, Guardian.createAttributes().build())
-+            .put(EntityType.HOGLIN, Hoglin.createAttributes().build())
-+            .put(EntityType.HORSE, AbstractHorse.createBaseHorseAttributes().build())
-+            .put(EntityType.HUSK, Zombie.createAttributes().build())
-+            .put(EntityType.ILLUSIONER, Illusioner.createAttributes().build())
-+            .put(EntityType.IRON_GOLEM, IronGolem.createAttributes().build())
-+            .put(EntityType.LLAMA, Llama.createAttributes().build())
-+            .put(EntityType.MAGMA_CUBE, MagmaCube.createAttributes().build())
-+            .put(EntityType.MOOSHROOM, Cow.createAttributes().build())
-+            .put(EntityType.MULE, AbstractChestedHorse.createBaseChestedHorseAttributes().build())
-+            .put(EntityType.OCELOT, Ocelot.createAttributes().build())
-+            .put(EntityType.PANDA, Panda.createAttributes().build())
-+            .put(EntityType.PARROT, Parrot.createAttributes().build())
-+            .put(EntityType.PHANTOM, net.minecraft.world.entity.monster.Phantom.createAttributes().build()) // Purpur
-+            .put(EntityType.PIG, Pig.createAttributes().build())
-+            .put(EntityType.PIGLIN, Piglin.createAttributes().build())
-+            .put(EntityType.PIGLIN_BRUTE, PiglinBrute.createAttributes().build())
-+            .put(EntityType.PILLAGER, Pillager.createAttributes().build())
-+            .put(EntityType.PLAYER, Player.createAttributes().build())
-+            .put(EntityType.POLAR_BEAR, PolarBear.createAttributes().build())
-+            .put(EntityType.PUFFERFISH, AbstractFish.createAttributes().build())
-+            .put(EntityType.RABBIT, Rabbit.createAttributes().build())
-+            .put(EntityType.RAVAGER, Ravager.createAttributes().build())
-+            .put(EntityType.SALMON, AbstractFish.createAttributes().build())
-+            .put(EntityType.SHEEP, Sheep.createAttributes().build())
-+            .put(EntityType.SHULKER, Shulker.createAttributes().build())
-+            .put(EntityType.SILVERFISH, Silverfish.createAttributes().build())
-+            .put(EntityType.SKELETON, AbstractSkeleton.createAttributes().build())
-+            .put(EntityType.SKELETON_HORSE, SkeletonHorse.createAttributes().build())
-+            .put(EntityType.SLIME, Monster.createMonsterAttributes().build())
-+            .put(EntityType.SNIFFER, Sniffer.createAttributes().build())
-+            .put(EntityType.SNOW_GOLEM, SnowGolem.createAttributes().build())
-+            .put(EntityType.SPIDER, Spider.createAttributes().build())
-+            .put(EntityType.SQUID, Squid.createAttributes().build())
-+            .put(EntityType.STRAY, AbstractSkeleton.createAttributes().build())
-+            .put(EntityType.STRIDER, Strider.createAttributes().build())
-+            .put(EntityType.TADPOLE, Tadpole.createAttributes().build())
-+            .put(EntityType.TRADER_LLAMA, Llama.createAttributes().build())
-+            .put(EntityType.TROPICAL_FISH, AbstractFish.createAttributes().build())
-+            .put(EntityType.TURTLE, Turtle.createAttributes().build())
-+            .put(EntityType.VEX, Vex.createAttributes().build())
-+            .put(EntityType.VILLAGER, Villager.createAttributes().build())
-+            .put(EntityType.VINDICATOR, Vindicator.createAttributes().build())
-+            .put(EntityType.WARDEN, Warden.createAttributes().build())
-+            .put(EntityType.WANDERING_TRADER, Mob.createMobAttributes().build())
-+            .put(EntityType.WITCH, Witch.createAttributes().build())
-+            .put(EntityType.WITHER, WitherBoss.createAttributes().build())
-+            .put(EntityType.WITHER_SKELETON, AbstractSkeleton.createAttributes().build())
-+            .put(EntityType.WOLF, Wolf.createAttributes().build())
-+            .put(EntityType.ZOGLIN, Zoglin.createAttributes().build())
-+            .put(EntityType.ZOMBIE, Zombie.createAttributes().build())
-+            .put(EntityType.ZOMBIE_HORSE, ZombieHorse.createAttributes().build())
-+            .put(EntityType.ZOMBIE_VILLAGER, Zombie.createAttributes().build())
-+            .put(EntityType.ZOMBIFIED_PIGLIN, ZombifiedPiglin.createAttributes().build()).build();
- 
-     public static AttributeSupplier getSupplier(EntityType<? extends LivingEntity> type) {
-         return SUPPLIERS.get(type);
+@@ -129,7 +129,7 @@ public class DefaultAttributes {
+         .put(EntityType.OCELOT, Ocelot.createAttributes().build())
+         .put(EntityType.PANDA, Panda.createAttributes().build())
+         .put(EntityType.PARROT, Parrot.createAttributes().build())
+-        .put(EntityType.PHANTOM, Monster.createMonsterAttributes().build())
++        .put(EntityType.PHANTOM, net.minecraft.world.entity.monster.Phantom.createAttributes().build()) // Purpur
+         .put(EntityType.PIG, Pig.createAttributes().build())
+         .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 03d77c6d4697d4934ca65e3329982f0efe089820..ce7e3e90993b76225dc820a21e04267e488f5f7b 100644
+index c8fd5696de7c3623cdb4f498190a5c2708cf843e..e403d9dfeeaa3dcf53be790d761e7e922419efb0 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 {
@@ -505,7 +422,7 @@ index 03d77c6d4697d4934ca65e3329982f0efe089820..ce7e3e90993b76225dc820a21e04267e
          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 7df56705a4a0de2dc4ff7ab133fc26612c219162..384bed4505b6cabb1ae151cd2c4eb5e56f24563f 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;
@@ -524,21 +441,13 @@ index 7df56705a4a0de2dc4ff7ab133fc26612c219162..384bed4505b6cabb1ae151cd2c4eb5e5
 -    public void tick() {
 +    public void vanillaTick() { // Purpur
          if (this.lookAtCooldown > 0) {
-             --this.lookAtCooldown;
-             this.getYRotD().ifPresent((yaw) -> {
+             this.lookAtCooldown--;
+             this.getYRotD().ifPresent(yaw -> this.mob.yHeadRot = this.rotateTowards(this.mob.yHeadRot, yaw + 20.0F, this.yMaxRotSpeed));
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 2c91fe46355c9a201507de5577f693ed4f5fb974..e184d2a89a89d4bf77a32a2d610175c5bbd38a03 100644
+index dc27ddf5131e7398a5390a5187261d4c7fb6ccaa..c4a09778ca6bf5c15b588234bcadec3496017e3d 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -18,6 +18,7 @@ import net.minecraft.world.entity.EntityDimensions;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.entity.Mob;
- import net.minecraft.world.entity.MobSpawnType;
-+import net.minecraft.world.entity.MoverType;
- import net.minecraft.world.entity.Pose;
- import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
- import net.minecraft.world.entity.ai.attributes.Attributes;
-@@ -43,12 +44,59 @@ public class Bat extends AmbientCreature {
+@@ -44,12 +44,59 @@ public class Bat extends AmbientCreature {
  
      public Bat(EntityType<? extends Bat> type, Level world) {
          super(type, world);
@@ -551,7 +460,7 @@ index 2c91fe46355c9a201507de5577f693ed4f5fb974..e184d2a89a89d4bf77a32a2d610175c5
  
 +    // Purpur start
 +    @Override
-+    public boolean shouldSendAttribute(net.minecraft.world.entity.ai.attributes.Attribute attribute) { return attribute != Attributes.FLYING_SPEED; } // Fixes log spam on clients
++    public boolean shouldSendAttribute(net.minecraft.world.entity.ai.attributes.Attribute attribute) { return attribute != Attributes.FLYING_SPEED.value(); } // Fixes log spam on clients
 +
 +    @Override
 +    public boolean isRidable() {
@@ -589,7 +498,7 @@ index 2c91fe46355c9a201507de5577f693ed4f5fb974..e184d2a89a89d4bf77a32a2d610175c5
 +            float speed = (float) getAttributeValue(Attributes.FLYING_SPEED) * 2;
 +            setSpeed(speed);
 +            Vec3 mot = getDeltaMovement();
-+            move(MoverType.SELF, mot.multiply(speed, 0.25, speed));
++            move(net.minecraft.world.entity.MoverType.SELF, mot.multiply(speed, 0.25, speed));
 +            setDeltaMovement(mot.scale(0.9D));
 +        }
 +    }
@@ -597,8 +506,8 @@ index 2c91fe46355c9a201507de5577f693ed4f5fb974..e184d2a89a89d4bf77a32a2d610175c5
 +
      @Override
      public boolean isFlapping() {
-         return !this.isResting() && this.tickCount % Bat.TICKS_PER_FLAP == 0;
-@@ -98,7 +146,7 @@ public class Bat extends AmbientCreature {
+         return !this.isResting() && (float) this.tickCount % 10.0F == 0.0F;
+@@ -99,7 +146,7 @@ public class Bat extends AmbientCreature {
      protected void pushEntities() {}
  
      public static AttributeSupplier.Builder createAttributes() {
@@ -607,7 +516,7 @@ index 2c91fe46355c9a201507de5577f693ed4f5fb974..e184d2a89a89d4bf77a32a2d610175c5
      }
  
      public boolean isResting() {
-@@ -130,6 +178,14 @@ public class Bat extends AmbientCreature {
+@@ -132,6 +179,14 @@ public class Bat extends AmbientCreature {
  
      @Override
      protected void customServerAiStep() {
@@ -623,28 +532,27 @@ index 2c91fe46355c9a201507de5577f693ed4f5fb974..e184d2a89a89d4bf77a32a2d610175c5
          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 2249fc6dd98afb8d52623b5864955fdd3b3fc042..2ccfaab0a02cf5ff9779e250fb79a75a9852e10d 100644
+index 3231eaa6af2ddfe4095ff2d650f580ebd4d43aea..e8cb124d232f7316cc8c35dd8bd12f79bbcda7d6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
-@@ -94,7 +94,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -87,6 +87,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
      @Override
      protected void registerGoals() {
          super.registerGoals();
--        this.goalSelector.addGoal(0, new PanicGoal(this, 1.25D));
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 1.6D, 1.4D, EntitySelector.NO_SPECTATORS::test));
+         this.goalSelector.addGoal(0, new PanicGoal(this, 1.25));
+         this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 1.6, 1.4, EntitySelector.NO_SPECTATORS::test));
          this.goalSelector.addGoal(4, new AbstractFish.FishSwimGoal(this));
-     }
-@@ -107,7 +107,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -100,7 +101,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
      @Override
      public void travel(Vec3 movementInput) {
          if (this.isEffectiveAi() && this.isInWater()) {
 -            this.moveRelative(0.01F, movementInput);
 +            this.moveRelative(getRider() != null ? getSpeed() : 0.01F, movementInput); // Purpur
              this.move(MoverType.SELF, this.getDeltaMovement());
-             this.setDeltaMovement(this.getDeltaMovement().scale(0.9D));
+             this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
              if (this.getTarget() == null) {
-@@ -166,7 +166,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -161,7 +162,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
      protected void playStepSound(BlockPos pos, BlockState state) {
      }
  
@@ -653,7 +561,7 @@ index 2249fc6dd98afb8d52623b5864955fdd3b3fc042..2ccfaab0a02cf5ff9779e250fb79a75a
          private final AbstractFish fish;
  
          FishMoveControl(AbstractFish owner) {
-@@ -174,14 +174,22 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -169,14 +170,22 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
              this.fish = owner;
          }
  
@@ -669,7 +577,7 @@ index 2249fc6dd98afb8d52623b5864955fdd3b3fc042..2ccfaab0a02cf5ff9779e250fb79a75a
 +        @Override
 +        public void vanillaTick() { // Purpur
              if (this.fish.isEyeInFluid(FluidTags.WATER)) {
-                 this.fish.setDeltaMovement(this.fish.getDeltaMovement().add(0.0D, 0.005D, 0.0D));
+                 this.fish.setDeltaMovement(this.fish.getDeltaMovement().add(0.0, 0.005, 0.0));
              }
  
              if (this.operation == MoveControl.Operation.MOVE_TO && !this.fish.getNavigation().isDone()) {
@@ -679,26 +587,18 @@ index 2249fc6dd98afb8d52623b5864955fdd3b3fc042..2ccfaab0a02cf5ff9779e250fb79a75a
                  double d = this.wantedX - this.fish.getX();
                  double e = this.wantedY - this.fish.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e506d80540 100644
+index 0dfb8109fd8c022b079da00f6a0e3fc85b57bf7a..4b84cf76d052112e00cd13c330182abfbe618820 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -43,6 +43,7 @@ import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.entity.LivingEntity;
- import net.minecraft.world.entity.Mob;
- import net.minecraft.world.entity.MobType;
-+import net.minecraft.world.entity.MoverType;
- import net.minecraft.world.entity.NeutralMob;
- import net.minecraft.world.entity.PathfinderMob;
- import net.minecraft.world.entity.Pose;
-@@ -147,6 +148,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -143,6 +143,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      public Bee(EntityType<? extends Bee> type, Level world) {
          super(type, world);
          this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(this.random, 20, 60);
 +        final org.purpurmc.purpur.controller.FlyingMoveControllerWASD flyingController = new org.purpurmc.purpur.controller.FlyingMoveControllerWASD(this, 0.25F, 1.0F, false); // Purpur
-         // Paper start - apply gravity to bees when they get stuck in the void, fixes MC-167279
+         // Paper start - Fix MC-167279
          class BeeFlyingMoveControl extends FlyingMoveControl {
              public BeeFlyingMoveControl(final Mob entity, final int maxPitchChange, final boolean noGravity) {
-@@ -155,11 +157,24 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -151,11 +152,24 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
              @Override
              public void tick() {
@@ -722,9 +622,9 @@ index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e5
 +            // Purpur end
          }
          this.moveControl = new BeeFlyingMoveControl(this, 20, true);
-         // Paper end
-@@ -171,6 +186,40 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
-         this.setPathfindingMalus(BlockPathTypes.FENCE, -1.0F);
+         // Paper end - Fix MC-167279
+@@ -167,6 +181,40 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+         this.setPathfindingMalus(PathType.FENCE, -1.0F);
      }
  
 +    // Purpur start
@@ -755,16 +655,16 @@ index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e5
 +            float speed = (float) getAttributeValue(Attributes.FLYING_SPEED) * 2;
 +            setSpeed(speed);
 +            Vec3 mot = getDeltaMovement();
-+            move(MoverType.SELF, mot.multiply(speed, speed, speed));
++            move(net.minecraft.world.entity.MoverType.SELF, mot.multiply(speed, speed, speed));
 +            setDeltaMovement(mot.scale(0.9D));
 +        }
 +    }
 +    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
-@@ -185,6 +234,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
+@@ -181,6 +229,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
      @Override
      protected void registerGoals() {
@@ -772,7 +672,7 @@ index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e5
          this.goalSelector.addGoal(0, new Bee.BeeAttackGoal(this, 1.399999976158142D, true));
          this.goalSelector.addGoal(1, new Bee.BeeEnterHiveGoal());
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-@@ -200,6 +250,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -198,6 +247,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          this.goalSelector.addGoal(7, new Bee.BeeGrowCropGoal());
          this.goalSelector.addGoal(8, new Bee.BeeWanderGoal());
          this.goalSelector.addGoal(9, new FloatGoal(this));
@@ -780,14 +680,14 @@ index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e5
          this.targetSelector.addGoal(1, (new Bee.BeeHurtByOtherGoal(this)).setAlertOthers(new Class[0]));
          this.targetSelector.addGoal(2, new Bee.BeeBecomeAngryTargetGoal(this));
          this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
-@@ -881,16 +932,16 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -872,16 +922,16 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          }
      }
  
 -    private class BeeLookControl extends LookControl {
 +    private class BeeLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur
  
-         BeeLookControl(Mob entity) {
+         BeeLookControl(final Mob entity) {
              super(entity);
          }
  
@@ -801,11 +701,11 @@ index 9a7956befc346e1b58f064213800fd099a052fc6..ef056d4431388a49b24f63524ee246e5
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index de51ce9875e12961e6e549e87d76f492d2f19787..3e89e788c796fe168e43a6b78c0d6c1fc077fc78 100644
+index 07559b9629d4ecb40b511256f400a781e39820e0..3826c794ddde6b915e233e2d0395557e3ea867e0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -98,6 +98,31 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
-         super(type, world);
+@@ -104,6 +104,31 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+         this.reassessTameGoals();
      }
  
 +    // Purpur start
@@ -833,18 +733,18 @@ index de51ce9875e12961e6e549e87d76f492d2f19787..3e89e788c796fe168e43a6b78c0d6c1f
 +    }
 +    // Purpur end
 +
-     public ResourceLocation getResourceLocation() {
-         return this.getVariant().texture();
+     public ResourceLocation getTextureId() {
+         return ((CatVariant) this.getVariant().value()).texture();
      }
-@@ -106,6 +131,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
-     protected void registerGoals() {
-         this.temptGoal = new Cat.CatTemptGoal(this, 0.6D, Cat.TEMPT_INGREDIENT, true);
+@@ -114,6 +139,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+             return itemstack.is(ItemTags.CAT_FOOD);
+         }, true);
          this.goalSelector.addGoal(1, new FloatGoal(this));
 +        this.goalSelector.addGoal(1, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.5D));
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(3, new Cat.CatRelaxOnOwnerGoal(this));
-@@ -118,6 +144,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -126,6 +152,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          this.goalSelector.addGoal(10, new BreedGoal(this, 0.8D));
          this.goalSelector.addGoal(11, new WaterAvoidingRandomStrollGoal(this, 0.8D, 1.0000001E-5F));
          this.goalSelector.addGoal(12, new LookAtPlayerGoal(this, Player.class, 10.0F));
@@ -852,20 +752,20 @@ index de51ce9875e12961e6e549e87d76f492d2f19787..3e89e788c796fe168e43a6b78c0d6c1f
          this.targetSelector.addGoal(1, new NonTameRandomTargetGoal<>(this, Rabbit.class, false, (Predicate) null));
          this.targetSelector.addGoal(1, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
-@@ -374,6 +401,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -377,6 +404,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
  
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
 +        if (getRider() != null) return InteractionResult.PASS; // Purpur
          ItemStack itemstack = player.getItemInHand(hand);
          Item item = itemstack.getItem();
- 
+         InteractionResult enuminteractionresult;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 5e7e6526e2750d508a870dfbdbb46e520d201796..89e93366395136af826d26be2b85ac881e0dfacc 100644
+index 0a4d4cb4ad7cda7c50c46151c03586865d56c797..3e335383a28b510c779bfbf2b916653a25c6d43b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -55,9 +55,27 @@ public class Chicken extends Animal {
-         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0F);
+@@ -54,9 +54,27 @@ public class Chicken extends Animal {
+         this.setPathfindingMalus(PathType.WATER, 0.0F);
      }
  
 +    // Purpur start
@@ -891,7 +791,7 @@ index 5e7e6526e2750d508a870dfbdbb46e520d201796..89e93366395136af826d26be2b85ac88
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, Chicken.FOOD_ITEMS, false));
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, (itemstack) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
 index 824e5e4fe7619ae46061c3c978c9a044db8c84ab..e2a98b45e56a368de19bb65e304370a5998c7cb9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
@@ -916,10 +816,10 @@ index 824e5e4fe7619ae46061c3c978c9a044db8c84ab..e2a98b45e56a368de19bb65e304370a5
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 3cdd9f379c7e2d46ea47c9ef55b121c93ec0bb4a..b0cff23aa6f841ad291437964ea5bebb6395de84 100644
+index 5a7b1be351834a6b8889b1380cede1be025cb302..41b6c79c31414378d433500a35e434e546738e42 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -45,9 +45,27 @@ public class Cow extends Animal {
+@@ -44,9 +44,27 @@ public class Cow extends Animal {
          super(type, world);
      }
  
@@ -946,8 +846,8 @@ index 3cdd9f379c7e2d46ea47c9ef55b121c93ec0bb4a..b0cff23aa6f841ad291437964ea5bebb
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT), false));
-@@ -88,6 +106,7 @@ public class Cow extends Animal {
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, (itemstack) -> {
+@@ -94,6 +112,7 @@ public class Cow extends Animal {
  
      @Override
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -955,7 +855,7 @@ index 3cdd9f379c7e2d46ea47c9ef55b121c93ec0bb4a..b0cff23aa6f841ad291437964ea5bebb
          ItemStack itemstack = player.getItemInHand(hand);
  
          if (itemstack.is(Items.BUCKET) && !this.isBaby()) {
-@@ -95,7 +114,7 @@ public class Cow extends Animal {
+@@ -101,7 +120,7 @@ public class Cow extends Animal {
              PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((ServerLevel) player.level(), player, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, hand);
  
              if (event.isCancelled()) {
@@ -965,10 +865,10 @@ index 3cdd9f379c7e2d46ea47c9ef55b121c93ec0bb4a..b0cff23aa6f841ad291437964ea5bebb
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..3dab78e2f39855f71bb7294521be71b3faa59b81 100644
+index 1b1cb0e4d54e52ebe794199e386c54c5d84b3719..3af2017a4b860992a6db88edec3624fcb9884ae1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -82,14 +82,82 @@ public class Dolphin extends WaterAnimal {
+@@ -81,14 +81,82 @@ public class Dolphin extends WaterAnimal {
      public static final Predicate<ItemEntity> ALLOWED_ITEMS = (entityitem) -> {
          return !entityitem.hasPickUpDelay() && entityitem.isAlive() && entityitem.isInWater();
      };
@@ -1051,8 +951,8 @@ index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..3dab78e2f39855f71bb7294521be71b3
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
-@@ -164,6 +232,7 @@ public class Dolphin extends WaterAnimal {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
+@@ -158,6 +226,7 @@ public class Dolphin extends WaterAnimal {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new BreathAirGoal(this));
          this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
@@ -1060,7 +960,7 @@ index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..3dab78e2f39855f71bb7294521be71b3
          this.goalSelector.addGoal(1, new Dolphin.DolphinSwimToTreasureGoal(this));
          this.goalSelector.addGoal(2, new Dolphin.DolphinSwimWithPlayerGoal(this, 4.0D));
          this.goalSelector.addGoal(4, new RandomSwimmingGoal(this, 1.0D, 10));
-@@ -174,6 +243,7 @@ public class Dolphin extends WaterAnimal {
+@@ -168,6 +237,7 @@ public class Dolphin extends WaterAnimal {
          this.goalSelector.addGoal(8, new Dolphin.PlayWithItemsGoal());
          this.goalSelector.addGoal(8, new FollowBoatGoal(this));
          this.goalSelector.addGoal(9, new AvoidEntityGoal<>(this, Guardian.class, 8.0F, 1.0D, 1.0D));
@@ -1068,7 +968,7 @@ index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..3dab78e2f39855f71bb7294521be71b3
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Guardian.class})).setAlertOthers());
      }
  
-@@ -225,7 +295,7 @@ public class Dolphin extends WaterAnimal {
+@@ -214,7 +284,7 @@ public class Dolphin extends WaterAnimal {
  
      @Override
      protected boolean canRide(Entity entity) {
@@ -1077,7 +977,7 @@ index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..3dab78e2f39855f71bb7294521be71b3
      }
  
      @Override
-@@ -260,6 +330,11 @@ public class Dolphin extends WaterAnimal {
+@@ -249,6 +319,11 @@ public class Dolphin extends WaterAnimal {
      @Override
      public void tick() {
          super.tick();
@@ -1090,10 +990,10 @@ index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..3dab78e2f39855f71bb7294521be71b3
              this.setAirSupply(this.getMaxAirSupply());
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 31d4683f5e158f076ce9a416b7003478af293688..7d692f61ed4c6cc8e6b94eda4f48e9cb6baa0ae2 100644
+index e705449496b1a06270ecbc13f4dce5357479845b..935dff4d167d8b6ef4b7cdc95bf000a2ce761f92 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -144,6 +144,44 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -145,6 +145,44 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
          this.setCanPickUpLoot(true);
      }
  
@@ -1136,9 +1036,9 @@ index 31d4683f5e158f076ce9a416b7003478af293688..7d692f61ed4c6cc8e6b94eda4f48e9cb
 +    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
-@@ -163,6 +201,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
+@@ -164,6 +202,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
              return entityliving instanceof AbstractSchoolingFish;
          });
          this.goalSelector.addGoal(0, new Fox.FoxFloatGoal());
@@ -1146,7 +1046,7 @@ index 31d4683f5e158f076ce9a416b7003478af293688..7d692f61ed4c6cc8e6b94eda4f48e9cb
          this.goalSelector.addGoal(0, new ClimbOnTopOfPowderSnowGoal(this, this.level()));
          this.goalSelector.addGoal(1, new Fox.FaceplantGoal());
          this.goalSelector.addGoal(2, new Fox.FoxPanicGoal(2.2D));
-@@ -189,6 +228,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -190,6 +229,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
          this.goalSelector.addGoal(11, new Fox.FoxSearchForItemsGoal());
          this.goalSelector.addGoal(12, new Fox.FoxLookAtPlayerGoal(this, Player.class, 24.0F));
          this.goalSelector.addGoal(13, new Fox.PerchAndSearchGoal());
@@ -1195,11 +1095,11 @@ index 31d4683f5e158f076ce9a416b7003478af293688..7d692f61ed4c6cc8e6b94eda4f48e9cb
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index f383928fc5b331ddf128bdcb6a23010d8fe088d3..6815d7350a82c6d32f60aa6116466ebd06a920f9 100644
+index 932fae98c551052cadba4c6fc6e575fc30a25d58..4cc9138201b08aff8bb47720c6fe1e3447f03967 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -66,8 +66,27 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
-         this.setMaxUpStep(1.0F);
+@@ -61,8 +61,27 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+         super(type, world);
      }
  
 +    // Purpur start
@@ -1226,7 +1126,7 @@ index f383928fc5b331ddf128bdcb6a23010d8fe088d3..6815d7350a82c6d32f60aa6116466ebd
          this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.0D, true));
          this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
          this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false));
-@@ -75,6 +94,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -70,6 +89,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          this.goalSelector.addGoal(5, new OfferFlowerGoal(this));
          this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
@@ -1234,7 +1134,7 @@ index f383928fc5b331ddf128bdcb6a23010d8fe088d3..6815d7350a82c6d32f60aa6116466ebd
          this.targetSelector.addGoal(1, new DefendVillageTargetGoal(this));
          this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
-@@ -270,13 +290,13 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -265,13 +285,13 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          ItemStack itemstack = player.getItemInHand(hand);
  
          if (!itemstack.is(Items.IRON_INGOT)) {
@@ -1251,10 +1151,10 @@ index f383928fc5b331ddf128bdcb6a23010d8fe088d3..6815d7350a82c6d32f60aa6116466ebd
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 52cc265f1663d648b6bfd03f2ac3e191b1c16d44..9a84599457bbd14314e0c4f3fa8bf30bec8da347 100644
+index 0c21959f57ae88fcd0a4d6dc911c1ce347c96528..11944ee34fc7e3e5551b9e18a563164f96898a54 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -63,6 +63,23 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -64,6 +64,23 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          super(type, world);
      }
  
@@ -1278,29 +1178,29 @@ index 52cc265f1663d648b6bfd03f2ac3e191b1c16d44..9a84599457bbd14314e0c4f3fa8bf30b
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
-@@ -123,7 +140,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-         } else if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
-             // CraftBukkit start
-             if (!CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand)) {
--                return InteractionResult.PASS;
-+                return tryRide(player, hand); // Purpur
+@@ -128,7 +145,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+             org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
+             if (event != null) {
+                 if (event.isCancelled()) {
+-                    return InteractionResult.PASS;
++                    return tryRide(player, hand); // Purpur
+                 }
+                 drops = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getDrops());
              }
-             // CraftBukkit end
-             this.shear(SoundSource.PLAYERS);
-@@ -144,7 +161,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-                 Optional<List<SuspiciousEffectHolder.EffectEntry>> optional = this.getEffectsFromItemStack(itemstack);
+@@ -150,7 +167,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+                 Optional<SuspiciousStewEffects> optional = this.getEffectsFromItemStack(itemstack);
  
                  if (optional.isEmpty()) {
 -                    return InteractionResult.PASS;
 +                    return tryRide(player, hand); // Purpur
                  }
  
-                 if (!player.getAbilities().instabuild) {
+                 itemstack.consume(1, player);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 4300fab61765dd224fab084d118aae7294fc9de6..66f80ec010909648278c4e74c80d3766b9cf6c6a 100644
+index 2c7491edbb60e7ec6a208ea7292cd28a3f8f9e31..2b074f68c1be2ff591543685bbb4e7ea1c7784f8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -70,6 +70,23 @@ public class Ocelot extends Animal {
+@@ -66,6 +66,23 @@ public class Ocelot extends Animal {
          this.reassessTrustingGoals();
      }
  
@@ -1324,9 +1224,9 @@ index 4300fab61765dd224fab084d118aae7294fc9de6..66f80ec010909648278c4e74c80d3766
      public boolean isTrusting() {
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
-@@ -101,12 +118,14 @@ public class Ocelot extends Animal {
-     protected void registerGoals() {
-         this.temptGoal = new Ocelot.OcelotTemptGoal(this, 0.6D, Ocelot.TEMPT_INGREDIENT, true);
+@@ -99,12 +116,14 @@ public class Ocelot extends Animal {
+             return itemstack.is(ItemTags.OCELOT_FOOD);
+         }, true);
          this.goalSelector.addGoal(1, new FloatGoal(this));
 +        this.goalSelector.addGoal(1, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(3, this.temptGoal);
@@ -1340,10 +1240,10 @@ index 4300fab61765dd224fab084d118aae7294fc9de6..66f80ec010909648278c4e74c80d3766
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a4fb8d80b 100644
+index db60b91c2b26ca8cdb66e05deab7742ffe212767..5f9b7ae2ed4acff0fa7cfee07a29a28b5c0d67f8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -114,6 +114,32 @@ public class Panda extends Animal {
+@@ -120,6 +120,32 @@ public class Panda extends Animal {
  
      }
  
@@ -1376,7 +1276,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
      @Override
      public boolean canTakeItem(ItemStack stack) {
          EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
-@@ -275,6 +301,7 @@ public class Panda extends Animal {
+@@ -281,6 +307,7 @@ public class Panda extends Animal {
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -1384,7 +1284,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
          this.goalSelector.addGoal(2, new Panda.PandaPanicGoal(this, 2.0D));
          this.goalSelector.addGoal(2, new Panda.PandaBreedGoal(this, 1.0D));
          this.goalSelector.addGoal(3, new Panda.PandaAttackGoal(this, 1.2000000476837158D, true));
-@@ -290,6 +317,7 @@ public class Panda extends Animal {
+@@ -298,6 +325,7 @@ public class Panda extends Animal {
          this.goalSelector.addGoal(12, new Panda.PandaRollGoal(this));
          this.goalSelector.addGoal(13, new FollowParentGoal(this, 1.25D));
          this.goalSelector.addGoal(14, new WaterAvoidingRandomStrollGoal(this, 1.0D));
@@ -1392,7 +1292,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
          this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0]));
      }
  
-@@ -636,7 +664,7 @@ public class Panda extends Animal {
+@@ -655,7 +683,7 @@ public class Panda extends Animal {
          ItemStack itemstack = player.getItemInHand(hand);
  
          if (this.isScared()) {
@@ -1401,8 +1301,8 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
          } else if (this.isOnBack()) {
              this.setOnBack(false);
              return InteractionResult.sidedSuccess(this.level().isClientSide);
-@@ -653,7 +681,7 @@ public class Panda extends Animal {
-                 this.setInLove(player);
+@@ -673,7 +701,7 @@ public class Panda extends Animal {
+                 this.setInLove(player, breedCopy); // Paper - Fix EntityBreedEvent copying
              } else {
                  if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
 -                    return InteractionResult.PASS;
@@ -1410,7 +1310,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
                  }
  
                  this.tryToSit();
-@@ -672,7 +700,7 @@ public class Panda extends Animal {
+@@ -692,7 +720,7 @@ public class Panda extends Animal {
  
              return InteractionResult.SUCCESS;
          } else {
@@ -1419,8 +1319,8 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
          }
      }
  
-@@ -717,7 +745,7 @@ public class Panda extends Animal {
-         return new Vector3f(0.0F, dimensions.height - (this.isBaby() ? 0.4375F : 0.0F) * scaleFactor, 0.0F);
+@@ -737,7 +765,7 @@ public class Panda extends Animal {
+         return this.isBaby() ? Panda.BABY_DIMENSIONS : super.getDefaultDimensions(pose);
      }
  
 -    private static class PandaMoveControl extends MoveControl {
@@ -1428,7 +1328,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
  
          private final Panda panda;
  
-@@ -727,9 +755,9 @@ public class Panda extends Animal {
+@@ -747,9 +775,9 @@ public class Panda extends Animal {
          }
  
          @Override
@@ -1441,10 +1341,10 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 397264d31992fd43bd57736c25693ae001330b6d..a3cb82e65ea344de1889762f638e72fcf0a44714 100644
+index 5ca96541abbb754f4d9fbe01f37ebaf19c532bbb..12200cca54304d567a1880527a49f3e26ad08c7b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -130,12 +130,68 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -124,12 +124,68 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      public Parrot(EntityType<? extends Parrot> type, Level world) {
          super(type, world);
@@ -1472,9 +1372,9 @@ index 397264d31992fd43bd57736c25693ae001330b6d..a3cb82e65ea344de1889762f638e72fc
 +        }
 +        this.moveControl = new ParrotMoveControl(this, 10, false);
 +        // Purpur end
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0F);
-         this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, -1.0F);
-         this.setPathfindingMalus(BlockPathTypes.COCOA, -1.0F);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, -1.0F);
+         this.setPathfindingMalus(PathType.DAMAGE_FIRE, -1.0F);
+         this.setPathfindingMalus(PathType.COCOA, -1.0F);
      }
  
 +    // Purpur start
@@ -1513,8 +1413,8 @@ index 397264d31992fd43bd57736c25693ae001330b6d..a3cb82e65ea344de1889762f638e72fc
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
-@@ -154,8 +210,10 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
+@@ -148,8 +204,10 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      @Override
      protected void registerGoals() {
@@ -1527,10 +1427,10 @@ index 397264d31992fd43bd57736c25693ae001330b6d..a3cb82e65ea344de1889762f638e72fc
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(2, new FollowOwnerGoal(this, 1.0D, 5.0F, 1.0F, true));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index a43479c92775d618794f8f1fbeb31f42d303e167..28f68a7383fe6e53541eb1b36ba73eb15723f0f7 100644
+index dc67b0e8c4020c3f8a632efc82a6cd93b9bffe9f..7d2579748fd182b89667edb2eb3ea65b195e2001 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -67,9 +67,27 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -64,9 +64,27 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          this.steering = new ItemBasedSteering(this.entityData, Pig.DATA_BOOST_TIME, Pig.DATA_SADDLE_ID);
      }
  
@@ -1557,12 +1457,12 @@ index a43479c92775d618794f8f1fbeb31f42d303e167..28f68a7383fe6e53541eb1b36ba73eb1
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.25D));
          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));
+         this.goalSelector.addGoal(4, new TemptGoal(this, 1.2D, (itemstack) -> {
 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 01e17bac2358c42fb9455974ab8141e32c4f9161..2b6efb46035c5695928643780bfbd5b5a2ed28e9 100644
+index c87a57e8ceac32a6c8a603aa24f8cb053610e47c..d97314380b69ea2ad83b86c0f1bcaaccd4a1644f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -60,11 +60,40 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -59,11 +59,40 @@ public class PolarBear extends Animal implements NeutralMob {
      private int remainingPersistentAngerTime;
      @Nullable
      private UUID persistentAngerTarget;
@@ -1603,25 +1503,26 @@ index 01e17bac2358c42fb9455974ab8141e32c4f9161..2b6efb46035c5695928643780bfbd5b5
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-@@ -80,12 +109,14 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -79,12 +108,14 @@ public class PolarBear extends Animal implements NeutralMob {
      protected void registerGoals() {
          super.registerGoals();
          this.goalSelector.addGoal(0, new FloatGoal(this));
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal());
          this.goalSelector.addGoal(1, new PolarBear.PolarBearPanicGoal());
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
-         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
+         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25));
+         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
 +        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(1, new PolarBear.PolarBearHurtByTargetGoal());
          this.targetSelector.addGoal(2, new PolarBear.PolarBearAttackPlayersGoal());
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
-@@ -202,6 +233,11 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -201,6 +232,12 @@ public class PolarBear extends Animal implements NeutralMob {
+         if (!this.level().isClientSide) {
              this.updatePersistentAnger((ServerLevel)this.level(), true);
          }
- 
++
 +        // Purpur start
 +        if (isStanding() && --standTimer <= 0) {
 +            setStanding(false);
@@ -1630,7 +1531,7 @@ index 01e17bac2358c42fb9455974ab8141e32c4f9161..2b6efb46035c5695928643780bfbd5b5
      }
  
      @Override
-@@ -231,6 +267,7 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -230,6 +267,7 @@ public class PolarBear extends Animal implements NeutralMob {
  
      public void setStanding(boolean warning) {
          this.entityData.set(DATA_STANDING_ID, warning);
@@ -1639,10 +1540,10 @@ index 01e17bac2358c42fb9455974ab8141e32c4f9161..2b6efb46035c5695928643780bfbd5b5
  
      public float getStandingAnimationScale(float tickDelta) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index a197337f2e09f53cf382022569c8836745d78769..95383e246a8e1b311e4f26a66372966b6bc51de5 100644
+index 3f0fad476fe573c3ba946a9436d1b3f7c5260ee2..d75016647c513841358d08e5931821ecf8c21c2a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-@@ -45,6 +45,18 @@ public class Pufferfish extends AbstractFish {
+@@ -51,6 +51,18 @@ public class Pufferfish extends AbstractFish {
          this.refreshDimensions();
      }
  
@@ -1659,13 +1560,13 @@ index a197337f2e09f53cf382022569c8836745d78769..95383e246a8e1b311e4f26a66372966b
 +    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc0add1797 100644
+index b58300e114e2e27ac68d7a9489bc52b127c9bc17..ba408a4195e03b484f143fbe66d5d3b13ebb8f11 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -87,6 +87,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -86,6 +86,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      private boolean wasOnGround;
      private int jumpDelayTicks;
      public int moreCarrotTicks;
@@ -1673,7 +1574,7 @@ index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc
  
      public Rabbit(EntityType<? extends Rabbit> type, Level world) {
          super(type, world);
-@@ -94,9 +95,55 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -93,9 +94,55 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          this.moveControl = new Rabbit.RabbitMoveControl(this);
      }
  
@@ -1729,7 +1630,7 @@ index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc
          this.goalSelector.addGoal(1, new ClimbOnTopOfPowderSnowGoal(this, this.level()));
          this.goalSelector.addGoal(1, new Rabbit.RabbitPanicGoal(this, 2.2D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 0.8D));
-@@ -111,6 +158,14 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -112,6 +159,14 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
  
      @Override
      protected float getJumpPower() {
@@ -1744,7 +1645,7 @@ index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc
          float f = 0.3F;
  
          if (this.horizontalCollision || this.moveControl.hasWanted() && this.moveControl.getWantedY() > this.getY() + 0.5D) {
-@@ -135,7 +190,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -136,7 +191,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      }
  
      @Override
@@ -1753,7 +1654,7 @@ index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc
          super.jumpFromGround();
          double d0 = this.moveControl.getSpeedModifier();
  
-@@ -185,6 +240,13 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -186,6 +241,13 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
  
      @Override
      public void customServerAiStep() {
@@ -1767,7 +1668,7 @@ index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc
          if (this.jumpDelayTicks > 0) {
              --this.jumpDelayTicks;
          }
-@@ -469,7 +531,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -466,7 +528,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          }
      }
  
@@ -1776,7 +1677,7 @@ index cf4859814a60468f683e3afe285b4934d35e9704..f8989e0db656389fe04487d5d407aacc
  
          private final Rabbit rabbit;
          private double nextJumpSpeed;
-@@ -480,14 +542,14 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -477,14 +539,14 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          }
  
          @Override
@@ -1817,10 +1718,10 @@ index 0af79daa357f53a8871e293b57e16c099e5d3f64..87c442fb198cad8671ad1419e589a5a6
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 55afa58f3df53ce548c7484d8fff62c903f9dc07..80b91cdaffc0af25b9a8b13281519cf093928e85 100644
+index 3ce86f952a18cae7fda1903916903b31a63a40b4..7c1da46554aefde8e5e2b33a3644c9cbd771d7bc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -119,10 +119,28 @@ public class Sheep extends Animal implements Shearable {
+@@ -117,10 +117,28 @@ public class Sheep extends Animal implements Shearable {
          super(type, world);
      }
  
@@ -1848,12 +1749,12 @@ index 55afa58f3df53ce548c7484d8fff62c903f9dc07..80b91cdaffc0af25b9a8b13281519cf0
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.25D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.1D, Ingredient.of(Items.WHEAT), false));
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.1D, (itemstack) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..04927f5f06d6dc14ad01319dd22583632c2c511b 100644
+index 5c2ed3c39c8eb850f3be1e2ea5b5a7ea266e16d1..d51b486afb83bf3e12046ed5e61e73eec5bd7c7c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -54,12 +54,31 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -52,12 +52,31 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
          super(type, world);
      }
  
@@ -1885,7 +1786,7 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..04927f5f06d6dc14ad01319dd2258363
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Mob.class, 10, true, false, (entityliving) -> {
              return entityliving instanceof Enemy;
          }));
-@@ -107,6 +126,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -105,6 +124,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
                  return;
              }
  
@@ -1893,16 +1794,16 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..04927f5f06d6dc14ad01319dd2258363
              BlockState iblockdata = Blocks.SNOW.defaultBlockState();
  
              for (int i = 0; i < 4; ++i) {
-@@ -154,7 +174,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-         if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
-             // CraftBukkit start
-             if (!CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand)) {
--                return InteractionResult.PASS;
-+                return tryRide(player, hand); // Purpur
+@@ -151,7 +171,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+             org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
+             if (event != null) {
+                 if (event.isCancelled()) {
+-                    return InteractionResult.PASS;
++                    return tryRide(player, hand); // Purpur
+                 }
+                 drops = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getDrops());
              }
-             // CraftBukkit end
-             this.shear(SoundSource.PLAYERS);
-@@ -167,7 +187,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -165,7 +185,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
  
              return InteractionResult.sidedSuccess(this.level().isClientSide);
          } else {
@@ -1912,10 +1813,10 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..04927f5f06d6dc14ad01319dd2258363
      }
  
 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 f60c4cd0543fd5d50fa7e2c1a9e8381227adb540..7fa03dbc442942b70f374096e346d54089d8f0a0 100644
+index 43b4ea96c5c4a6234e5b83d41db9b85c1fe27b8f..37402f7df48f04a6df2211e079519ed95d3735bc 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 {
+@@ -46,9 +46,32 @@ public class Squid extends WaterAnimal {
          this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
      }
  
@@ -1948,7 +1849,7 @@ index f60c4cd0543fd5d50fa7e2c1a9e8381227adb540..7fa03dbc442942b70f374096e346d540
          this.goalSelector.addGoal(1, new Squid.SquidFleeGoal());
      }
  
-@@ -298,6 +321,37 @@ public class Squid extends WaterAnimal {
+@@ -290,6 +313,37 @@ public class Squid extends WaterAnimal {
  
          @Override
          public void tick() {
@@ -1987,10 +1888,10 @@ index f60c4cd0543fd5d50fa7e2c1a9e8381227adb540..7fa03dbc442942b70f374096e346d540
              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 b05b560b7570e97bc234b75f26233909fcf575b3..71234b258157579d3a47064e7e299bb7fb90908f 100644
+index 3d03ffe2e12eca82dfa2f414471d12bb362d4552..18dcb67d246b63637d8c948b6c3f48c58d71c339 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-@@ -42,6 +42,18 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
+@@ -67,6 +67,18 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
          super(type, world);
      }
  
@@ -2010,11 +1911,11 @@ index b05b560b7570e97bc234b75f26233909fcf575b3..71234b258157579d3a47064e7e299bb7
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 490472bb618e9ac07da5883a71dff8920525b1e2..b9fb6c5527a621bc8012188d2e08604fe730e6c8 100644
+index 30b87b5cb18c25cdd04eab64cfbe5acd6c1b6d84..4742d90ca38c1d8034b0cfcf7f336e225fade197 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -86,6 +86,23 @@ public class Turtle extends Animal {
-         this.setMaxUpStep(1.0F);
+@@ -87,6 +87,23 @@ public class Turtle extends Animal {
+         this.moveControl = new Turtle.TurtleMoveControl(this);
      }
  
 +    // Purpur start
@@ -2037,7 +1938,7 @@ index 490472bb618e9ac07da5883a71dff8920525b1e2..b9fb6c5527a621bc8012188d2e08604f
      public void setHomePos(BlockPos pos) {
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
-@@ -188,6 +205,7 @@ public class Turtle extends Animal {
+@@ -189,6 +206,7 @@ public class Turtle extends Animal {
  
      @Override
      protected void registerGoals() {
@@ -2045,8 +1946,8 @@ index 490472bb618e9ac07da5883a71dff8920525b1e2..b9fb6c5527a621bc8012188d2e08604f
          this.goalSelector.addGoal(0, new Turtle.TurtlePanicGoal(this, 1.2D));
          this.goalSelector.addGoal(1, new Turtle.TurtleBreedGoal(this, 1.0D));
          this.goalSelector.addGoal(1, new Turtle.TurtleLayEggGoal(this, 1.0D));
-@@ -351,13 +369,15 @@ public class Turtle extends Animal {
-         return new Vector3f(0.0F, dimensions.height + (this.isBaby() ? 0.0F : 0.15625F) * scaleFactor, -0.25F * scaleFactor);
+@@ -342,13 +360,15 @@ public class Turtle extends Animal {
+         return this.isBaby() ? Turtle.BABY_DIMENSIONS : super.getDefaultDimensions(pose);
      }
  
 -    private static class TurtleMoveControl extends MoveControl {
@@ -2062,27 +1963,16 @@ index 490472bb618e9ac07da5883a71dff8920525b1e2..b9fb6c5527a621bc8012188d2e08604f
          }
  
          private void updateSpeed() {
-@@ -376,8 +396,18 @@ public class Turtle extends Animal {
- 
+@@ -368,7 +388,7 @@ public class Turtle extends Animal {
          }
  
-+        // Purpur start
-+        public void purpurTick(Player rider) {
-+            if (turtle.isInWater()) {
-+                waterController.purpurTick(rider);
-+            } else {
-+                super.purpurTick(rider);
-+            }
-+        }
-+        // Purpur end
-+
          @Override
 -        public void tick() {
 +        public void vanillaTick() { // Purpur
              this.updateSpeed();
              if (this.operation == MoveControl.Operation.MOVE_TO && !this.turtle.getNavigation().isDone()) {
                  double d0 = this.wantedX - this.turtle.getX();
-@@ -393,7 +423,7 @@ public class Turtle extends Animal {
+@@ -384,7 +404,7 @@ public class Turtle extends Animal {
  
                      this.turtle.setYRot(this.rotlerp(this.turtle.getYRot(), f, 90.0F));
                      this.turtle.yBodyRot = this.turtle.getYRot();
@@ -2092,11 +1982,11 @@ index 490472bb618e9ac07da5883a71dff8920525b1e2..b9fb6c5527a621bc8012188d2e08604f
                      this.turtle.setSpeed(Mth.lerp(0.125F, this.turtle.getSpeed(), f1));
                      this.turtle.setDeltaMovement(this.turtle.getDeltaMovement().add(0.0D, (double) this.turtle.getSpeed() * d1 * 0.1D, 0.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index eecb7511582e5e316b71fa4a4734881424be5ca7..2efa2e19485f9d959a55115ab62f985454689379 100644
+index cebbb7341f86b13dcbfc3a41cbe264e9d4b68d60..92cc8a9b033052d5f510792d916c60cb2b90f07c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -105,9 +105,32 @@ public class Wolf extends TamableAnimal implements NeutralMob {
-         this.setPathfindingMalus(BlockPathTypes.DANGER_POWDER_SNOW, -1.0F);
+@@ -124,9 +124,32 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+         this.setPathfindingMalus(PathType.DANGER_POWDER_SNOW, -1.0F);
      }
  
 +    // Purpur start
@@ -2125,10 +2015,10 @@ index eecb7511582e5e316b71fa4a4734881424be5ca7..2efa2e19485f9d959a55115ab62f9854
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 +        this.goalSelector.addGoal(1, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.goalSelector.addGoal(1, new Wolf.WolfPanicGoal(1.5D));
+         this.goalSelector.addGoal(1, new Wolf.WolfPanicGoal(this, 1.5D));
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(3, new Wolf.WolfAvoidEntityGoal<>(this, Llama.class, 24.0F, 1.5D, 1.5D));
-@@ -119,6 +142,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -138,6 +161,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          this.goalSelector.addGoal(9, new BegGoal(this, 8.0F));
          this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(10, new RandomLookAroundGoal(this));
@@ -2137,7 +2027,7 @@ index eecb7511582e5e316b71fa4a4734881424be5ca7..2efa2e19485f9d959a55115ab62f9854
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
          this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index d241ca4d0295f9fce39c11197bd435cfac7f6e54..09f796ec491f21520e1fcc454249e4696dad3b1b 100644
+index 991e3274091c4e25eebc6debd44653e5b566eedb..09502b15c20f401c3b56ecedc4d3b515384d654f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -100,10 +100,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -2194,21 +2084,20 @@ index d241ca4d0295f9fce39c11197bd435cfac7f6e54..09f796ec491f21520e1fcc454249e469
      @Override
      protected Brain.Provider<Allay> brainProvider() {
          return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
-@@ -225,7 +260,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+@@ -218,6 +253,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("allayBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
          this.level().getProfiler().pop();
          this.level().getProfiler().push("allayActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index eb1e850f11ed1cd8d2f1f2eb1af55b7fe6352ed4..4dfe6a909ac3d553bd1cd4cfc131ac8bfb5a0b02 100644
+index a8cc6ddbf45370fe632e5c5fb7ceef3d299e62a4..045ac081120f65987251d04d1522a5b7197e1d88 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -98,6 +98,23 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
-         this.setMaxUpStep(1.0F);
+@@ -96,6 +96,23 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+         this.lookControl = new Axolotl.AxolotlLookControl(this, 20);
      }
  
 +    // Purpur start
@@ -2231,17 +2120,15 @@ index eb1e850f11ed1cd8d2f1f2eb1af55b7fe6352ed4..4dfe6a909ac3d553bd1cd4cfc131ac8b
      @Override
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
-@@ -283,8 +300,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
-     private int behaviorTick = 0; // Pufferfish
+@@ -271,6 +288,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
      @Override
      protected void customServerAiStep() {
--        this.level().getProfiler().push("axolotlBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         this.level().getProfiler().push("axolotlBrain");
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
          this.level().getProfiler().pop();
          this.level().getProfiler().push("axolotlActivityUpdate");
-@@ -516,14 +532,22 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -503,14 +521,22 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
      private static class AxolotlMoveControl extends SmoothSwimmingMoveControl {
  
          private final Axolotl axolotl;
@@ -2264,7 +2151,7 @@ index eb1e850f11ed1cd8d2f1f2eb1af55b7fe6352ed4..4dfe6a909ac3d553bd1cd4cfc131ac8b
              if (!this.axolotl.isPlayingDead()) {
                  super.tick();
              }
-@@ -538,9 +562,9 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -525,9 +551,9 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
          }
  
          @Override
@@ -2277,11 +2164,11 @@ index eb1e850f11ed1cd8d2f1f2eb1af55b7fe6352ed4..4dfe6a909ac3d553bd1cd4cfc131ac8b
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 1d9427da270edb447a2c8e031c4f05fe5d39603b..29108c481756d3150fd0ae69f6d249d127b11fdd 100644
+index 4eb26874f21726bbc6e6ad78bfaf4ecd268c7246..4477f201ff02a5e0758af5431b7d9b7c5e11d642 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -86,6 +86,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
-         groundPathNavigation.setCanWalkOverFences(true);
+@@ -84,6 +84,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+         navigation.setCanWalkOverFences(true);
      }
  
 +    // Purpur start
@@ -2295,10 +2182,10 @@ index 1d9427da270edb447a2c8e031c4f05fe5d39603b..29108c481756d3150fd0ae69f6d249d1
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index c8e3d47b3f2dc919cca8ad397095437f1da6c762..3098f90ef97f69dbaf482ce0acd0c0c7ba3572b9 100644
+index 816977990639ec0559b652fc9666afd5046f0a5d..b6a4b4e66ca67e4dcb4b14a13ab6586a94e1b020 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -79,16 +79,65 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -103,6 +103,8 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
      public final AnimationState croakAnimationState = new AnimationState();
      public final AnimationState tongueAnimationState = new AnimationState();
      public final AnimationState swimIdleAnimationState = new AnimationState();
@@ -2307,10 +2194,10 @@ index c8e3d47b3f2dc919cca8ad397095437f1da6c762..3098f90ef97f69dbaf482ce0acd0c0c7
  
      public Frog(EntityType<? extends Animal> type, Level world) {
          super(type, world);
-         this.lookControl = new Frog.FrogLookControl(this);
-         this.setPathfindingMalus(BlockPathTypes.WATER, 4.0F);
-         this.setPathfindingMalus(BlockPathTypes.TRAPDOOR, -1.0F);
--        this.moveControl = new SmoothSwimmingMoveControl(this, 85, 10, 0.02F, 0.1F, true);
+@@ -110,7 +112,55 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
+         this.setPathfindingMalus(PathType.WATER, 4.0F);
+         this.setPathfindingMalus(PathType.TRAPDOOR, -1.0F);
+         this.moveControl = new SmoothSwimmingMoveControl(this, 85, 10, 0.02F, 0.1F, true);
 +        // Purpur start
 +        this.purpurLandController = new org.purpurmc.purpur.controller.MoveControllerWASD(this, 0.2F);
 +        this.purpurWaterController = new org.purpurmc.purpur.controller.WaterMoveControllerWASD(this, 0.5F);
@@ -2331,9 +2218,8 @@ index c8e3d47b3f2dc919cca8ad397095437f1da6c762..3098f90ef97f69dbaf482ce0acd0c0c7
 +            }
 +        };
 +        // Purpur end
-         this.setMaxUpStep(1.0F);
-     }
- 
++    }
++
 +    // Purpur start
 +    @Override
 +    public boolean isRidable() {
@@ -2359,35 +2245,33 @@ index c8e3d47b3f2dc919cca8ad397095437f1da6c762..3098f90ef97f69dbaf482ce0acd0c0c7
 +    @Override
 +    public float getJumpPower() {
 +        return (getRider() != null && isControllable()) ? level().purpurConfig.frogRidableJumpHeight * this.getBlockJumpFactor() : super.getJumpPower();
-+    }
+     }
 +    // Purpur end
-+
+ 
      @Override
      protected Brain.Provider<Frog> brainProvider() {
-         return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-@@ -168,7 +217,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -184,6 +234,7 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("frogBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel)this.level(), this);
          this.level().getProfiler().pop();
          this.level().getProfiler().push("frogActivityUpdate");
-@@ -354,7 +403,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -371,7 +422,7 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
          return world.getBlockState(pos.below()).is(BlockTags.FROGS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos);
      }
  
 -    class FrogLookControl extends LookControl {
 +    class FrogLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur
-         FrogLookControl(Mob entity) {
+         FrogLookControl(final Mob entity) {
              super(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 6ed4ac06c76b8d0d6e8db778cade15dbd1e3e5f5..af8438ae8c805d3276ef2d82eb39b08880fcc8a1 100644
+index 290d41136f5ec7671bc4990dfe50da0a770c124d..b98a34357e59168bbb22c967b86a449fc91f47f0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -45,13 +45,50 @@ public class Tadpole extends AbstractFish {
+@@ -51,13 +51,50 @@ public class Tadpole extends AbstractFish {
      protected static final ImmutableList<SensorType<? extends Sensor<? super Tadpole>>> SENSOR_TYPES = ImmutableList.of(SensorType.NEAREST_LIVING_ENTITIES, SensorType.NEAREST_PLAYERS, SensorType.HURT_BY, SensorType.FROG_TEMPTATIONS);
      protected static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.LOOK_TARGET, MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.NEAREST_VISIBLE_ADULT, MemoryModuleType.TEMPTATION_COOLDOWN_TICKS, MemoryModuleType.IS_TEMPTED, MemoryModuleType.TEMPTING_PLAYER, MemoryModuleType.BREED_TARGET, MemoryModuleType.IS_PANICKING);
      public boolean ageLocked; // Paper
@@ -2439,20 +2323,19 @@ index 6ed4ac06c76b8d0d6e8db778cade15dbd1e3e5f5..af8438ae8c805d3276ef2d82eb39b088
      @Override
      protected PathNavigation createNavigation(Level world) {
          return new WaterBoundPathNavigation(this, world);
-@@ -81,7 +118,7 @@ public class Tadpole extends AbstractFish {
+@@ -86,6 +123,7 @@ public class Tadpole extends AbstractFish {
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("tadpoleBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
          this.level().getProfiler().pop();
          this.level().getProfiler().push("tadpoleActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index ff12ba2b79cb2e7e0bfd0e3b58ff6cb9e770092b..fef3b7d193d20c4fdd50b38c6a0371f05165a49d 100644
+index 02e49c7ae5e120302b6479cf3e3934b9217eebf0..9cd8220a1e5e43c141ad27df4969e66ef3746ecd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -92,6 +92,23 @@ public class Goat extends Animal {
+@@ -91,6 +91,23 @@ public class Goat extends Animal {
          return InstrumentItem.create(Items.GOAT_HORN, (Holder) holderset.getRandomElement(randomsource).get());
      }
  
@@ -2476,26 +2359,24 @@ index ff12ba2b79cb2e7e0bfd0e3b58ff6cb9e770092b..fef3b7d193d20c4fdd50b38c6a0371f0
      @Override
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
-@@ -195,7 +212,7 @@ public class Goat extends Animal {
+@@ -193,6 +210,7 @@ public class Goat extends Animal {
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("goatBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
          this.level().getProfiler().pop();
          this.level().getProfiler().push("goatActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 09e9c0e55c789f03a4b64136f28154bd114db6f5..27050c00ea4e4b301d4c85528117fc1d87e6f1ef 100644
+index 9357cf0179d19fbdfe76413e909a99b924c85780..12a137665f93d992094e86327a496057890d1018 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -149,12 +149,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -217,11 +217,21 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
  
      protected AbstractHorse(EntityType<? extends AbstractHorse> type, Level world) {
          super(type, world);
 +        this.moveControl = new net.minecraft.world.entity.ai.control.MoveControl(this); // Purpur - use vanilla controller
 +        this.lookControl = new net.minecraft.world.entity.ai.control.LookControl(this); // Purpur - use vanilla controller
-         this.setMaxUpStep(1.0F);
          this.createInventory();
      }
  
@@ -2512,7 +2393,7 @@ index 09e9c0e55c789f03a4b64136f28154bd114db6f5..27050c00ea4e4b301d4c85528117fc1d
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.2D));
          this.goalSelector.addGoal(1, new RunAroundLikeCrazyGoal(this, 1.2D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D, AbstractHorse.class));
-@@ -165,6 +175,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -232,6 +242,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
          if (this.canPerformRearing()) {
              this.goalSelector.addGoal(9, new RandomStandGoal(this));
          }
@@ -2521,7 +2402,7 @@ index 09e9c0e55c789f03a4b64136f28154bd114db6f5..27050c00ea4e4b301d4c85528117fc1d
          this.addBehaviourGoals();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index e0dfee0e0ce091d5ae0ec740e939c2c50915c104..6a5fb18523545ccc788b09ab4fbee1b14a64bc63 100644
+index ff02169ba14f5264cea8beaf1779e2890c5d74b8..1febe8e173886d501e40331c12261701bd36b0f6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -15,6 +15,13 @@ public class Donkey extends AbstractChestedHorse {
@@ -2539,10 +2420,10 @@ index e0dfee0e0ce091d5ae0ec740e939c2c50915c104..6a5fb18523545ccc788b09ab4fbee1b1
      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 5f5dc651d570989ec1294c31a14dcfede466b80a..3e50581033e88e8eddcbd85bfa890cbe0b88a7e6 100644
+index 6e299770fca78699f7e1988db4cdef37b99d74c1..816c698a81a77f217a606468aa157bdaed779479 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> {
+@@ -44,6 +44,13 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          super(type, world);
      }
  
@@ -2557,7 +2438,7 @@ index 5f5dc651d570989ec1294c31a14dcfede466b80a..3e50581033e88e8eddcbd85bfa890cbe
      protected void randomizeAttributes(RandomSource random) {
          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 5f61c97478f005aaaaad1b027118079db7275cf7..0549974c56ae7d05b5eec77029c5d08a6614a8bf 100644
+index 1dd4290287725898ace29e46b439b55df8fdd1af..3943ca63aaeecfb98c34ceef9b0c40e71de4e832 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -78,7 +78,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -2612,7 +2493,7 @@ index 5f61c97478f005aaaaad1b027118079db7275cf7..0549974c56ae7d05b5eec77029c5d08a
  
      public boolean isTraderLlama() {
          return false;
-@@ -129,6 +173,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -120,6 +164,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -2620,7 +2501,7 @@ index 5f61c97478f005aaaaad1b027118079db7275cf7..0549974c56ae7d05b5eec77029c5d08a
          this.goalSelector.addGoal(1, new RunAroundLikeCrazyGoal(this, 1.2D));
          this.goalSelector.addGoal(2, new LlamaFollowCaravanGoal(this, 2.0999999046325684D));
          this.goalSelector.addGoal(3, new RangedAttackGoal(this, 1.25D, 40, 20.0F));
-@@ -139,6 +184,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -132,6 +177,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 0.7D));
          this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(9, new RandomLookAroundGoal(this));
@@ -2629,7 +2510,7 @@ index 5f61c97478f005aaaaad1b027118079db7275cf7..0549974c56ae7d05b5eec77029c5d08a
          this.targetSelector.addGoal(2, new Llama.LlamaAttackWolfGoal(this));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index a6601f70890f90691923c0e6a9f10ea597ccabc2..ae7bcfa608d8bdd2a2320618225294de0314ce53 100644
+index 2802a8144c823b270a0cdab445af4523c1432ceb..1d18c983efad3ea309e7bc2a7c75d60d46ab80a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -14,6 +14,13 @@ public class Mule extends AbstractChestedHorse {
@@ -2647,36 +2528,39 @@ index a6601f70890f90691923c0e6a9f10ea597ccabc2..ae7bcfa608d8bdd2a2320618225294de
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index 92d170dd0155a7a5879de4a320cdc03bb66d8887..6d5a37facc288ebb27d96c2451091ea299c16077 100644
+index c12086c50bb9b5923c179108e92674b2b26d27f2..b3ce3c484c2e447e2d9fa52e1ccc30b2e4883923 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -31,6 +31,13 @@ public class SkeletonHorse extends AbstractHorse {
+@@ -42,6 +42,13 @@ public class SkeletonHorse extends AbstractHorse {
          super(type, world);
      }
  
 +    // Purpur start
 +    @Override
 +    public boolean isTamed() {
-+        return true;
++        return super.isTamed() || this.level().purpurConfig.skeletonHorseRidable;
 +    }
 +    // Purpur end
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
+     }
+@@ -59,7 +66,9 @@ public class SkeletonHorse extends AbstractHorse {
      }
-@@ -42,6 +49,7 @@ public class SkeletonHorse extends AbstractHorse {
  
      @Override
-     protected void addBehaviourGoals() {
+-    protected void addBehaviourGoals() {}
++    protected void addBehaviourGoals() {
 +        if (level().purpurConfig.skeletonHorseCanSwim) goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this));
-     }
++    }
  
      @Override
+     protected SoundEvent getAmbientSound() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index b016f53c6644c6411b3a91e09049892131187179..5fc37e2322188e0db12f7679e40b1a3d40268ca7 100644
+index bbfc94237bbd546361cc4a7bde773c810e8c5d49..2abc4a5a9043d7c8643b27b7ba874d42bbdc04b7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -27,6 +27,28 @@ public class TraderLlama extends Llama {
+@@ -30,6 +30,28 @@ public class TraderLlama extends Llama {
          super(type, world);
      }
  
@@ -2706,10 +2590,10 @@ index b016f53c6644c6411b3a91e09049892131187179..5fc37e2322188e0db12f7679e40b1a3d
      public boolean isTraderLlama() {
          return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index 7f8bbacf00498a2ed6a13760266df993a289c2dd..6c03ad3d978378221db3e5bed947738bd710eae0 100644
+index 9127b5667704d05add534a5c05a91fb38c5b6749..2cf47ea1cedc1cecfeb4d2bcebc0810a19f64022 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-@@ -22,6 +22,18 @@ public class ZombieHorse extends AbstractHorse {
+@@ -33,6 +33,18 @@ public class ZombieHorse extends AbstractHorse {
          super(type, world);
      }
  
@@ -2721,14 +2605,14 @@ index 7f8bbacf00498a2ed6a13760266df993a289c2dd..6c03ad3d978378221db3e5bed947738b
 +
 +    @Override
 +    public boolean isTamed() {
-+        return true;
++        return super.isTamed() || this.level().purpurConfig.zombieHorseRidable;
 +    }
 +    // Purpur end
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
-@@ -64,6 +76,7 @@ public class ZombieHorse extends AbstractHorse {
+@@ -78,6 +90,7 @@ public class ZombieHorse extends AbstractHorse {
  
      @Override
      protected void addBehaviourGoals() {
@@ -2737,11 +2621,11 @@ index 7f8bbacf00498a2ed6a13760266df993a289c2dd..6c03ad3d978378221db3e5bed947738b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 47a5125e44cea1ece84657cdb874807f13ee824f..13096fa2032679006f4264e03fdf86a71454f3ca 100644
+index dc035bf94c5f6574ed8ad369b327b7f7a145e1d6..c6b6b47e8c268604ab0d1f3bb59c0b0b3a7a1d25 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -91,6 +91,23 @@ public class Sniffer extends Animal {
-         this.setPathfindingMalus(BlockPathTypes.DAMAGE_CAUTIOUS, -1.0F);
+@@ -94,6 +94,23 @@ public class Sniffer extends Animal {
+         this.setPathfindingMalus(PathType.DAMAGE_CAUTIOUS, -1.0F);
      }
  
 +    // Purpur start
@@ -2761,10 +2645,10 @@ index 47a5125e44cea1ece84657cdb874807f13ee824f..13096fa2032679006f4264e03fdf86a7
 +    }
 +    // Purpur end
 +
-     // CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
      @Override
-     protected void defineSynchedData() {
-@@ -331,7 +348,7 @@ public class Sniffer extends Animal {
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
+@@ -329,7 +346,7 @@ public class Sniffer extends Animal {
      }
  
      @Override
@@ -2774,10 +2658,10 @@ index 47a5125e44cea1ece84657cdb874807f13ee824f..13096fa2032679006f4264e03fdf86a7
          double d0 = this.moveControl.getSpeedModifier();
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java b/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
-index a6f3fba3b02b0b4d2a4e9e5205301c6f52d0188a..4eebfc27ded55e4d764d04f35d3e9c9e0791c89f 100644
+index 6725013c608e9321ce0d088059672af4412cf6db..1c8ac6b9603a6e282c5bbe8cdcc61046c9efe41e 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
-@@ -24,6 +24,13 @@ public class EnderDragonPart extends Entity {
+@@ -25,6 +25,13 @@ public class EnderDragonPart extends Entity {
          this.name = name;
      }
  
@@ -2789,25 +2673,24 @@ index a6f3fba3b02b0b4d2a4e9e5205301c6f52d0188a..4eebfc27ded55e4d764d04f35d3e9c9e
 +    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82fd0aab07 100644
+index 6f14607a88761171a72e274b3c9b476b20a272f1..170038f2bfdfd01003b6661672a9f8ed266343e2 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -107,6 +107,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -106,6 +106,7 @@ public class EnderDragon extends Mob implements Enemy {
      @Nullable
      private BlockPos podium;
-     // Paper end
+     // Paper end - Allow changing the EnderDragon podium
 +    private boolean hadRider; // Purpur
  
      public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
          super(EntityType.ENDER_DRAGON, world);
-@@ -128,7 +129,37 @@ public class EnderDragon extends Mob implements Enemy {
-         this.noPhysics = true;
+@@ -128,6 +129,37 @@ public class EnderDragon extends Mob implements Enemy {
          this.noCulling = true;
          this.phaseManager = new EnderDragonPhaseManager(this);
--        this.explosionSource = new Explosion(world, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // CraftBukkit
+         this.explosionSource = new Explosion(world, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY, ParticleTypes.EXPLOSION, ParticleTypes.EXPLOSION_EMITTER, SoundEvents.GENERIC_EXPLODE); // CraftBukkit
 +
 +        // Purpur start
 +        this.moveControl = new org.purpurmc.purpur.controller.FlyingMoveControllerWASD(this) {
@@ -2842,7 +2725,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
      }
  
      public void setDragonFight(EndDragonFight fight) {
-@@ -143,6 +174,17 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -142,6 +174,17 @@ public class EnderDragon extends Mob implements Enemy {
          return this.fightOrigin;
      }
  
@@ -2860,7 +2743,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
      public static AttributeSupplier.Builder createAttributes() {
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
      }
-@@ -204,6 +246,37 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -203,6 +246,37 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
      public void aiStep() {
@@ -2898,7 +2781,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
          this.processFlappingMovement();
          if (this.level().isClientSide) {
              this.setHealth(this.getHealth());
-@@ -230,6 +303,8 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -229,6 +303,8 @@ public class EnderDragon extends Mob implements Enemy {
          float f;
  
          if (this.isDeadOrDying()) {
@@ -2907,7 +2790,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
              float f1 = (this.random.nextFloat() - 0.5F) * 8.0F;
  
              f = (this.random.nextFloat() - 0.5F) * 4.0F;
-@@ -242,9 +317,9 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -241,9 +317,9 @@ public class EnderDragon extends Mob implements Enemy {
  
              f = 0.2F / ((float) vec3d.horizontalDistance() * 10.0F + 1.0F);
              f *= (float) Math.pow(2.0D, vec3d.y);
@@ -2919,7 +2802,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
                  this.flapTime += f * 0.5F;
              } else {
                  this.flapTime += f;
-@@ -278,7 +353,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -277,7 +353,7 @@ public class EnderDragon extends Mob implements Enemy {
                      }
  
                      this.phaseManager.getCurrentPhase().doClientTick();
@@ -2928,7 +2811,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
                      DragonPhaseInstance idragoncontroller = this.phaseManager.getCurrentPhase();
  
                      idragoncontroller.doServerTick();
-@@ -347,7 +422,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -346,7 +422,7 @@ public class EnderDragon extends Mob implements Enemy {
                  this.tickPart(this.body, (double) (f11 * 0.5F), 0.0D, (double) (-f12 * 0.5F));
                  this.tickPart(this.wing1, (double) (f12 * 4.5F), 2.0D, (double) (f11 * 4.5F));
                  this.tickPart(this.wing2, (double) (f12 * -4.5F), 2.0D, (double) (f11 * -4.5F));
@@ -2937,7 +2820,7 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
                      this.knockBack(this.level().getEntities((Entity) this, this.wing1.getBoundingBox().inflate(4.0D, 2.0D, 4.0D).move(0.0D, -2.0D, 0.0D), EntitySelector.NO_CREATIVE_OR_SPECTATOR));
                      this.knockBack(this.level().getEntities((Entity) this, this.wing2.getBoundingBox().inflate(4.0D, 2.0D, 4.0D).move(0.0D, -2.0D, 0.0D), EntitySelector.NO_CREATIVE_OR_SPECTATOR));
                      this.hurt(this.level().getEntities((Entity) this, this.head.getBoundingBox().inflate(1.0D), EntitySelector.NO_CREATIVE_OR_SPECTATOR));
-@@ -391,7 +466,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -390,7 +466,7 @@ public class EnderDragon extends Mob implements Enemy {
                  }
  
                  if (!this.level().isClientSide) {
@@ -2947,11 +2830,11 @@ index f8cdc76561852fd32d9c079ceb3567e6d49c892e..52920b603ef88f9f6e3dd7935292fe82
                          this.dragonFight.updateDragon(this);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65..6674d1b184246ecce5270a6826b153903e4a5a88 100644
+index 7ddca52f7fe3f289b4b867e134326b1ead1a2aee..14f9ded1b44d05d69f1a9394fdacab5b145e4c45 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -84,16 +84,30 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-         return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable();
+@@ -88,16 +88,30 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+         return !entityliving.getType().is(EntityTypeTags.WITHER_FRIENDS) && entityliving.attackable();
      };
      private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
 +    private int shootCooldown = 0; // Purpur
@@ -2982,7 +2865,7 @@ index c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65..6674d1b184246ecce5270a6826b15390
          this.setHealth(this.getMaxHealth());
          this.xpReward = 50;
      }
-@@ -108,13 +122,113 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -112,13 +126,113 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          return navigationflying;
      }
  
@@ -3113,7 +2996,7 @@ index c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65..6674d1b184246ecce5270a6826b15390
          int i;
  
          if (this.getInvulnerableTicks() > 0) {
-@@ -583,11 +707,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -580,11 +704,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
      }
  
      public int getAlternativeTarget(int headIndex) {
@@ -3128,10 +3011,10 @@ index c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65..6674d1b184246ecce5270a6826b15390
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index b319021b22c5dceba6199ed27814b2dcf47b8d50..2dbcfd847dd5b6db587b291a8a7a6e278949c3a9 100644
+index 0c5fe46d2da113beff3e220843593d616e37d4ca..8f71739a4b23bc53994f1cbff8500b6bad288a42 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -70,12 +70,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -69,12 +69,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
  
      @Override
      protected void registerGoals() {
@@ -3147,7 +3030,7 @@ index b319021b22c5dceba6199ed27814b2dcf47b8d50..2dbcfd847dd5b6db587b291a8a7a6e27
          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 17aa7676ab624440651850bbe5689f8a6c9dbeed..63049b0b4a4ae09e5925129dc363e43dbae23272 100644
+index aee2fa184bc5723dfd3d54f460a173982d874c8b..0e1aa9a00284ce43436b1290f9ebe243c4d09fdc 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 {
@@ -3155,9 +3038,9 @@ index 17aa7676ab624440651850bbe5689f8a6c9dbeed..63049b0b4a4ae09e5925129dc363e43d
      public Blaze(EntityType<? extends Blaze> type, Level world) {
          super(type, world);
 +        this.moveControl = new org.purpurmc.purpur.controller.FlyingWithSpacebarMoveControllerWASD(this, 0.3F); // Purpur
-         this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
-         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
+         this.setPathfindingMalus(PathType.WATER, -1.0F);
+         this.setPathfindingMalus(PathType.LAVA, 8.0F);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, 0.0F);
 @@ -39,19 +40,55 @@ public class Blaze extends Monster {
          this.xpReward = 10;
      }
@@ -3200,22 +3083,22 @@ index 17aa7676ab624440651850bbe5689f8a6c9dbeed..63049b0b4a4ae09e5925129dc363e43d
      protected void registerGoals() {
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(4, new Blaze.BlazeAttackGoal(this));
-         this.goalSelector.addGoal(5, new MoveTowardsRestrictionGoal(this, 1.0D));
-         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D, 0.0F));
+         this.goalSelector.addGoal(5, new MoveTowardsRestrictionGoal(this, 1.0));
+         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0, 0.0F));
          this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
 +        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this)).setAlertOthers());
+         this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
  
      public static AttributeSupplier.Builder createAttributes() {
--        return Monster.createMonsterAttributes().add(Attributes.ATTACK_DAMAGE, 6.0D).add(Attributes.MOVEMENT_SPEED, (double)0.23F).add(Attributes.FOLLOW_RANGE, 48.0D);
-+        return Monster.createMonsterAttributes().add(Attributes.ATTACK_DAMAGE, 6.0D).add(Attributes.MOVEMENT_SPEED, (double)0.23F).add(Attributes.FOLLOW_RANGE, 48.0D).add(Attributes.FLYING_SPEED, 0.6D); // Purpur
+-        return Monster.createMonsterAttributes().add(Attributes.ATTACK_DAMAGE, 6.0).add(Attributes.MOVEMENT_SPEED, 0.23F).add(Attributes.FOLLOW_RANGE, 48.0);
++        return Monster.createMonsterAttributes().add(Attributes.ATTACK_DAMAGE, 6.0).add(Attributes.MOVEMENT_SPEED, 0.23F).add(Attributes.FOLLOW_RANGE, 48.0).add(Attributes.FLYING_SPEED, 0.6D); // Purpur
      }
  
      @Override
-@@ -106,6 +143,14 @@ public class Blaze extends Monster {
+@@ -116,6 +153,13 @@ public class Blaze extends Monster {
  
      @Override
      protected void customServerAiStep() {
@@ -3226,15 +3109,14 @@ index 17aa7676ab624440651850bbe5689f8a6c9dbeed..63049b0b4a4ae09e5925129dc363e43d
 +            return;
 +        }
 +        // Purpur end
-+
-         --this.nextHeightOffsetChangeTick;
+         this.nextHeightOffsetChangeTick--;
          if (this.nextHeightOffsetChangeTick <= 0) {
              this.nextHeightOffsetChangeTick = 100;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-index 70d25bb45ad603095a1f5812cc396dfc5f16a1e1..562faf0257388d9c22146a418f25716cef7471b8 100644
+index 87e4b300ac248f6c13d9b4a8f24fd78b24b565b4..504996c8309fcd11de1dd166dee12d7e7db8db56 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-@@ -29,6 +29,23 @@ public class CaveSpider extends Spider {
+@@ -26,6 +26,23 @@ public class CaveSpider extends Spider {
          return Spider.createAttributes().add(Attributes.MAX_HEALTH, 12.0D);
      }
  
@@ -3259,13 +3141,13 @@ index 70d25bb45ad603095a1f5812cc396dfc5f16a1e1..562faf0257388d9c22146a418f25716c
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index fd1b5a1beea7594fa65decfdcccfa15781fc005b..66b2fdcda53fdfd278994dc16be3e12041be6e99 100644
+index cbcb2bfa8f91099e5c374f590f48885390bdf7a7..6e812033323b1d1ace9023d57f0405e0d546c337 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -59,21 +59,98 @@ public class Creeper extends Monster implements PowerableMob {
-     public int maxSwell = 30;
+@@ -61,21 +61,98 @@ public class Creeper extends Monster implements PowerableMob {
      public int explosionRadius = 3;
      private int droppedSkulls;
+     private Player entityIgniter; // CraftBukkit
 +    // Purpur start
 +    private int spacebarCharge = 0;
 +    private int prevSpacebarCharge = 0;
@@ -3361,20 +3243,20 @@ index fd1b5a1beea7594fa65decfdcccfa15781fc005b..66b2fdcda53fdfd278994dc16be3e120
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
      }
-@@ -324,6 +401,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -323,6 +400,7 @@ public class Creeper extends Monster implements PowerableMob {
              com.destroystokyo.paper.event.entity.CreeperIgniteEvent event = new com.destroystokyo.paper.event.entity.CreeperIgniteEvent((org.bukkit.entity.Creeper) getBukkitEntity(), ignited);
              if (event.callEvent()) {
                  this.entityData.set(Creeper.DATA_IS_IGNITED, event.isIgnited());
 +                if (!event.isIgnited()) setSwellDir(-1); // Purpur
              }
          }
-         // Paper end
+         // Paper end - CreeperIgniteEvent
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 991d728db2a3b64316fc2102cf3aee470327a62e..c64c88ddd929d49fcfc6ebc2d0030bc86c8ac337 100644
+index cff1b5e0e3fd32d82157d5f13d83d4abdfad7378..2b93338db154e6c0c3c8814adabaab761f08af08 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -68,6 +68,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
-         this.groundNavigation = new GroundPathNavigation(this, world);
+@@ -71,6 +71,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
+         return Zombie.createAttributes().add(Attributes.STEP_HEIGHT, 1.0D);
      }
  
 +    // Purpur start
@@ -3397,7 +3279,7 @@ index 991d728db2a3b64316fc2102cf3aee470327a62e..c64c88ddd929d49fcfc6ebc2d0030bc8
      @Override
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0D));
-@@ -259,8 +276,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -262,8 +279,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.searchingForLand = targetingUnderwater;
      }
  
@@ -3407,7 +3289,7 @@ index 991d728db2a3b64316fc2102cf3aee470327a62e..c64c88ddd929d49fcfc6ebc2d0030bc8
          private final Drowned drowned;
  
          public DrownedMoveControl(Drowned drowned) {
-@@ -269,7 +285,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -272,7 +288,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
          }
  
          @Override
@@ -3416,7 +3298,7 @@ index 991d728db2a3b64316fc2102cf3aee470327a62e..c64c88ddd929d49fcfc6ebc2d0030bc8
              LivingEntity entityliving = this.drowned.getTarget();
  
              if (this.drowned.wantsToSwim() && this.drowned.isInWater()) {
-@@ -292,7 +308,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -295,7 +311,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
  
                  this.drowned.setYRot(this.rotlerp(this.drowned.getYRot(), f, 90.0F));
                  this.drowned.yBodyRot = this.drowned.getYRot();
@@ -3425,7 +3307,7 @@ index 991d728db2a3b64316fc2102cf3aee470327a62e..c64c88ddd929d49fcfc6ebc2d0030bc8
                  float f2 = Mth.lerp(0.125F, this.drowned.getSpeed(), f1);
  
                  this.drowned.setSpeed(f2);
-@@ -302,7 +318,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -305,7 +321,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
                      this.drowned.setDeltaMovement(this.drowned.getDeltaMovement().add(0.0D, -0.008D, 0.0D));
                  }
  
@@ -3435,10 +3317,10 @@ index 991d728db2a3b64316fc2102cf3aee470327a62e..c64c88ddd929d49fcfc6ebc2d0030bc8
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index efc1d49c5bfea7d1674b8a9de2c8b617657eda0f..37afe706c5c453003ea96e62f376f45d7b8eb4a8 100644
+index fd995b1f29c47884e9db2cb92f1dd615d62ae032..430899602940aa04c21d45ae94bcc506352389cf 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-@@ -36,6 +36,18 @@ public class ElderGuardian extends Guardian {
+@@ -33,6 +33,18 @@ public class ElderGuardian extends Guardian {
  
      }
  
@@ -3458,11 +3340,11 @@ index efc1d49c5bfea7d1674b8a9de2c8b617657eda0f..37afe706c5c453003ea96e62f376f45d
          return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 9fc3db543a0c9df502df5fb85012c6aa590e887d..a838a35be772dffc38c84c4f352598cd75dc3f33 100644
+index 260202fab3ac300552c557b44dcf251f083c6a78..0c1e3b00bdc1e6b033e6e9e37400a475cee2500e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -98,9 +98,27 @@ public class EnderMan extends Monster implements NeutralMob {
-         this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
+@@ -93,9 +93,27 @@ public class EnderMan extends Monster implements NeutralMob {
+         this.setPathfindingMalus(PathType.WATER, -1.0F);
      }
  
 +    // Purpur start
@@ -3489,7 +3371,7 @@ index 9fc3db543a0c9df502df5fb85012c6aa590e887d..a838a35be772dffc38c84c4f352598cd
          this.goalSelector.addGoal(1, new EnderMan.EndermanFreezeWhenLookedAt(this));
          this.goalSelector.addGoal(2, new MeleeAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D, 0.0F));
-@@ -108,6 +126,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -103,6 +121,7 @@ public class EnderMan extends Monster implements NeutralMob {
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
          this.goalSelector.addGoal(10, new EnderMan.EndermanLeaveBlockGoal(this));
          this.goalSelector.addGoal(11, new EnderMan.EndermanTakeBlockGoal(this));
@@ -3497,7 +3379,7 @@ index 9fc3db543a0c9df502df5fb85012c6aa590e887d..a838a35be772dffc38c84c4f352598cd
          this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
          this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Endermite.class, true, false));
-@@ -294,7 +313,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -279,7 +298,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      @Override
      protected void customServerAiStep() {
@@ -3505,8 +3387,8 @@ index 9fc3db543a0c9df502df5fb85012c6aa590e887d..a838a35be772dffc38c84c4f352598cd
 +        if ((getRider() == null || !this.isControllable()) && this.level().isDay() && this.tickCount >= this.targetChangeTime + 600) { // Purpur - no random teleporting
              float f = this.getLightLevelDependentMagicValue();
  
-             if (f > 0.5F && this.level().canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
-@@ -415,6 +434,7 @@ public class EnderMan extends Monster implements NeutralMob {
+             if (f > 0.5F && this.level().canSeeSky(this.blockPosition()) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper - EndermanEscapeEvent
+@@ -394,6 +413,7 @@ public class EnderMan extends Monster implements NeutralMob {
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
              return false;
@@ -3515,7 +3397,7 @@ index 9fc3db543a0c9df502df5fb85012c6aa590e887d..a838a35be772dffc38c84c4f352598cd
              boolean flag = source.getDirectEntity() instanceof ThrownPotion;
              boolean flag1;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 66b6c55f72aec7e4e9dfa5417a46ba68dbb16a83..7fb02aab225a45e951ab1e7c6ba1c53f53d0fecd 100644
+index 9c78905762d9a484878fa9cf03a2ca3850e7e613..ee88933c7baba3bc82c6dc9d52291d5f9fc0f25d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -38,14 +38,33 @@ public class Endermite extends Monster {
@@ -3549,14 +3431,14 @@ index 66b6c55f72aec7e4e9dfa5417a46ba68dbb16a83..7fb02aab225a45e951ab1e7c6ba1c53f
          this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
 +        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this)).setAlertOthers());
+         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 7f0fbca7638bf89465bafed9d106813b86f0149b..a566824074850724023830f6b6fa3728d0b2aa99 100644
+index 38e866571c35ebc4843a8d4fa39691902a5fcc91..0d1931398f1f6bad941ff133a0d872ffabb00bd3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-@@ -50,10 +50,28 @@ public class Evoker extends SpellcasterIllager {
+@@ -52,10 +52,28 @@ public class Evoker extends SpellcasterIllager {
          this.xpReward = 10;
      }
  
@@ -3585,7 +3467,7 @@ index 7f0fbca7638bf89465bafed9d106813b86f0149b..a566824074850724023830f6b6fa3728
          this.goalSelector.addGoal(1, new Evoker.EvokerCastingSpellGoal());
          this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Player.class, 8.0F, 0.6D, 1.0D));
          this.goalSelector.addGoal(4, new Evoker.EvokerSummonSpellGoal());
-@@ -62,6 +80,7 @@ public class Evoker extends SpellcasterIllager {
+@@ -64,6 +82,7 @@ public class Evoker extends SpellcasterIllager {
          this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
          this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
          this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 8.0F));
@@ -3594,10 +3476,10 @@ index 7f0fbca7638bf89465bafed9d106813b86f0149b..a566824074850724023830f6b6fa3728
          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/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index c135bc245f59a1af706f98b9d140dee77016b12f..3f886ffb0aa8591e4ca8324301ae9a8eeac57ab4 100644
+index 373a4f036157017b0d95e8f1849780582235a549..862ad83b536fd0b5eb38ac0f2940cc46aed1fba2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-@@ -45,11 +45,47 @@ public class Ghast extends FlyingMob implements Enemy {
+@@ -43,11 +43,47 @@ public class Ghast extends FlyingMob implements Enemy {
          this.moveControl = new Ghast.GhastMoveControl(this);
      }
  
@@ -3645,7 +3527,7 @@ index c135bc245f59a1af706f98b9d140dee77016b12f..3f886ffb0aa8591e4ca8324301ae9a8e
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, (entityliving) -> {
              return Math.abs(entityliving.getY() - this.getY()) <= 4.0D;
          }));
-@@ -104,7 +140,7 @@ public class Ghast extends FlyingMob implements Enemy {
+@@ -102,7 +138,7 @@ public class Ghast extends FlyingMob implements Enemy {
      }
  
      public static AttributeSupplier.Builder createAttributes() {
@@ -3654,8 +3536,8 @@ index c135bc245f59a1af706f98b9d140dee77016b12f..3f886ffb0aa8591e4ca8324301ae9a8e
      }
  
      @Override
-@@ -171,7 +207,7 @@ public class Ghast extends FlyingMob implements Enemy {
-         return 2.6F;
+@@ -154,7 +190,7 @@ public class Ghast extends FlyingMob implements Enemy {
+ 
      }
  
 -    private static class GhastMoveControl extends MoveControl {
@@ -3663,7 +3545,7 @@ index c135bc245f59a1af706f98b9d140dee77016b12f..3f886ffb0aa8591e4ca8324301ae9a8e
  
          private final Ghast ghast;
          private int floatDuration;
-@@ -182,7 +218,7 @@ public class Ghast extends FlyingMob implements Enemy {
+@@ -165,7 +201,7 @@ public class Ghast extends FlyingMob implements Enemy {
          }
  
          @Override
@@ -3673,10 +3555,10 @@ index c135bc245f59a1af706f98b9d140dee77016b12f..3f886ffb0aa8591e4ca8324301ae9a8e
                  if (this.floatDuration-- <= 0) {
                      this.floatDuration += this.ghast.getRandom().nextInt(5) + 2;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 793c72bb7b86e404926085629121d6cad19a2740..198e3219e8f44eaea8ff1914c6c20efda172ff70 100644
+index 118521ae54254b0a73bb7cba7b2871c9c26f89fc..868e8383a890d76b4cfeac8b77b06e8f58d0a6dc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -15,6 +15,29 @@ public class Giant extends Monster {
+@@ -12,6 +12,29 @@ public class Giant extends Monster {
          super(type, world);
      }
  
@@ -3703,16 +3585,16 @@ index 793c72bb7b86e404926085629121d6cad19a2740..198e3219e8f44eaea8ff1914c6c20efd
 +    }
 +    // Purpur end
 +
-     @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return 10.440001F;
+     public static AttributeSupplier.Builder createAttributes() {
+         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
+     }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b7292215e4fba5 100644
+index 6c2e2fd5826a5f8070502e20d1d140c3d70bd0d3..9a1b1a1b0b6d59d599a2ab87f047121f47cf2bec 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-@@ -70,15 +70,36 @@ public class Guardian extends Monster {
+@@ -66,15 +66,36 @@ public class Guardian extends Monster {
          this.xpReward = 10;
-         this.setPathfindingMalus(BlockPathTypes.WATER, 0.0F);
+         this.setPathfindingMalus(PathType.WATER, 0.0F);
          this.moveControl = new Guardian.GuardianMoveControl(this);
 +        // Purpur start
 +        this.lookControl = new org.purpurmc.purpur.controller.LookControllerWASD(this) {
@@ -3747,7 +3629,7 @@ index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b72922
          this.goalSelector.addGoal(4, this.guardianAttackGoal = new Guardian.GuardianAttackGoal(this)); // CraftBukkit - assign field
          this.goalSelector.addGoal(5, pathfindergoalmovetowardsrestriction);
          this.goalSelector.addGoal(7, this.randomStrollGoal);
-@@ -87,6 +108,7 @@ public class Guardian extends Monster {
+@@ -83,6 +104,7 @@ public class Guardian extends Monster {
          this.goalSelector.addGoal(9, new RandomLookAroundGoal(this));
          this.randomStrollGoal.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
          pathfindergoalmovetowardsrestriction.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK));
@@ -3755,7 +3637,7 @@ index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b72922
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 10, true, false, new Guardian.GuardianAttackSelector(this)));
      }
  
-@@ -352,7 +374,7 @@ public class Guardian extends Monster {
+@@ -333,7 +355,7 @@ public class Guardian extends Monster {
      @Override
      public void travel(Vec3 movementInput) {
          if (this.isControlledByLocalInstance() && this.isInWater()) {
@@ -3764,8 +3646,8 @@ index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b72922
              this.move(MoverType.SELF, this.getDeltaMovement());
              this.setDeltaMovement(this.getDeltaMovement().scale(0.9D));
              if (!this.isMoving() && this.getTarget() == null) {
-@@ -369,7 +391,7 @@ public class Guardian extends Monster {
-         return new Vector3f(0.0F, dimensions.height + 0.125F * scaleFactor, 0.0F);
+@@ -345,7 +367,7 @@ public class Guardian extends Monster {
+ 
      }
  
 -    private static class GuardianMoveControl extends MoveControl {
@@ -3773,7 +3655,7 @@ index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b72922
  
          private final Guardian guardian;
  
-@@ -378,8 +400,17 @@ public class Guardian extends Monster {
+@@ -354,8 +376,17 @@ public class Guardian extends Monster {
              this.guardian = guardian;
          }
  
@@ -3792,7 +3674,7 @@ index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b72922
              if (this.operation == MoveControl.Operation.MOVE_TO && !this.guardian.getNavigation().isDone()) {
                  Vec3 vec3d = new Vec3(this.wantedX - this.guardian.getX(), this.wantedY - this.guardian.getY(), this.wantedZ - this.guardian.getZ());
                  double d0 = vec3d.length();
-@@ -390,7 +421,7 @@ public class Guardian extends Monster {
+@@ -366,7 +397,7 @@ public class Guardian extends Monster {
  
                  this.guardian.setYRot(this.rotlerp(this.guardian.getYRot(), f, 90.0F));
                  this.guardian.yBodyRot = this.guardian.getYRot();
@@ -3802,10 +3684,10 @@ index 45300f79cba6133d2a2eca706eae03ee3cd973c3..3a2ed35542c775a0712b3bec94b72922
  
                  this.guardian.setSpeed(f2);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 8ef1e325d722ca36fc0fc36f1e5287d7002b9fb2..774c15a91b0e988364acc33b8516ef132bcc9464 100644
+index c34c8483a026f61fe20935697d321d7ef5d8dfbc..20ea3187626a667815245974df88189f7d6ffc76 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -24,6 +24,23 @@ public class Husk extends Zombie {
+@@ -22,6 +22,23 @@ public class Husk extends Zombie {
          super(type, world);
      }
  
@@ -3827,13 +3709,13 @@ index 8ef1e325d722ca36fc0fc36f1e5287d7002b9fb2..774c15a91b0e988364acc33b8516ef13
 +    // Purpur end
 +
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
+         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (MobSpawnType.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index 63fce7e3d9f59f36e29bc827a46396d73143bb8b..f83f09f7568c44a1165aac73f7127c5d1af0478f 100644
+index a7964208c952cb4e34916ae6523850fc3921b07e..bef63bb69ea81298a1021eadd6c260943e18eba7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-@@ -59,10 +59,28 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
+@@ -56,10 +56,28 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
  
      }
  
@@ -3862,7 +3744,7 @@ index 63fce7e3d9f59f36e29bc827a46396d73143bb8b..f83f09f7568c44a1165aac73f7127c5d
          this.goalSelector.addGoal(1, new SpellcasterIllager.SpellcasterCastingSpellGoal());
          this.goalSelector.addGoal(4, new Illusioner.IllusionerMirrorSpellGoal());
          this.goalSelector.addGoal(5, new Illusioner.IllusionerBlindnessSpellGoal());
-@@ -70,6 +88,7 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
+@@ -67,6 +85,7 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
          this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
          this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 3.0F, 1.0F));
          this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 8.0F));
@@ -3871,10 +3753,10 @@ index 63fce7e3d9f59f36e29bc827a46396d73143bb8b..f83f09f7568c44a1165aac73f7127c5d
          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 2858ea5562d06c11e5c7337a2b123f9be7a3f62e..aad51022eac584fbc058c2b25e2bf1929fccca6f 100644
+index 7be2393dc3cb79556d9767b09f43be0f81308a12..6a03a5f1c209d248207b6835ba1d7c0f59dec557 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 {
+@@ -24,6 +24,28 @@ public class MagmaCube extends Slime {
          super(type, world);
      }
  
@@ -3901,9 +3783,9 @@ index 2858ea5562d06c11e5c7337a2b123f9be7a3f62e..aad51022eac584fbc058c2b25e2bf192
 +    // Purpur end
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
-@@ -70,11 +92,12 @@ public class MagmaCube extends Slime {
+@@ -64,11 +86,12 @@ public class MagmaCube extends Slime {
      }
  
      @Override
@@ -3918,11 +3800,11 @@ index 2858ea5562d06c11e5c7337a2b123f9be7a3f62e..aad51022eac584fbc058c2b25e2bf192
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..34de7704ad6bf6989fb83a1e24905098d7ba0123 100644
+index 68f8945292753535a3b73acb9f48c1594f0789a4..03c873b830f45d848af076ac7921fc4d019f69c8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -61,6 +61,64 @@ public class Phantom extends FlyingMob implements Enemy {
-         this.lookControl = new Phantom.PhantomLookControl(this);
+@@ -59,6 +59,64 @@ public class Phantom extends FlyingMob implements Enemy {
+         this.lookControl = new Phantom.PhantomLookControl(this, this);
      }
  
 +    // Purpur start
@@ -3986,7 +3868,7 @@ index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..34de7704ad6bf6989fb83a1e24905098
      @Override
      public boolean isFlapping() {
          return (this.getUniqueFlapTickOffset() + this.tickCount) % Phantom.TICKS_PER_FLAP == 0;
-@@ -73,9 +131,11 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -71,9 +129,11 @@ public class Phantom extends FlyingMob implements Enemy {
  
      @Override
      protected void registerGoals() {
@@ -3998,15 +3880,15 @@ index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..34de7704ad6bf6989fb83a1e24905098
          this.targetSelector.addGoal(1, new Phantom.PhantomAttackPlayerTargetGoal());
      }
  
-@@ -146,6 +206,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -139,6 +199,7 @@ public class Phantom extends FlyingMob implements Enemy {
      @Override
      public void aiStep() {
-         if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
+         if (this.isAlive() && this.shouldBurnInDay && this.isSunBurnTick()) { // Paper - shouldBurnInDay API
 +            if (getRider() == null || !this.isControllable()) // Purpur
-             this.setSecondsOnFire(8);
+             this.igniteForSeconds(8);
          }
  
-@@ -274,7 +335,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -254,7 +315,7 @@ public class Phantom extends FlyingMob implements Enemy {
          private AttackPhase() {}
      }
  
@@ -4015,7 +3897,7 @@ index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..34de7704ad6bf6989fb83a1e24905098
  
          private float speed = 0.1F;
  
-@@ -282,8 +343,19 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -262,8 +323,19 @@ public class Phantom extends FlyingMob implements Enemy {
              super(entity);
          }
  
@@ -4036,15 +3918,15 @@ index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..34de7704ad6bf6989fb83a1e24905098
              if (Phantom.this.horizontalCollision) {
                  Phantom.this.setYRot(Phantom.this.getYRot() + 180.0F);
                  this.speed = 0.1F;
-@@ -329,14 +401,20 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -309,14 +381,20 @@ public class Phantom extends FlyingMob implements Enemy {
          }
      }
  
 -    private class PhantomLookControl extends LookControl {
 +    private class PhantomLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur
  
-         public PhantomLookControl(Mob entity) {
-             super(entity);
+         public PhantomLookControl(final Phantom entity, final Mob phantom) {
+             super(phantom);
          }
  
 +        // Purpur start
@@ -4060,10 +3942,10 @@ index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..34de7704ad6bf6989fb83a1e24905098
  
      private class PhantomBodyRotationControl extends BodyRotationControl {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index cec545c3baa6599d47b9cf1a4b97de8771062a22..31d204d8d81ccc30371070af3678d82dc721618d 100644
+index ac411202c0029052a962b51b015da191b124de5f..6bfe582390dcb6111dcaf8325bd2773b9f5fd6a9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-@@ -62,15 +62,34 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
+@@ -58,15 +58,34 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          super(type, world);
      }
  
@@ -4089,21 +3971,21 @@ index cec545c3baa6599d47b9cf1a4b97de8771062a22..31d204d8d81ccc30371070af3678d82d
          super.registerGoals();
          this.goalSelector.addGoal(0, new FloatGoal(this));
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, 10.0F));
+         this.goalSelector.addGoal(2, new Raider.HoldGroundAttackGoal(this, 10.0F)); // Paper - decomp fix
          this.goalSelector.addGoal(3, new RangedCrossbowAttackGoal<>(this, 1.0D, 8.0F));
          this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
          this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F));
          this.goalSelector.addGoal(10, new LookAtPlayerGoal(this, Mob.class, 15.0F));
 +        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
+         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Raider.class})).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 0c11d9bef8f0129c541e30ad057612e881703b24..cfa324c6a75ac83cff4ba87034677d4e9415189e 100644
+index 2d7b7c949faaaaae94c0043132a4a822f55df104..1248a48c0146258d14efcaa805a82ce1a79c623d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -71,14 +71,39 @@ public class Ravager extends Raider {
-         this.setPathfindingMalus(BlockPathTypes.LEAVES, 0.0F);
+@@ -68,14 +68,39 @@ public class Ravager extends Raider {
+         this.setPathfindingMalus(PathType.LEAVES, 0.0F);
      }
  
 +    // Purpur start
@@ -4142,7 +4024,7 @@ index 0c11d9bef8f0129c541e30ad057612e881703b24..cfa324c6a75ac83cff4ba87034677d4e
          this.targetSelector.addGoal(2, (new HurtByTargetGoal(this, new Class[]{Raider.class})).setAlertOthers());
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true, (entityliving) -> {
-@@ -136,7 +161,7 @@ public class Ravager extends Raider {
+@@ -128,7 +153,7 @@ public class Ravager extends Raider {
      @Override
      public void aiStep() {
          super.aiStep();
@@ -4152,7 +4034,7 @@ index 0c11d9bef8f0129c541e30ad057612e881703b24..cfa324c6a75ac83cff4ba87034677d4e
                  this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.0D);
              } else {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 8cb6f2d32c4b7a62ec1bdfeb8b661a1387cafe4b..eea85643a2cedb5fd1a08892aea82b96b935e408 100644
+index 5215fa54666979ef4da074ddfdb082e7274f2957..78433d0b7624019018012c55e8dd6fec029f8cd1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -97,12 +97,31 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -4187,20 +4069,20 @@ index 8cb6f2d32c4b7a62ec1bdfeb8b661a1387cafe4b..eea85643a2cedb5fd1a08892aea82b96
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{this.getClass()})).setAlertOthers());
          this.targetSelector.addGoal(2, new Shulker.ShulkerNearestAttackGoal(this));
          this.targetSelector.addGoal(3, new Shulker.ShulkerDefenseAttackGoal(this));
-@@ -601,7 +620,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
+@@ -602,7 +621,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          return b0 != 16 && b0 <= 15 ? DyeColor.byId(b0) : null;
      }
  
 -    private class ShulkerLookControl extends LookControl {
 +    private class ShulkerLookControl extends org.purpurmc.purpur.controller.LookControllerWASD { // Purpur
  
-         public ShulkerLookControl(Mob entity) {
+         public ShulkerLookControl(final Mob entity) {
              super(entity);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 2c60a3765d22909e73b660492410ab8456304b68..f5dda5ed4532c8572bc4f511c49377c262efe057 100644
+index 860e385fc83f9787dca92efe35d21fd69c4dd635..97cab38a47e302f40ca69ef4eb8f7dcb11eccf35 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -47,14 +47,33 @@ public class Silverfish extends Monster {
+@@ -43,14 +43,33 @@ public class Silverfish extends Monster {
          super(type, world);
      }
  
@@ -4235,7 +4117,7 @@ index 2c60a3765d22909e73b660492410ab8456304b68..f5dda5ed4532c8572bc4f511c49377c2
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 8b818a7cb835512c4bd2ea9641d4bfd904150332..4db19589d19d1a0e488ddd0b691e81152ac236e4 100644
+index 5642bddc8268d70e5bb5446b65be1d8ce34feb9b..2f4f38fe7b7640b6658884b826d7f7a335370bd3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -26,6 +26,23 @@ public class Skeleton extends AbstractSkeleton {
@@ -4260,10 +4142,10 @@ index 8b818a7cb835512c4bd2ea9641d4bfd904150332..4db19589d19d1a0e488ddd0b691e8115
 +    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index b14979ab7bed34a37fceff5589ecb789bab31318..cf81e9ade3200251ca3a25eb0e5ce7dc852e396a 100644
+index f223e78eb1204bbf5f2de38a7ce5b663800f7dc4..2c73e80d916529cb0433846a2e57bc845bf7f3d4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -61,6 +61,7 @@ public class Slime extends Mob implements Enemy {
@@ -4323,7 +4205,7 @@ index b14979ab7bed34a37fceff5589ecb789bab31318..cf81e9ade3200251ca3a25eb0e5ce7dc
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, (entityliving) -> {
              return Math.abs(entityliving.getY() - this.getY()) <= 4.0D;
          }));
-@@ -375,11 +412,12 @@ public class Slime extends Mob implements Enemy {
+@@ -382,11 +419,12 @@ public class Slime extends Mob implements Enemy {
      }
  
      @Override
@@ -4337,8 +4219,8 @@ index b14979ab7bed34a37fceff5589ecb789bab31318..cf81e9ade3200251ca3a25eb0e5ce7dc
      }
  
      @Nullable
-@@ -413,7 +451,7 @@ public class Slime extends Mob implements Enemy {
-         return super.getDimensions(pose).scale(0.255F * (float) this.getSize());
+@@ -420,7 +458,7 @@ public class Slime extends Mob implements Enemy {
+         return super.getDefaultDimensions(pose).scale((float) this.getSize());
      }
  
 -    private static class SlimeMoveControl extends MoveControl {
@@ -4346,7 +4228,7 @@ index b14979ab7bed34a37fceff5589ecb789bab31318..cf81e9ade3200251ca3a25eb0e5ce7dc
  
          private float yRot;
          private int jumpDelay;
-@@ -432,21 +470,33 @@ public class Slime extends Mob implements Enemy {
+@@ -439,21 +477,33 @@ public class Slime extends Mob implements Enemy {
          }
  
          public void setWantedMovement(double speed) {
@@ -4383,7 +4265,7 @@ index b14979ab7bed34a37fceff5589ecb789bab31318..cf81e9ade3200251ca3a25eb0e5ce7dc
                      if (this.jumpDelay-- <= 0) {
                          this.jumpDelay = this.slime.getJumpDelay();
                          if (this.isAggressive) {
-@@ -463,7 +513,7 @@ public class Slime extends Mob implements Enemy {
+@@ -470,7 +520,7 @@ public class Slime extends Mob implements Enemy {
                          this.mob.setSpeed(0.0F);
                      }
                  } else {
@@ -4393,10 +4275,10 @@ index b14979ab7bed34a37fceff5589ecb789bab31318..cf81e9ade3200251ca3a25eb0e5ce7dc
  
              }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 71b5a9c97a13f703073c0122742ff9e8a0e49df2..3c3eb009f2d80d658447034c3df41070f254349b 100644
+index fa0316e9d2a4cf213982994dc8bf310299cca984..87f63373ccef3de9ce77a92933ff332be4fd6305 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -53,14 +53,33 @@ public class Spider extends Monster {
+@@ -51,9 +51,27 @@ public class Spider extends Monster {
          super(type, world);
      }
  
@@ -4421,8 +4303,10 @@ index 71b5a9c97a13f703073c0122742ff9e8a0e49df2..3c3eb009f2d80d658447034c3df41070
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 +        this.goalSelector.addGoal(1, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.goalSelector.addGoal(3, new LeapAtTargetGoal(this, 0.4F));
-         this.goalSelector.addGoal(4, new Spider.SpiderAttackGoal(this));
+         this.goalSelector.addGoal(2, new AvoidEntityGoal<>(this, Armadillo.class, 6.0F, 1.0D, 1.2D, (entityliving) -> {
+             return !((Armadillo) entityliving).isScared();
+         }));
+@@ -62,6 +80,7 @@ public class Spider extends Monster {
          this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 0.8D));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
@@ -4431,7 +4315,7 @@ index 71b5a9c97a13f703073c0122742ff9e8a0e49df2..3c3eb009f2d80d658447034c3df41070
          this.targetSelector.addGoal(2, new Spider.SpiderTargetGoal<>(this, Player.class));
          this.targetSelector.addGoal(3, new Spider.SpiderTargetGoal<>(this, IronGolem.class));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
-index 118b636a44e4b062e812e433f603b039276337da..137ee6d1aa8ec334009b6fab21b9f30303ace45f 100644
+index 207a649d737adff440bd3f7cba15b0dbca338a35..44006bcb7d70661a6990e3fc4375dd6da34517e0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -21,6 +21,23 @@ public class Stray extends AbstractSkeleton {
@@ -4459,11 +4343,11 @@ index 118b636a44e4b062e812e433f603b039276337da..137ee6d1aa8ec334009b6fab21b9f303
          BlockPos blockPos = pos;
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 61162ecd43dc5e6f7898daecdec49f444e6d869b..bfd69abf24d788b5e539498d56ade57fcb78f580 100644
+index fe85900a610afd0b237d8b5a164181c03afbdfc7..7e5ad9d52db7a39be60e0b2f24e13e8ed82785e1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -100,6 +100,23 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
-         this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
+@@ -97,6 +97,23 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+         this.setPathfindingMalus(PathType.DAMAGE_FIRE, 0.0F);
      }
  
 +    // Purpur start
@@ -4486,14 +4370,14 @@ index 61162ecd43dc5e6f7898daecdec49f444e6d869b..bfd69abf24d788b5e539498d56ade57f
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
-@@ -161,6 +178,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+@@ -158,6 +175,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.65D));
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.temptGoal = new TemptGoal(this, 1.4D, Strider.TEMPT_ITEMS, false);
-         this.goalSelector.addGoal(3, this.temptGoal);
+         this.temptGoal = new TemptGoal(this, 1.4D, (itemstack) -> {
+             return itemstack.is(ItemTags.STRIDER_TEMPT_ITEMS);
 @@ -468,7 +486,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
              if (!enuminteractionresult.consumesAction()) {
                  ItemStack itemstack = player.getItemInHand(hand);
@@ -4504,10 +4388,10 @@ index 61162ecd43dc5e6f7898daecdec49f444e6d869b..bfd69abf24d788b5e539498d56ade57f
                  if (flag && !this.isSilent()) {
                      this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.STRIDER_EAT, this.getSoundSource(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index 90e577b1a89b02c38daff2845a63dafe5ed929e1..566fa6f2f26139e457584b6e73fd8609efbf67d7 100644
+index fd3b37dde54623ba38186efb2a64d364c86b81d2..98c9d7080595a5d9ffa3d65a153780b68aec0e47 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-@@ -63,6 +63,50 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -60,6 +60,50 @@ public class Vex extends Monster implements TraceableEntity {
          this.xpReward = 3;
      }
  
@@ -4556,9 +4440,9 @@ index 90e577b1a89b02c38daff2845a63dafe5ed929e1..566fa6f2f26139e457584b6e73fd8609
 +    // Purpur end
 +
      @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return dimensions.height - 0.28125F;
-@@ -81,7 +125,7 @@ public class Vex extends Monster implements TraceableEntity {
+     public boolean isFlapping() {
+         return this.tickCount % Vex.TICKS_PER_FLAP == 0;
+@@ -73,7 +117,7 @@ public class Vex extends Monster implements TraceableEntity {
  
      @Override
      public void tick() {
@@ -4567,7 +4451,7 @@ index 90e577b1a89b02c38daff2845a63dafe5ed929e1..566fa6f2f26139e457584b6e73fd8609
          super.tick();
          this.noPhysics = false;
          this.setNoGravity(true);
-@@ -96,17 +140,19 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -88,17 +132,19 @@ public class Vex extends Monster implements TraceableEntity {
      protected void registerGoals() {
          super.registerGoals();
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -4588,14 +4472,14 @@ index 90e577b1a89b02c38daff2845a63dafe5ed929e1..566fa6f2f26139e457584b6e73fd8609
      }
  
      @Override
-@@ -240,14 +286,14 @@ public class Vex extends Monster implements TraceableEntity {
-         return new Vector3f(0.0F, dimensions.height - 0.0625F * scaleFactor, 0.0F);
+@@ -230,14 +276,14 @@ public class Vex extends Monster implements TraceableEntity {
+         this.setDropChance(EquipmentSlot.MAINHAND, 0.0F);
      }
  
 -    private class VexMoveControl extends MoveControl {
 +    private class VexMoveControl extends org.purpurmc.purpur.controller.FlyingMoveControllerWASD { // Purpur
  
-         public VexMoveControl(Vex entityvex) {
+         public VexMoveControl(final Vex entityvex) {
              super(entityvex);
          }
  
@@ -4605,7 +4489,7 @@ index 90e577b1a89b02c38daff2845a63dafe5ed929e1..566fa6f2f26139e457584b6e73fd8609
              if (this.operation == MoveControl.Operation.MOVE_TO) {
                  Vec3 vec3d = new Vec3(this.wantedX - Vex.this.getX(), this.wantedY - Vex.this.getY(), this.wantedZ - Vex.this.getZ());
                  double d0 = vec3d.length();
-@@ -256,7 +302,7 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -246,7 +292,7 @@ public class Vex extends Monster implements TraceableEntity {
                      this.operation = MoveControl.Operation.WAIT;
                      Vex.this.setDeltaMovement(Vex.this.getDeltaMovement().scale(0.5D));
                  } else {
@@ -4615,10 +4499,10 @@ index 90e577b1a89b02c38daff2845a63dafe5ed929e1..566fa6f2f26139e457584b6e73fd8609
                          Vec3 vec3d1 = Vex.this.getDeltaMovement();
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index ad41bbbf5395ed18c2c9e1e692c7661a6e0cb98c..049e81af9d5cc746e872be9bdec80917e3137be3 100644
+index b3da310d6fd1d533da805c38c2f449cf06d01492..c6d12c939cd3fbd9facf88cdc0c7c51744089484 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -58,14 +58,33 @@ public class Vindicator extends AbstractIllager {
+@@ -50,14 +50,33 @@ public class Vindicator extends AbstractIllager {
          super(type, world);
      }
  
@@ -4647,16 +4531,16 @@ index ad41bbbf5395ed18c2c9e1e692c7661a6e0cb98c..049e81af9d5cc746e872be9bdec80917
          this.goalSelector.addGoal(1, new Vindicator.VindicatorBreakDoorGoal(this));
          this.goalSelector.addGoal(2, new AbstractIllager.RaiderOpenDoorGoal(this));
          this.goalSelector.addGoal(3, new Raider.HoldGroundAttackGoal(this, 10.0F));
-         this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, false));
+         this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0, false));
 +        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
+         this.targetSelector.addGoal(1, new HurtByTargetGoal(this, Raider.class).setAlertOthers());
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 580dff41d746d9591f718081d9dfe4ac77e7eeaa..c146d16acac7d3ea380b5e3591f22491c102d7a9 100644
+index 5803c1d36b769f0186baa0665976749765b4cb61..b5f44495f0a384c8a7d8d96e3a0f16999fba86fe 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -59,6 +59,23 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -55,6 +55,23 @@ public class Witch extends Raider implements RangedAttackMob {
          super(type, world);
      }
  
@@ -4680,7 +4564,7 @@ index 580dff41d746d9591f718081d9dfe4ac77e7eeaa..c146d16acac7d3ea380b5e3591f22491
      @Override
      protected void registerGoals() {
          super.registerGoals();
-@@ -67,10 +84,12 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -63,10 +80,12 @@ public class Witch extends Raider implements RangedAttackMob {
          });
          this.attackPlayersGoal = new NearestAttackableWitchTargetGoal<>(this, Player.class, 10, true, false, (Predicate) null);
          this.goalSelector.addGoal(1, new FloatGoal(this));
@@ -4694,11 +4578,11 @@ index 580dff41d746d9591f718081d9dfe4ac77e7eeaa..c146d16acac7d3ea380b5e3591f22491
          this.targetSelector.addGoal(2, this.healRaidersGoal);
          this.targetSelector.addGoal(3, this.attackPlayersGoal);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 3dcd43279ce1295b37c3504ecbdaac5275df2b80..728e3c78fb17d954247cc62f05cdd970d8b5f540 100644
+index 3f1191795e58f31b7e2fe34ef2774df13b9a789f..355ed17da77256c84d8ba7d4d99b5c73d729a48d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-@@ -35,6 +35,23 @@ public class WitherSkeleton extends AbstractSkeleton {
-         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
+@@ -32,6 +32,23 @@ public class WitherSkeleton extends AbstractSkeleton {
+         this.setPathfindingMalus(PathType.LAVA, 8.0F);
      }
  
 +    // Purpur start
@@ -4722,10 +4606,10 @@ index 3dcd43279ce1295b37c3504ecbdaac5275df2b80..728e3c78fb17d954247cc62f05cdd970
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 11275a9ec6faa69c9f054683cb47312e443ba883..dc29e875c1e184c1c4553c127bb8c86dddf8c5ab 100644
+index cfdb2b793f11544ec5e2d1e726134089994b2b0f..2cb65bc3e2a2f990f4036f4f0418d9cd5226381e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-@@ -69,6 +69,23 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+@@ -80,6 +80,23 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
          this.xpReward = 5;
      }
  
@@ -4749,7 +4633,7 @@ index 11275a9ec6faa69c9f054683cb47312e443ba883..dc29e875c1e184c1c4553c127bb8c86d
      @Override
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
-@@ -201,6 +218,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+@@ -235,6 +252,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("zoglinBrain");
@@ -4758,10 +4642,10 @@ index 11275a9ec6faa69c9f054683cb47312e443ba883..dc29e875c1e184c1c4553c127bb8c86d
          this.level().getProfiler().pop();
          this.updateActivity();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 3d44f8e9f8056d7d899e90e61240b2d1d109354b..7be0c7776608582adf556b36dcfe289465490ecd 100644
+index e42dfc62bb179be1ab01b0096c05c6549d38abbc..7c78b243164a517818565845b1a6c7d40c8839d8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -107,11 +107,30 @@ public class Zombie extends Monster {
+@@ -104,11 +104,30 @@ public class Zombie extends Monster {
          this(EntityType.ZOMBIE, world);
      }
  
@@ -4785,7 +4669,7 @@ index 3d44f8e9f8056d7d899e90e61240b2d1d109354b..7be0c7776608582adf556b36dcfe2894
      @Override
      protected void registerGoals() {
 +        this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-         if (this.level().paperConfig().entities.behavior.zombiesTargetTurtleEggs) this.goalSelector.addGoal(4, new Zombie.ZombieAttackTurtleEggGoal(this, 1.0D, 3)); // Paper
+         if (this.level().paperConfig().entities.behavior.zombiesTargetTurtleEggs) this.goalSelector.addGoal(4, new Zombie.ZombieAttackTurtleEggGoal(this, 1.0D, 3)); // Paper - Add zombie targets turtle egg config
          this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(8, new RandomLookAroundGoal(this));
 +        this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -4793,10 +4677,10 @@ index 3d44f8e9f8056d7d899e90e61240b2d1d109354b..7be0c7776608582adf556b36dcfe2894
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 807cff3fb51269b97d9aecbcc4706f0a139dfeaa..be1234f1c087b3140c79278e7d7e7c1394352cc8 100644
+index f38acc96f71298e40ce9433e7759fd223ca55e48..cc3d9f47ef6d1efa589c8bed5c51ed9e61d7c07d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -82,6 +82,23 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+@@ -80,6 +80,23 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          });
      }
  
@@ -4818,14 +4702,14 @@ index 807cff3fb51269b97d9aecbcc4706f0a139dfeaa..be1234f1c087b3140c79278e7d7e7c13
 +    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 1afe8a8694c1fd0bf43ce3c0c36a83fda9aec141..252d2994fac423ea1fef36bdc7c09778203049cb 100644
+index a6def4133f06c41be287e9942643e80a7b8e8218..2ff0ce04ce210b77c555f59967182ed4dd3fe9aa 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -64,6 +64,23 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
-         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
+@@ -62,6 +62,23 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+         this.setPathfindingMalus(PathType.LAVA, 8.0F);
      }
  
 +    // Purpur start
@@ -4849,10 +4733,10 @@ index 1afe8a8694c1fd0bf43ce3c0c36a83fda9aec141..252d2994fac423ea1fef36bdc7c09778
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index e703320717ff620a19ff76d1c10066117c9895d5..d040198ce528293ed95adcdb17ddf0acbc5a93e0 100644
+index c583d883118ded5e1884c757427dc5e73c10dd27..6e86e0597af66bad8f2e97661b588e950b2679ba 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -69,6 +69,23 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -90,6 +90,23 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          this.xpReward = 5;
      }
  
@@ -4876,20 +4760,19 @@ index e703320717ff620a19ff76d1c10066117c9895d5..d040198ce528293ed95adcdb17ddf0ac
      @Override
      public boolean canBeLeashed(Player player) {
          return !this.isLeashed();
-@@ -132,7 +149,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -156,6 +173,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("hoglinBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel)this.level(), this);
          this.level().getProfiler().pop();
          HoglinAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index cfdc1650783d6855e0d4f33ec68aab48dbee09f0..f57d7fee1ece00aba9bc7b07dda8398e7acc73c3 100644
+index a8ab486c7e11ec137da48174af6f1030dfd48056..6632cab4ed43bbfd10b4d8f3b2c447a35eba735e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -96,6 +96,23 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -94,6 +94,23 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          this.xpReward = 5;
      }
  
@@ -4913,20 +4796,19 @@ index cfdc1650783d6855e0d4f33ec68aab48dbee09f0..f57d7fee1ece00aba9bc7b07dda8398e
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
-@@ -304,7 +321,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -297,6 +314,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("piglinBrain");
--        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
++        //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
          this.level().getProfiler().pop();
          PiglinAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index e1be4a77fae0b9120781f460079269b85c993930..2d842c0dfce1c7e7229bd42b2a92c024a4162b68 100644
+index fcadd7f28ccb81bbb36e97d8b8d8a8ba3f3d6a16..17e2457bc83e7ee4402c10ee7d2ef5aa36901565 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -41,6 +41,23 @@ public class PiglinBrute extends AbstractPiglin {
+@@ -62,6 +62,23 @@ public class PiglinBrute extends AbstractPiglin {
          this.xpReward = 20;
      }
  
@@ -4948,9 +4830,9 @@ index e1be4a77fae0b9120781f460079269b85c993930..2d842c0dfce1c7e7229bd42b2a92c024
 +    // Purpur end
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D);
+         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 7.0);
      }
-@@ -86,6 +103,7 @@ public class PiglinBrute extends AbstractPiglin {
+@@ -107,6 +124,7 @@ public class PiglinBrute extends AbstractPiglin {
      @Override
      protected void customServerAiStep() {
          this.level().getProfiler().push("piglinBruteBrain");
@@ -4959,13 +4841,13 @@ index e1be4a77fae0b9120781f460079269b85c993930..2d842c0dfce1c7e7229bd42b2a92c024
          this.level().getProfiler().pop();
          PiglinBruteAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 5e43912708f9074dee1bb351efa737a7e6796fc3..250af1ce7a93c2d2897f35c68fae319c9ba7d55d 100644
+index ddd60be52dce5773c80934be5aa5705db239e3dd..9f5325444cc4f64fc88f85794fbad09ddd4f7860 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -122,8 +122,32 @@ public class Warden extends Monster implements VibrationSystem {
-         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
-         this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
+@@ -123,8 +123,32 @@ public class Warden extends Monster implements VibrationSystem {
+         this.setPathfindingMalus(PathType.LAVA, 8.0F);
+         this.setPathfindingMalus(PathType.DAMAGE_FIRE, 0.0F);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, 0.0F);
 +        this.moveControl = new org.purpurmc.purpur.controller.MoveControllerWASD(this, 0.5F); // Purpur
      }
  
@@ -4995,16 +4877,14 @@ index 5e43912708f9074dee1bb351efa737a7e6796fc3..250af1ce7a93c2d2897f35c68fae319c
      @Override
      public Packet<ClientGamePacketListener> getAddEntityPacket() {
          return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0);
-@@ -397,19 +421,16 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -392,17 +416,14 @@ public class Warden extends Monster implements VibrationSystem {
  
      @Contract("null->false")
      public boolean canTargetEntity(@Nullable Entity entity) {
 -        boolean flag;
 -
 +        if (getRider() != null && isControllable()) return false; // Purpur
-         if (entity instanceof LivingEntity) {
-             LivingEntity entityliving = (LivingEntity) entity;
- 
+         if (entity instanceof LivingEntity entityliving) {
              if (this.level() == entity.level() && EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(entity) && !this.isAlliedTo(entity) && entityliving.getType() != EntityType.ARMOR_STAND && entityliving.getType() != EntityType.WARDEN && !entityliving.isInvulnerable() && !entityliving.isDeadOrDying() && this.level().getWorldBorder().isWithinBounds(entityliving.getBoundingBox())) {
 -                flag = true;
 -                return flag;
@@ -5019,10 +4899,10 @@ index 5e43912708f9074dee1bb351efa737a7e6796fc3..250af1ce7a93c2d2897f35c68fae319c
  
      public static void applyDarknessAround(ServerLevel world, Vec3 pos, @Nullable Entity entity, int range) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index bbcc0356b4c0470502e893cf2dc2f16936a88bc4..f7b81f14cd069da83c25ca6b063289c0fad07952 100644
+index a7930f9875aa4aca997caaead46ecdc21e5e11d7..980f48b546f0da5696c110357ea42352a48fbd42 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -157,6 +157,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -156,6 +156,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.setVillagerData(this.getVillagerData().setType(type).setProfession(VillagerProfession.NONE));
      }
  
@@ -5051,16 +4931,19 @@ index bbcc0356b4c0470502e893cf2dc2f16936a88bc4..f7b81f14cd069da83c25ca6b063289c0
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-@@ -258,7 +280,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -256,6 +278,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          // Paper end
          this.level().getProfiler().push("villagerBrain");
-         // Pufferfish start
--        if (!inactive && this.behaviorTick++ % this.activatedPriority == 0) {
+         if (!inactive) this.getBrain().tick((ServerLevel) this.level(), this); // Paper
++        /*// Purpur start // Purpur - TODO: Pufferfish
 +        if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) { // Purpur - only use brain if no rider
-             this.getBrain().tick((ServerLevel) this.level(), this); // Paper
-         }
-         // Pufferfish end
-@@ -318,7 +340,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
++            this.getBrain().tick((ServerLevel) this.level(), this); // Paper
++        }
++        // Purpur end*/ // Purpur - TODO: Pufferfish
+         this.level().getProfiler().pop();
+         if (this.assignProfessionWhenSpawned) {
+             this.assignProfessionWhenSpawned = false;
+@@ -312,7 +339,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          if (!itemstack.is(Items.VILLAGER_SPAWN_EGG) && this.isAlive() && !this.isTrading() && !this.isSleeping()) {
              if (this.isBaby()) {
                  this.setUnhappy();
@@ -5069,7 +4952,7 @@ index bbcc0356b4c0470502e893cf2dc2f16936a88bc4..f7b81f14cd069da83c25ca6b063289c0
              } else {
                  boolean flag = this.getOffers().isEmpty();
  
-@@ -331,8 +353,9 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -325,8 +352,9 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                  }
  
                  if (flag) {
@@ -5081,10 +4964,10 @@ index bbcc0356b4c0470502e893cf2dc2f16936a88bc4..f7b81f14cd069da83c25ca6b063289c0
                          this.startTrading(player);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 3c2941d799c9acb3dd9e2b67b7092f4bba5ede17..808bf21dc16b5007c49a56c6597fd66c3ec4992e 100644
+index 0854e9b7ee2e6b23b6c1ee6a324a5a253c9d4679..6bdf3d1e3652a661282d61f1dc2bfc2712339953 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -70,6 +70,23 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -71,6 +71,23 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          //this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader // Paper - move back to MobSpawnerTrader - Vanilla behavior is that only traders spawned by it have this value set.
      }
  
@@ -5108,7 +4991,7 @@ index 3c2941d799c9acb3dd9e2b67b7092f4bba5ede17..808bf21dc16b5007c49a56c6597fd66c
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-@@ -117,8 +134,9 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -118,8 +135,9 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
              }
  
              if (this.getOffers().isEmpty()) {
@@ -5120,10 +5003,10 @@ index 3c2941d799c9acb3dd9e2b67b7092f4bba5ede17..808bf21dc16b5007c49a56c6597fd66c
                      this.setTradingPlayer(player);
                      this.openTradingScreen(player, this.getDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d58b4c0dbe651b5068212e5f14dce3164ee520f5..90d437ef429fa6eef620eb54fcb9512e46b19b15 100644
+index 093d1388ff90ad59110a37536b6639f939549068..66753bffa1e21ac5d5aaab4bc6cccb833774ddf5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -199,6 +199,19 @@ public abstract class Player extends LivingEntity {
+@@ -206,6 +206,19 @@ public abstract class Player extends LivingEntity {
      }
      // CraftBukkit end
  
@@ -5144,10 +5027,10 @@ index d58b4c0dbe651b5068212e5f14dce3164ee520f5..90d437ef429fa6eef620eb54fcb9512e
          super(EntityType.PLAYER, world);
          this.lastItemInMainHand = ItemStack.EMPTY;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java b/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java
-index 0bbe853f7df93f9dcd2b21d762939f8b6be069aa..7db9844083703944f59e112c6dc5e1a5e062d31c 100644
+index ffd01d24cbfc90e2a8807757e61b2cf20a944354..a419820d5001079ed839e67c757bc8fa591a20b3 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/LlamaSpit.java
-@@ -26,6 +26,12 @@ public class LlamaSpit extends Projectile {
+@@ -30,6 +30,12 @@ public class LlamaSpit extends Projectile {
          this.setPos(owner.getX() - (double) (owner.getBbWidth() + 1.0F) * 0.5D * (double) Mth.sin(owner.yBodyRot * 0.017453292F), owner.getEyeY() - 0.10000000149011612D, owner.getZ() + (double) (owner.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(owner.yBodyRot * 0.017453292F));
      }
  
@@ -5158,43 +5041,32 @@ index 0bbe853f7df93f9dcd2b21d762939f8b6be069aa..7db9844083703944f59e112c6dc5e1a5
 +    // Purpur end
 +
      @Override
-     public void tick() {
-         super.tick();
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java
-index cc0a3d9794d05b6bc6ab05f4f2ab8d83134b181d..e1f918d0bd2a70db1aba8bda8717149f58766825 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java
-@@ -33,7 +33,7 @@ public final class ProjectileUtil {
-         return getHitResult(vec32, entity, predicate, vec3, level);
-     }
- 
--    private static HitResult getHitResult(Vec3 pos, Entity entity, Predicate<Entity> predicate, Vec3 velocity, Level world) {
-+    public static HitResult getHitResult(Vec3 pos, Entity entity, Predicate<Entity> predicate, Vec3 velocity, Level world) { // Purpur - private -> public
-         Vec3 vec3 = pos.add(velocity);
-         HitResult hitResult = world.clip(new ClipContext(pos, vec3, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, entity));
-         if (hitResult.getType() != HitResult.Type.MISS) {
+     protected double getDefaultGravity() {
+         return 0.06D;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab15f91d3d0 100644
+index 55b4b5ad5f084c9a271a716d076672478d6486ba..4117260538e47c978ea31c76f439d43369ebedfb 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-@@ -109,6 +109,12 @@ public class WitherSkull extends AbstractHurtingProjectile {
+@@ -111,6 +111,14 @@ public class WitherSkull extends AbstractHurtingProjectile {
  
      }
  
++    // Purpur start
 +    @Override
 +    public boolean canHitEntity(Entity target) {
 +        // do not hit rider
 +        return target != this.getRider() && super.canHitEntity(target);
 +    }
++    // Purpur end
 +
      @Override
-     public boolean isPickable() {
+     public boolean hurt(DamageSource source, float amount) {
          return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f7ebddd35ff5a60a81034fd7de035ebba83e9517..6092004f91e1a4a143df1a82bcad9c16760f5096 100644
+index a2d336ceb52b63db5c03432ee7bc94dc6a742b82..a6268b3df9691278606501284b5504da718703c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1527,4 +1527,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1280,4 +1280,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().getScoreboardName();
      }
      // Paper end - entity scoreboard name
@@ -5223,7 +5095,7 @@ index f7ebddd35ff5a60a81034fd7de035ebba83e9517..6092004f91e1a4a143df1a82bcad9c16
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 193ad79f57255b1ea4cf7930071b4f4988dc2b04..05039f5d90c9c039a776d56befe2dfe201d95475 100644
+index 547ab158cd0cbf51da06ea97740cfce34bca651b..a49193a023bbd9b65bcd3652dc9c241720500755 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -592,6 +592,15 @@ public class CraftEventFactory {
@@ -5242,32 +5114,16 @@ index 193ad79f57255b1ea4cf7930071b4f4988dc2b04..05039f5d90c9c039a776d56befe2dfe2
          return event;
      }
  
-@@ -1033,6 +1042,7 @@ public class CraftEventFactory {
-                     damageCause = DamageCause.ENTITY_EXPLOSION;
-                 }
-                 event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
-+                damager.processClick(InteractionHand.MAIN_HAND); // Purpur
-             }
-             event.setCancelled(cancelled);
- 
-@@ -1147,6 +1157,7 @@ public class CraftEventFactory {
-             } else {
-                 entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
-             }
-+            damager.getHandle().processClick(InteractionHand.MAIN_HAND); // Purpur
-             return event;
-         }
- 
-@@ -1210,6 +1221,7 @@ public class CraftEventFactory {
+@@ -1179,6 +1188,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
-             event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API
+             event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
 +            damager.processClick(InteractionHand.MAIN_HAND); // Purpur
          } else {
-             event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
+             event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 61d193d8ddd87817bf2c560037d42366cff1eca9..8ad548fc059568d37675e017548b171d4dd1d555 100644
+index 19161d9736b626811423deefedd045abe60360cc..9287376ae1374e355857108d722f1be2fd7276d9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -172,4 +172,9 @@ public class PurpurConfig {
@@ -5281,10 +5137,10 @@ index 61d193d8ddd87817bf2c560037d42366cff1eca9..8ad548fc059568d37675e017548b171d
 +    }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5f0732c2b8f85185b6dfc1db3119c22e8be7f5da..4c25461a6d75a47425b66e04285792787d7193ee 100644
+index 5f0732c2b8f85185b6dfc1db3119c22e8be7f5da..3eae97d610d8f61528b87039723ef4ce2dc75c91 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -89,4 +89,722 @@ public class PurpurWorldConfig {
+@@ -89,4 +89,726 @@ public class PurpurWorldConfig {
          final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
          return value.isEmpty() ? fallback : value;
      }
@@ -5775,9 +5631,11 @@ index 5f0732c2b8f85185b6dfc1db3119c22e8be7f5da..4c25461a6d75a47425b66e0428579278
 +        skeletonControllable = getBoolean("mobs.skeleton.controllable", skeletonControllable);
 +    }
 +
++    public boolean skeletonHorseRidable = false;
 +    public boolean skeletonHorseRidableInWater = true;
 +    public boolean skeletonHorseCanSwim = false;
 +    private void skeletonHorseSettings() {
++        skeletonHorseRidable = getBoolean("mobs.skeleton_horse.ridable", skeletonHorseRidable);
 +        skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
 +        skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
 +    }
@@ -5982,9 +5840,11 @@ index 5f0732c2b8f85185b6dfc1db3119c22e8be7f5da..4c25461a6d75a47425b66e0428579278
 +        zombieControllable = getBoolean("mobs.zombie.controllable", zombieControllable);
 +    }
 +
++    public boolean zombieHorseRidable = false;
 +    public boolean zombieHorseRidableInWater = false;
 +    public boolean zombieHorseCanSwim = false;
 +    private void zombieHorseSettings() {
++        zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
 +        zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
 +        zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
 +    }
@@ -6388,10 +6248,10 @@ index 0000000000000000000000000000000000000000..ba2a37dad43e238e54632975abea8ee6
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..af057c1d7fd74f3dd806c5ce7f8b0ad06cab7b8e
+index 0000000000000000000000000000000000000000..89c476c740b4efb4f44c1dcd384b908626d96780
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,100 @@
 +package org.purpurmc.purpur.entity;
 +
 +import net.minecraft.core.particles.ParticleTypes;
@@ -6410,6 +6270,7 @@ index 0000000000000000000000000000000000000000..af057c1d7fd74f3dd806c5ce7f8b0ad0
 +import net.minecraft.world.phys.EntityHitResult;
 +import net.minecraft.world.phys.HitResult;
 +import net.minecraft.world.phys.Vec3;
++import org.bukkit.event.entity.EntityRemoveEvent;
 +
 +public class DolphinSpit extends LlamaSpit {
 +    public LivingEntity dolphin;
@@ -6433,9 +6294,9 @@ index 0000000000000000000000000000000000000000..af057c1d7fd74f3dd806c5ce7f8b0ad0
 +        super_tick();
 +
 +        Vec3 mot = this.getDeltaMovement();
-+        HitResult hitResult = ProjectileUtil.getHitResult(this.position(), this, this::canHitEntity, mot, level());
++        HitResult hitResult = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
 +
-+        this.preOnHit(hitResult);
++        this.preHitTargetOrDeflectSelf(hitResult);
 +
 +        double x = this.getX() + mot.x;
 +        double y = this.getY() + mot.y;
@@ -6453,7 +6314,7 @@ index 0000000000000000000000000000000000000000..af057c1d7fd74f3dd806c5ce7f8b0ad0
 +        }
 +
 +        if (++ticksLived > 20) {
-+            this.discard();
++            this.discard(EntityRemoveEvent.Cause.DISCARD);
 +        } else {
 +            this.setDeltaMovement(mot.scale(0.99D));
 +            if (!this.isNoGravity()) {
@@ -6488,12 +6349,12 @@ index 0000000000000000000000000000000000000000..af057c1d7fd74f3dd806c5ce7f8b0ad0
 +        }
 +        BlockState state = this.level().getBlockState(blockHitResult.getBlockPos());
 +        state.onProjectileHit(this.level(), state, blockHitResult, this);
-+        this.discard();
++        this.discard(EntityRemoveEvent.Cause.DISCARD);
 +    }
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1fd6412e332ea8ee82b19c108e113624e51d764b
+index 0000000000000000000000000000000000000000..c0b7e0eeffdf31b88662232b07944bf3e6fa2148
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 @@ -0,0 +1,114 @@
@@ -6541,9 +6402,9 @@ index 0000000000000000000000000000000000000000..1fd6412e332ea8ee82b19c108e113624
 +        super_tick();
 +
 +        Vec3 mot = this.getDeltaMovement();
-+        HitResult hitResult = ProjectileUtil.getHitResult(this.position(), this, this::canHitEntity, mot, level());
++        HitResult hitResult = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
 +
-+        this.preOnHit(hitResult);
++        this.preHitTargetOrDeflectSelf(hitResult);
 +
 +        double x = this.getX() + mot.x;
 +        double y = this.getY() + mot.y;
@@ -6561,11 +6422,11 @@ index 0000000000000000000000000000000000000000..1fd6412e332ea8ee82b19c108e113624
 +        }
 +
 +        if (++ticksLived > 20) {
-+            this.discard();
++            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +        } else if (this.level().getBlockStates(this.getBoundingBox()).noneMatch(BlockBehaviour.BlockStateBase::isAir)) {
-+            this.discard();
++            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +        } else if (this.isInWaterOrBubble()) {
-+            this.discard();
++            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +        } else {
 +            this.setDeltaMovement(mot.scale(0.99D));
 +            if (!this.isNoGravity()) {
@@ -6593,7 +6454,7 @@ index 0000000000000000000000000000000000000000..1fd6412e332ea8ee82b19c108e113624
 +            if (canGrief || (target instanceof LivingEntity && !(target instanceof ArmorStand))) {
 +                boolean hurt = target.hurt(target.damageSources().mobProjectile(this, (LivingEntity) shooter), level().purpurConfig.phantomFlameDamage);
 +                if (hurt && level().purpurConfig.phantomFlameFireTime > 0) {
-+                    target.setSecondsOnFire(level().purpurConfig.phantomFlameFireTime);
++                    target.igniteForSeconds(level().purpurConfig.phantomFlameFireTime);
 +                }
 +            }
 +        }
@@ -6608,7 +6469,7 @@ index 0000000000000000000000000000000000000000..1fd6412e332ea8ee82b19c108e113624
 +            BlockState state = this.level().getBlockState(blockHitResult.getBlockPos());
 +            state.onProjectileHit(this.level(), state, blockHitResult, this);
 +        }
-+        this.discard();
++        this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +    }
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/entity/ai/HasRider.java b/src/main/java/org/purpurmc/purpur/entity/ai/HasRider.java
@@ -6683,16 +6544,3 @@ index 0000000000000000000000000000000000000000..18a95e043cbffa65eeaaf65ff7695e5d
 +        return super.canUse() && llama.isSaddled() && llama.isControllable();
 +    }
 +}
-diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
-index 654ed436e99dd56f1fe7c1d4f38da34d95ce9349..6453b1d4182a47367e89500ed4180ce75556b47d 100644
---- a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
-+++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
-@@ -36,7 +36,7 @@ public class VanillaMobGoalTest {
-         }
- 
-         List<Class<?>> classes;
--        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft").scan()) {
-+        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages("net.minecraft", "org.purpurmc.purpur.entity.ai").scan()) { // Purpur
-             classes = scanResult.getSubclasses(net.minecraft.world.entity.ai.goal.Goal.class.getName()).loadClasses();
-         }
- 
diff --git a/patches/server/0009-Configurable-entity-base-attributes.patch b/patches/server/0007-Configurable-entity-base-attributes.patch
similarity index 90%
rename from patches/server/0009-Configurable-entity-base-attributes.patch
rename to patches/server/0007-Configurable-entity-base-attributes.patch
index 9af1d204d..47c653034 100644
--- a/patches/server/0009-Configurable-entity-base-attributes.patch
+++ b/patches/server/0007-Configurable-entity-base-attributes.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Configurable entity base attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5eb10b5f75b55f66a002745d016b88e0366d1301..b4edc2ab9d831c3c81677544cbd1cd7369591ff5 100644
+index 9c99a3df80c5f0a0d81e1f6a6516d088438a0b1e..e49dda27dd609ebf377f679c4f60c13a5f610c8e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
+@@ -163,7 +163,7 @@ import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
  
- public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, CommandSource, ScoreHolder {
 -
 +    public static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-     public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation
+     public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first setPositionRotation
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 75c278b67ad2b78766efd8f89c4c2ca7eb7cdcb2..dc99e7f0e6f173c1313c0d5e9ea5dd6bdbdac169 100644
+index aa76a24421cdb3908a3544d92eb3d1e3c2ebedc4..8211c152e6f4232e82e452b08047e4579465d770 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -36,6 +36,11 @@ public class GlowSquid extends Squid {
@@ -34,18 +34,18 @@ index 75c278b67ad2b78766efd8f89c4c2ca7eb7cdcb2..dc99e7f0e6f173c1313c0d5e9ea5dd6b
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cc82a506e0da0bf4318a37326924d71ca3340d5e..7471edf871522543cb49afef63d2c539b7e871a3 100644
+index 72bd60f691a639a0e7b6b5a98e5a3816305cfdaf..a3ee2af337acef86a15b12c9e6d8cd8452980a87 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         this.useItem = ItemStack.EMPTY;
+@@ -301,6 +301,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.lastClimbablePos = Optional.empty();
+         this.appliedScale = 1.0F;
          this.attributes = new AttributeMap(DefaultAttributes.getSupplier(type), this); // Purpur
 +        this.initAttributes(); // Purpur
          this.craftAttributes = new CraftAttributeMap(this.attributes); // CraftBukkit
          // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor
          this.entityData.set(LivingEntity.DATA_HEALTH_ID, (float) this.getAttribute(Attributes.MAX_HEALTH).getValue());
-@@ -302,6 +303,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -315,6 +316,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.brain = this.makeBrain(new Dynamic(dynamicopsnbt, (Tag) dynamicopsnbt.createMap((Map) ImmutableMap.of(dynamicopsnbt.createString("memories"), (Tag) dynamicopsnbt.emptyMap()))));
      }
  
@@ -55,10 +55,10 @@ index cc82a506e0da0bf4318a37326924d71ca3340d5e..7471edf871522543cb49afef63d2c539
          return this.brain;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index e184d2a89a89d4bf77a32a2d610175c5bbd38a03..c283900e6c43fda62428a6e6d8b70e512458e779 100644
+index f8a649b0fee040bbf53084ca7094583ab4ffd900..cea588d68c7e23ad8831bc611f1030d63354d91c 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -264,6 +264,18 @@ public class Bat extends AmbientCreature {
+@@ -265,6 +265,18 @@ public class Bat extends AmbientCreature {
          }
      }
  
@@ -78,10 +78,10 @@ index e184d2a89a89d4bf77a32a2d610175c5bbd38a03..c283900e6c43fda62428a6e6d8b70e51
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index ef056d4431388a49b24f63524ee246e506d80540..ee9a12a0285f43535b377e5aea2c3e9e5f64b496 100644
+index 4b84cf76d052112e00cd13c330182abfbe618820..ae4b53f4cdd78368deb7d510be4936ffefce4d9c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -471,6 +471,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -467,6 +467,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          }
      }
  
@@ -94,26 +94,28 @@ index ef056d4431388a49b24f63524ee246e506d80540..ee9a12a0285f43535b377e5aea2c3e9e
      public int getRemainingPersistentAngerTime() {
          return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 3e89e788c796fe168e43a6b78c0d6c1fc077fc78..87642c1c2c1f39a1c2029797bab73f60c19a1080 100644
+index 3826c794ddde6b915e233e2d0395557e3ea867e0..7930e9735abf8357df737798e80b08295c2e06ec 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -123,6 +123,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -129,6 +129,13 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
      }
      // Purpur end
  
++    // Purpur start
 +    @Override
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.catMaxHealth);
 +    }
++    // Purpur end
 +
-     public ResourceLocation getResourceLocation() {
-         return this.getVariant().texture();
+     public ResourceLocation getTextureId() {
+         return ((CatVariant) this.getVariant().value()).texture();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 89e93366395136af826d26be2b85ac881e0dfacc..3c06fe81e2e1d7bd546ead0d13d87cbe7e2e7b5b 100644
+index 3e335383a28b510c779bfbf2b916653a25c6d43b..a7c76e1d89f54f0dc3b27a8a8db168ea4570bf60 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -72,6 +72,11 @@ public class Chicken extends Animal {
+@@ -71,6 +71,11 @@ public class Chicken extends Animal {
      }
      // Purpur end
  
@@ -142,10 +144,10 @@ index e2a98b45e56a368de19bb65e304370a5998c7cb9..3d61c2d5da103de68242c16d85c70381
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index b0cff23aa6f841ad291437964ea5bebb6395de84..f440eabffb1abe4c7370bf7badf6137a22f99071 100644
+index 41b6c79c31414378d433500a35e434e546738e42..bee1a275f242866206dc461461b7962e04289ddc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -62,6 +62,11 @@ public class Cow extends Animal {
+@@ -61,6 +61,11 @@ public class Cow extends Animal {
      }
      // Purpur end
  
@@ -158,10 +160,10 @@ index b0cff23aa6f841ad291437964ea5bebb6395de84..f440eabffb1abe4c7370bf7badf6137a
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 3dab78e2f39855f71bb7294521be71b3faa59b81..89e3dbfddc739f97fdb6ec9a5714530f03cc7092 100644
+index 3af2017a4b860992a6db88edec3624fcb9884ae1..4f294b3ecf061f34046b52bf2b6a3d0ff1ed347b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -158,6 +158,11 @@ public class Dolphin extends WaterAnimal {
+@@ -157,6 +157,11 @@ public class Dolphin extends WaterAnimal {
      }
      // Purpur end
  
@@ -172,12 +174,12 @@ index 3dab78e2f39855f71bb7294521be71b3faa59b81..89e3dbfddc739f97fdb6ec9a5714530f
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 7d692f61ed4c6cc8e6b94eda4f48e9cb6baa0ae2..5a7f4c0565b2d8f95930b39e1aacd9904e382736 100644
+index 935dff4d167d8b6ef4b7cdc95bf000a2ce761f92..8666d82775570b812d5bdd80336c8e14db6ddf47 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -182,6 +182,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -183,6 +183,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
      }
      // Purpur end
  
@@ -187,13 +189,13 @@ index 7d692f61ed4c6cc8e6b94eda4f48e9cb6baa0ae2..5a7f4c0565b2d8f95930b39e1aacd990
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 6815d7350a82c6d32f60aa6116466ebd06a920f9..95ff109511c97d603aeaf9e73c49397a841fcbce 100644
+index 4cc9138201b08aff8bb47720c6fe1e3447f03967..2919d055e2136a956aa038bd0bf4c1a2ff5afa2f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -81,6 +81,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -76,6 +76,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      public boolean isControllable() {
          return level().purpurConfig.ironGolemControllable;
      }
@@ -206,10 +208,10 @@ index 6815d7350a82c6d32f60aa6116466ebd06a920f9..95ff109511c97d603aeaf9e73c49397a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 9a84599457bbd14314e0c4f3fa8bf30bec8da347..e3fe62285ced917de6817916e99483e117008670 100644
+index 11944ee34fc7e3e5551b9e18a563164f96898a54..b47dddb2fc6058a90665ccbd362088d9a2e837b5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -80,6 +80,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -81,6 +81,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
      }
      // Purpur end
  
@@ -222,10 +224,10 @@ index 9a84599457bbd14314e0c4f3fa8bf30bec8da347..e3fe62285ced917de6817916e99483e1
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 66f80ec010909648278c4e74c80d3766b9cf6c6a..14daac1a87e32e0ff0a610aef256e20cbfe50001 100644
+index 2b074f68c1be2ff591543685bbb4e7ea1c7784f8..31f3982359a00f55a7fc053becc4043dcf423c50 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -87,6 +87,11 @@ public class Ocelot extends Animal {
+@@ -83,6 +83,11 @@ public class Ocelot extends Animal {
      }
      // Purpur end
  
@@ -238,10 +240,10 @@ index 66f80ec010909648278c4e74c80d3766b9cf6c6a..14daac1a87e32e0ff0a610aef256e20c
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 5b3a2010da3b6429da783f8263fd170a4fb8d80b..2832d7cbcfad43b3f0f6c33504cff68add85601d 100644
+index 5f9b7ae2ed4acff0fa7cfee07a29a28b5c0d67f8..d2410da0b453e0128ff8b00956cae89cabff1d5d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -140,6 +140,12 @@ public class Panda extends Animal {
+@@ -146,6 +146,12 @@ public class Panda extends Animal {
      }
      // Purpur end
  
@@ -254,7 +256,7 @@ index 5b3a2010da3b6429da783f8263fd170a4fb8d80b..2832d7cbcfad43b3f0f6c33504cff68a
      @Override
      public boolean canTakeItem(ItemStack stack) {
          EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
-@@ -641,7 +647,10 @@ public class Panda extends Animal {
+@@ -660,7 +666,10 @@ public class Panda extends Animal {
  
      public void setAttributes() {
          if (this.isWeak()) {
@@ -267,10 +269,10 @@ index 5b3a2010da3b6429da783f8263fd170a4fb8d80b..2832d7cbcfad43b3f0f6c33504cff68a
  
          if (this.isLazy()) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index a3cb82e65ea344de1889762f638e72fcf0a44714..fa8f9fdb873a65d3685b808c20b2d069dc1f3a90 100644
+index 12200cca54304d567a1880527a49f3e26ad08c7b..04507e05b499e536faa3c55179bb91913f7cda81 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -192,6 +192,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -186,6 +186,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
      }
      // Purpur end
  
@@ -281,12 +283,12 @@ index a3cb82e65ea344de1889762f638e72fcf0a44714..fa8f9fdb873a65d3685b808c20b2d069
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 28f68a7383fe6e53541eb1b36ba73eb15723f0f7..6480e0f026e686b2d0a093d901d7f1e312a45021 100644
+index 7d2579748fd182b89667edb2eb3ea65b195e2001..a365573c5c5e640f165701bc79f7c605674c5709 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -84,6 +84,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -81,6 +81,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
      }
      // Purpur end
  
@@ -299,10 +301,10 @@ index 28f68a7383fe6e53541eb1b36ba73eb15723f0f7..6480e0f026e686b2d0a093d901d7f1e3
      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 2b6efb46035c5695928643780bfbd5b5a2ed28e9..70b45c622a459ace397d4d54cd99e8ae7fc1ce65 100644
+index d97314380b69ea2ad83b86c0f1bcaaccd4a1644f..00afde0ec4811992aac306a42d473026b7e7e468 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -94,6 +94,11 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -93,6 +93,11 @@ public class PolarBear extends Animal implements NeutralMob {
      }
      // Purpur end
  
@@ -315,10 +317,10 @@ index 2b6efb46035c5695928643780bfbd5b5a2ed28e9..70b45c622a459ace397d4d54cd99e8ae
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index 95383e246a8e1b311e4f26a66372966b6bc51de5..8b5bf8ef4481ccc829d1a39c0921941581b2f045 100644
+index d75016647c513841358d08e5931821ecf8c21c2a..0682df1037e23068c715f7bc06f1dc461641bb2f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-@@ -57,6 +57,11 @@ public class Pufferfish extends AbstractFish {
+@@ -63,6 +63,11 @@ public class Pufferfish extends AbstractFish {
      }
      // Purpur end
  
@@ -328,13 +330,13 @@ index 95383e246a8e1b311e4f26a66372966b6bc51de5..8b5bf8ef4481ccc829d1a39c09219415
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index f8989e0db656389fe04487d5d407aacc0add1797..23ede55b9b1198c72fe93b086129d4725d9352fe 100644
+index ba408a4195e03b484f143fbe66d5d3b13ebb8f11..9eb1158213064ddb37ae76e445b5861b963a1f55 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -138,6 +138,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -137,6 +137,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          }
          wasOnGround = onGround;
      }
@@ -363,10 +365,10 @@ index 87c442fb198cad8671ad1419e589a5a67c4fdca8..742805994f29a18af444912b10af631d
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 80b91cdaffc0af25b9a8b13281519cf093928e85..c24299cb482beaef3e2e860475c66e068fa03eb1 100644
+index 7c1da46554aefde8e5e2b33a3644c9cbd771d7bc..b68886cc72d3055e7745fe4a955192bbad90dc13 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -136,6 +136,11 @@ public class Sheep extends Animal implements Shearable {
+@@ -134,6 +134,11 @@ public class Sheep extends Animal implements Shearable {
      }
      // Purpur end
  
@@ -379,10 +381,10 @@ index 80b91cdaffc0af25b9a8b13281519cf093928e85..c24299cb482beaef3e2e860475c66e06
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 04927f5f06d6dc14ad01319dd22583632c2c511b..3ffd9dd16c80399842ba138ed60abd66cd312dcb 100644
+index d51b486afb83bf3e12046ed5e61e73eec5bd7c7c..a54893d51cc1ce204e59a6ffe8b84228775af4da 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -71,6 +71,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -69,6 +69,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      }
      // Purpur end
  
@@ -395,10 +397,10 @@ index 04927f5f06d6dc14ad01319dd22583632c2c511b..3ffd9dd16c80399842ba138ed60abd66
      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 7fa03dbc442942b70f374096e346d54089d8f0a0..913b66be2111da862e706d4978825c64cfe8b00b 100644
+index 37402f7df48f04a6df2211e079519ed95d3735bc..e38416189d9dc72f0b5951a1f6430dbc4578c422 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 {
+@@ -68,6 +68,11 @@ public class Squid extends WaterAnimal {
      }
      // Purpur end
  
@@ -411,10 +413,10 @@ index 7fa03dbc442942b70f374096e346d54089d8f0a0..913b66be2111da862e706d4978825c64
      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 71234b258157579d3a47064e7e299bb7fb90908f..7d02e552a27632939bb9c40a62f4e0df7bd60bbc 100644
+index 18dcb67d246b63637d8c948b6c3f48c58d71c339..327b1805d9d4069212a8772ff189c9ab24ae1183 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-@@ -54,6 +54,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
+@@ -79,6 +79,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
      }
      // Purpur end
  
@@ -427,10 +429,10 @@ index 71234b258157579d3a47064e7e299bb7fb90908f..7d02e552a27632939bb9c40a62f4e0df
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index b9fb6c5527a621bc8012188d2e08604fe730e6c8..4b76c207c7f1eee6bdceebeeba50779557a2662a 100644
+index 4742d90ca38c1d8034b0cfcf7f336e225fade197..b8dcf3d632c79585ec7e9f50fa040fa9fac5d7c5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -103,6 +103,11 @@ public class Turtle extends Animal {
+@@ -104,6 +104,11 @@ public class Turtle extends Animal {
      }
      // Purpur end
  
@@ -443,10 +445,10 @@ index b9fb6c5527a621bc8012188d2e08604fe730e6c8..4b76c207c7f1eee6bdceebeeba507795
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 2efa2e19485f9d959a55115ab62f985454689379..eecdb1f1d49951cb8a294d176afd12c68fb6c3b1 100644
+index 731909acd1e18dcfbd25becb0ddff30fb2a6a0f5..8aaac4e86ec6d9c40999f6198cda7d367ece54e3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -127,6 +127,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -146,6 +146,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
      }
      // Purpur end
  
@@ -459,10 +461,10 @@ index 2efa2e19485f9d959a55115ab62f985454689379..eecdb1f1d49951cb8a294d176afd12c6
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 4dfe6a909ac3d553bd1cd4cfc131ac8bfb5a0b02..882c8fe0d9dc2e34eed2f1b11bb2c1b4d72319d2 100644
+index 045ac081120f65987251d04d1522a5b7197e1d88..414ff28670c3d36dc78e3df4d39b6d4eb3ec1e77 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -115,6 +115,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -113,6 +113,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
      }
      // Purpur end
  
@@ -475,10 +477,10 @@ index 4dfe6a909ac3d553bd1cd4cfc131ac8bfb5a0b02..882c8fe0d9dc2e34eed2f1b11bb2c1b4
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 29108c481756d3150fd0ae69f6d249d127b11fdd..85a557b50498bb83eeec4125aa2ae14f3bfaaab8 100644
+index 4477f201ff02a5e0758af5431b7d9b7c5e11d642..07a5599a9370ba167e985006d74caa3c80288e28 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -320,6 +320,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -316,6 +316,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
          return this.dashCooldown;
      }
  
@@ -503,10 +505,10 @@ index 29108c481756d3150fd0ae69f6d249d127b11fdd..85a557b50498bb83eeec4125aa2ae14f
      protected SoundEvent getAmbientSound() {
          return SoundEvents.CAMEL_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 27050c00ea4e4b301d4c85528117fc1d87e6f1ef..ad4d4e38a2f0125e0943945c9440a9be80b60257 100644
+index 12a137665f93d992094e86327a496057890d1018..59829fb7342696d29aa709d392f89bf263257fd3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -162,6 +162,44 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -229,6 +229,44 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
      }
      // Purpur end
  
@@ -551,17 +553,17 @@ index 27050c00ea4e4b301d4c85528117fc1d87e6f1ef..ad4d4e38a2f0125e0943945c9440a9be
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HorseHasRider(this)); // Purpur
-@@ -1245,7 +1283,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -1260,7 +1298,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
              entityData = new AgeableMob.AgeableMobGroupData(0.2F);
          }
  
 -        this.randomizeAttributes(world.getRandom());
 +        // this.randomizeAttributes(world.getRandom()); // Purpur - replaced by initAttributes()
-         return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData, entityNbt);
+         return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index 6a5fb18523545ccc788b09ab4fbee1b14a64bc63..365273173e37e74470a1cf511334ea8cb25f8302 100644
+index 1febe8e173886d501e40331c12261701bd36b0f6..b47a72ffb8b947cea5d4bc6ee37b824c4161be31 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -22,6 +22,21 @@ public class Donkey extends AbstractChestedHorse {
@@ -587,10 +589,10 @@ index 6a5fb18523545ccc788b09ab4fbee1b14a64bc63..365273173e37e74470a1cf511334ea8c
      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 3e50581033e88e8eddcbd85bfa890cbe0b88a7e6..92339f5a07dcb6bf7eb1bce6d584464ebd8430b5 100644
+index 816c698a81a77f217a606468aa157bdaed779479..9ad0d3972d1970b11687da174a83e3a0a4180c0e 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> {
+@@ -51,6 +51,21 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
      }
      // Purpur end
  
@@ -613,7 +615,7 @@ index 3e50581033e88e8eddcbd85bfa890cbe0b88a7e6..92339f5a07dcb6bf7eb1bce6d584464e
      protected void randomizeAttributes(RandomSource random) {
          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 0549974c56ae7d05b5eec77029c5d08a6614a8bf..278c33b7de4472a746cdbc1faaa68e05592777bc 100644
+index 3943ca63aaeecfb98c34ceef9b0c40e71de4e832..697895661826e4a1ecbdfd2c3a195b9d0ee7e00a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -124,6 +124,21 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -639,7 +641,7 @@ index 0549974c56ae7d05b5eec77029c5d08a6614a8bf..278c33b7de4472a746cdbc1faaa68e05
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index ae7bcfa608d8bdd2a2320618225294de0314ce53..abbeb305b2d09e9c4c02ade603adac5ceb34bdd0 100644
+index 1d18c983efad3ea309e7bc2a7c75d60d46ab80a7..68fe99ea6d683dd18171d35764b4cb319433f6e0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -21,6 +21,21 @@ public class Mule extends AbstractChestedHorse {
@@ -665,10 +667,10 @@ index ae7bcfa608d8bdd2a2320618225294de0314ce53..abbeb305b2d09e9c4c02ade603adac5c
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index 6d5a37facc288ebb27d96c2451091ea299c16077..8ffba7c368f936ea5cdfc46c5fa76c3feb63e1ac 100644
+index b3ce3c484c2e447e2d9fa52e1ccc30b2e4883923..6180f750ed159e35d20bbaefc57bdd7293c657ec 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -38,6 +38,21 @@ public class SkeletonHorse extends AbstractHorse {
+@@ -49,6 +49,21 @@ public class SkeletonHorse extends AbstractHorse {
      }
      // Purpur end
  
@@ -688,13 +690,13 @@ index 6d5a37facc288ebb27d96c2451091ea299c16077..8ffba7c368f936ea5cdfc46c5fa76c3f
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index 5fc37e2322188e0db12f7679e40b1a3d40268ca7..4abb9d5fedf63eba9dc3f716d44ea11806607af0 100644
+index 2abc4a5a9043d7c8643b27b7ba874d42bbdc04b7..af29ba1512bfda03718fb01ecff8d86b4e927611 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -49,6 +49,21 @@ public class TraderLlama extends Llama {
+@@ -52,6 +52,21 @@ public class TraderLlama extends Llama {
      }
      // Purpur end
  
@@ -717,10 +719,10 @@ index 5fc37e2322188e0db12f7679e40b1a3d40268ca7..4abb9d5fedf63eba9dc3f716d44ea118
      public boolean isTraderLlama() {
          return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index 6c03ad3d978378221db3e5bed947738bd710eae0..2e6b55a01e022252245c16ed310920bcba072975 100644
+index 2cf47ea1cedc1cecfeb4d2bcebc0810a19f64022..d2b3859f9c69e6d73fa859db858d38dd41fa35cd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-@@ -34,6 +34,21 @@ public class ZombieHorse extends AbstractHorse {
+@@ -45,6 +45,21 @@ public class ZombieHorse extends AbstractHorse {
      }
      // Purpur end
  
@@ -740,26 +742,26 @@ index 6c03ad3d978378221db3e5bed947738bd710eae0..2e6b55a01e022252245c16ed310920bc
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 13096fa2032679006f4264e03fdf86a71454f3ca..a5fd822713b56ebb2bec51364be715570ec056bb 100644
+index c6b6b47e8c268604ab0d1f3bb59c0b0b3a7a1d25..d63913cca12a008ceb4bffc97ba08b8d800102c3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -108,6 +108,11 @@ public class Sniffer extends Animal {
+@@ -109,6 +109,11 @@ public class Sniffer extends Animal {
+     public boolean isControllable() {
+         return level().purpurConfig.snifferControllable;
      }
-     // Purpur end
- 
++
 +    @Override
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.snifferMaxHealth);
 +    }
-+
-     // CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
+     // Purpur end
+ 
      @Override
-     protected void defineSynchedData() {
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 52920b603ef88f9f6e3dd7935292fe82fd0aab07..e50cf2e27900da6a9f7b4bb07fc4c2ee1ed52313 100644
+index 170038f2bfdfd01003b6661672a9f8ed266343e2..0a7f87ac09f9ef6ad69974090f0d6f437d232b11 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -185,6 +185,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -775,10 +777,10 @@ index 52920b603ef88f9f6e3dd7935292fe82fd0aab07..e50cf2e27900da6a9f7b4bb07fc4c2ee
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 6674d1b184246ecce5270a6826b153903e4a5a88..e6d6341f895c763fee05db3a7a7e05a68b9d36e9 100644
+index 14f9ded1b44d05d69f1a9394fdacab5b145e4c45..0cc32342cf6c65466dd1e45f9097ca89b01036e4 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -112,6 +112,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -116,6 +116,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          this.xpReward = 50;
      }
  
@@ -790,7 +792,7 @@ index 6674d1b184246ecce5270a6826b153903e4a5a88..e6d6341f895c763fee05db3a7a7e05a6
      @Override
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
-@@ -427,7 +432,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -428,7 +433,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
  
              this.setInvulnerableTicks(i);
              if (this.tickCount % 10 == 0) {
@@ -800,7 +802,7 @@ index 6674d1b184246ecce5270a6826b153903e4a5a88..e6d6341f895c763fee05db3a7a7e05a6
  
          } 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 63049b0b4a4ae09e5925129dc363e43dbae23272..04226492a5655e4a3a9716590e2af7fc79560ad9 100644
+index 0e1aa9a00284ce43436b1290f9ebe243c4d09fdc..220deda05517fd200070f823ad7af075240bb623 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 {
@@ -816,10 +818,10 @@ index 63049b0b4a4ae09e5925129dc363e43dbae23272..04226492a5655e4a3a9716590e2af7fc
      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/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-index 562faf0257388d9c22146a418f25716cef7471b8..c8bac8cb738ad96003a014b468681c43512ac4c4 100644
+index 504996c8309fcd11de1dd166dee12d7e7db8db56..562f73dd5e617c10382c50be86ce88f4de1a4fe1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-@@ -46,6 +46,11 @@ public class CaveSpider extends Spider {
+@@ -43,6 +43,11 @@ public class CaveSpider extends Spider {
      }
      // Purpur end
  
@@ -832,10 +834,10 @@ index 562faf0257388d9c22146a418f25716cef7471b8..c8bac8cb738ad96003a014b468681c43
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 66b2fdcda53fdfd278994dc16be3e12041be6e99..e31094f270117dec3053620c06e409953fb6d710 100644
+index 6e812033323b1d1ace9023d57f0405e0d546c337..624ae0e10ef9f51d484e45ec9a15e4a120bf2af2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -250,6 +250,11 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -252,6 +252,11 @@ public class Creeper extends Monster implements PowerableMob {
          }
      }
  
@@ -848,10 +850,10 @@ index 66b2fdcda53fdfd278994dc16be3e12041be6e99..e31094f270117dec3053620c06e40995
      protected SoundEvent getHurtSound(DamageSource source) {
          return SoundEvents.CREEPER_HURT;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index c64c88ddd929d49fcfc6ebc2d0030bc86c8ac337..3cde608a222ab2ef2b5fc7f543e97ba71e440ea9 100644
+index 2b93338db154e6c0c3c8814adabaab761f08af08..02bceb31c517b94653573380ed29d9401a6b9ce8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -85,6 +85,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -88,6 +88,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
      }
      // Purpur end
  
@@ -869,10 +871,10 @@ index c64c88ddd929d49fcfc6ebc2d0030bc86c8ac337..3cde608a222ab2ef2b5fc7f543e97ba7
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index 37afe706c5c453003ea96e62f376f45d7b8eb4a8..971210c1199ec48f28446e75d8d796a1f3f9a734 100644
+index 430899602940aa04c21d45ae94bcc506352389cf..6152117a3e13252068e16945b4346a73a3090dda 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-@@ -48,6 +48,11 @@ public class ElderGuardian extends Guardian {
+@@ -45,6 +45,11 @@ public class ElderGuardian extends Guardian {
      }
      // Purpur end
  
@@ -885,10 +887,10 @@ index 37afe706c5c453003ea96e62f376f45d7b8eb4a8..971210c1199ec48f28446e75d8d796a1
          return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index a838a35be772dffc38c84c4f352598cd75dc3f33..36e2d5873f8de180bda97acbad2fed4da5b02872 100644
+index 0c1e3b00bdc1e6b033e6e9e37400a475cee2500e..3abfc4f449552ec60a1f7c4e3faa9fd0ebfdc300 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -115,6 +115,11 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -110,6 +110,11 @@ public class EnderMan extends Monster implements NeutralMob {
      }
      // Purpur end
  
@@ -901,7 +903,7 @@ index a838a35be772dffc38c84c4f352598cd75dc3f33..36e2d5873f8de180bda97acbad2fed4d
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 7fb02aab225a45e951ab1e7c6ba1c53f53d0fecd..336a22876bcf1cdfcd9d17d22f615d45c2863589 100644
+index ee88933c7baba3bc82c6dc9d52291d5f9fc0f25d..52e2588b32b56b51bdbbdf63a290b2a4a4b02c13 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -55,6 +55,11 @@ public class Endermite extends Monster {
@@ -917,10 +919,10 @@ index 7fb02aab225a45e951ab1e7c6ba1c53f53d0fecd..336a22876bcf1cdfcd9d17d22f615d45
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index a566824074850724023830f6b6fa3728d0b2aa99..86999c7932216871b4b6e06d68168e3b48038a18 100644
+index 0d1931398f1f6bad941ff133a0d872ffabb00bd3..8f0c685790aa59b7f2352c3bac6ede444d0ede22 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-@@ -67,6 +67,11 @@ public class Evoker extends SpellcasterIllager {
+@@ -69,6 +69,11 @@ public class Evoker extends SpellcasterIllager {
      }
      // Purpur end
  
@@ -933,10 +935,10 @@ index a566824074850724023830f6b6fa3728d0b2aa99..86999c7932216871b4b6e06d68168e3b
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index 3f886ffb0aa8591e4ca8324301ae9a8eeac57ab4..edd3b7a855165eb090edb9ad95d36cdb649d231e 100644
+index 862ad83b536fd0b5eb38ac0f2940cc46aed1fba2..4bad5bdce2df5f5233465b30bcd3121b1dff0874 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-@@ -133,6 +133,11 @@ public class Ghast extends FlyingMob implements Enemy {
+@@ -131,6 +131,11 @@ public class Ghast extends FlyingMob implements Enemy {
          }
      }
  
@@ -946,16 +948,17 @@ index 3f886ffb0aa8591e4ca8324301ae9a8eeac57ab4..edd3b7a855165eb090edb9ad95d36cdb
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 198e3219e8f44eaea8ff1914c6c20efda172ff70..2a30499fd6f4a1340f6911f0f7f079bcbe8576a3 100644
+index 868e8383a890d76b4cfeac8b77b06e8f58d0a6dc..9602e59cbebeedc85ea75d2a41d3e74f0ff45b46 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -38,6 +38,13 @@ public class Giant extends Monster {
+@@ -33,6 +33,14 @@ public class Giant extends Monster {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
+         this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
      }
-     // Purpur end
- 
++
 +    @Override
 +    protected void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.giantMaxHealth);
@@ -963,14 +966,14 @@ index 198e3219e8f44eaea8ff1914c6c20efda172ff70..2a30499fd6f4a1340f6911f0f7f079bc
 +        this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(this.level().purpurConfig.giantAttackDamage);
 +    }
 +
-     @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return 10.440001F;
+     // Purpur end
+ 
+     public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-index 3a2ed35542c775a0712b3bec94b7292215e4fba5..74c4bcccb12b25eac50d061edbc2d2cb46ccb8df 100644
+index 9a1b1a1b0b6d59d599a2ab87f047121f47cf2bec..7fa4e9761c6aad83848bf5e80a213689d728921d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-@@ -94,6 +94,11 @@ public class Guardian extends Monster {
+@@ -90,6 +90,11 @@ public class Guardian extends Monster {
      }
      // Purpur end
  
@@ -983,10 +986,10 @@ index 3a2ed35542c775a0712b3bec94b7292215e4fba5..74c4bcccb12b25eac50d061edbc2d2cb
      protected void registerGoals() {
          MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 774c15a91b0e988364acc33b8516ef132bcc9464..469ad6f0d73add7b005217b2ae39b201c7679a27 100644
+index 20ea3187626a667815245974df88189f7d6ffc76..805bfee8b061445de5b5d8aeb13c792178e25f7b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -41,6 +41,16 @@ public class Husk extends Zombie {
+@@ -39,6 +39,16 @@ public class Husk extends Zombie {
      }
      // Purpur end
  
@@ -1001,13 +1004,13 @@ index 774c15a91b0e988364acc33b8516ef132bcc9464..469ad6f0d73add7b005217b2ae39b201
 +    }
 +
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
+         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (MobSpawnType.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index f83f09f7568c44a1165aac73f7127c5d1af0478f..0f3e6c19e55a18cde71f3cb84c1e92b433ebcb7f 100644
+index bef63bb69ea81298a1021eadd6c260943e18eba7..c680e1efb73a6387aad6ecdab94f690c12451a32 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-@@ -76,6 +76,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
+@@ -73,6 +73,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
      }
      // Purpur end
  
@@ -1022,10 +1025,10 @@ index f83f09f7568c44a1165aac73f7127c5d1af0478f..0f3e6c19e55a18cde71f3cb84c1e92b4
      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 aad51022eac584fbc058c2b25e2bf1929fccca6f..b472309f97b24f1d7b97d8b6d464c479c2d602d5 100644
+index 6a03a5f1c209d248207b6835ba1d7c0f59dec557..61cd97bc17802d3ab30999fc1f2b91e8b00652b2 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 {
+@@ -46,6 +46,26 @@ public class MagmaCube extends Slime {
      }
      // Purpur end
  
@@ -1050,13 +1053,13 @@ index aad51022eac584fbc058c2b25e2bf1929fccca6f..b472309f97b24f1d7b97d8b6d464c479
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 34de7704ad6bf6989fb83a1e24905098d7ba0123..8446ce22139fa2473c789cab67f4031a23f0d31d 100644
+index 03c873b830f45d848af076ac7921fc4d019f69c8..01e8eaecec61e664838b5d7f18a9c3e730f00ddf 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -151,7 +151,10 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -149,7 +149,10 @@ public class Phantom extends FlyingMob implements Enemy {
  
      private void updatePhantomSizeInfo() {
          this.refreshDimensions();
@@ -1068,7 +1071,7 @@ index 34de7704ad6bf6989fb83a1e24905098d7ba0123..8446ce22139fa2473c789cab67f4031a
      }
  
      public int getPhantomSize() {
-@@ -181,6 +184,21 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -174,6 +177,21 @@ public class Phantom extends FlyingMob implements Enemy {
          return true;
      }
  
@@ -1091,10 +1094,10 @@ index 34de7704ad6bf6989fb83a1e24905098d7ba0123..8446ce22139fa2473c789cab67f4031a
      public void tick() {
          super.tick();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index 31d204d8d81ccc30371070af3678d82dc721618d..6a6349c7002439965422aa4979682b4ce6dfba1e 100644
+index 6bfe582390dcb6111dcaf8325bd2773b9f5fd6a9..8c06e648df453fdd4eea0aa4843fada9b6375f81 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-@@ -79,6 +79,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
+@@ -75,6 +75,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
      }
      // Purpur end
  
@@ -1107,10 +1110,10 @@ index 31d204d8d81ccc30371070af3678d82dc721618d..6a6349c7002439965422aa4979682b4c
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index cfa324c6a75ac83cff4ba87034677d4e9415189e..28795558000d76fd255faabc79cc45600efa2c92 100644
+index 1248a48c0146258d14efcaa805a82ce1a79c623d..32d547a4430a8f524a7fc0bd1aa063bbebfaeb7f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -94,6 +94,11 @@ public class Ravager extends Raider {
+@@ -91,6 +91,11 @@ public class Ravager extends Raider {
      }
      // Purpur end
  
@@ -1123,7 +1126,7 @@ index cfa324c6a75ac83cff4ba87034677d4e9415189e..28795558000d76fd255faabc79cc4560
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index eea85643a2cedb5fd1a08892aea82b96b935e408..fde2a69f489e12d9c1ccee4522258d2746dcb2e0 100644
+index 78433d0b7624019018012c55e8dd6fec029f8cd1..1793c5f4e33fbab9d64d81bb1767b0e9b248106f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -114,6 +114,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1139,10 +1142,10 @@ index eea85643a2cedb5fd1a08892aea82b96b935e408..fde2a69f489e12d9c1ccee4522258d27
      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/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index f5dda5ed4532c8572bc4f511c49377c262efe057..1738f0a251e4cab2eb3f122e83366afb02201765 100644
+index 97cab38a47e302f40ca69ef4eb8f7dcb11eccf35..75f82922260b2c0666021e7ed42dfde401e1a9d6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -64,6 +64,11 @@ public class Silverfish extends Monster {
+@@ -60,6 +60,11 @@ public class Silverfish extends Monster {
      }
      // Purpur end
  
@@ -1155,7 +1158,7 @@ index f5dda5ed4532c8572bc4f511c49377c262efe057..1738f0a251e4cab2eb3f122e83366afb
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 4db19589d19d1a0e488ddd0b691e81152ac236e4..6250d2bd682ce3c421aeea598cf8ec9032ac9785 100644
+index 2f4f38fe7b7640b6658884b826d7f7a335370bd3..1f751a9a079d59ee54afb43ec87284f0de8fa07a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -43,6 +43,11 @@ public class Skeleton extends AbstractSkeleton {
@@ -1168,10 +1171,10 @@ index 4db19589d19d1a0e488ddd0b691e81152ac236e4..6250d2bd682ce3c421aeea598cf8ec90
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index cf81e9ade3200251ca3a25eb0e5ce7dc852e396a..3870314f5d45ed1908b45ed08ff7932da66a0bad 100644
+index 2c73e80d916529cb0433846a2e57bc845bf7f3d4..8deddd8b543a30e295e6d55880d5051a63fef87b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -101,6 +101,37 @@ public class Slime extends Mob implements Enemy {
@@ -1225,10 +1228,10 @@ index cf81e9ade3200251ca3a25eb0e5ce7dc852e396a..3870314f5d45ed1908b45ed08ff7932d
              this.setHealth(this.getMaxHealth());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 3c3eb009f2d80d658447034c3df41070f254349b..52fa3d5426bb44cc9b9c0ebfd9c9d3b1adbc17a4 100644
+index 87f63373ccef3de9ce77a92933ff332be4fd6305..92276f6c015e60783f23f433466f50c918057f61 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -70,6 +70,11 @@ public class Spider extends Monster {
+@@ -68,6 +68,11 @@ public class Spider extends Monster {
      }
      // Purpur end
  
@@ -1241,7 +1244,7 @@ index 3c3eb009f2d80d658447034c3df41070f254349b..52fa3d5426bb44cc9b9c0ebfd9c9d3b1
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
-index 137ee6d1aa8ec334009b6fab21b9f30303ace45f..2bfc34d300627c17b2b34442665527c34ebea78a 100644
+index 44006bcb7d70661a6990e3fc4375dd6da34517e0..e1327ea96fe394b1c27dbe88c49596256e4e61d3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -38,6 +38,11 @@ public class Stray extends AbstractSkeleton {
@@ -1257,10 +1260,10 @@ index 137ee6d1aa8ec334009b6fab21b9f30303ace45f..2bfc34d300627c17b2b34442665527c3
          BlockPos blockPos = pos;
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index bfd69abf24d788b5e539498d56ade57fcb78f580..9b853fd05a3a851cb08d7f849b51f2b220780982 100644
+index 7e5ad9d52db7a39be60e0b2f24e13e8ed82785e1..4abbeaf9f88511f37bd14c17dbd9a107648a5534 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -117,6 +117,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+@@ -114,6 +114,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
      }
      // Purpur end
  
@@ -1273,26 +1276,26 @@ index bfd69abf24d788b5e539498d56ade57fcb78f580..9b853fd05a3a851cb08d7f849b51f2b2
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index 566fa6f2f26139e457584b6e73fd8609efbf67d7..3f44b666a618d41b029905f463f507ad9217da0b 100644
+index 98c9d7080595a5d9ffa3d65a153780b68aec0e47..ca6c688b31240863dfc5095c7b6187583cf2f6ce 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-@@ -107,6 +107,11 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -102,6 +102,11 @@ public class Vex extends Monster implements TraceableEntity {
+     public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
+         return false; //  no fall damage please
      }
-     // Purpur end
- 
++
 +    @Override
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.vexMaxHealth);
 +    }
-+
+     // Purpur end
+ 
      @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return dimensions.height - 0.28125F;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 049e81af9d5cc746e872be9bdec80917e3137be3..fece613e9c182c6658f9df1d333a5b7e1e862218 100644
+index c6d12c939cd3fbd9facf88cdc0c7c51744089484..e270da29fdab5060b6a936bba67c433a78c54b5b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -75,6 +75,11 @@ public class Vindicator extends AbstractIllager {
+@@ -67,6 +67,11 @@ public class Vindicator extends AbstractIllager {
      }
      // Purpur end
  
@@ -1305,10 +1308,10 @@ index 049e81af9d5cc746e872be9bdec80917e3137be3..fece613e9c182c6658f9df1d333a5b7e
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index c146d16acac7d3ea380b5e3591f22491c102d7a9..710c6fb948407c7cc79a5a0492b7172550071e35 100644
+index b5f44495f0a384c8a7d8d96e3a0f16999fba86fe..d99c52b4f0326421f90162d4894044394b3c49c4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -76,6 +76,11 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -72,6 +72,11 @@ public class Witch extends Raider implements RangedAttackMob {
      }
      // Purpur end
  
@@ -1321,10 +1324,10 @@ index c146d16acac7d3ea380b5e3591f22491c102d7a9..710c6fb948407c7cc79a5a0492b71725
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 728e3c78fb17d954247cc62f05cdd970d8b5f540..8eb43574faef713b876d36155775fe2fa2505497 100644
+index 355ed17da77256c84d8ba7d4d99b5c73d729a48d..9fd9b95cbec010dafec261b5923938c5b39cd1e6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-@@ -52,6 +52,11 @@ public class WitherSkeleton extends AbstractSkeleton {
+@@ -49,6 +49,11 @@ public class WitherSkeleton extends AbstractSkeleton {
      }
      // Purpur end
  
@@ -1337,10 +1340,10 @@ index 728e3c78fb17d954247cc62f05cdd970d8b5f540..8eb43574faef713b876d36155775fe2f
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index dc29e875c1e184c1c4553c127bb8c86dddf8c5ab..1d862dd019b2d024f61cfc8956430d18d94b1ebf 100644
+index 2cb65bc3e2a2f990f4036f4f0418d9cd5226381e..698076b0e958aadf9736d7753df64a73dd3c17cd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-@@ -86,6 +86,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+@@ -97,6 +97,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
      }
      // Purpur end
  
@@ -1353,10 +1356,10 @@ index dc29e875c1e184c1c4553c127bb8c86dddf8c5ab..1d862dd019b2d024f61cfc8956430d18
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 7be0c7776608582adf556b36dcfe289465490ecd..56f9d91ba48c501fbcdbb959f683ce8728a36503 100644
+index 7c78b243164a517818565845b1a6c7d40c8839d8..9af1c4b794ddaf8640076f172cf0317acad6bcb2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -124,6 +124,11 @@ public class Zombie extends Monster {
+@@ -121,6 +121,11 @@ public class Zombie extends Monster {
      }
      // Purpur end
  
@@ -1368,7 +1371,7 @@ index 7be0c7776608582adf556b36dcfe289465490ecd..56f9d91ba48c501fbcdbb959f683ce87
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-@@ -607,7 +612,7 @@ public class Zombie extends Monster {
+@@ -596,7 +601,7 @@ public class Zombie extends Monster {
      }
  
      protected void randomizeReinforcementsChance() {
@@ -1378,10 +1381,10 @@ index 7be0c7776608582adf556b36dcfe289465490ecd..56f9d91ba48c501fbcdbb959f683ce87
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index be1234f1c087b3140c79278e7d7e7c1394352cc8..a205c668d0d7b428622fbcaa1598f01c685b516e 100644
+index cc3d9f47ef6d1efa589c8bed5c51ed9e61d7c07d..8e7f0f2069c3382f3a7b08b80f829398e62377f7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -99,6 +99,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+@@ -97,6 +97,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
      }
      // Purpur end
  
@@ -1396,13 +1399,13 @@ index be1234f1c087b3140c79278e7d7e7c1394352cc8..a205c668d0d7b428622fbcaa1598f01c
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 252d2994fac423ea1fef36bdc7c09778203049cb..fa5fa58ee03243054a38475634a6aa67815ca77d 100644
+index 2ff0ce04ce210b77c555f59967182ed4dd3fe9aa..138f3f6a9b0754d54e5f8000962bb52b224f677d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -81,6 +81,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -79,6 +79,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
      }
      // Purpur end
  
@@ -1414,7 +1417,7 @@ index 252d2994fac423ea1fef36bdc7c09778203049cb..fa5fa58ee03243054a38475634a6aa67
      @Override
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
-@@ -263,7 +268,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -261,7 +266,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
  
      @Override
      protected void randomizeReinforcementsChance() {
@@ -1424,10 +1427,10 @@ index 252d2994fac423ea1fef36bdc7c09778203049cb..fa5fa58ee03243054a38475634a6aa67
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index d040198ce528293ed95adcdb17ddf0acbc5a93e0..22788892f7286f3fa6b40059b2bedaf0c6ec5ef3 100644
+index 6e86e0597af66bad8f2e97661b588e950b2679ba..3bfc073fb142e3446044a42c33be6c30587cc3c4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -86,6 +86,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -107,6 +107,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
      }
      // Purpur end
  
@@ -1440,10 +1443,10 @@ index d040198ce528293ed95adcdb17ddf0acbc5a93e0..22788892f7286f3fa6b40059b2bedaf0
      public boolean canBeLeashed(Player player) {
          return !this.isLeashed();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index f57d7fee1ece00aba9bc7b07dda8398e7acc73c3..d9b1bde3ce458b7e50f7645d07ee578d13006a0a 100644
+index 6632cab4ed43bbfd10b4d8f3b2c447a35eba735e..06e0f737615c90bd733a89a731156598ccfe447f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -113,6 +113,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -111,6 +111,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
      }
      // Purpur end
  
@@ -1456,10 +1459,10 @@ index f57d7fee1ece00aba9bc7b07dda8398e7acc73c3..d9b1bde3ce458b7e50f7645d07ee578d
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index 2d842c0dfce1c7e7229bd42b2a92c024a4162b68..04e54c241078e6cd6419a21ba1bf913fd3b413d1 100644
+index 17e2457bc83e7ee4402c10ee7d2ef5aa36901565..362f3fddd8090799278f4b4e58c5af5de00315f2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -58,6 +58,11 @@ public class PiglinBrute extends AbstractPiglin {
+@@ -79,6 +79,11 @@ public class PiglinBrute extends AbstractPiglin {
      }
      // Purpur end
  
@@ -1469,13 +1472,13 @@ index 2d842c0dfce1c7e7229bd42b2a92c024a4162b68..04e54c241078e6cd6419a21ba1bf913f
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D);
+         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 7.0);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index f7b81f14cd069da83c25ca6b063289c0fad07952..95df7d57c3aaa46f09f37996a89d88aa9e9383b4 100644
+index 980f48b546f0da5696c110357ea42352a48fbd42..ff86c7d4878e43fc9d375b9b60213a2271b92cff 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -179,6 +179,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -178,6 +178,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      // Purpur end
  
@@ -1488,10 +1491,10 @@ index f7b81f14cd069da83c25ca6b063289c0fad07952..95df7d57c3aaa46f09f37996a89d88aa
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 808bf21dc16b5007c49a56c6597fd66c3ec4992e..9178c018c8e008b46a978bb95c244abf986f93d9 100644
+index 6bdf3d1e3652a661282d61f1dc2bfc2712339953..ac3cca0db4478841f91d966bd49ca4e5b5e91229 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -87,6 +87,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -88,6 +88,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
      }
      // Purpur end
  
@@ -1504,7 +1507,7 @@ index 808bf21dc16b5007c49a56c6597fd66c3ec4992e..9178c018c8e008b46a978bb95c244abf
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b023919b77 100644
+index 3eae97d610d8f61528b87039723ef4ce2dc75c91..e248395ad5f5f012aeefecf367d54f90cade0996 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -112,99 +112,190 @@ public class PurpurWorldConfig {
@@ -2188,7 +2191,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -461,189 +806,361 @@ public class PurpurWorldConfig {
+@@ -461,191 +806,363 @@ public class PurpurWorldConfig {
          phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
          phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -2411,6 +2414,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
 +        skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
      }
  
+     public boolean skeletonHorseRidable = false;
      public boolean skeletonHorseRidableInWater = true;
      public boolean skeletonHorseCanSwim = false;
 +    public double skeletonHorseMaxHealthMin = 15.0D;
@@ -2420,6 +2424,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
 +    public double skeletonHorseMovementSpeedMin = 0.2D;
 +    public double skeletonHorseMovementSpeedMax = 0.2D;
      private void skeletonHorseSettings() {
+         skeletonHorseRidable = getBoolean("mobs.skeleton_horse.ridable", skeletonHorseRidable);
          skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
          skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
 +        if (PurpurConfig.version < 10) {
@@ -2550,7 +2555,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
      }
  
      public boolean tadpoleRidable = false;
-@@ -658,64 +1175,125 @@ public class PurpurWorldConfig {
+@@ -660,64 +1177,125 @@ public class PurpurWorldConfig {
      public boolean traderLlamaRidable = false;
      public boolean traderLlamaRidableInWater = false;
      public boolean traderLlamaControllable = true;
@@ -2676,7 +2681,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
      }
  
      public boolean wardenRidable = false;
-@@ -730,81 +1308,165 @@ public class PurpurWorldConfig {
+@@ -732,83 +1310,167 @@ public class PurpurWorldConfig {
      public boolean witchRidable = false;
      public boolean witchRidableInWater = true;
      public boolean witchControllable = true;
@@ -2781,6 +2786,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
 +        zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
      }
  
+     public boolean zombieHorseRidable = false;
      public boolean zombieHorseRidableInWater = false;
      public boolean zombieHorseCanSwim = false;
 +    public double zombieHorseMaxHealthMin = 15.0D;
@@ -2790,6 +2796,7 @@ index 4c25461a6d75a47425b66e04285792787d7193ee..27ce55687c7c59fdfdcc4553240ea8b0
 +    public double zombieHorseMovementSpeedMin = 0.2D;
 +    public double zombieHorseMovementSpeedMax = 0.2D;
      private void zombieHorseSettings() {
+         zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
          zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
 +        if (PurpurConfig.version < 10) {
diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/server/0008-Barrels-and-enderchests-6-rows.patch
similarity index 73%
rename from patches/server/0010-Barrels-and-enderchests-6-rows.patch
rename to patches/server/0008-Barrels-and-enderchests-6-rows.patch
index b85c594ef..c21c377e1 100644
--- a/patches/server/0010-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0008-Barrels-and-enderchests-6-rows.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Barrels and enderchests 6 rows
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 09b111dd0189b8764569e24fb6de862b1bb3bc89..cf03faf3207f886b03b0e90ad6f4ce5310db428c 100644
+index 2d6b6795703431939005aa09d1ed590c3f755163..f10dcc0debcdd2077ee53cb1aefca8abd12f3ecd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1164,6 +1164,27 @@ public abstract class PlayerList {
+@@ -1188,6 +1188,27 @@ public abstract class PlayerList {
          player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
          this.server.getCommands().sendCommands(player);
-         } // Paper
+         } // Paper - Add sendOpLevel API
 +
 +        // Purpur start
 +        if (org.purpurmc.purpur.PurpurConfig.enderChestSixRows && org.purpurmc.purpur.PurpurConfig.enderChestPermissionRows) {
@@ -37,13 +37,13 @@ index 09b111dd0189b8764569e24fb6de862b1bb3bc89..cf03faf3207f886b03b0e90ad6f4ce53
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 90d437ef429fa6eef620eb54fcb9512e46b19b15..ea475f6fff35e346ca153a385d6b20f90b5f4283 100644
+index 90e44c7281935bc7ceb3b220bbcd73187fed44fb..0641e448e0e98694976b820c2e9c4868f2b76909 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -188,6 +188,7 @@ public abstract class Player extends LivingEntity {
-     public boolean affectsSpawning = true;
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
-     // Paper end
+@@ -195,6 +195,7 @@ public abstract class Player extends LivingEntity {
+     public boolean ignoreFallDamageFromCurrentImpulse;
+     public boolean affectsSpawning = true; // Paper - Affects Spawning API
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
 +    public int sixRowEnderchestSlotCount = -1; // Purpur
  
      // CraftBukkit start
@@ -84,10 +84,10 @@ index 0dbfd23bbfc6ad203f048142f8c90ef741849fe1..9a80427d2bb470b6b1638e59aba57216
          return new ChestMenu(MenuType.GENERIC_9x6, syncId, playerInventory, inventory, 6);
      }
 diff --git a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-index 4703f23316f82a1a942907b46d2d6dcb7d70ec37..162798f57a05b78121fa6c4fadf5adee80fbe221 100644
+index a15d5ff872dbd77f3c3145e0328f3d02e431ff8c..1dcf36d502990d32fc4cd3ea69c3ea334baed69a 100644
 --- a/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 +++ b/src/main/java/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-@@ -30,11 +30,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
+@@ -31,11 +31,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
      }
  
      public PlayerEnderChestContainer(Player owner) {
@@ -108,49 +108,59 @@ index 4703f23316f82a1a942907b46d2d6dcb7d70ec37..162798f57a05b78121fa6c4fadf5adee
          this.activeChest = blockEntity;
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-index 7385e91f32f070e86a4e0fd3d214f55d832c7979..7b73de87236a60ce7343c29ec147e1866b448ba3 100644
+index 5f9858ef8d0ec1a74d469ab4426eb1db068873fd..d7ef772444b301d0a3f167679027195e4150b064 100644
 --- a/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -85,6 +85,34 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
+@@ -91,7 +91,7 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
                  EnderChestBlockEntity enderChestBlockEntity = (EnderChestBlockEntity)blockEntity;
                  playerEnderChestContainer.setActiveChest(enderChestBlockEntity);
-                 player.openMenu(new SimpleMenuProvider((syncId, inventory, playerx) -> {
-+                    // Purpur start
-+                    if (org.purpurmc.purpur.PurpurConfig.enderChestSixRows) {
-+                        if (org.purpurmc.purpur.PurpurConfig.enderChestPermissionRows) {
-+                            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkitPlayer = player.getBukkitEntity();
-+                            if (bukkitPlayer.hasPermission("purpur.enderchest.rows.six")) {
-+                                player.sixRowEnderchestSlotCount = 54;
-+                                return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
-+                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.five")) {
-+                                player.sixRowEnderchestSlotCount = 45;
-+                                return ChestMenu.fiveRows(syncId, inventory, playerEnderChestContainer);
-+                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.four")) {
-+                                player.sixRowEnderchestSlotCount = 36;
-+                                return ChestMenu.fourRows(syncId, inventory, playerEnderChestContainer);
-+                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.three")) {
-+                                player.sixRowEnderchestSlotCount = 27;
-+                                return ChestMenu.threeRows(syncId, inventory, playerEnderChestContainer);
-+                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.two")) {
-+                                player.sixRowEnderchestSlotCount = 18;
-+                                return ChestMenu.twoRows(syncId, inventory, playerEnderChestContainer);
-+                            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.one")) {
-+                                player.sixRowEnderchestSlotCount = 9;
-+                                return ChestMenu.oneRow(syncId, inventory, playerEnderChestContainer);
-+                            }
-+                        }
-+                        player.sixRowEnderchestSlotCount = -1;
-+                        return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
-+                    }
-+                    // Purpur end
-                     return ChestMenu.threeRows(syncId, inventory, playerEnderChestContainer);
-                 }, CONTAINER_TITLE));
+                 player.openMenu(
+-                    new SimpleMenuProvider((i, inventory, playerx) -> ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE)
++                    new SimpleMenuProvider((i, inventory, playerx) -> org.purpurmc.purpur.PurpurConfig.enderChestSixRows ? getEnderChestSixRows(i, inventory, player, playerEnderChestContainer) : ChestMenu.threeRows(i, inventory, playerEnderChestContainer), CONTAINER_TITLE) // Purpur
+                 );
                  player.awardStat(Stats.OPEN_ENDERCHEST);
+                 PiglinAi.angerNearbyPiglins(player, true);
+@@ -102,6 +102,35 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
+         }
+     }
+ 
++    // Purpur start
++    private ChestMenu getEnderChestSixRows(int syncId, net.minecraft.world.entity.player.Inventory inventory, Player player, PlayerEnderChestContainer playerEnderChestContainer) {
++        if (org.purpurmc.purpur.PurpurConfig.enderChestPermissionRows) {
++            org.bukkit.craftbukkit.entity.CraftHumanEntity bukkitPlayer = player.getBukkitEntity();
++            if (bukkitPlayer.hasPermission("purpur.enderchest.rows.six")) {
++                player.sixRowEnderchestSlotCount = 54;
++                return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
++            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.five")) {
++                player.sixRowEnderchestSlotCount = 45;
++                return ChestMenu.fiveRows(syncId, inventory, playerEnderChestContainer);
++            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.four")) {
++                player.sixRowEnderchestSlotCount = 36;
++                return ChestMenu.fourRows(syncId, inventory, playerEnderChestContainer);
++            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.three")) {
++                player.sixRowEnderchestSlotCount = 27;
++                return ChestMenu.threeRows(syncId, inventory, playerEnderChestContainer);
++            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.two")) {
++                player.sixRowEnderchestSlotCount = 18;
++                return ChestMenu.twoRows(syncId, inventory, playerEnderChestContainer);
++            } else if (bukkitPlayer.hasPermission("purpur.enderchest.rows.one")) {
++                player.sixRowEnderchestSlotCount = 9;
++                return ChestMenu.oneRow(syncId, inventory, playerEnderChestContainer);
++            }
++        }
++        player.sixRowEnderchestSlotCount = -1;
++        return ChestMenu.sixRows(syncId, inventory, playerEnderChestContainer);
++    }
++    // Purpur end
++
+     @Override
+     public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+         return new EnderChestBlockEntity(pos, state);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index 416aa989ebb18a8741cc9d605a1180ab830f6643..e38a0adf5463c48311ad08b8d2e5b5c2d989a3b5 100644
+index 6186e55014bbb9d5bedaa0e9d196879c55339d42..f4f11292d6d00f4a7c65e3e2a157bba595f70889 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -67,7 +67,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -68,7 +68,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
      public BarrelBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BARREL, pos, state);
@@ -168,7 +178,7 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..e38a0adf5463c48311ad08b8d2e5b5c2
          this.openersCounter = new ContainerOpenersCounter() {
              @Override
              protected void onOpen(Level world, BlockPos pos, BlockState state) {
-@@ -118,7 +127,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -119,7 +128,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
      @Override
      public int getContainerSize() {
@@ -186,7 +196,7 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..e38a0adf5463c48311ad08b8d2e5b5c2
      }
  
      @Override
-@@ -138,7 +156,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+@@ -139,7 +157,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
  
      @Override
      protected AbstractContainerMenu createMenu(int syncId, Inventory playerInventory) {
@@ -205,10 +215,10 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..e38a0adf5463c48311ad08b8d2e5b5c2
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index 633e6f4922ccaf59979a22885162f42c65bf628a..15001e7c8eae3a89f9d8669be532d56b70d538ef 100644
+index 977b77547f7ba62cef3640cf8d4f1c8e7cded53a..beae43e9b6fe447e7515d878ac175f461968768a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -181,8 +181,19 @@ public class CraftContainer extends AbstractContainerMenu {
+@@ -184,8 +184,19 @@ public class CraftContainer extends AbstractContainerMenu {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:
@@ -230,10 +240,10 @@ index 633e6f4922ccaf59979a22885162f42c65bf628a..15001e7c8eae3a89f9d8669be532d56b
              case DISPENSER:
              case DROPPER:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 471ae4458e7ea7c29d7551b32cec98180fbccd4e..23db63c78e9fcf86cd498b3ed36ca50253c2fe97 100644
+index af1ae3dacb628da23f7d2988c6e76d3fb2d64103..4ee2d501f882279b48edb4b8bf0824587c276bf6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -83,7 +83,7 @@ public class CraftInventory implements Inventory {
+@@ -84,7 +84,7 @@ public class CraftInventory implements Inventory {
  
      @Override
      public void setContents(ItemStack[] items) {
@@ -243,7 +253,7 @@ index 471ae4458e7ea7c29d7551b32cec98180fbccd4e..23db63c78e9fcf86cd498b3ed36ca502
          for (int i = 0; i < this.getSize(); i++) {
              if (i >= items.length) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8ad548fc059568d37675e017548b171d4dd1d555..7937023274acf3a1efdd21bbdd2f933f4399baeb 100644
+index 463af65182c0894a75a138df8100f3f616143f4c..a0eb18409f72afe393581e6dc8e2260b3a25197f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -177,4 +177,39 @@ public class PurpurConfig {
diff --git a/patches/server/0011-Llama-API.patch b/patches/server/0009-Llama-API.patch
similarity index 81%
rename from patches/server/0011-Llama-API.patch
rename to patches/server/0009-Llama-API.patch
index 45f03e0d6..784f0c6a1 100644
--- a/patches/server/0011-Llama-API.patch
+++ b/patches/server/0009-Llama-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Llama API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-index 21725aee29e9120d1c7e1e19f91c21a73a28844f..849f0c7c6d13df00d90211a48d8b56ab156812b8 100644
+index df695b444fa2a993d381e2f197182c3e91a68502..eb0faf58fa1a408f294fc62120b140def97f998d 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 @@ -22,6 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
@@ -14,7 +14,7 @@ index 21725aee29e9120d1c7e1e19f91c21a73a28844f..849f0c7c6d13df00d90211a48d8b56ab
      public boolean canUse() {
 +        if (!this.llama.shouldJoinCaravan) return false; // Purpur
          if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
-             List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0D, 4.0D, 9.0D), (entity) -> {
+             List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity -> {
                  EntityType<?> entityType = entity.getType();
 @@ -71,6 +72,7 @@ public class LlamaFollowCaravanGoal extends Goal {
  
@@ -23,9 +23,9 @@ index 21725aee29e9120d1c7e1e19f91c21a73a28844f..849f0c7c6d13df00d90211a48d8b56ab
 +        if (!this.llama.shouldJoinCaravan) return false; // Purpur
          if (this.llama.inCaravan() && this.llama.getCaravanHead().isAlive() && this.firstIsLeashed(this.llama, 0)) {
              double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
-             if (d > 676.0D) {
+             if (d > 676.0) {
 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 278c33b7de4472a746cdbc1faaa68e05592777bc..15a08abe94cb97de1450ff42cfb924a537b9eb5c 100644
+index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e827365a4cefcf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -75,6 +75,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -36,25 +36,23 @@ index 278c33b7de4472a746cdbc1faaa68e05592777bc..15a08abe94cb97de1450ff42cfb924a5
  
      public Llama(EntityType<? extends Llama> type, Level world) {
          super(type, world);
-@@ -170,7 +171,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         if (!this.inventory.getItem(1).isEmpty()) {
-             nbt.put("DecorItem", this.inventory.getItem(1).save(new CompoundTag()));
-         }
--
+@@ -167,6 +168,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+         super.addAdditionalSaveData(nbt);
+         nbt.putInt("Variant", this.getVariant().id);
+         nbt.putInt("Strength", this.getStrength());
 +        nbt.putBoolean("Purpur.ShouldJoinCaravan", shouldJoinCaravan); // Purpur
      }
  
      @Override
-@@ -181,7 +182,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         if (nbt.contains("DecorItem", 10)) {
-             this.inventory.setItem(1, ItemStack.of(nbt.getCompound("DecorItem")));
-         }
--
+@@ -174,6 +176,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+         this.setStrength(nbt.getInt("Strength"));
+         super.readAdditionalSaveData(nbt);
+         this.setVariant(Llama.Variant.byId(nbt.getInt("Variant")));
 +        if (nbt.contains("Purpur.ShouldJoinCaravan")) this.shouldJoinCaravan = nbt.getBoolean("Purpur.ShouldJoinCaravan"); // Purpur
-         this.updateContainerEquipment();
      }
  
-@@ -500,6 +501,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+     @Override
+@@ -460,6 +463,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
  
      public void leaveCaravan() {
          if (this.caravanHead != null) {
@@ -62,7 +60,7 @@ index 278c33b7de4472a746cdbc1faaa68e05592777bc..15a08abe94cb97de1450ff42cfb924a5
              this.caravanHead.caravanTail = null;
          }
  
-@@ -507,6 +509,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -467,6 +471,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
  
      public void joinCaravan(Llama llama) {
diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0010-AFK-API.patch
similarity index 82%
rename from patches/server/0012-AFK-API.patch
rename to patches/server/0010-AFK-API.patch
index e0c00849b..78b6d741e 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0010-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3f5d87ccdee1309ae8240a3d181e268d8c022f56..9918f6ac1066ccadd3eb2635450faaf5a4350523 100644
+index 2820333cbcd2cb972c4408cb0d9cc1be37a844cf..bc6a5de72d52627b3ceca4b52b95e12ceddf1247 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2134,8 +2134,68 @@ public class ServerPlayer extends Player {
+@@ -2326,8 +2326,68 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -78,11 +78,11 @@ index 3f5d87ccdee1309ae8240a3d181e268d8c022f56..9918f6ac1066ccadd3eb2635450faaf5
          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 675e6e7246d84195dc027c0209744896bd2b7224..3d4908a8686804a43e114d4720d7295107659e47 100644
+index 1377d7abfe024b8ac977aa1a071b401836c3c048..510a4391463026dd0c896027a579a94174c24299 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -323,6 +323,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     private boolean hasMoved; // Spigot
+@@ -332,6 +332,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     private boolean justTeleported = false;
      // CraftBukkit end
  
 +        // Purpur start
@@ -102,10 +102,10 @@ index 675e6e7246d84195dc027c0209744896bd2b7224..3d4908a8686804a43e114d4720d72951
      @Override
      public void tick() {
          if (this.ackBlockChangesUpTo > -1) {
-@@ -390,6 +404,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -399,6 +413,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          }
  
-         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits.
+         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits
 +            // Purpur start
 +            this.player.setAfk(true);
 +            if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.getUnchecked(this.player.getBukkitEntity()))) {
@@ -115,33 +115,33 @@ index 675e6e7246d84195dc027c0209744896bd2b7224..3d4908a8686804a43e114d4720d72951
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
              this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
          }
-@@ -638,6 +658,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -658,6 +678,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                      this.lastYaw = to.getYaw();
                      this.lastPitch = to.getPitch();
  
 +                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur
 +
-                     // Skip the first time we do this
-                     if (true) { // Spigot - don't skip any move events
-                         Location oldTo = to.clone();
-@@ -1467,7 +1489,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                 if (!event.isAllowed()) {
-                                 flag2 = true; // Paper - diff on change, this should be moved wrongly
+                     Location oldTo = to.clone();
+                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
+                     this.cserver.getPluginManager().callEvent(event);
+@@ -1494,7 +1516,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                     movedWrongly = true;
                                      if (event.getLogWarning())
--                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
-+                                        ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), d11); // Purpur
-                                 }
                                  // Paper end
+-                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
++                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), d11); // Purpur
+                                 } // Paper
                              }
-@@ -1529,6 +1551,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ 
+@@ -1562,6 +1584,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
  
 +                                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur
 +
-                                     // Skip the first time we do this
-                                     if (from.getX() != Double.MAX_VALUE) {
-                                         Location oldTo = to.clone();
+                                     Location oldTo = to.clone();
+                                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
+                                     this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/players/SleepStatus.java b/src/main/java/net/minecraft/server/players/SleepStatus.java
 index 823efad652d8ff9e96b99375b102fef6f017716e..caa8a69bde0c212c36dd990a67836ac2f95548c0 100644
 --- a/src/main/java/net/minecraft/server/players/SleepStatus.java
@@ -165,19 +165,19 @@ index 823efad652d8ff9e96b99375b102fef6f017716e..caa8a69bde0c212c36dd990a67836ac2
                  }
                  // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 3ff999734d14e2b6e7828e117f5ee32a60c26bc1..cfa9607241c3e69777ffc317206996c2f783437a 100644
+index d8cc5614502db7025349e085381b6b32ad32296a..f1b9e83206cc67e6ef29ebe088351b0aaa5eb349 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -39,6 +39,7 @@ public final class EntitySelector {
+@@ -40,6 +40,7 @@ public final class EntitySelector {
          return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
      };
-     // Paper end
+     // Paper end - Ability to control player's insomnia and phantoms
 +    public static Predicate<Player> notAfk = (player) -> !player.isAfk(); // Purpur
  
      private EntitySelector() {}
-     // Paper start
+     // 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 ac5e5676b194a2a99e5cf53eb89c1152cac963b8..872454743f6dedc27519a13566559195c47cc9f8 100644
+index d2f0c3b26d4beedb49d86e0242d843590d469d02..7463eefb7d09ea55fe8780210e7e967c2fe7896d 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 {
@@ -192,10 +192,10 @@ index ac5e5676b194a2a99e5cf53eb89c1152cac963b8..872454743f6dedc27519a13566559195
              if (baseEntity == null) {
                  if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level().getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index ea475f6fff35e346ca153a385d6b20f90b5f4283..535fe476ebe5b791cae7a4013c4a498b89d047e3 100644
+index 054c905085b70ba72a3b76649bf5a20106f239d1..cd0992ec6b70f88c17cf7492847ae7f35e9c1e0d 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -194,6 +194,13 @@ public abstract class Player extends LivingEntity {
+@@ -201,6 +201,13 @@ public abstract class Player extends LivingEntity {
      public boolean fauxSleeping;
      public int oldLevel = -1;
  
@@ -210,23 +210,23 @@ index ea475f6fff35e346ca153a385d6b20f90b5f4283..535fe476ebe5b791cae7a4013c4a498b
      public CraftHumanEntity getBukkitEntity() {
          return (CraftHumanEntity) super.getBukkitEntity();
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index aaa07fcd4b32fe0de88142ab30378327a01f1729..bc8555d21d418f9da37cc089904f7cb038b1cdbe 100644
+index ea0aee88c7d901034427db201c1b2430f8a1d522..1f28bfb435c1e4d97da713f96c452abab3fda91a 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -191,7 +191,7 @@ public interface EntityGetter {
+@@ -192,7 +192,7 @@ public interface EntityGetter {
  
      default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
-         for(Player player : this.players()) {
+         for (Player player : this.players()) {
 -            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
-+            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player) && EntitySelector.notAfk.test(player)) {
++            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player) && EntitySelector.notAfk.test(player)) { // Purpur
                  double d = player.distanceToSqr(x, y, z);
-                 if (range < 0.0D || d < range * range) {
+                 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 16c05edcd94d8a7ea166a4ab8c72cdeb09f26a73..12012dd42a9c1faffcad55c9786a9f99e426600a 100644
+index 7f78db4e0331d0f4801807ed1242642ee940d0f8..a4e4babedbf5bbf09bfbabd4f55ecd6301dae302 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -519,10 +519,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -574,10 +574,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setPlayerListName(String name) {
@@ -236,14 +236,14 @@ index 16c05edcd94d8a7ea166a4ab8c72cdeb09f26a73..12012dd42a9c1faffcad55c9786a9f99
 +    public void setPlayerListName(String name, boolean useMM) {
 +        // Purpur end
          if (name == null) {
-             name = getName();
+             name = this.getName();
          }
--        this.getHandle().listName = name.equals(getName()) ? null : CraftChatMessage.fromStringOrNull(name);
-+        this.getHandle().listName = name.equals(getName()) ? null : useMM ? io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name)) : CraftChatMessage.fromStringOrNull(name); // Purpur
-         for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
+-        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()));
-@@ -3289,5 +3294,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3528,5 +3533,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -265,7 +265,7 @@ index 16c05edcd94d8a7ea166a4ab8c72cdeb09f26a73..12012dd42a9c1faffcad55c9786a9f99
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 7937023274acf3a1efdd21bbdd2f933f4399baeb..3fba9f640ef03219c89a2a405e4d5a5870e366bf 100644
+index 940438c4b86d38be618dca8af95e3a7bf97bfa3c..beab078faaa6ea72539fdfd626ec64ff800d030c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -174,8 +174,18 @@ public class PurpurConfig {
@@ -288,7 +288,7 @@ index 7937023274acf3a1efdd21bbdd2f933f4399baeb..3fba9f640ef03219c89a2a405e4d5a58
  
      public static int barrelRows = 3;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 27ce55687c7c59fdfdcc4553240ea8b023919b77..3ed1a91c93f659306acaf8bad6820f49208554c8 100644
+index e248395ad5f5f012aeefecf367d54f90cade0996..70f53ccb22de2c05c9ead68f8bd29d0b69d0993f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -90,6 +90,24 @@ public class PurpurWorldConfig {
@@ -317,10 +317,10 @@ index 27ce55687c7c59fdfdcc4553240ea8b023919b77..3ed1a91c93f659306acaf8bad6820f49
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 14e8e7ad8d742cdc0c50d29d6dade3e338c0463e..d1448f50a9c03bd779f4bcd6b4fc896365316b78 100644
+index 3283ed99c35ffed6805567705e0518d9f84feedc..a9a39f0da7b09410d8171172a4219c7d509fdb99 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -203,6 +203,7 @@ public class ActivationRange
+@@ -201,6 +201,7 @@ public class ActivationRange
                  continue;
              }
  
diff --git a/patches/server/0013-Bring-back-server-name.patch b/patches/server/0011-Bring-back-server-name.patch
similarity index 81%
rename from patches/server/0013-Bring-back-server-name.patch
rename to patches/server/0011-Bring-back-server-name.patch
index 360d8d409..d72709ac6 100644
--- a/patches/server/0013-Bring-back-server-name.patch
+++ b/patches/server/0011-Bring-back-server-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..cda4544ae96a4fcb5c6c4483df67a59f1b53fd27 100644
+index 9d10cdacb3aed2c00dc60aeb6f2cbeb48905e21f..842f382de43df5d5c321422372ec30ccdd7859d7 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -58,6 +58,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -56,6 +56,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
      public final boolean onlineMode = this.get("online-mode", true);
      public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
      public final String serverIp = this.get("server-ip", "");
@@ -17,12 +17,12 @@ index c5598adb8cbcbcf7277c2fd4dd72c243d44d9700..cda4544ae96a4fcb5c6c4483df67a59f
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2674aede815f8c6d0fbaf22895ccb7ed05f9a714..76d448e18b81fbb4b87c9cc1425fb446d9d6419c 100644
+index 26eb9ff0f4e77230d1eae793398869e71999982b..c014528d7d2583fa0a3007c42ea9c16f2d0eb20c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3152,4 +3152,11 @@ public final class CraftServer implements Server {
+@@ -3293,4 +3293,11 @@ public final class CraftServer implements Server {
+         return this.potionBrewer;
      }
- 
      // Paper end
 +
 +    // Purpur start
diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/server/0012-Configurable-server-mod-name.patch
similarity index 74%
rename from patches/server/0014-Configurable-server-mod-name.patch
rename to patches/server/0012-Configurable-server-mod-name.patch
index 307580843..d409b5409 100644
--- a/patches/server/0014-Configurable-server-mod-name.patch
+++ b/patches/server/0012-Configurable-server-mod-name.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index edd53077098cfaaa5987dc7df7163b83a5ed3b26..a22dbc34cfd9de6e996eb925c47abfccef13b0e7 100644
+index 73b77367039eb6a4445d1ef2d66fb3410e91f4b8..8a6f7681d97c48886f5a78b61763e718e56ec015 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1700,7 +1700,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1925,7 +1925,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Purpur"; // Purpur - Purpur > Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return org.purpurmc.purpur.PurpurConfig.serverModName; // Purpur - Purpur > Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Purpur"; // Purpur - Purpur > // Pufferfish > // Paper
++        return org.purpurmc.purpur.PurpurConfig.serverModName; // Purpur - Purpur > // Pufferfish > // Paper
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3fba9f640ef03219c89a2a405e4d5a5870e366bf..bb7acf61cf2928181d014a17166d4d1414218e01 100644
+index 7312ae7323032a0ba3c47aa7bdfe5dffe9674535..881c5654f181ea9b66e1cdf3bc3bf46869e8557f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -188,6 +188,11 @@ public class PurpurConfig {
diff --git a/patches/server/0016-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch
similarity index 66%
rename from patches/server/0016-Lagging-threshold.patch
rename to patches/server/0013-Lagging-threshold.patch
index 0c9e4c45b..bad5618fe 100644
--- a/patches/server/0016-Lagging-threshold.patch
+++ b/patches/server/0013-Lagging-threshold.patch
@@ -5,30 +5,30 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a22dbc34cfd9de6e996eb925c47abfccef13b0e7..4eeb7a43c8cdcd81fd9f8da4792ab27f54595d14 100644
+index 8a6f7681d97c48886f5a78b61763e718e56ec015..dfa332c4ff52033eb95248518bc44bbd22697697 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -301,6 +301,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-     public static long currentTickLong = 0L; // Paper
+@@ -315,6 +315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
+     public static long currentTickLong = 0L; // Paper - track current tick as a long
+     public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
 +    public boolean lagging = false; // Purpur
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -1141,6 +1142,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1215,6 +1216,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     this.recentTps[0] = tps1.getAverage();
                      this.recentTps[1] = tps5.getAverage();
                      this.recentTps[2] = tps15.getAverage();
-                     // Paper end
-+                        lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
-                     tickSection = curTime;
++                    lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
+                     tickSection = currentTime;
                  }
-                 // Spigot end
+                 // Paper end - further improve server tick loop
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 76d448e18b81fbb4b87c9cc1425fb446d9d6419c..dbe110d95095e5230d1711181e4b7a762662c2bb 100644
+index c014528d7d2583fa0a3007c42ea9c16f2d0eb20c..6d8b433af8596dd5b5a3b04e901527cd50a31dec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3158,5 +3158,10 @@ public final class CraftServer implements Server {
+@@ -3299,5 +3299,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
@@ -40,7 +40,7 @@ index 76d448e18b81fbb4b87c9cc1425fb446d9d6419c..dbe110d95095e5230d1711181e4b7a76
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index bb7acf61cf2928181d014a17166d4d1414218e01..34afed28faeb56352b48faf8078a5fb07912eb5e 100644
+index 881c5654f181ea9b66e1cdf3bc3bf46869e8557f..9c5bba0ae119f8d42274455e322530ceb5f67d9b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -193,6 +193,11 @@ public class PurpurConfig {
diff --git a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0014-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 55%
rename from patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0014-PlayerSetSpawnerTypeWithEggEvent.patch
index c924e2a4e..474557138 100644
--- a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0014-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 2561e74ffdf595a9b6ae13dcd738662c772db442..518b927dac087000b5049bc61d43a46a7379e256 100644
+index a46bf73c608641bf1f00fd55242de71a0f2ee06e..9b3bf5ac043262c6cd00d83b750c3313122d92a9 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -316,6 +316,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -330,6 +330,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
      }
  
@@ -25,7 +25,7 @@ index 2561e74ffdf595a9b6ae13dcd738662c772db442..518b927dac087000b5049bc61d43a46a
      public static ResourceLocation getKey(EntityType<?> type) {
          return BuiltInRegistries.ENTITY_TYPE.getKey(type);
      }
-@@ -531,6 +541,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -537,6 +547,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return this.category;
      }
  
@@ -43,22 +43,22 @@ index 2561e74ffdf595a9b6ae13dcd738662c772db442..518b927dac087000b5049bc61d43a46a
          if (this.descriptionId == null) {
              this.descriptionId = Util.makeDescriptionId("entity", BuiltInRegistries.ENTITY_TYPE.getKey(this));
 diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index 741719301e6fc91a598e74342810c4185e6fde26..6fbff9c02fbabf03c9c649a9ea6128021081f9cd 100644
+index 9cea8da84f39bb3f687139ef213ccea358724dee..076e6858222b92f8409f1f5cad398582c1fd6bcb 100644
 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-@@ -68,6 +68,15 @@ public class SpawnEggItem extends Item {
-                     SpawnerBlockEntity tileentitymobspawner = (SpawnerBlockEntity) tileentity;
-                     EntityType<?> entitytypes = this.getType(itemstack.getTag());
+@@ -74,6 +74,15 @@ public class SpawnEggItem extends Item {
+                 Spawner spawner = (Spawner) tileentity;
  
-+                    // Purpur start
-+                    org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                    org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent event = new  org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.CreatureSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(entitytypes.getName()));
-+                    if (!event.callEvent()) {
-+                        return InteractionResult.FAIL;
-+                    }
-+                    entitytypes = EntityType.getFromBukkitType(event.getEntityType());
-+                    // Purpur end
+                 entitytypes = this.getType(itemstack);
 +
-                     tileentitymobspawner.setEntityId(entitytypes, world.getRandom());
-                     tileentity.setChanged();
-                     world.sendBlockUpdated(blockposition, iblockdata, iblockdata, 3);
++                // Purpur start
++                org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
++                org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent event = new  org.purpurmc.purpur.event.PlayerSetSpawnerTypeWithEggEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), bukkitBlock, (org.bukkit.block.CreatureSpawner) bukkitBlock.getState(), org.bukkit.entity.EntityType.fromName(entitytypes.getName()));
++                if (!event.callEvent()) {
++                    return InteractionResult.FAIL;
++                }
++                entitytypes = EntityType.getFromBukkitType(event.getEntityType());
++                // Purpur end
+                 spawner.setEntityId(entitytypes, world.getRandom());
+                 world.sendBlockUpdated(blockposition, iblockdata, iblockdata, 3);
+                 world.gameEvent((Entity) context.getPlayer(), (Holder) GameEvent.BLOCK_CHANGE, blockposition);
diff --git a/patches/server/0018-Anvil-API.patch b/patches/server/0015-Anvil-API.patch
similarity index 71%
rename from patches/server/0018-Anvil-API.patch
rename to patches/server/0015-Anvil-API.patch
index 330e4ff7f..588aaa9d2 100644
--- a/patches/server/0018-Anvil-API.patch
+++ b/patches/server/0015-Anvil-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Anvil API
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index ffd349c1b80df0f1e8c02bda23700184825170fd..29f301bde378bd320d5c44f2c1b6bf9dc185e286 100644
+index 32910f677b0522ac8ec513fa0d00b714b52cfae4..f85eef14b91a0ada1f6f4b13ab3966f051ff92d3 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -76,6 +76,7 @@ public abstract class AbstractContainerMenu {
@@ -17,10 +17,10 @@ index ffd349c1b80df0f1e8c02bda23700184825170fd..29f301bde378bd320d5c44f2c1b6bf9d
      // CraftBukkit start
      public boolean checkReachable = true;
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9e87b2a46 100644
+index 2bd91b48eaa06f85a5b9b1ae052c70e966ae8e4c..9036426256f87b3ba4a78e6fa2cea4e028f84481 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -23,6 +23,13 @@ import org.slf4j.Logger;
+@@ -25,6 +25,13 @@ import org.slf4j.Logger;
  import org.bukkit.craftbukkit.inventory.CraftInventoryView;
  // CraftBukkit end
  
@@ -34,7 +34,7 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9
  public class AnvilMenu extends ItemCombinerMenu {
  
      public static final int INPUT_SLOT = 0;
-@@ -51,6 +58,8 @@ public class AnvilMenu extends ItemCombinerMenu {
+@@ -53,6 +60,8 @@ public class AnvilMenu extends ItemCombinerMenu {
      public int maximumRepairCost = 40;
      private CraftInventoryView bukkitEntity;
      // CraftBukkit end
@@ -43,12 +43,12 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9
  
      public AnvilMenu(int syncId, Inventory inventory) {
          this(syncId, inventory, ContainerLevelAccess.NULL);
-@@ -78,12 +87,15 @@ public class AnvilMenu extends ItemCombinerMenu {
+@@ -80,12 +89,15 @@ public class AnvilMenu extends ItemCombinerMenu {
  
      @Override
      protected boolean mayPickup(Player player, boolean present) {
--        return (player.getAbilities().instabuild || player.experienceLevel >= this.cost.get()) && this.cost.get() > AnvilMenu.DEFAULT_DENIED_COST && present; // CraftBukkit - allow cost 0 like a free item
-+        return (player.getAbilities().instabuild || player.experienceLevel >= this.cost.get()) && (bypassCost || this.cost.get() > AnvilMenu.DEFAULT_DENIED_COST) && present; // CraftBukkit - allow cost 0 like a free item // Purpur
+-        return (player.hasInfiniteMaterials() || player.experienceLevel >= this.cost.get()) && this.cost.get() > AnvilMenu.DEFAULT_DENIED_COST && present; // CraftBukkit - allow cost 0 like a free item
++        return (player.hasInfiniteMaterials() || player.experienceLevel >= this.cost.get()) && (bypassCost || this.cost.get() > AnvilMenu.DEFAULT_DENIED_COST) && present; // CraftBukkit - allow cost 0 like a free item // Purpur
      }
  
      @Override
@@ -60,7 +60,7 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9
              player.giveExperienceLevels(-this.cost.get());
          }
  
-@@ -134,6 +146,12 @@ public class AnvilMenu extends ItemCombinerMenu {
+@@ -136,6 +148,12 @@ public class AnvilMenu extends ItemCombinerMenu {
  
      @Override
      public void createResult() {
@@ -73,31 +73,30 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9
          ItemStack itemstack = this.inputSlots.getItem(0);
  
          this.cost.set(1);
-@@ -210,7 +228,7 @@ public class AnvilMenu extends ItemCombinerMenu {
-                             int i2 = (Integer) map1.get(enchantment);
+@@ -143,7 +161,7 @@ public class AnvilMenu extends ItemCombinerMenu {
+         long j = 0L;
+         byte b0 = 0;
  
-                             i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
--                            boolean flag3 = enchantment.canEnchant(itemstack);
-+                            boolean flag3 = canDoUnsafeEnchants || enchantment.canEnchant(itemstack); // Purpur
- 
-                             if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) {
-                                 flag3 = true;
+-        if (!itemstack.isEmpty() && EnchantmentHelper.canStoreEnchantments(itemstack)) {
++        if (!itemstack.isEmpty() && canDoUnsafeEnchants || EnchantmentHelper.canStoreEnchantments(itemstack)) { // Purpur
+             ItemStack itemstack1 = itemstack.copy();
+             ItemStack itemstack2 = this.inputSlots.getItem(1);
+             ItemEnchantments.Mutable itemenchantments_a = new ItemEnchantments.Mutable(EnchantmentHelper.getEnchantmentsForCrafting(itemstack1));
 @@ -222,7 +240,7 @@ public class AnvilMenu extends ItemCombinerMenu {
-                                 Enchantment enchantment1 = (Enchantment) iterator1.next();
+                             Holder<Enchantment> holder1 = (Holder) iterator1.next();
  
-                                 if (enchantment1 != enchantment && !enchantment.isCompatibleWith(enchantment1)) {
--                                    flag3 = false;
-+                                    flag3 = canDoUnsafeEnchants; // Purpur
-                                     ++i;
-                                 }
+                             if (!holder1.equals(holder) && !enchantment.isCompatibleWith((Enchantment) holder1.value())) {
+-                                flag3 = false;
++                                flag3 = canDoUnsafeEnchants; // Purpur
+                                 ++i;
                              }
-@@ -293,6 +311,13 @@ public class AnvilMenu extends ItemCombinerMenu {
+                         }
+@@ -280,6 +298,12 @@ public class AnvilMenu extends ItemCombinerMenu {
                  this.cost.set(this.maximumRepairCost - 1); // CraftBukkit
              }
  
 +            // Purpur start
 +            if (bypassCost && cost.get() >= maximumRepairCost) {
-+                itemstack.addTagElement("Purpur.realCost", IntTag.valueOf(cost.get()));
 +                cost.set(maximumRepairCost - 1);
 +            }
 +            // Purpur end
@@ -105,9 +104,9 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9
              if (this.cost.get() >= this.maximumRepairCost && !this.player.getAbilities().instabuild) { // CraftBukkit
                  itemstack1 = ItemStack.EMPTY;
              }
-@@ -315,6 +340,12 @@ public class AnvilMenu extends ItemCombinerMenu {
+@@ -301,6 +325,12 @@ public class AnvilMenu extends ItemCombinerMenu {
              org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), itemstack1); // CraftBukkit
-             sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
+             this.sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
              this.broadcastChanges();
 +            // Purpur start
 +            if (canDoUnsafeEnchants && itemstack1 != ItemStack.EMPTY) {
@@ -115,11 +114,11 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b500a04b8135604f0159a741b3d228c9
 +                ((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
 +            }
 +            // Purpur end
-         }
-     }
- 
+         } else {
+             org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(this.getBukkitView(), ItemStack.EMPTY); // CraftBukkit
+             this.cost.set(AnvilMenu.DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
 diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-index c2cf5a8e788637c6264cf43d712a5be223ff1cc5..a578882b64c581ef4f47fa483a9f2988cfa4c8cf 100644
+index 7de5e47f9a54263734eeef855a2dc07ef64d30ea..7215af6cc91f48b040c23c54536d4aac8d293497 100644
 --- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
 @@ -178,7 +178,9 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
@@ -133,7 +132,7 @@ index c2cf5a8e788637c6264cf43d712a5be223ff1cc5..a578882b64c581ef4f47fa483a9f2988
  
          return itemstack;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
-index 88d3ca586ff6905f18a8ab9f0e229f440ed44088..27dd4eb4781a3c75772860c11db886e1038cecd2 100644
+index 9ee14589d63bbfc0880f2eee5e924fe946ee0035..0a5841fa26698e60bdeadbb58b9343fe1ff08a28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
 @@ -9,7 +9,7 @@ import org.bukkit.inventory.AnvilInventory;
@@ -147,7 +146,7 @@ index 88d3ca586ff6905f18a8ab9f0e229f440ed44088..27dd4eb4781a3c75772860c11db886e1
          super(inventory, resultInventory);
 @@ -57,4 +57,26 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
          Preconditions.checkArgument(levels >= 0, "Maximum repair cost must be positive (or 0)");
-         container.maximumRepairCost = levels;
+         this.container.maximumRepairCost = levels;
      }
 +
 +    // Purpur start
diff --git a/patches/server/0015-LivingEntity-safeFallDistance.patch b/patches/server/0015-LivingEntity-safeFallDistance.patch
deleted file mode 100644
index a666d56c7..000000000
--- a/patches/server/0015-LivingEntity-safeFallDistance.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 5 May 2019 12:58:45 -0500
-Subject: [PATCH] LivingEntity safeFallDistance
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7471edf871522543cb49afef63d2c539b7e871a3..960e6ae3e7ceb981459b87343cacb7458d51eecf 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -253,6 +253,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-     private boolean skipDropExperience;
-     // CraftBukkit start
-     public int expToDrop;
-+    public float safeFallDistance = 3.0F; // Purpur
-     public boolean forceDrops;
-     public ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
-     public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -353,7 +354,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             this.tryAddSoulSpeed();
-         }
- 
--        if (!this.level().isClientSide && this.fallDistance > 3.0F && onGround && !state.isAir()) {
-+        if (!this.level().isClientSide && this.fallDistance > this.safeFallDistance && onGround && !state.isAir()) { // Purpur
-             double d1 = this.getX();
-             double d2 = this.getY();
-             double d3 = this.getZ();
-@@ -368,7 +369,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 d3 = (double) landedPosition.getZ() + 0.5D + d5 / d6 * 0.5D;
-             }
- 
--            float f = (float) Mth.ceil(this.fallDistance - 3.0F);
-+            float f = (float) Mth.ceil(this.fallDistance - this.safeFallDistance); // Purpur
-             double d7 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-             int i = (int) (150.0D * d7);
- 
-@@ -2092,7 +2093,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
-             float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
- 
--            return Mth.ceil((fallDistance - 3.0F - f2) * damageMultiplier);
-+            return Mth.ceil((fallDistance - this.safeFallDistance - f2) * damageMultiplier); // Purpur
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index ad4d4e38a2f0125e0943945c9440a9be80b60257..d3b655ccf40d24b7f5a09383fd5771bb275ac4b7 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -386,7 +386,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
- 
-     @Override
-     protected int calculateFallDamage(float fallDistance, float damageMultiplier) {
--        return Mth.ceil((fallDistance * 0.5F - 3.0F) * damageMultiplier);
-+        return Mth.ceil((fallDistance * 0.5F - this.safeFallDistance) * damageMultiplier);
-     }
- 
-     protected int getInventorySize() {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 2a30499fd6f4a1340f6911f0f7f079bcbe8576a3..c3c0fbe71c9af1125c80698865cb9eaf42d4a1c5 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -13,6 +13,7 @@ import net.minecraft.world.level.LevelReader;
- public class Giant extends Monster {
-     public Giant(EntityType<? extends Giant> type, Level world) {
-         super(type, world);
-+        this.safeFallDistance = 10.0F; // Purpur
-     }
- 
-     // Purpur start
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3579715faa33a722cccb13d8d7c86a3de740d6fc..3c65041eed148fe30be3c73e423433e37ae58cc5 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1099,4 +1099,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         getHandle().knockback(strength, directionX, directionZ);
-     };
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public float getSafeFallDistance() {
-+        return getHandle().safeFallDistance;
-+    }
-+
-+    @Override
-+    public void setSafeFallDistance(float safeFallDistance) {
-+        getHandle().safeFallDistance = safeFallDistance;
-+    }
-+    // Purpur end
- }
diff --git a/patches/server/0019-Alternative-Keepalive-Handling.patch b/patches/server/0016-Alternative-Keepalive-Handling.patch
similarity index 73%
rename from patches/server/0019-Alternative-Keepalive-Handling.patch
rename to patches/server/0016-Alternative-Keepalive-Handling.patch
index e388e60aa..224feaaf5 100644
--- a/patches/server/0019-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0016-Alternative-Keepalive-Handling.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 9226fadcf53da5f7d55f4434a660d3e091c0775f..0166107f8b48393a93ac046e6af70f0ff24fbb85 100644
+index 4228fd441f8350d43bd545e31c920304f07968bc..3a15085e0421f46800f779066d235ef21b463289 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -51,6 +51,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     private long keepAliveTime = Util.getMillis(); // Paper
-     private boolean keepAlivePending;
+@@ -73,6 +73,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      private long keepAliveChallenge;
+     private long closedListenerTime;
+     private boolean closed = false;
 +    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur
      private int latency;
      private volatile boolean suspendFlushingOnServerThread = false;
-     private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
-@@ -91,6 +92,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
+@@ -124,6 +125,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -30,10 +30,10 @@ index 9226fadcf53da5f7d55f4434a660d3e091c0775f..0166107f8b48393a93ac046e6af70f0f
 +            }
 +        } else
 +        // Purpur end
-         //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread
+         //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - handle ServerboundKeepAlivePacket async
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
-@@ -204,6 +215,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -260,6 +271,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          long currentTime = Util.getMillis();
          long elapsedTime = currentTime - this.keepAliveTime;
  
@@ -52,11 +52,11 @@ index 9226fadcf53da5f7d55f4434a660d3e091c0775f..0166107f8b48393a93ac046e6af70f0f
 +        } else
 +        // Purpur end
 +
-         if (this.keepAlivePending) {
-             if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
-                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
+         if (!this.isSingleplayerOwner() && elapsedTime >= KEEPALIVE_LIMIT) { // Paper - check keepalive limit, don't fire if already disconnected
+             if (this.keepAlivePending && !this.processedDisconnect) { // Paper
+                 this.disconnect(ServerCommonPacketListenerImpl.TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 34afed28faeb56352b48faf8078a5fb07912eb5e..ad239ba9259c5a63b40261ebc44224893496b47d 100644
+index 9c5bba0ae119f8d42274455e322530ceb5f67d9b..a14cf3a5dc2ba265de5e400404afcbd9faa3f25a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -198,6 +198,11 @@ public class PurpurConfig {
diff --git a/patches/server/0020-Silk-touch-spawners.patch b/patches/server/0017-Silk-touch-spawners.patch
similarity index 54%
rename from patches/server/0020-Silk-touch-spawners.patch
rename to patches/server/0017-Silk-touch-spawners.patch
index a0dd9db8f..d1ee5a1b5 100644
--- a/patches/server/0020-Silk-touch-spawners.patch
+++ b/patches/server/0017-Silk-touch-spawners.patch
@@ -4,72 +4,83 @@ Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners
 
 
+diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
+index 96fb69ec6db2e7c8c728435f0c537b076259b2fb..3253361d91e2a2e68d354eaf3dd3e3cd486e191d 100644
+--- a/src/main/java/net/minecraft/world/item/BlockItem.java
++++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+@@ -219,6 +219,7 @@ public class BlockItem extends Item {
+ 
+                 if (tileentity != null) {
+                     if (!world.isClientSide && tileentity.onlyOpCanSetNbt() && (player == null || !(player.canUseGameMasterBlocks() || (player.getAbilities().instabuild && player.getBukkitEntity().hasPermission("minecraft.nbt.place"))))) { // Spigot - add permission
++                        if (!(!world.isClientSide && world.purpurConfig.silkTouchEnabled && tileentity instanceof net.minecraft.world.level.block.entity.SpawnerBlockEntity && player.getBukkitEntity().hasPermission("purpur.drop.spawners")))
+                         return false;
+                     }
+ 
 diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
-index 5f20e075c532f0f1d413242949d1738c0c152bf7..e6f8cb165f7e3da5f0edfc952d14059516de8acf 100644
+index d00b59efb754594cf532f8598f4b6d3b29693232..6467358f5fdf4cd4f7c1e2cc65c834a9da39596a 100644
 --- a/src/main/java/net/minecraft/world/item/Items.java
 +++ b/src/main/java/net/minecraft/world/item/Items.java
-@@ -294,7 +294,7 @@ public class Items {
+@@ -338,7 +338,7 @@ public class Items {
      public static final Item PURPUR_BLOCK = registerBlock(Blocks.PURPUR_BLOCK);
      public static final Item PURPUR_PILLAR = registerBlock(Blocks.PURPUR_PILLAR);
      public static final Item PURPUR_STAIRS = registerBlock(Blocks.PURPUR_STAIRS);
 -    public static final Item SPAWNER = registerBlock(Blocks.SPAWNER);
 +    public static final Item SPAWNER = registerBlock(new org.purpurmc.purpur.item.SpawnerItem(Blocks.SPAWNER, new Item.Properties().rarity(Rarity.EPIC))); // Purpur
-     public static final Item CHEST = registerBlock(Blocks.CHEST);
+     public static final Item CHEST = registerBlock(Blocks.CHEST, settings -> settings.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY));
      public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE);
      public static final Item FARMLAND = registerBlock(Blocks.FARMLAND);
 diff --git a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
-index 936d844a5a246138c9f9ae4ae6e318242b8f1420..93f5f226cf6fd6110e4daa02b3f5d9ad253814a0 100644
+index 4f190a40b8474aa06a92c8afcc06d0044120ff7b..66c17bdfecdfbcfb2d853e561432dd51a8f7ed46 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java
-@@ -40,6 +40,58 @@ public class SpawnerBlock extends BaseEntityBlock {
+@@ -42,6 +42,57 @@ public class SpawnerBlock extends BaseEntityBlock {
          return createTickerHelper(type, BlockEntityType.MOB_SPAWNER, world.isClientSide ? SpawnerBlockEntity::clientTick : SpawnerBlockEntity::serverTick);
      }
  
 +    // Purpur start
 +    @Override
-+    public void playerDestroy(Level level, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, BlockEntity blockEntity, ItemStack stack, boolean includeDrops) {
++    public void playerDestroy(Level level, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack, boolean includeDrops, boolean dropExp) {
 +        if (level.purpurConfig.silkTouchEnabled && player.getBukkitEntity().hasPermission("purpur.drop.spawners") && isSilkTouch(level, stack)) {
-+            Optional<net.minecraft.world.entity.EntityType<?>> type = net.minecraft.world.entity.EntityType.by(((SpawnerBlockEntity) blockEntity).getSpawner().nextSpawnData.getEntityToSpawn());
-+
-+            net.minecraft.world.entity.EntityType<?> entityType = type.orElse(null);
-+            final net.kyori.adventure.text.Component mobName = io.papermc.paper.adventure.PaperAdventure.asAdventure(entityType == null ? Component.empty() : entityType.getDescription());
-+            CompoundTag display = new CompoundTag();
-+            CompoundTag tag = new CompoundTag();
-+
-+            String name = level.purpurConfig.silkTouchSpawnerName;
-+            if (name != null && !name.isEmpty() && !name.equals("Monster Spawner")) {
-+                net.kyori.adventure.text.Component displayName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("mob", mobName));
-+                if (name.startsWith("<reset>")) {
-+                    displayName = displayName.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
-+                }
-+                display.put("Name", net.minecraft.nbt.StringTag.valueOf(io.papermc.paper.adventure.PaperAdventure.asJsonString(displayName, java.util.Locale.ROOT)));
-+                tag.put("display", display);
-+            }
-+
-+            List<String> lore = level.purpurConfig.silkTouchSpawnerLore;
-+            if (lore != null && !lore.isEmpty()) {
-+                net.minecraft.nbt.ListTag list = new net.minecraft.nbt.ListTag();
-+                for (String line : lore) {
-+                    net.kyori.adventure.text.Component lineComponent = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(line, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("mob", mobName));
-+                    if (line.startsWith("<reset>")) {
-+                        lineComponent = lineComponent.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
-+                    }
-+                    list.add(net.minecraft.nbt.StringTag.valueOf(io.papermc.paper.adventure.PaperAdventure.asJsonString(lineComponent, java.util.Locale.ROOT)));
-+                }
-+                display.put("Lore", list);
-+                tag.put("display", display);
-+            }
-+
 +            ItemStack item = new ItemStack(Blocks.SPAWNER.asItem());
-+            if (entityType != null) {
-+                tag.putString("Purpur.mob_type", entityType.getName());
-+                tag.putDouble("HideFlags", 32); // hides the "Interact with Spawn Egg" tooltip
-+                item.setTag(tag);
++
++            net.minecraft.world.level.SpawnData nextSpawnData = blockEntity instanceof SpawnerBlockEntity spawnerBlock ? spawnerBlock.getSpawner().nextSpawnData : null;
++            java.util.Optional<net.minecraft.world.entity.EntityType<?>> type = java.util.Optional.empty();
++            if (nextSpawnData != null) {
++                type = net.minecraft.world.entity.EntityType.by(nextSpawnData.getEntityToSpawn());
++                net.minecraft.world.level.SpawnData.CODEC.encodeStart(net.minecraft.nbt.NbtOps.INSTANCE, nextSpawnData).result().ifPresent(tag -> item.set(net.minecraft.core.component.DataComponents.CUSTOM_DATA, net.minecraft.world.item.component.CustomData.EMPTY.update(compoundTag -> compoundTag.put("Purpur.SpawnData", tag))));
 +            }
 +
++            if (type.isPresent()) {
++                final net.kyori.adventure.text.Component mobName = io.papermc.paper.adventure.PaperAdventure.asAdventure(type.get().getDescription());
++
++                String name = level.purpurConfig.silkTouchSpawnerName;
++                if (name != null && !name.isEmpty() && !name.equals("Monster Spawner")) {
++                    net.kyori.adventure.text.Component displayName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("mob", mobName));
++                    if (name.startsWith("<reset>")) {
++                        displayName = displayName.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
++                    }
++                    item.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, io.papermc.paper.adventure.PaperAdventure.asVanilla(displayName));
++                }
++
++                List<String> lore = level.purpurConfig.silkTouchSpawnerLore;
++                if (lore != null && !lore.isEmpty()) {
++
++                    List<Component> loreComponentList = new java.util.ArrayList<>();
++                    for (String line : lore) {
++                        net.kyori.adventure.text.Component lineComponent = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(line, net.kyori.adventure.text.minimessage.tag.resolver.Placeholder.component("mob", mobName));
++                        if (line.startsWith("<reset>")) {
++                            lineComponent = lineComponent.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
++                        }
++                        loreComponentList.add(io.papermc.paper.adventure.PaperAdventure.asVanilla(lineComponent));
++                    }
++
++                    item.set(net.minecraft.core.component.DataComponents.LORE, new net.minecraft.world.item.component.ItemLore(loreComponentList, loreComponentList));
++                }
++                item.set(net.minecraft.core.component.DataComponents.HIDE_ADDITIONAL_TOOLTIP, net.minecraft.util.Unit.INSTANCE);
++            }
 +            popResource(level, pos, item);
 +        }
-+        super.playerDestroy(level, player, pos, state, blockEntity, stack, includeDrops);
++        super.playerDestroy(level, player, pos, state, blockEntity, stack, includeDrops, dropExp);
 +    }
 +
 +    private boolean isSilkTouch(Level level, ItemStack stack) {
@@ -78,9 +89,9 @@ index 936d844a5a246138c9f9ae4ae6e318242b8f1420..93f5f226cf6fd6110e4daa02b3f5d9ad
 +    // Purpur end
 +
      @Override
-     public void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack tool, boolean dropExperience) {
+     protected void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack tool, boolean dropExperience) {
          super.spawnAfterBreak(state, world, pos, tool, dropExperience);
-@@ -48,6 +100,7 @@ public class SpawnerBlock extends BaseEntityBlock {
+@@ -50,6 +101,7 @@ public class SpawnerBlock extends BaseEntityBlock {
  
      @Override
      public int getExpDrop(BlockState iblockdata, ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack, boolean flag) {
@@ -89,7 +100,7 @@ index 936d844a5a246138c9f9ae4ae6e318242b8f1420..93f5f226cf6fd6110e4daa02b3f5d9ad
              int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3ed1a91c93f659306acaf8bad6820f49208554c8..570abbb70cfb523917de473bd91640719c40a611 100644
+index 70f53ccb22de2c05c9ead68f8bd29d0b69d0993f..d4bca5b5f3d10c3a04befd8c365f46433491f299 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -108,6 +108,38 @@ public class PurpurWorldConfig {
@@ -133,18 +144,20 @@ index 3ed1a91c93f659306acaf8bad6820f49208554c8..570abbb70cfb523917de473bd9164071
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java b/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c038fb2bbb0f0e78380bc24bbd6348b869669a90
+index 0000000000000000000000000000000000000000..ed50cb2115401c9039df4136caf5a087a5f5991c
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,40 @@
 +package org.purpurmc.purpur.item;
 +
 +import net.minecraft.core.BlockPos;
++import net.minecraft.core.component.DataComponents;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.world.entity.EntityType;
 +import net.minecraft.world.entity.player.Player;
 +import net.minecraft.world.item.BlockItem;
 +import net.minecraft.world.item.ItemStack;
++import net.minecraft.world.item.component.CustomData;
 +import net.minecraft.world.level.Level;
 +import net.minecraft.world.level.block.Block;
 +import net.minecraft.world.level.block.entity.BlockEntity;
@@ -161,12 +174,14 @@ index 0000000000000000000000000000000000000000..c038fb2bbb0f0e78380bc24bbd6348b8
 +    protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, Player player, ItemStack stack, BlockState state) {
 +        boolean handled = super.updateCustomBlockEntityTag(pos, level, player, stack, state);
 +        if (level.purpurConfig.silkTouchEnabled && player.getBukkitEntity().hasPermission("purpur.place.spawners")) {
-+            BlockEntity spawner = level.getBlockEntity(pos);
-+            if (spawner instanceof SpawnerBlockEntity && stack.hasTag()) {
-+                CompoundTag tag = stack.getTag();
-+                if (tag.contains("Purpur.mob_type")) {
-+                    EntityType.byString(tag.getString("Purpur.mob_type")).ifPresent(type ->
-+                            ((SpawnerBlockEntity) spawner).getSpawner().setEntityId(type, level, level.random, pos));
++            BlockEntity blockEntity = level.getBlockEntity(pos);
++            if (blockEntity instanceof SpawnerBlockEntity spawner) {
++                CompoundTag customData = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag();
++                if (customData.contains("Purpur.mob_type")) {
++                    EntityType.byString(customData.getString("Purpur.mob_type")).ifPresent(type -> spawner.getSpawner().setEntityId(type, level, level.random, pos));
++                } else if (customData.contains("Purpur.SpawnData")) {
++                    net.minecraft.world.level.SpawnData.CODEC.parse(net.minecraft.nbt.NbtOps.INSTANCE, customData.getCompound("Purpur.SpawnData")).result()
++                        .ifPresent(spawnData -> spawner.getSpawner().nextSpawnData = spawnData);
 +                }
 +            }
 +        }
diff --git a/patches/server/0021-Add-turtle-egg-block-options.patch b/patches/server/0018-Add-turtle-egg-block-options.patch
similarity index 85%
rename from patches/server/0021-Add-turtle-egg-block-options.patch
rename to patches/server/0018-Add-turtle-egg-block-options.patch
index 8666b8216..efb936f2b 100644
--- a/patches/server/0021-Add-turtle-egg-block-options.patch
+++ b/patches/server/0018-Add-turtle-egg-block-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add turtle egg block options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 07157822659288e76b2fba34db8d5d566506f33b..18feb559f9fd157dd4a01faf2b2bb18df2a64675 100644
+index a6f408e56fa6c9de82fd93555fe21e1b11ce1022..c7377d04ceac3ea624117439783a443c6d6f6d08 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-@@ -195,6 +195,25 @@ public class TurtleEggBlock extends Block {
+@@ -203,6 +203,25 @@ public class TurtleEggBlock extends Block {
      }
  
      private boolean canDestroyEgg(Level world, Entity entity) {
@@ -36,16 +36,16 @@ index 07157822659288e76b2fba34db8d5d566506f33b..18feb559f9fd157dd4a01faf2b2bb18d
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 570abbb70cfb523917de473bd91640719c40a611..7a4c1c04b7e3c558ac19b72693d5abe6c14acdfe 100644
+index d4bca5b5f3d10c3a04befd8c365f46433491f299..ac44ee7789b96e60e6d1d964d64ca33a3d3c2c62 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -140,6 +140,15 @@ public class PurpurWorldConfig {
          });
      }
  
-+    public boolean turtleEggsBreakFromExpOrbs = true;
-+    public boolean turtleEggsBreakFromItems = true;
-+    public boolean turtleEggsBreakFromMinecarts = true;
++    public boolean turtleEggsBreakFromExpOrbs = false;
++    public boolean turtleEggsBreakFromItems = false;
++    public boolean turtleEggsBreakFromMinecarts = false;
 +    private void turtleEggSettings() {
 +        turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
 +        turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
diff --git a/patches/server/0022-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0019-Logger-settings-suppressing-pointless-logs.patch
similarity index 83%
rename from patches/server/0022-Logger-settings-suppressing-pointless-logs.patch
rename to patches/server/0019-Logger-settings-suppressing-pointless-logs.patch
index de53218b8..06fe35a02 100644
--- a/patches/server/0022-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0019-Logger-settings-suppressing-pointless-logs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index e38e2e5a7ddba9c140f362021b6be0b0974f7cd1..0b3a06027f2c600960cd88159803be187c4d0317 100644
+index c7e1f2bac3eca9bb72bf1f8c26cccb2905e1ddfc..94893039363b5fe2d7d0622d0592bce2c867b1c3 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -200,6 +200,7 @@ public class PlayerAdvancements {
+@@ -199,6 +199,7 @@ public class PlayerAdvancements {
  
              if (advancementholder == null) {
                  if (!minecraftkey.getNamespace().equals("minecraft")) return; // CraftBukkit
@@ -17,17 +17,17 @@ index e38e2e5a7ddba9c140f362021b6be0b0974f7cd1..0b3a06027f2c600960cd88159803be18
              } else {
                  this.startProgress(advancementholder, advancementprogress);
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 50ed7cfe1ecef6d075ba484804827cec83ba2bf2..54f9cd80ac925aa95ff4fdb4d52cbcc2b04263a5 100644
+index 1351423a12c19a01f602a202832372a399e6a867..1e2025674eafcf56460c741083c91e2e42d61b19 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -318,6 +318,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -326,6 +326,7 @@ public class WorldGenRegion implements WorldGenLevel {
              return true;
          } else {
-             // Paper start
+             // Paper start - Buffer OOB setBlock calls
 +            if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSetBlockFarChunk) // Purpur
              if (!hasSetFarWarned) {
-             Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
-             hasSetFarWarned = true;
+             Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + String.valueOf(pos) + ", status: " + String.valueOf(this.generatingStatus) + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
+                 hasSetFarWarned = true;
 diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
 index 4103ddf16164e3992fef0765d368282572537e29..a0cb49233b1dbf53ce9d1bcc52b8967829d0530e 100644
 --- a/src/main/java/net/minecraft/stats/ServerRecipeBook.java
@@ -41,7 +41,7 @@ index 4103ddf16164e3992fef0765d368282572537e29..a0cb49233b1dbf53ce9d1bcc52b89678
                  } else {
                      handler.accept((RecipeHolder) optional.get());
 diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
-index 2677e21d8239bf0361a3bc5c9a50c328e54d70f6..544a79d5da661aff19e2019f7b83a3a49350bb68 100644
+index 71d057dc8c7362f8e7aaca5e31c9f02b2bf3f281..9d9405af0db28c0f3ffff2881b54f1dc84675a9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
 @@ -256,6 +256,7 @@ public final class CraftLegacy {
@@ -49,11 +49,11 @@ index 2677e21d8239bf0361a3bc5c9a50c328e54d70f6..544a79d5da661aff19e2019f7b83a3a4
  
      static {
 +        if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressInitLegacyMaterialError) // Purpur
-         LOGGER.warn("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!"); // Paper - doesn't need to be an error
+         LOGGER.warn("Initializing Legacy Material Support. Unless you have legacy plugins and/or data this is a bug!"); // Paper - Improve logging and errors; doesn't need to be an error
          if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
              new Exception().printStackTrace();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ad239ba9259c5a63b40261ebc44224893496b47d..308d7556f5b12c0aa5b2fde5a23ef6fbacb303de 100644
+index a14cf3a5dc2ba265de5e400404afcbd9faa3f25a..a14879f4266c71b7493c05e105114590c6709045 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -237,4 +237,15 @@ public class PurpurConfig {
diff --git a/patches/server/0023-Disable-outdated-build-check.patch b/patches/server/0020-Disable-outdated-build-check.patch
similarity index 89%
rename from patches/server/0023-Disable-outdated-build-check.patch
rename to patches/server/0020-Disable-outdated-build-check.patch
index 703cb32e7..a082f35b6 100644
--- a/patches/server/0023-Disable-outdated-build-check.patch
+++ b/patches/server/0020-Disable-outdated-build-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a6b1c83e289bd0a9ad59288ed2da88ac3e607c0f..45f63f2fedee7bcab9cd3ebc3117cecd225b89d2 100644
+index 66a3b28d7b943d443ff66fdcfbce6e5260b9463e..222865a3cee62f244a566092a7d814efe478ee01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -300,7 +300,7 @@ public class Main {
+@@ -302,7 +302,7 @@ public class Main {
                      System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
diff --git a/patches/server/0024-Giants-AI-settings.patch b/patches/server/0021-Giants-AI-settings.patch
similarity index 88%
rename from patches/server/0024-Giants-AI-settings.patch
rename to patches/server/0021-Giants-AI-settings.patch
index a9b0ffe4c..1f14b308e 100644
--- a/patches/server/0024-Giants-AI-settings.patch
+++ b/patches/server/0021-Giants-AI-settings.patch
@@ -5,22 +5,19 @@ Subject: [PATCH] Giants AI settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index c3c0fbe71c9af1125c80698865cb9eaf42d4a1c5..d014731fe352246299253bf005e23673abe091bc 100644
+index 9602e59cbebeedc85ea75d2a41d3e74f0ff45b46..3c1217d36522b1fd3d1a099d3a12d99016f34c4b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -1,14 +1,37 @@
+@@ -1,11 +1,34 @@
  package net.minecraft.world.entity.monster;
  
  import net.minecraft.core.BlockPos;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.world.Difficulty;
 +import net.minecraft.world.DifficultyInstance;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityDimensions;
  import net.minecraft.world.entity.EntityType;
 +import net.minecraft.world.entity.EquipmentSlot;
 +import net.minecraft.world.entity.MobSpawnType;
- import net.minecraft.world.entity.Pose;
 +import net.minecraft.world.entity.SpawnGroupData;
  import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
  import net.minecraft.world.entity.ai.attributes.Attributes;
@@ -46,7 +43,7 @@ index c3c0fbe71c9af1125c80698865cb9eaf42d4a1c5..d014731fe352246299253bf005e23673
  
  public class Giant extends Monster {
      public Giant(EntityType<? extends Giant> type, Level world) {
-@@ -34,8 +57,23 @@ public class Giant extends Monster {
+@@ -30,8 +53,23 @@ public class Giant extends Monster {
  
      @Override
      protected void registerGoals() {
@@ -70,15 +67,15 @@ index c3c0fbe71c9af1125c80698865cb9eaf42d4a1c5..d014731fe352246299253bf005e23673
 +            }
 +        }
      }
-     // Purpur end
  
-@@ -46,6 +84,32 @@ public class Giant extends Monster {
-         this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(this.level().purpurConfig.giantAttackDamage);
+     @Override
+@@ -47,8 +85,34 @@ public class Giant extends Monster {
+         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 100.0).add(Attributes.MOVEMENT_SPEED, 0.5).add(Attributes.ATTACK_DAMAGE, 50.0);
      }
  
 +    @Override
-+    public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
-+        SpawnGroupData groupData = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
++    public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
++        SpawnGroupData groupData = super.finalizeSpawn(world, difficulty, spawnReason, entityData);
 +        if (groupData == null) {
 +            populateDefaultEquipmentSlots(this.random, difficulty);
 +            populateDefaultEquipmentEnchantments(this.random, difficulty);
@@ -102,11 +99,6 @@ index c3c0fbe71c9af1125c80698865cb9eaf42d4a1c5..d014731fe352246299253bf005e23673
 +        return level().purpurConfig.giantJumpHeight;
 +    }
 +
-     @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return 10.440001F;
-@@ -62,6 +126,6 @@ public class Giant extends Monster {
- 
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
 -        return world.getPathfindingCostFromLightLevels(pos);
@@ -114,7 +106,7 @@ index c3c0fbe71c9af1125c80698865cb9eaf42d4a1c5..d014731fe352246299253bf005e23673
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7a4c1c04b7e3c558ac19b72693d5abe6c14acdfe..b18c498b6fd17ef298cc6ee7b2386188f0b75b36 100644
+index ac44ee7789b96e60e6d1d964d64ca33a3d3c2c62..fb61cd498955fee2dec15fa584273a6e19ca58c9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -554,6 +554,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0025-Zombie-horse-naturally-spawn.patch b/patches/server/0022-Zombie-horse-naturally-spawn.patch
similarity index 86%
rename from patches/server/0025-Zombie-horse-naturally-spawn.patch
rename to patches/server/0022-Zombie-horse-naturally-spawn.patch
index d989763f1..8ff2f18f1 100644
--- a/patches/server/0025-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0022-Zombie-horse-naturally-spawn.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 19698f13530183b3580a7a6ad720d078b6c791ba..c0f11d06e077c41d65b25396a14a4d81a39993e2 100644
+index fc791a66d299905798c2c1ca542467e4c7933caf..b02d9db8442b209a9df27e417be71b11d426878b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1000,10 +1000,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                 boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
+@@ -1006,10 +1006,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+                 boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper - Configurable spawn chances for skeleton horses
  
                  if (flag1) {
 -                    SkeletonHorse entityhorseskeleton = (SkeletonHorse) EntityType.SKELETON_HORSE.create(this);
@@ -30,18 +30,18 @@ index 19698f13530183b3580a7a6ad720d078b6c791ba..c0f11d06e077c41d65b25396a14a4d81
                          entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
                          this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b18c498b6fd17ef298cc6ee7b2386188f0b75b36..bae186807d44745942faf8919831f82e475a4f63 100644
+index fb61cd498955fee2dec15fa584273a6e19ca58c9..41822b9b050f4267cc0151ea85682523f89af57f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1484,6 +1484,7 @@ public class PurpurWorldConfig {
+@@ -1487,6 +1487,7 @@ public class PurpurWorldConfig {
      public double zombieHorseJumpStrengthMax = 1.0D;
      public double zombieHorseMovementSpeedMin = 0.2D;
      public double zombieHorseMovementSpeedMax = 0.2D;
 +    public double zombieHorseSpawnChance = 0.0D;
      private void zombieHorseSettings() {
+         zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
-         zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
-@@ -1499,6 +1500,7 @@ public class PurpurWorldConfig {
+@@ -1503,6 +1504,7 @@ public class PurpurWorldConfig {
          zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax);
          zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
diff --git a/patches/server/0026-Charged-creeper-naturally-spawn.patch b/patches/server/0023-Charged-creeper-naturally-spawn.patch
similarity index 87%
rename from patches/server/0026-Charged-creeper-naturally-spawn.patch
rename to patches/server/0023-Charged-creeper-naturally-spawn.patch
index 53a7034e1..3796f4ab6 100644
--- a/patches/server/0026-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0023-Charged-creeper-naturally-spawn.patch
@@ -5,26 +5,26 @@ Subject: [PATCH] Charged creeper naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index e31094f270117dec3053620c06e409953fb6d710..a1e3f29ce49dc41ad70f74ee224250fe9ebea175 100644
+index 624ae0e10ef9f51d484e45ec9a15e4a120bf2af2..84114356ea4c06998572c03f2e2a75b49e539980 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -255,6 +255,14 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -257,6 +257,14 @@ public class Creeper extends Monster implements PowerableMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.creeperMaxHealth);
      }
  
-+    public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.MobSpawnType spawnReason, @Nullable net.minecraft.world.entity.SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
++    public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.MobSpawnType spawnReason, @Nullable net.minecraft.world.entity.SpawnGroupData entityData) {
 +        double chance = world.getLevel().purpurConfig.creeperChargedChance;
 +        if (chance > 0D && random.nextDouble() <= chance) {
 +            setPowered(true);
 +        }
-+        return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
++        return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
 +    }
 +
      @Override
      protected SoundEvent getHurtSound(DamageSource source) {
          return SoundEvents.CREEPER_HURT;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bae186807d44745942faf8919831f82e475a4f63..8503f57e3b07318331045aa25aa0fd07b8ca17ed 100644
+index 41822b9b050f4267cc0151ea85682523f89af57f..e033ef722d9b6336f1cbc6bdf404f35c34b45db9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -345,6 +345,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0027-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0024-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 89%
rename from patches/server/0027-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/server/0024-Rabbit-naturally-spawn-toast-and-killer.patch
index 6640c1049..da9dd0eab 100644
--- a/patches/server/0027-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/server/0024-Rabbit-naturally-spawn-toast-and-killer.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 23ede55b9b1198c72fe93b086129d4725d9352fe..106600ad9712d9a4fdf6770e81b40606b2f9b9b2 100644
+index 9eb1158213064ddb37ae76e445b5861b963a1f55..4abcde662ed78b16632ee575f695ee4329f11b2f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -469,10 +469,23 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -466,10 +466,23 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          }
  
          this.setVariant(entityrabbit_variant);
@@ -19,7 +19,7 @@ index 23ede55b9b1198c72fe93b086129d4725d9352fe..106600ad9712d9a4fdf6770e81b40606
 +        }
 +        // Purpur end
 +
-         return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData, entityNbt);
+         return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
      }
  
      private static Rabbit.Variant getRandomRabbitVariant(LevelAccessor world, BlockPos pos) {
@@ -33,7 +33,7 @@ index 23ede55b9b1198c72fe93b086129d4725d9352fe..106600ad9712d9a4fdf6770e81b40606
          int i = world.getRandom().nextInt(100);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8503f57e3b07318331045aa25aa0fd07b8ca17ed..86232e49f12cae623dbe235fd0fac5fbf0255a2b 100644
+index e033ef722d9b6336f1cbc6bdf404f35c34b45db9..a96aa7f127467a6ea8025c09f4e336f1910cc8af 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -988,6 +988,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0025-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 92%
rename from patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0025-Fix-outdated-server-showing-in-ping-before-server-fu.patch
index ac019e68c..7699f3fc7 100644
--- a/patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0025-Fix-outdated-server-showing-in-ping-before-server-fu.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-index 2c13147bc063a09bb7907d6f90c3a1e811a09eb1..3edb0c392cec7fdabebad81da1a8b06a700fbfca 100644
+index 6f1c9fa89e718cbc01a8d72de34154f49c5f46db..2455f8e9679914660ec4fcd081138dabfe9c225b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
 @@ -153,6 +153,7 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
diff --git a/patches/server/0029-Tulips-change-fox-type.patch b/patches/server/0026-Tulips-change-fox-type.patch
similarity index 89%
rename from patches/server/0029-Tulips-change-fox-type.patch
rename to patches/server/0026-Tulips-change-fox-type.patch
index ae12cdfc3..50f08714b 100644
--- a/patches/server/0029-Tulips-change-fox-type.patch
+++ b/patches/server/0026-Tulips-change-fox-type.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Tulips change fox type
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 5a7f4c0565b2d8f95930b39e1aacd9904e382736..f26fa004e1372f8711e76bc7fa4cdb383b989755 100644
+index 8666d82775570b812d5bdd80336c8e14db6ddf47..d2be8c1c23f291e98b9a31a63ba5fa7d44fc7402 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -36,6 +36,7 @@ import net.minecraft.util.RandomSource;
+@@ -37,6 +37,7 @@ import net.minecraft.util.RandomSource;
  import net.minecraft.util.StringRepresentable;
  import net.minecraft.world.DifficultyInstance;
  import net.minecraft.world.InteractionHand;
@@ -16,7 +16,7 @@ index 5a7f4c0565b2d8f95930b39e1aacd9904e382736..f26fa004e1372f8711e76bc7fa4cdb38
  import net.minecraft.world.damagesource.DamageSource;
  import net.minecraft.world.entity.AgeableMob;
  import net.minecraft.world.entity.Entity;
-@@ -390,6 +391,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -389,6 +390,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
      }
  
      private void setTargetGoals() {
@@ -28,7 +28,7 @@ index 5a7f4c0565b2d8f95930b39e1aacd9904e382736..f26fa004e1372f8711e76bc7fa4cdb38
          if (this.getVariant() == Fox.Type.RED) {
              this.targetSelector.addGoal(4, this.landTargetGoal);
              this.targetSelector.addGoal(4, this.turtleEggTargetGoal);
-@@ -423,6 +429,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -422,6 +428,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
  
      public void setVariant(Fox.Type variant) {
          this.entityData.set(Fox.DATA_TYPE_ID, variant.getId());
@@ -37,8 +37,8 @@ index 5a7f4c0565b2d8f95930b39e1aacd9904e382736..f26fa004e1372f8711e76bc7fa4cdb38
  
      List<UUID> getTrustedUUIDs() {
 @@ -762,6 +769,29 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
-         return this.getTrustedUUIDs().contains(uuid);
      }
+     // Paper end
  
 +    // Purpur start
 +    @Override
@@ -67,7 +67,7 @@ index 5a7f4c0565b2d8f95930b39e1aacd9904e382736..f26fa004e1372f8711e76bc7fa4cdb38
      // Paper start - Cancellable death event
      protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 86232e49f12cae623dbe235fd0fac5fbf0255a2b..de3fe605c4cc477007d15468338a7de5dfc87c4c 100644
+index a96aa7f127467a6ea8025c09f4e336f1910cc8af..d084d5ef20b2fb4d3b5479cb51003fb82a0358fc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -509,6 +509,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0030-Breedable-Polar-Bears.patch b/patches/server/0027-Breedable-Polar-Bears.patch
similarity index 89%
rename from patches/server/0030-Breedable-Polar-Bears.patch
rename to patches/server/0027-Breedable-Polar-Bears.patch
index b0871157c..952012279 100644
--- a/patches/server/0030-Breedable-Polar-Bears.patch
+++ b/patches/server/0027-Breedable-Polar-Bears.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 26 Mar 2020 19:46:44 -0500
+Date: Fri, 12 Apr 2024 15:40:12 -0700
 Subject: [PATCH] Breedable Polar Bears
 
 
 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 70b45c622a459ace397d4d54cd99e8ae7fc1ce65..0377d40198b88512b1f204a31367c2db039a7f9c 100644
+index 00afde0ec4811992aac306a42d473026b7e7e468..067bb175c457d6de089f18826dfce6c3661dad67 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -99,6 +99,27 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -98,6 +98,27 @@ public class PolarBear extends Animal implements NeutralMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.polarBearMaxHealth);
      }
  
@@ -36,7 +36,7 @@ index 70b45c622a459ace397d4d54cd99e8ae7fc1ce65..0377d40198b88512b1f204a31367c2db
      @Nullable
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-@@ -107,7 +128,7 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -106,7 +127,7 @@ public class PolarBear extends Animal implements NeutralMob {
  
      @Override
      public boolean isFood(ItemStack stack) {
@@ -45,7 +45,7 @@ index 70b45c622a459ace397d4d54cd99e8ae7fc1ce65..0377d40198b88512b1f204a31367c2db
      }
  
      @Override
-@@ -117,6 +138,12 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -116,6 +137,12 @@ public class PolarBear extends Animal implements NeutralMob {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal());
          this.goalSelector.addGoal(1, new PolarBear.PolarBearPanicGoal());
@@ -55,11 +55,11 @@ index 70b45c622a459ace397d4d54cd99e8ae7fc1ce65..0377d40198b88512b1f204a31367c2db
 +            this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, net.minecraft.world.item.crafting.Ingredient.of(level().purpurConfig.polarBearBreedableItem), false));
 +        }
 +        // Purpur end
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
-         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
+         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25));
+         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index de3fe605c4cc477007d15468338a7de5dfc87c4c..4b97350dd6968125d91e02441b6a573ce7000943 100644
+index d084d5ef20b2fb4d3b5479cb51003fb82a0358fc..ae6383c3d8435caba2bae551f36e3562e724361a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -960,6 +960,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0031-Chickens-can-retaliate.patch b/patches/server/0028-Chickens-can-retaliate.patch
similarity index 88%
rename from patches/server/0031-Chickens-can-retaliate.patch
rename to patches/server/0028-Chickens-can-retaliate.patch
index e320a51e1..b7479c92c 100644
--- a/patches/server/0031-Chickens-can-retaliate.patch
+++ b/patches/server/0028-Chickens-can-retaliate.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Chickens can retaliate
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 3c06fe81e2e1d7bd546ead0d13d87cbe7e2e7b5b..bc3094493d7d25eaf50da8fdd74eacae25692b09 100644
+index a7c76e1d89f54f0dc3b27a8a8db168ea4570bf60..14210dac8a4fa8caaf69ec830f83d15525bb1bea 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -75,19 +75,30 @@ public class Chicken extends Animal {
+@@ -74,13 +74,16 @@ public class Chicken extends Animal {
      @Override
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.chickenMaxHealth);
@@ -24,8 +24,9 @@ index 3c06fe81e2e1d7bd546ead0d13d87cbe7e2e7b5b..bc3094493d7d25eaf50da8fdd74eacae
 -        this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D));
 +        // this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D)); // Purpur - moved down
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, Chicken.FOOD_ITEMS, false));
-         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.1D));
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, (itemstack) -> {
+             return itemstack.is(ItemTags.CHICKEN_FOOD);
+@@ -89,6 +92,14 @@ public class Chicken extends Animal {
          this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
@@ -40,7 +41,7 @@ index 3c06fe81e2e1d7bd546ead0d13d87cbe7e2e7b5b..bc3094493d7d25eaf50da8fdd74eacae
      }
  
      @Override
-@@ -96,7 +107,7 @@ public class Chicken extends Animal {
+@@ -97,7 +108,7 @@ public class Chicken extends Animal {
      }
  
      public static AttributeSupplier.Builder createAttributes() {
@@ -50,7 +51,7 @@ index 3c06fe81e2e1d7bd546ead0d13d87cbe7e2e7b5b..bc3094493d7d25eaf50da8fdd74eacae
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4b97350dd6968125d91e02441b6a573ce7000943..c208253d9afcdaa18fdb1f020d3d385556190203 100644
+index ae6383c3d8435caba2bae551f36e3562e724361a..4cd6d9309ed81956d59063fe4d229c6f930922ed 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -299,6 +299,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0032-Add-option-to-set-armorstand-step-height.patch b/patches/server/0029-Add-option-to-set-armorstand-step-height.patch
similarity index 68%
rename from patches/server/0032-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0029-Add-option-to-set-armorstand-step-height.patch
index 2e70c706f..cb9752a8c 100644
--- a/patches/server/0032-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0029-Add-option-to-set-armorstand-step-height.patch
@@ -5,32 +5,40 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b4edc2ab9d831c3c81677544cbd1cd7369591ff5..a5f54e2c17f618b99c76281b45d005280e4e31f9 100644
+index e49dda27dd609ebf377f679c4f60c13a5f610c8e..429d1a3fd7a75fe3dc8eb8d467ad4f2bd99e0212 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -333,7 +333,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -340,6 +340,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public double xOld;
      public double yOld;
      public double zOld;
--    private float maxUpStep;
-+    public float maxUpStep; // Purpur - private -> public
++    public float maxUpStep; // Purpur
      public boolean noPhysics;
-     protected final RandomSource random;
+     public final RandomSource random;
      public int tickCount;
+@@ -4852,7 +4853,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     }
+ 
+     public float maxUpStep() {
+-        return 0.0F;
++        return maxUpStep;
+     }
+ 
+     public void onExplosionHit(@Nullable Entity entity) {}
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 1c7702a5c888846f93f8f80d3b854a26c11499be..14424afdb708df7f93caf6df45412ec721b5e1dd 100644
+index c2bd2e303f956d390319f6bbbe9a6492ebec5154..5abbc0caf90cafc1a06dfff158c158b1538f827c 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -690,6 +690,7 @@ public class ArmorStand extends LivingEntity {
+@@ -676,6 +676,7 @@ public class ArmorStand extends LivingEntity {
  
      @Override
      public void tick() {
 +        maxUpStep = level().purpurConfig.armorstandStepHeight;
-         // Paper start
+         // Paper start - Allow ArmorStands not to tick
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c208253d9afcdaa18fdb1f020d3d385556190203..5875b0e956a91ddb89adfdcb97418cc1d72a1ddf 100644
+index 4cd6d9309ed81956d59063fe4d229c6f930922ed..6649787fc15ca06ec2d4e7ac7b0ff061c4d4de82 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -90,6 +90,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0033-Cat-spawning-options.patch b/patches/server/0030-Cat-spawning-options.patch
similarity index 73%
rename from patches/server/0033-Cat-spawning-options.patch
rename to patches/server/0030-Cat-spawning-options.patch
index de9b7978f..862db1dc6 100644
--- a/patches/server/0033-Cat-spawning-options.patch
+++ b/patches/server/0030-Cat-spawning-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cat spawning options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-index 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b6631689f1b8 100644
+index e0e5046c84941a8d17e18c177f3daea9cb631940..d503d7a5837dbeb98e58dbe8f7e5de45f6d88990 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java
-@@ -30,7 +30,7 @@ public class CatSpawner implements CustomSpawner {
+@@ -27,7 +27,7 @@ public class CatSpawner implements CustomSpawner {
              if (this.nextTick > 0) {
                  return 0;
              } else {
@@ -17,41 +17,36 @@ index 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b663
                  Player player = world.getRandomPlayer();
                  if (player == null) {
                      return 0;
-@@ -63,11 +63,15 @@ public class CatSpawner implements CustomSpawner {
-     }
+@@ -61,8 +61,12 @@ public class CatSpawner implements CustomSpawner {
  
      private int spawnInVillage(ServerLevel world, BlockPos pos) {
--        int i = 48;
+         int i = 48;
+-        if (world.getPoiManager().getCountInRange(entry -> entry.is(PoiTypes.HOME), pos, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
+-            List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(48.0, 8.0, 48.0));
 +        // Purpur start
 +        int range = world.purpurConfig.catSpawnVillageScanRange;
 +        if (range <= 0) return 0;
-+
-         if (world.getPoiManager().getCountInRange((entry) -> {
-             return entry.is(PoiTypes.HOME);
--        }, pos, 48, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
--            List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(48.0D, 8.0D, 48.0D));
-+        }, pos, range, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
-+            List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(range, 8.0D, range));
-+            // Purpur end
++        if (world.getPoiManager().getCountInRange(entry -> entry.is(PoiTypes.HOME), pos, range, PoiManager.Occupancy.IS_OCCUPIED) > 4L) {
++            List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(range, 8.0, range));
++        // Purpur end
              if (list.size() < 5) {
                  return this.spawnCat(pos, world);
              }
-@@ -77,8 +81,11 @@ public class CatSpawner implements CustomSpawner {
-     }
+@@ -73,7 +77,11 @@ public class CatSpawner implements CustomSpawner {
  
      private int spawnInHut(ServerLevel world, BlockPos pos) {
--        int i = 16;
--        List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(16.0D, 8.0D, 16.0D));
+         int i = 16;
+-        List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(16.0, 8.0, 16.0));
 +        // Purpur start
 +        int range = world.purpurConfig.catSpawnSwampHutScanRange;
 +        if (range <= 0) return 0;
-+        List<Cat> list = world.getEntitiesOfClass(Cat.class, (new AABB(pos)).inflate(range, 8.0D, range));
++        List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB(pos).inflate(range, 8.0, range));
 +        // Purpur end
          return list.size() < 1 ? this.spawnCat(pos, world) : 0;
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5875b0e956a91ddb89adfdcb97418cc1d72a1ddf..8f75164e9d877a61cc91886c1e1a7dd4026628c3 100644
+index 6649787fc15ca06ec2d4e7ac7b0ff061c4d4de82..c9dbbe9dde5b463bdde68604d6e5b1c2902d57fa 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -272,6 +272,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0034-Cows-eat-mushrooms.patch b/patches/server/0031-Cows-eat-mushrooms.patch
similarity index 84%
rename from patches/server/0034-Cows-eat-mushrooms.patch
rename to patches/server/0031-Cows-eat-mushrooms.patch
index 5fe654b66..4b9bf527b 100644
--- a/patches/server/0034-Cows-eat-mushrooms.patch
+++ b/patches/server/0031-Cows-eat-mushrooms.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index f440eabffb1abe4c7370bf7badf6137a22f99071..d42c8bcd85ffb1e00d2883485bf22981611b0bc3 100644
+index bee1a275f242866206dc461461b7962e04289ddc..bda0d933ccbee613aa7fb31534351a0d2dbab0a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -2,6 +2,7 @@ package net.minecraft.world.entity.animal;
@@ -16,23 +16,24 @@ index f440eabffb1abe4c7370bf7badf6137a22f99071..d42c8bcd85ffb1e00d2883485bf22981
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.sounds.SoundEvent;
  import net.minecraft.sounds.SoundEvents;
-@@ -30,6 +31,7 @@ import net.minecraft.world.item.ItemUtils;
+@@ -29,6 +30,7 @@ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.item.ItemUtils;
  import net.minecraft.world.item.Items;
- import net.minecraft.world.item.crafting.Ingredient;
  import net.minecraft.world.level.Level;
 +import net.minecraft.world.level.block.Blocks;
  import net.minecraft.world.level.block.state.BlockState;
- import org.joml.Vector3f;
- 
-@@ -73,6 +75,7 @@ public class Cow extends Animal {
-         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+ // CraftBukkit start
+ import org.bukkit.craftbukkit.event.CraftEventFactory;
+@@ -73,7 +75,7 @@ public class Cow extends Animal {
          this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-+        if (level().purpurConfig.cowFeedMushrooms > 0) this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT, Blocks.RED_MUSHROOM.asItem(), Blocks.BROWN_MUSHROOM.asItem()), false)); else // Purpur
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT), false));
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, (itemstack) -> {
+-            return itemstack.is(ItemTags.COW_FOOD);
++            return level().purpurConfig.cowFeedMushrooms > 0 && (itemstack.is(Blocks.RED_MUSHROOM.asItem()) || itemstack.is(Blocks.BROWN_MUSHROOM.asItem())) || itemstack.is(ItemTags.COW_FOOD); // Purpur
+         }, false));
          this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
          this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-@@ -128,6 +131,10 @@ public class Cow extends Animal {
+@@ -134,6 +136,10 @@ public class Cow extends Animal {
  
              player.setItemInHand(hand, itemstack1);
              return InteractionResult.sidedSuccess(this.level().isClientSide);
@@ -43,9 +44,9 @@ index f440eabffb1abe4c7370bf7badf6137a22f99071..d42c8bcd85ffb1e00d2883485bf22981
          } else {
              return super.mobInteract(player, hand);
          }
-@@ -148,4 +155,69 @@ public class Cow extends Animal {
-     protected Vector3f getPassengerAttachmentPoint(Entity passenger, EntityDimensions dimensions, float scaleFactor) {
-         return new Vector3f(0.0F, dimensions.height - 0.03125F * scaleFactor, 0.0F);
+@@ -149,4 +155,69 @@ public class Cow extends Animal {
+     public EntityDimensions getDefaultDimensions(Pose pose) {
+         return this.isBaby() ? Cow.BABY_DIMENSIONS : super.getDefaultDimensions(pose);
      }
 +
 +    // Purpur start - feed mushroom to change to mooshroom
@@ -100,7 +101,7 @@ index f440eabffb1abe4c7370bf7badf6137a22f99071..d42c8bcd85ffb1e00d2883485bf22981
 +            return InteractionResult.PASS;
 +        }
 +        this.level().addFreshEntity(mooshroom);
-+        this.remove(RemovalReason.DISCARDED);
++        this.remove(RemovalReason.DISCARDED, org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +        if (!player.getAbilities().instabuild) {
 +            stack.shrink(1);
 +        }
@@ -114,7 +115,7 @@ index f440eabffb1abe4c7370bf7badf6137a22f99071..d42c8bcd85ffb1e00d2883485bf22981
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8f75164e9d877a61cc91886c1e1a7dd4026628c3..3d222e3cdb95409d9d35ef8a9224814e94c4b333 100644
+index c9dbbe9dde5b463bdde68604d6e5b1c2902d57fa..ab5960b9104d362852ee3d6ba151cf78dd58a0ee 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -342,6 +342,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0035-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0032-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 88%
rename from patches/server/0035-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0032-Fix-cow-rotation-when-shearing-mooshroom.patch
index aec0f2158..b487f483e 100644
--- a/patches/server/0035-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0032-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index e3fe62285ced917de6817916e99483e117008670..c83e5d58ca5db1e63e099f36006043f7e78ea56f 100644
+index b47dddb2fc6058a90665ccbd362088d9a2e837b5..41b52f128fbc174939a7f2d1cd937ab19432de25 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -198,7 +198,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -218,7 +218,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
                  // this.discard(); // CraftBukkit - moved down
                  entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  entitycow.setHealth(this.getHealth());
diff --git a/patches/server/0036-Pigs-give-saddle-back.patch b/patches/server/0033-Pigs-give-saddle-back.patch
similarity index 90%
rename from patches/server/0036-Pigs-give-saddle-back.patch
rename to patches/server/0033-Pigs-give-saddle-back.patch
index 32d857eba..0eb376a50 100644
--- a/patches/server/0036-Pigs-give-saddle-back.patch
+++ b/patches/server/0033-Pigs-give-saddle-back.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Pigs give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 6480e0f026e686b2d0a093d901d7f1e312a45021..dc27fa0df90f8eefc20bf76ff58b1b2ebaacf120 100644
+index a365573c5c5e640f165701bc79f7c605674c5709..4f84406304114abbaff9f96a5df6a48616983fa9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -177,6 +177,17 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -178,6 +178,17 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
      public InteractionResult mobInteract(Player player, InteractionHand hand) {
          boolean flag = this.isFood(player.getItemInHand(hand));
  
@@ -27,7 +27,7 @@ index 6480e0f026e686b2d0a093d901d7f1e312a45021..dc27fa0df90f8eefc20bf76ff58b1b2e
              if (!this.level().isClientSide) {
                  player.startRiding(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3d222e3cdb95409d9d35ef8a9224814e94c4b333..92d8babfa6c9a2ba90f7832110bc536e06e6f4f2 100644
+index ab5960b9104d362852ee3d6ba151cf78dd58a0ee..1c530384c9040236ce525329f37913cdd3e424ff 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -911,6 +911,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0034-Snowman-drop-and-put-back-pumpkin.patch
similarity index 68%
rename from patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/server/0034-Snowman-drop-and-put-back-pumpkin.patch
index f2b8ae6dc..4ac6f1b7e 100644
--- a/patches/server/0037-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0034-Snowman-drop-and-put-back-pumpkin.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Snowman drop and put back pumpkin
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 3ffd9dd16c80399842ba138ed60abd66cd312dcb..bd9dd01e9140c2ad0ab9859b9a455f73ab04a253 100644
+index a54893d51cc1ce204e59a6ffe8b84228775af4da..0060414b1d5afde56372ce121e9d37a1668cd03b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -191,6 +191,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -189,6 +189,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
              }
  
              return InteractionResult.sidedSuccess(this.level().isClientSide);
@@ -23,32 +23,22 @@ index 3ffd9dd16c80399842ba138ed60abd66cd312dcb..bd9dd01e9140c2ad0ab9859b9a455f73
          } else {
              return tryRide(player, hand); // Purpur
          }
-@@ -202,6 +210,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-         if (!this.level().isClientSide()) {
-             this.setPumpkin(false);
-             this.forceDrops = true; // CraftBukkit
-+            if (level().purpurConfig.snowGolemDropsPumpkin) // Purpur
-             this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7F);
-             this.forceDrops = false; // CraftBukkit
-         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 92d8babfa6c9a2ba90f7832110bc536e06e6f4f2..63d1acee8006afc72449f9b9dbb6807554dc7285 100644
+index 1c530384c9040236ce525329f37913cdd3e424ff..acec5455e9c16508ae474e1307e3cc234d17e6ee 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1174,6 +1174,8 @@ public class PurpurWorldConfig {
+@@ -1176,6 +1176,7 @@ public class PurpurWorldConfig {
      public boolean snowGolemControllable = true;
      public boolean snowGolemLeaveTrailWhenRidden = false;
      public double snowGolemMaxHealth = 4.0D;
-+    public boolean snowGolemDropsPumpkin = true;
 +    public boolean snowGolemPutPumpkinBack = false;
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1185,6 +1187,8 @@ public class PurpurWorldConfig {
+@@ -1187,6 +1188,7 @@ public class PurpurWorldConfig {
              set("mobs.snow_golem.attributes.max_health", oldValue);
          }
          snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
-+        snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
 +        snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
      }
  
diff --git a/patches/server/0038-Ender-dragon-always-drop-full-exp.patch b/patches/server/0035-Ender-dragon-always-drop-full-exp.patch
similarity index 91%
rename from patches/server/0038-Ender-dragon-always-drop-full-exp.patch
rename to patches/server/0035-Ender-dragon-always-drop-full-exp.patch
index 1c9025bec..2226fff2e 100644
--- a/patches/server/0038-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0035-Ender-dragon-always-drop-full-exp.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ender dragon always drop full exp
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index e50cf2e27900da6a9f7b4bb07fc4c2ee1ed52313..4149a7aea12cac04a2dfe29e071047de461eb3f4 100644
+index 0a7f87ac09f9ef6ad69974090f0d6f437d232b11..f751444603e4a1a2ef53e7232b5abfff82c316e8 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -747,7 +747,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -18,7 +18,7 @@ index e50cf2e27900da6a9f7b4bb07fc4c2ee1ed52313..4149a7aea12cac04a2dfe29e071047de
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 63d1acee8006afc72449f9b9dbb6807554dc7285..9948d2e6594dfa5b4e98e7aca29f1cd08c03479e 100644
+index acec5455e9c16508ae474e1307e3cc234d17e6ee..a9d6c6713a098ca87d62b43d491bc2d9a8590741 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -455,6 +455,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0039-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0036-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 72%
rename from patches/server/0039-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/server/0036-Allow-soil-to-moisten-from-water-directly-under-it.patch
index 3ce261cff..184d03b5d 100644
--- a/patches/server/0039-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0036-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 5946f06f63b5694034bd027984a4925b0831d439..1776906e886edd511bfbe96b8a345438a3cd66f8 100644
+index d59e33e7326489c6d55d316d0130f22235f4c63c..da85fabd75e9bd5ebece7127ef5b512df16fe3ac 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -162,7 +162,7 @@ public class FarmBlock extends Block {
+@@ -172,7 +172,7 @@ public class FarmBlock extends Block {
              }
          }
  
 -        return false;
 +        return ((ServerLevel) world).purpurConfig.farmlandGetsMoistFromBelow && world.getFluidState(pos.relative(Direction.DOWN)).is(FluidTags.WATER); // Purpur;
+         // Paper end - Perf: remove abstract block iteration
      }
  
-     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9948d2e6594dfa5b4e98e7aca29f1cd08c03479e..ed64be25581f407edcd15b8eac1c4effd9bb8728 100644
+index a9d6c6713a098ca87d62b43d491bc2d9a8590741..41b804abeab390a259eb0c8ed72f75ad403471dd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -145,6 +145,11 @@ public class PurpurWorldConfig {
@@ -30,6 +30,6 @@ index 9948d2e6594dfa5b4e98e7aca29f1cd08c03479e..ed64be25581f407edcd15b8eac1c4eff
 +        farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
 +    }
 +
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
diff --git a/patches/server/0040-Minecart-settings-and-WASD-controls.patch b/patches/server/0037-Minecart-settings-and-WASD-controls.patch
similarity index 90%
rename from patches/server/0040-Minecart-settings-and-WASD-controls.patch
rename to patches/server/0037-Minecart-settings-and-WASD-controls.patch
index de1ad7255..b38b1d122 100644
--- a/patches/server/0040-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0037-Minecart-settings-and-WASD-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9918f6ac1066ccadd3eb2635450faaf5a4350523..85383b6a9d16b7cf7e928c4d9aaf7af932540091 100644
+index bc6a5de72d52627b3ceca4b52b95e12ceddf1247..a17de781053a2c2caf615e5ac48a45c14386b0af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1109,6 +1109,7 @@ public class ServerPlayer extends Player {
+@@ -1189,6 +1189,7 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {
@@ -17,12 +17,12 @@ index 9918f6ac1066ccadd3eb2635450faaf5a4350523..85383b6a9d16b7cf7e928c4d9aaf7af9
  
              if (!flag && this.spawnInvulnerableTime > 0 && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 44a6118d3bd67a95180f750c17967561946e2e87..9d9d9cf2366441b453b66f91c53e7a0fe0c01e8f 100644
+index 4d7454e5a64fc18e63793a221daa94617f17c666..97172e9c53c381d451111227feb4d1fa19d38ad8 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -112,12 +112,14 @@ public abstract class AbstractMinecart extends Entity {
-     private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
+@@ -102,12 +102,14 @@ public abstract class AbstractMinecart extends VehicleEntity {
+     private double flyingY = 0.95;
+     private double flyingZ = 0.95;
      public double maxSpeed = 0.4D;
 +    public double storedMaxSpeed; // Purpur
      // CraftBukkit end
@@ -35,7 +35,7 @@ index 44a6118d3bd67a95180f750c17967561946e2e87..9d9d9cf2366441b453b66f91c53e7a0f
      }
  
      protected AbstractMinecart(EntityType<?> type, Level world, double x, double y, double z) {
-@@ -342,6 +344,12 @@ public abstract class AbstractMinecart extends Entity {
+@@ -296,6 +298,12 @@ public abstract class AbstractMinecart extends VehicleEntity {
  
      @Override
      public void tick() {
@@ -48,7 +48,7 @@ index 44a6118d3bd67a95180f750c17967561946e2e87..9d9d9cf2366441b453b66f91c53e7a0f
          // CraftBukkit start
          double prevX = this.getX();
          double prevY = this.getY();
-@@ -499,16 +507,62 @@ public abstract class AbstractMinecart extends Entity {
+@@ -448,16 +456,62 @@ public abstract class AbstractMinecart extends VehicleEntity {
  
      public void activateMinecart(int x, int y, int z, boolean powered) {}
  
@@ -112,10 +112,10 @@ index 44a6118d3bd67a95180f750c17967561946e2e87..9d9d9cf2366441b453b66f91c53e7a0f
          this.move(MoverType.SELF, this.getDeltaMovement());
          if (!this.onGround()) {
 diff --git a/src/main/java/net/minecraft/world/item/MinecartItem.java b/src/main/java/net/minecraft/world/item/MinecartItem.java
-index a33395dc5a94d89b5ab273c7832813b6ff9ea3b7..2b2218e2de535ebc8f529f5b5bf98fa1ef819a5e 100644
+index 66074445d3908b9bb1c8d70e1e27d057720ec8e5..0fd4f2ab929df479360755a3f1e58a933ae59520 100644
 --- a/src/main/java/net/minecraft/world/item/MinecartItem.java
 +++ b/src/main/java/net/minecraft/world/item/MinecartItem.java
-@@ -122,8 +122,9 @@ public class MinecartItem extends Item {
+@@ -120,8 +120,9 @@ public class MinecartItem extends Item {
          BlockState iblockdata = world.getBlockState(blockposition);
  
          if (!iblockdata.is(BlockTags.RAILS)) {
@@ -126,8 +126,8 @@ index a33395dc5a94d89b5ab273c7832813b6ff9ea3b7..2b2218e2de535ebc8f529f5b5bf98fa1
 +        } // else { // Purpur - place minecarts anywhere
              ItemStack itemstack = context.getItemInHand();
  
-             if (!world.isClientSide) {
-@@ -151,6 +152,6 @@ public class MinecartItem extends Item {
+             if (world instanceof ServerLevel) {
+@@ -146,6 +147,6 @@ public class MinecartItem extends Item {
  
              itemstack.shrink(1);
              return InteractionResult.sidedSuccess(world.isClientSide);
@@ -136,20 +136,20 @@ index a33395dc5a94d89b5ab273c7832813b6ff9ea3b7..2b2218e2de535ebc8f529f5b5bf98fa1
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index e6a4a5898ffdcb2aa2bc01371a6d7dbc06d610ce..443bed339884f78ecda8abdbcdc9b57ea9768cc9 100644
+index 2034ca2edd3aff61d94416266e75402babd3e741..3c1091f2a729b7d06ba6e21c37f788edb2ad1775 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -89,7 +89,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -94,7 +94,7 @@ public abstract class BlockBehaviour implements FeatureElement {
      protected final float jumpFactor;
      protected final boolean dynamicShape;
      protected final FeatureFlagSet requiredFeatures;
 -    protected final BlockBehaviour.Properties properties;
 +    public final BlockBehaviour.Properties properties; // Purpur - protected -> public
      @Nullable
-     protected ResourceLocation drops;
+     protected ResourceKey<LootTable> drops;
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ed64be25581f407edcd15b8eac1c4effd9bb8728..7290de61830b84ddc54f50353dd5c24a65192816 100644
+index 41b804abeab390a259eb0c8ed72f75ad403471dd..755d53e04bb0ed678bebc3497476e252dd5a736e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -95,6 +95,68 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0041-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0038-Disable-loot-drops-on-death-by-cramming.patch
similarity index 87%
rename from patches/server/0041-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/server/0038-Disable-loot-drops-on-death-by-cramming.patch
index 02ec25159..996296e66 100644
--- a/patches/server/0041-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0038-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 960e6ae3e7ceb981459b87343cacb7458d51eecf..c22b07728dde5807873004e4037ce3b738792689 100644
+index a3ee2af337acef86a15b12c9e6d8cd8452980a87..7b210484fd10e6e994c66afb45f8a28ffb5812f1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1838,6 +1838,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1864,6 +1864,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
          this.dropEquipment(); // CraftBukkit - from below
          if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -16,7 +16,7 @@ index 960e6ae3e7ceb981459b87343cacb7458d51eecf..c22b07728dde5807873004e4037ce3b7
              this.dropFromLootTable(source, flag);
              // Paper start
              final boolean prev = this.clearEquipmentSlots;
-@@ -1846,6 +1847,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1872,6 +1873,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              // Paper end
              this.dropCustomDeathLoot(source, i, flag);
              this.clearEquipmentSlots = prev; // Paper
@@ -25,7 +25,7 @@ index 960e6ae3e7ceb981459b87343cacb7458d51eecf..c22b07728dde5807873004e4037ce3b7
          // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
          org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7290de61830b84ddc54f50353dd5c24a65192816..807b1b1de4019f279618c6e02ab90bf230ed5e66 100644
+index 755d53e04bb0ed678bebc3497476e252dd5a736e..b7bf1a6e59e33d13887ae3d98f37658f52030e37 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -95,6 +95,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0042-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 67%
rename from patches/server/0042-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
index 13d4d83f7..90595d0c8 100644
--- a/patches/server/0042-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch
@@ -5,30 +5,21 @@ Subject: [PATCH] Option to toggle milk curing bad omen
 
 
 diff --git a/src/main/java/net/minecraft/world/item/MilkBucketItem.java b/src/main/java/net/minecraft/world/item/MilkBucketItem.java
-index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af74fe2473 100644
+index 0f83ae4b0d5f52ff9ccfff6bbcc31153d45bd619..d0751274e89042715cab8e9e72387042356e3244 100644
 --- a/src/main/java/net/minecraft/world/item/MilkBucketItem.java
 +++ b/src/main/java/net/minecraft/world/item/MilkBucketItem.java
-@@ -5,6 +5,8 @@ import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.stats.Stats;
- import net.minecraft.world.InteractionHand;
- import net.minecraft.world.InteractionResultHolder;
-+import net.minecraft.world.effect.MobEffectInstance;
-+import net.minecraft.world.effect.MobEffects;
- import net.minecraft.world.entity.LivingEntity;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.level.Level;
-@@ -31,7 +33,9 @@ public class MilkBucketItem extends Item {
-         }
+@@ -26,7 +26,9 @@ public class MilkBucketItem extends Item {
  
+         stack.consume(1, user);
          if (!world.isClientSide) {
-+            MobEffectInstance badOmen = user.getEffect(MobEffects.BAD_OMEN);
++            net.minecraft.world.effect.MobEffectInstance badOmen = user.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN); // Purpur
              user.removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.MILK); // CraftBukkit
 +            if (!world.purpurConfig.milkCuresBadOmen && badOmen != null) user.addEffect(badOmen); // Purpur
          }
  
          return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 807b1b1de4019f279618c6e02ab90bf230ed5e66..e943bd03ea9010f7d7f877380c38a38aab396d9f 100644
+index b7bf1a6e59e33d13887ae3d98f37658f52030e37..40493cbb1b14f16549b95aa439e4c25c04a0627c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -96,8 +96,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0043-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0040-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 74%
rename from patches/server/0043-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0040-End-gateway-should-check-if-entity-can-use-portal.patch
index bfc7326f3..d5bd1de5c 100644
--- a/patches/server/0043-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0040-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] End gateway should check if entity can use portal
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7..9717b37aef9f487502e696c209ae209ab3b8f000 100644
+index 93bd70c1dc2ba8b893a6087730071c81fb1132f4..60b343edc4383c8bc450f106f483349850432fa3 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -177,6 +177,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -167,6 +167,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
  
      public static void teleportEntity(Level world, BlockPos pos, BlockState state, Entity entity, TheEndGatewayBlockEntity blockEntity) {
-         if (world instanceof ServerLevel && !blockEntity.isCoolingDown()) {
+         if (world instanceof ServerLevel worldserver && !blockEntity.isCoolingDown()) {
 +            if (!entity.canChangeDimensions()) return; // Purpur
-             ServerLevel worldserver = (ServerLevel) world;
- 
              blockEntity.teleportCooldown = 100;
+             BlockPos blockposition1;
+ 
diff --git a/patches/server/0044-Skip-events-if-there-s-no-listeners.patch b/patches/server/0041-Skip-events-if-there-s-no-listeners.patch
similarity index 79%
rename from patches/server/0044-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0041-Skip-events-if-there-s-no-listeners.patch
index 768487bbd..a34b98f86 100644
--- a/patches/server/0044-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0041-Skip-events-if-there-s-no-listeners.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 3eec879bf3975636739b2491cc05b8177032d16d..a5829f0726fd92faae04f978c82b2f0736bcd50b 100644
+index aa2fca6917fb67fe0e9ba067d11487c3a274f675..5c7287ef8c2d59215aff81cb138a55676bfa6356 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -462,6 +462,7 @@ public class Commands {
+@@ -501,6 +501,7 @@ public class Commands {
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
-         // Paper end - Async command map building
-         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper
+         // Paper end - Perf: Async command map building
+         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper - Brigadier API
 +        if (PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - skip all this crap if there's nothing listening
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
-@@ -472,6 +473,7 @@ public class Commands {
+@@ -511,6 +512,7 @@ public class Commands {
              }
          }
          // CraftBukkit end
diff --git a/patches/server/0045-Add-permission-for-F3-N-debug.patch b/patches/server/0042-Add-permission-for-F3-N-debug.patch
similarity index 83%
rename from patches/server/0045-Add-permission-for-F3-N-debug.patch
rename to patches/server/0042-Add-permission-for-F3-N-debug.patch
index d01f4d38b..8b2ac074b 100644
--- a/patches/server/0045-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0042-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf03faf3207f886b03b0e90ad6f4ce5310db428c..1eafc1854d47002d683f625f4c164290eee59181 100644
+index f10dcc0debcdd2077ee53cb1aefca8abd12f3ecd..338808ba1138f62d89f3f1338a4c5068426df0e4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1156,6 +1156,7 @@ public abstract class PlayerList {
+@@ -1180,6 +1180,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + permissionLevel);
              }
diff --git a/patches/server/0046-Configurable-TPS-Catchup.patch b/patches/server/0043-Configurable-TPS-Catchup.patch
similarity index 59%
rename from patches/server/0046-Configurable-TPS-Catchup.patch
rename to patches/server/0043-Configurable-TPS-Catchup.patch
index d380a71f6..2bed1436e 100644
--- a/patches/server/0046-Configurable-TPS-Catchup.patch
+++ b/patches/server/0043-Configurable-TPS-Catchup.patch
@@ -5,26 +5,24 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4eeb7a43c8cdcd81fd9f8da4792ab27f54595d14..57f2b54ad36d33e76e538895df691987c869a043 100644
+index dfa332c4ff52033eb95248518bc44bbd22697697..f3ad4ee45ba48a10bbae1084f291ae0bcccdf624 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1160,7 +1160,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 this.tickServer(this::haveTime);
+@@ -1240,6 +1240,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.profiler.popPush("nextTickWait");
                  this.mayHaveDelayedTasks = true;
--                this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
-+                    // Purpur start - tps catchup
-+                    if (org.purpurmc.purpur.PurpurConfig.tpsCatchup) {
-+                        this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
-+                    } else {
-+                        this.delayedTasksMaxNextTickTime = this.nextTickTime = curTime / 1000000L + 50L;
-+                    }
-+                    // Purpur end - tps catchup
+                 this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
++                // Purpur start
++                if (!org.purpurmc.purpur.PurpurConfig.tpsCatchup) {
++                    this.nextTickTimeNanos = currentTime + i;
++                    this.delayedTasksMaxNextTickTimeNanos = nextTickTimeNanos;
++                }
++                // Purpur end
+                 this.startMeasuringTaskExecutionTime();
                  this.waitUntilNextTick();
-                 this.profiler.pop();
-                 this.endMetricsRecordingTick();
+                 this.finishMeasuringTaskExecutionTime();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 308d7556f5b12c0aa5b2fde5a23ef6fbacb303de..e2edbb0842862b8ffdf30cec104a1d71a71e92e0 100644
+index a14879f4266c71b7493c05e105114590c6709045..909cfeba89c2370adc2eebf72ba8ad46d33bce7b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -248,4 +248,9 @@ public class PurpurConfig {
diff --git a/patches/server/0047-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 89%
rename from patches/server/0047-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index 6c9883b2d..d357ceeda 100644
--- a/patches/server/0047-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-index a6bc277b6589dd7104566542733327822d6299a4..dde841cc09ba4a3575a462b03537887551d47ba5 100644
+index 3ff06cc6ad35567bcb1f29115db63c11a8e79dbb..f7dd785bdb0dbd0706b367b48235215ff1a0e08f 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-@@ -62,7 +62,7 @@ public class ThrownTrident extends AbstractArrow {
+@@ -67,7 +67,7 @@ public class ThrownTrident extends AbstractArrow {
          Entity entity = this.getOwner();
          byte b0 = (Byte) this.entityData.get(ThrownTrident.ID_LOYALTY);
  
@@ -18,7 +18,7 @@ index a6bc277b6589dd7104566542733327822d6299a4..dde841cc09ba4a3575a462b035378875
                  if (!this.level().isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                      this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e943bd03ea9010f7d7f877380c38a38aab396d9f..9bac609bcd1cca55a9e92b5959e64910b16c3b58 100644
+index 40493cbb1b14f16549b95aa439e4c25c04a0627c..a5ec746fc30af0093430bb7a7f6848081220ec57 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,9 +97,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0048-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0045-Add-enderman-and-creeper-griefing-controls.patch
similarity index 85%
rename from patches/server/0048-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/server/0045-Add-enderman-and-creeper-griefing-controls.patch
index b0520bbc9..d66f9a8f4 100644
--- a/patches/server/0048-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0045-Add-enderman-and-creeper-griefing-controls.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Add enderman and creeper griefing controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index a1e3f29ce49dc41ad70f74ee224250fe9ebea175..5bfeb39a23a72f57523a3c2db1d79c7aef70eb02 100644
+index 84114356ea4c06998572c03f2e2a75b49e539980..98c93c46694f1e67be803a7ca0c0f55532df2e95 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -362,7 +362,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -361,7 +361,7 @@ public class Creeper extends Monster implements PowerableMob {
              if (!event.isCancelled()) {
              // CraftBukkit end
              this.dead = true;
--            this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit
-+            this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), this.level().getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING) && level().purpurConfig.creeperAllowGriefing ? Level.ExplosionInteraction.MOB : Level.ExplosionInteraction.NONE); // CraftBukkit // Purpur
-             this.discard();
+-            this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit // Paper - fix DamageSource API
++            this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), this.level().getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING) && level().purpurConfig.creeperAllowGriefing ? Level.ExplosionInteraction.MOB : Level.ExplosionInteraction.NONE); // CraftBukkit // Paper - fix DamageSource API // Purpur
+             this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
              this.spawnLingeringCloud();
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 36e2d5873f8de180bda97acbad2fed4da5b02872..86581579aed4d8bd18c7b7ea58e2dc4fee5315ba 100644
+index 3abfc4f449552ec60a1f7c4e3faa9fd0ebfdc300..89275ac02fcfab963b520efae6135d6f5ac13465 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -547,6 +547,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -524,6 +524,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
          public boolean canUse() {
@@ -29,7 +29,7 @@ index 36e2d5873f8de180bda97acbad2fed4da5b02872..86581579aed4d8bd18c7b7ea58e2dc4f
              return this.enderman.getCarriedBlock() == null ? false : (!this.enderman.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0);
          }
  
-@@ -592,6 +593,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -569,6 +570,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
          @Override
          public boolean canUse() {
@@ -38,7 +38,7 @@ index 36e2d5873f8de180bda97acbad2fed4da5b02872..86581579aed4d8bd18c7b7ea58e2dc4f
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9bac609bcd1cca55a9e92b5959e64910b16c3b58..2bed8409b399188955a1de405b3e0de4498f8674 100644
+index a5ec746fc30af0093430bb7a7f6848081220ec57..b266fc52508106f1f0f449b8eb900e4c04316fec 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -437,6 +437,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0049-Villagers-follow-emerald-blocks.patch b/patches/server/0046-Villagers-follow-emerald-blocks.patch
similarity index 88%
rename from patches/server/0049-Villagers-follow-emerald-blocks.patch
rename to patches/server/0046-Villagers-follow-emerald-blocks.patch
index f078a4c38..ca38dbc6b 100644
--- a/patches/server/0049-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0046-Villagers-follow-emerald-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Villagers follow emerald blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-index 0d9b194781d152e842c9a4b8d6f23d307b2e4452..00cf59524477ec79d4354cc403fc3e75a63b81a0 100644
+index 13f8c2cb42334ba3b573ca44ace1d3df76e41ff7..baca552e52c728867fcb0527b6c3eb394b2b9c7f 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
-@@ -62,7 +62,7 @@ public class TemptGoal extends Goal {
+@@ -64,7 +64,7 @@ public class TemptGoal extends Goal {
      }
  
      private boolean shouldFollow(LivingEntity entity) {
@@ -18,10 +18,10 @@ index 0d9b194781d152e842c9a4b8d6f23d307b2e4452..00cf59524477ec79d4354cc403fc3e75
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 5119d070dbb04f5a4f9c2def526e33e15ca8573f..d5408629801716ccb227b6a7068d17495ed3d0fb 100644
+index d323cf157f2a910916baa9ce3f7e5bc81648c47d..6cbbca1db5362fa2dd5c5704c7fbaa612d3cbab1 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-@@ -42,6 +42,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
+@@ -48,6 +48,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
  // CraftBukkit end
  
  public abstract class AbstractVillager extends AgeableMob implements InventoryCarrier, Npc, Merchant {
@@ -30,10 +30,10 @@ index 5119d070dbb04f5a4f9c2def526e33e15ca8573f..d5408629801716ccb227b6a7068d1749
      // CraftBukkit start
      private CraftMerchant craftMerchant;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 95df7d57c3aaa46f09f37996a89d88aa9e9383b4..d92a151fa308dd9cbf49e4ab6c581feeb3080519 100644
+index ff86c7d4878e43fc9d375b9b60213a2271b92cff..fad0d393a96d818e90aaa42f3d8d32fa97f7b337 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -155,6 +155,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -154,6 +154,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.getNavigation().setCanFloat(true);
          this.setCanPickUpLoot(true);
          this.setVillagerData(this.getVillagerData().setType(type).setProfession(VillagerProfession.NONE));
@@ -42,10 +42,10 @@ index 95df7d57c3aaa46f09f37996a89d88aa9e9383b4..d92a151fa308dd9cbf49e4ab6c581fee
  
      // Purpur start
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 9178c018c8e008b46a978bb95c244abf986f93d9..c1c41990bc53c822aa170e3d69924437f4a25115 100644
+index ac3cca0db4478841f91d966bd49ca4e5b5e91229..30f13bc35a96950f05b065b5c77830834e5792d1 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -112,6 +112,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -113,6 +113,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          this.goalSelector.addGoal(1, new PanicGoal(this, 0.5D));
          this.goalSelector.addGoal(1, new LookAtTradingPlayerGoal(this));
          this.goalSelector.addGoal(2, new WanderingTrader.WanderToPositionGoal(this, 2.0D, 0.35D));
@@ -54,7 +54,7 @@ index 9178c018c8e008b46a978bb95c244abf986f93d9..c1c41990bc53c822aa170e3d69924437
          this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
          this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2bed8409b399188955a1de405b3e0de4498f8674..b78702f6d2cb36d720c6ef59e5414ca381af08a1 100644
+index b266fc52508106f1f0f449b8eb900e4c04316fec..f42a1205a66f4842ca43aad456dcb42481c041e9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1435,6 +1435,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0050-Allow-leashing-villagers.patch b/patches/server/0047-Allow-leashing-villagers.patch
similarity index 86%
rename from patches/server/0050-Allow-leashing-villagers.patch
rename to patches/server/0047-Allow-leashing-villagers.patch
index d1d0542d9..33f1f3212 100644
--- a/patches/server/0050-Allow-leashing-villagers.patch
+++ b/patches/server/0047-Allow-leashing-villagers.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 785421bc26d86c91983ab501fbc7484bbb389112..b6fd8797d791a60505f8389a38ef6626407a4dbf 100644
+index 26b03594b6ccd69ca35156472e27543d11ba2077..3d5f08d673f6b95c8f87070345f1fb200b5f4bde 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1318,6 +1318,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1450,6 +1450,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
          if (!this.isAlive()) {
              return InteractionResult.PASS;
          } else if (this.getLeashHolder() == player) {
 +            if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur
              // CraftBukkit start - fire PlayerUnleashEntityEvent
-             // Paper start - drop leash variable
-             org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.getAbilities().instabuild);
+             // Paper start - Expand EntityUnleashEvent
+             org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials());
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index d92a151fa308dd9cbf49e4ab6c581feeb3080519..616a6c78a056839575b4dabfeebb7cb2dce25026 100644
+index fad0d393a96d818e90aaa42f3d8d32fa97f7b337..051940da69567274f48485f060cbc3ac21a0907f 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -185,6 +185,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -184,6 +184,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.villagerMaxHealth);
      }
  
@@ -33,10 +33,10 @@ index d92a151fa308dd9cbf49e4ab6c581feeb3080519..616a6c78a056839575b4dabfeebb7cb2
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index c1c41990bc53c822aa170e3d69924437f4a25115..31daa61db84fcb3cde7ec4b18b32aba350ab2cfb 100644
+index 30f13bc35a96950f05b065b5c77830834e5792d1..9d5eaaf1869a3ecb61947ab0c09af558fa1cd283 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -92,6 +92,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -93,6 +93,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.wanderingTraderMaxHealth);
      }
  
@@ -49,7 +49,7 @@ index c1c41990bc53c822aa170e3d69924437f4a25115..31daa61db84fcb3cde7ec4b18b32aba3
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b78702f6d2cb36d720c6ef59e5414ca381af08a1..cb46d1527a5f7f9b3c06aea27a55d98b7b6e734e 100644
+index f42a1205a66f4842ca43aad456dcb42481c041e9..c07064174a0ef81a9bbe628251ee1346af890ae0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1436,6 +1436,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0051-Implement-infinite-liquids.patch b/patches/server/0048-Implement-infinite-liquids.patch
similarity index 83%
rename from patches/server/0051-Implement-infinite-liquids.patch
rename to patches/server/0048-Implement-infinite-liquids.patch
index 43b739b5a..e52ee6bdf 100644
--- a/patches/server/0051-Implement-infinite-liquids.patch
+++ b/patches/server/0048-Implement-infinite-liquids.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement infinite liquids
 
 
 diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-index c55f51e6db55f9fa66f53eef0e7a56af5f81d742..74688f4672936cd2ac629b9f2f404163df6730e9 100644
+index c2943d892b067b3f1fb3b93301a092e912d71f08..a091c51476214977d7a9729b5c72e8478fe4a391 100644
 --- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-@@ -228,7 +228,7 @@ public abstract class FlowingFluid extends Fluid {
+@@ -217,7 +217,7 @@ public abstract class FlowingFluid extends Fluid {
              }
          }
  
@@ -17,7 +17,7 @@ index c55f51e6db55f9fa66f53eef0e7a56af5f81d742..74688f4672936cd2ac629b9f2f404163
              BlockState iblockdata2 = world.getBlockState(pos.below());
              FluidState fluid1 = iblockdata2.getFluidState();
  
-@@ -337,6 +337,12 @@ public abstract class FlowingFluid extends Fluid {
+@@ -301,6 +301,12 @@ public abstract class FlowingFluid extends Fluid {
  
      protected abstract boolean canConvertToSource(Level world);
  
@@ -31,7 +31,7 @@ index c55f51e6db55f9fa66f53eef0e7a56af5f81d742..74688f4672936cd2ac629b9f2f404163
          if (state.getBlock() instanceof LiquidBlockContainer) {
              ((LiquidBlockContainer) state.getBlock()).placeLiquid(world, pos, state, fluidState);
 diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-index c3f8e1e2dd89c168b8b4a15b589109db486bc8d7..2076e4b433e0a57e3ae7053c1df77e0cdc457fc9 100644
+index 3bb4a9a1a6249e8ba2de237f801210e7f4fd5825..4c230136d832d50ae16ffa037b0b30ff1101b50a 100644
 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 @@ -198,6 +198,13 @@ public abstract class LavaFluid extends FlowingFluid {
@@ -49,10 +49,10 @@ index c3f8e1e2dd89c168b8b4a15b589109db486bc8d7..2076e4b433e0a57e3ae7053c1df77e0c
      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 d280c98aed5262c4ce39526c917de884f25a8584..e7d9f6802520620a1dcf0938256ffe80fc72a6f0 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
-@@ -64,6 +64,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);
      }
  
@@ -63,11 +63,11 @@ index d280c98aed5262c4ce39526c917de884f25a8584..e7d9f6802520620a1dcf0938256ffe80
 +    }
 +    // Purpur end
 +
-     // Paper start
+     // Paper start - Add BlockBreakBlockEvent
      @Override
      protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cb46d1527a5f7f9b3c06aea27a55d98b7b6e734e..e06739783b33e72bf43e577f0f7931ad243a48c9 100644
+index c07064174a0ef81a9bbe628251ee1346af890ae0..5e9ce4502f5219b941ffc6f341c95d39755af664 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -221,6 +221,11 @@ public class PurpurWorldConfig {
@@ -79,9 +79,9 @@ index cb46d1527a5f7f9b3c06aea27a55d98b7b6e734e..e06739783b33e72bf43e577f0f7931ad
 +        lavaInfiniteRequiredSources = getInt("blocks.lava.infinite-required-sources", lavaInfiniteRequiredSources);
 +    }
 +
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
 @@ -230,6 +235,11 @@ public class PurpurWorldConfig {
          turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
      }
diff --git a/patches/server/0052-Make-lava-flow-speed-configurable.patch b/patches/server/0049-Make-lava-flow-speed-configurable.patch
similarity index 87%
rename from patches/server/0052-Make-lava-flow-speed-configurable.patch
rename to patches/server/0049-Make-lava-flow-speed-configurable.patch
index 595647c15..ba688f13d 100644
--- a/patches/server/0052-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0049-Make-lava-flow-speed-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make lava flow speed configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
-index 2076e4b433e0a57e3ae7053c1df77e0cdc457fc9..70ddb3b130ee59a6e200ea5af3ac89f3c3fa9e9b 100644
+index 4c230136d832d50ae16ffa037b0b30ff1101b50a..2d492d849ff73a738dfbcb16507feb89bf19a962 100644
 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
 @@ -180,7 +180,7 @@ public abstract class LavaFluid extends FlowingFluid {
@@ -18,7 +18,7 @@ index 2076e4b433e0a57e3ae7053c1df77e0cdc457fc9..70ddb3b130ee59a6e200ea5af3ac89f3
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e06739783b33e72bf43e577f0f7931ad243a48c9..d85062beff8ee3b1c6141d433e133be8374e08d8 100644
+index 5e9ce4502f5219b941ffc6f341c95d39755af664..09c131e3b5282d1ac1230ddc2677f2a49449dc48 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -222,8 +222,12 @@ public class PurpurWorldConfig {
@@ -33,4 +33,4 @@ index e06739783b33e72bf43e577f0f7931ad243a48c9..d85062beff8ee3b1c6141d433e133be8
 +        lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  
-     public boolean turtleEggsBreakFromExpOrbs = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
diff --git a/patches/server/0053-Add-player-death-exp-control-options.patch b/patches/server/0050-Add-player-death-exp-control-options.patch
similarity index 92%
rename from patches/server/0053-Add-player-death-exp-control-options.patch
rename to patches/server/0050-Add-player-death-exp-control-options.patch
index 19a3ed070..ae4a16619 100644
--- a/patches/server/0053-Add-player-death-exp-control-options.patch
+++ b/patches/server/0050-Add-player-death-exp-control-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 535fe476ebe5b791cae7a4013c4a498b89d047e3..dd7e47ddde00e0b4f3b9833c1793246547ba0cf2 100644
+index d5383e9cbbee2f9d4223319ae38abed41a13cfb3..a838f339dd0085660164b0eb1597e0a14e4de6f4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2004,9 +2004,19 @@ public abstract class Player extends LivingEntity {
+@@ -1962,9 +1962,19 @@ public abstract class Player extends LivingEntity {
      @Override
      public int getExperienceReward() {
          if (!this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {
@@ -32,7 +32,7 @@ index 535fe476ebe5b791cae7a4013c4a498b89d047e3..dd7e47ddde00e0b4f3b9833c17932465
              return 0;
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d85062beff8ee3b1c6141d433e133be8374e08d8..189b59cd6218e8e6b7f7c0326211e1b6545e9ca3 100644
+index 09c131e3b5282d1ac1230ddc2677f2a49449dc48..66e12893bb9d8984a8cd2916834c5e86058f47bb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -171,6 +171,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0054-Configurable-void-damage-height-and-damage.patch b/patches/server/0051-Configurable-void-damage-height-and-damage.patch
similarity index 85%
rename from patches/server/0054-Configurable-void-damage-height-and-damage.patch
rename to patches/server/0051-Configurable-void-damage-height-and-damage.patch
index 70a840519..8adbee6ec 100644
--- a/patches/server/0054-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0051-Configurable-void-damage-height-and-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a5f54e2c17f618b99c76281b45d005280e4e31f9..790c6c677cd83bd4158e1567e51b7669fc219178 100644
+index 429d1a3fd7a75fe3dc8eb8d467ad4f2bd99e0212..f0ba7603795eb1fde01dc86cd3d8b02d73a55869 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -860,7 +860,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -948,7 +948,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
      public void checkBelowWorld() {
          // Paper start - Configurable nether ceiling damage
@@ -16,12 +16,12 @@ index a5f54e2c17f618b99c76281b45d005280e4e31f9..790c6c677cd83bd4158e1567e51b7669
 +        if (this.getY() < (double) (this.level.getMinBuildHeight() + level().purpurConfig.voidDamageHeight) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER // Purpur
              && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
-             // Paper end
+             // Paper end - Configurable nether ceiling damage
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c22b07728dde5807873004e4037ce3b738792689..8b25c2f8b089caf3fa03ff73d65be5c2f442a5d3 100644
+index 7b210484fd10e6e994c66afb45f8a28ffb5812f1..ed8833ed95584cdf9be2b931915277c04beac6ee 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2538,7 +2538,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2592,7 +2592,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      @Override
      protected void onBelowWorld() {
@@ -31,7 +31,7 @@ index c22b07728dde5807873004e4037ce3b738792689..8b25c2f8b089caf3fa03ff73d65be5c2
  
      protected void updateSwingTime() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 189b59cd6218e8e6b7f7c0326211e1b6545e9ca3..9311e620a821bbd46d962dd01ef9b0c1ec99555f 100644
+index 66e12893bb9d8984a8cd2916834c5e86058f47bb..03c35e455b405517114ffc043732359c112e343f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,10 +98,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0055-Add-canSaveToDisk-to-Entity.patch b/patches/server/0052-Add-canSaveToDisk-to-Entity.patch
similarity index 77%
rename from patches/server/0055-Add-canSaveToDisk-to-Entity.patch
rename to patches/server/0052-Add-canSaveToDisk-to-Entity.patch
index f7ebcf7a3..0503b956b 100644
--- a/patches/server/0055-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0052-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 790c6c677cd83bd4158e1567e51b7669fc219178..ea1ecc287a75860fd8275d604fb9b130d355894b 100644
+index f0ba7603795eb1fde01dc86cd3d8b02d73a55869..a99d04b820c230422bc82a3e0e094a79ab0c5c33 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -492,6 +492,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -558,6 +558,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return false;
      }
  
@@ -20,38 +20,38 @@ index 790c6c677cd83bd4158e1567e51b7669fc219178..ea1ecc287a75860fd8275d604fb9b130
          return this.hardCollides;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-index 937f57d8af629c4e913d7ccabf6adab15f91d3d0..f40ab9d5b18c189ba9b572e49243640bd44362d1 100644
+index 4117260538e47c978ea31c76f439d43369ebedfb..c753f715710ec4bb8337e035ac5a4c11371a84a0 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-@@ -115,6 +115,11 @@ public class WitherSkull extends AbstractHurtingProjectile {
+@@ -117,6 +117,11 @@ public class WitherSkull extends AbstractHurtingProjectile {
+         // do not hit rider
          return target != this.getRider() && super.canHitEntity(target);
      }
- 
++
 +    @Override
 +    public boolean canSaveToDisk() {
 +        return false;
 +    }
-+
+     // Purpur end
+ 
      @Override
-     public boolean isPickable() {
-         return false;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 060e064625969610539dbf969ce773b877a7c579..32cd9df202704cdfb8fa06aaf0e738d483054feb 100644
+index bee39dee1b96023c907407877aedf3aafaf5e1b8..5b6bc200381a486c99061f9f5b7121c2c355b477 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-@@ -112,6 +112,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
+@@ -107,6 +107,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {
          ListTag listTag = new ListTag();
-         final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper
+         final java.util.Map<net.minecraft.world.entity.EntityType<?>, Integer> savedEntityCounts = new java.util.HashMap<>(); // Paper - Entity load/save limit per chunk
          entities.forEach((entity) -> { // diff here: use entities parameter
 +            if (!entity.canSaveToDisk()) return; // Purpur
-             // Paper start
+             // Paper start - Entity load/save limit per chunk
              final EntityType<?> entityType = entity.getType();
              final int saveLimit = level.paperConfig().chunks.entityPerChunkSaveLimit.getOrDefault(entityType, -1);
 diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-index af057c1d7fd74f3dd806c5ce7f8b0ad06cab7b8e..ce614ae6b1fa0b31c1ee8dacb69134bb20c949f4 100644
+index 89c476c740b4efb4f44c1dcd384b908626d96780..f25abee6dbf99c8d08f8e09db02b41df86115faa 100644
 --- a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
 +++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java
-@@ -35,6 +35,13 @@ public class DolphinSpit extends LlamaSpit {
+@@ -36,6 +36,13 @@ public class DolphinSpit extends LlamaSpit {
                  dolphin.getZ() + (double) (dolphin.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(dolphin.yBodyRot * 0.017453292F));
      }
  
@@ -66,7 +66,7 @@ index af057c1d7fd74f3dd806c5ce7f8b0ad06cab7b8e..ce614ae6b1fa0b31c1ee8dacb69134bb
          super_tick();
  
 diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
-index 1fd6412e332ea8ee82b19c108e113624e51d764b..ea8b928b6d82689e71bbcc39ab497491072dfba6 100644
+index c0b7e0eeffdf31b88662232b07944bf3e6fa2148..75e31aee6e706f042398444f272888f9ad0fa3f4 100644
 --- a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 +++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java
 @@ -38,6 +38,13 @@ public class PhantomFlames extends LlamaSpit {
diff --git a/patches/server/0056-Dispenser-curse-of-binding-protection.patch b/patches/server/0053-Dispenser-curse-of-binding-protection.patch
similarity index 82%
rename from patches/server/0056-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0053-Dispenser-curse-of-binding-protection.patch
index a942f4635..9ceca7396 100644
--- a/patches/server/0056-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0053-Dispenser-curse-of-binding-protection.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Dispenser curse of binding protection
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b6fd8797d791a60505f8389a38ef6626407a4dbf..92e74dd04e715650b435537014bb89f15a112e19 100644
+index 3d5f08d673f6b95c8f87070345f1fb200b5f4bde..c4392a997061aa4939e5ad7dcacf5e39cbecc55a 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -65,6 +65,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
- import net.minecraft.world.item.SpawnEggItem;
+@@ -75,6 +75,7 @@ import net.minecraft.world.item.SpawnEggItem;
  import net.minecraft.world.item.SwordItem;
+ import net.minecraft.world.item.component.ItemAttributeModifiers;
  import net.minecraft.world.item.enchantment.EnchantmentHelper;
 +import net.minecraft.world.item.enchantment.Enchantments;
  import net.minecraft.world.level.GameRules;
  import net.minecraft.world.level.ItemLike;
  import net.minecraft.world.level.Level;
-@@ -1176,6 +1177,12 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1309,6 +1310,12 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
  
      }
  
@@ -30,10 +30,10 @@ index b6fd8797d791a60505f8389a38ef6626407a4dbf..92e74dd04e715650b435537014bb89f1
      public static Item getEquipmentForSlot(EquipmentSlot equipmentSlot, int equipmentLevel) {
          switch (equipmentSlot) {
 diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java
-index 42d87800a328f71c5127ce5599ca4c71cc9bb1cd..7868c2f7b563792f8902d9a77dca46e0dcb82194 100644
+index 786e4a8700cb84b16dd9b8892a0d1d5803924d81..b108ca4c7900ccf6a14ebea01c21c103459054f8 100644
 --- a/src/main/java/net/minecraft/world/item/ArmorItem.java
 +++ b/src/main/java/net/minecraft/world/item/ArmorItem.java
-@@ -61,7 +61,7 @@ public class ArmorItem extends Item implements Equipable {
+@@ -69,7 +69,7 @@ public class ArmorItem extends Item implements Equipable {
              return false;
          } else {
              LivingEntity entityliving = (LivingEntity) list.get(0);
@@ -43,7 +43,7 @@ index 42d87800a328f71c5127ce5599ca4c71cc9bb1cd..7868c2f7b563792f8902d9a77dca46e0
              // CraftBukkit start
              Level world = pointer.level();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9311e620a821bbd46d962dd01ef9b0c1ec99555f..2e2a347d341ef831aaf1a6b01fa2aeb82e76b810 100644
+index 03c35e455b405517114ffc043732359c112e343f..27c1f09be7d664073263a02a8854ff1e8c6f9ab1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -224,6 +224,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0054-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 87%
rename from patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0054-Add-option-for-boats-to-eject-players-on-land.patch
index c21f83b02..dfbc74be0 100644
--- a/patches/server/0057-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0054-Add-option-for-boats-to-eject-players-on-land.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option for boats to eject players on land
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 5c07da62c82bc70138f6cb5007629d6974be69ac..96f4ef06d16483bd4bb88cc36207d5bdc4bd1280 100644
+index b068cff9b5aa457d65b679529956e8210296d799..0b23e05f936cab7a9867828c2d69417cfde1d2ce 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -578,6 +578,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
+@@ -514,6 +514,7 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
  
              if (f > 0.0F) {
                  this.landFriction = f;
@@ -17,7 +17,7 @@ index 5c07da62c82bc70138f6cb5007629d6974be69ac..96f4ef06d16483bd4bb88cc36207d5bd
              } else {
                  return Boat.Status.IN_AIR;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2e2a347d341ef831aaf1a6b01fa2aeb82e76b810..e2e95793c02521df51d9dbf76a22e11f96778f49 100644
+index 27c1f09be7d664073263a02a8854ff1e8c6f9ab1..76c1cfc35b598eab2ca27656feeb17f79dde7e00 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -95,12 +95,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0058-Mending-mends-most-damages-equipment-first.patch b/patches/server/0055-Mending-mends-most-damages-equipment-first.patch
similarity index 81%
rename from patches/server/0058-Mending-mends-most-damages-equipment-first.patch
rename to patches/server/0055-Mending-mends-most-damages-equipment-first.patch
index b7d7983c2..e79a10187 100644
--- a/patches/server/0058-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0055-Mending-mends-most-damages-equipment-first.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Mending mends most damages equipment first
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index eca634792d2a7cc649675e3394e84dbaf1453905..2bd576849403bc2cfae298c2210616192ddc38db 100644
+index a207a31d80a302dbdfe80f8727222542d3a78da2..7ca70e9ddda24e2fe661c7b13fa439a6c19726dd 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -331,7 +331,7 @@ public class ExperienceOrb extends Entity {
+@@ -338,7 +338,7 @@ public class ExperienceOrb extends Entity {
      }
  
      private int repairPlayerItems(Player player, int amount) {
@@ -18,17 +18,17 @@ index eca634792d2a7cc649675e3394e84dbaf1453905..2bd576849403bc2cfae298c221061619
          if (entry != null) {
              ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4697df75fdee2023c41260bed211e3e3d90d2b9b..25be1927304e497a6ebf9d9ec09525a5418095db 100644
+index a45389d64c04cd4c2a35fbc511595be0535a8665..e51bbab02b816a431f18c520fc67eeb1880fbfa0 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -589,6 +589,16 @@ public final class ItemStack {
+@@ -636,6 +636,16 @@ public final class ItemStack implements DataComponentHolder {
          return this.isDamageableItem() && this.getDamageValue() > 0;
      }
  
 +    // Purpur start
 +    public float getDamagePercent() {
 +        if (isDamaged()) {
-+            return (float) getDamageValue() / (float) getItem().getMaxDamage();
++            return (float) getDamageValue() / (float) getMaxDamage();
 +        } else {
 +            return 0F;
 +        }
@@ -36,13 +36,13 @@ index 4697df75fdee2023c41260bed211e3e3d90d2b9b..25be1927304e497a6ebf9d9ec09525a5
 +    // Purpur end
 +
      public int getDamageValue() {
-         return this.tag == null ? 0 : this.tag.getInt("Damage");
+         return Mth.clamp((Integer) this.getOrDefault(DataComponents.DAMAGE, 0), 0, this.getMaxDamage());
      }
 diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-index ecf640b00007a386290f8dfe9935a8aa610079fd..2048899f8e4c8211e8dde0d11148d647678009fa 100644
+index d2f0463b0e74983eb2e3dfca9a268e9502b86257..6d0363cec691996be416ab22ef9d825196399158 100644
 --- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
 +++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-@@ -278,6 +278,29 @@ public class EnchantmentHelper {
+@@ -237,6 +237,29 @@ public class EnchantmentHelper {
          return getItemEnchantmentLevel(Enchantments.CHANNELING, stack) > 0;
      }
  
@@ -70,10 +70,10 @@ index ecf640b00007a386290f8dfe9935a8aa610079fd..2048899f8e4c8211e8dde0d11148d647
 +    // Purpur end
 +
      @Nullable
-     public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(Enchantment enchantment, LivingEntity entity) {
-         return getRandomItemWith(enchantment, entity, (stack) -> {
+     public static java.util.Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(Enchantment enchantment, LivingEntity entity) {
+         return getRandomItemWith(enchantment, entity, stack -> true);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e2e95793c02521df51d9dbf76a22e11f96778f49..c48fae071a538a11739193f782232edfafb14de4 100644
+index 76c1cfc35b598eab2ca27656feeb17f79dde7e00..6705d722e1abe678a5cb90503904dc7888bf55ee 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -95,6 +95,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0059-Add-5-second-tps-average-in-tps.patch b/patches/server/0056-Add-5-second-tps-average-in-tps.patch
similarity index 52%
rename from patches/server/0059-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0056-Add-5-second-tps-average-in-tps.patch
index cf86e81e2..9623dcb7d 100644
--- a/patches/server/0059-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0056-Add-5-second-tps-average-in-tps.patch
@@ -5,41 +5,32 @@ Subject: [PATCH] Add 5 second tps average in /tps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf21641a2200c 100644
+index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..308f67d0616e2d6bb135258f1fda53ccdee01430 100644
 --- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-@@ -58,7 +58,7 @@ public class RAMDetails extends JList<String> {
-         GraphData data = RAMGraph.DATA.peekLast();
-         Vector<String> vector = new Vector<>();
- 
--        double[] tps = new double[] {server.tps1.getAverage(), server.tps5.getAverage(), server.tps15.getAverage()};
-+        double[] tps = new double[] {server.tps5s.getAverage(), server.tps1.getAverage(), server.tps5.getAverage(), server.tps15.getAverage()}; // Purpur
-         String[] tpsAvg = new String[tps.length];
- 
-         for ( int g = 0; g < tps.length; g++) {
-@@ -67,7 +67,7 @@ public class RAMDetails extends JList<String> {
+@@ -68,7 +68,7 @@ public class RAMDetails extends JList<String> {
          vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
          vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
-         vector.add("Avg tick: " + DECIMAL_FORMAT.format(getAverage(server.tickTimes)) + " ms");
+         vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");
 -        vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg));
 +        vector.add("TPS from last 5s, 1m, 5m, 15m: " + String.join(", ", tpsAvg)); // Purpur
- 
          setListData(vector);
      }
+ 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 57f2b54ad36d33e76e538895df691987c869a043..c29f8291b43a2e92e3444ab72dd23065a006f11f 100644
+index f3ad4ee45ba48a10bbae1084f291ae0bcccdf624..3a622f5274f036608950702291c1e624488a6faa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -297,7 +297,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public static final int TPS = 20;
+@@ -310,7 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
-     private static final int SAMPLE_INTERVAL = 20; // Paper
+     private static final int SAMPLE_INTERVAL = 20; // Paper - improve server tick loop
+     @Deprecated(forRemoval = true) // Paper
 -    public final double[] recentTps = new double[ 3 ];
 +    public final double[] recentTps = new double[ 4 ]; // Purpur
      // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-     public static long currentTickLong = 0L; // Paper
-@@ -1034,6 +1034,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
+     public static long currentTickLong = 0L; // Paper - track current tick as a long
+@@ -1086,6 +1086,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -47,41 +38,55 @@ index 57f2b54ad36d33e76e538895df691987c869a043..c29f8291b43a2e92e3444ab72dd23065
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1134,13 +1135,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 {
-                     final long diff = curTime - tickSection;
-                     java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
-+                        tps5s.add(currentTps, diff); // Purpur
+@@ -1208,14 +1209,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
+                     final long diff = currentTime - tickSection;
+                     final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
++                    tps5s.add(currentTps, diff); // Purpur
                      tps1.add(currentTps, diff);
                      tps5.add(currentTps, diff);
                      tps15.add(currentTps, diff);
+ 
                      // Backwards compat with bad plugins
 -                    this.recentTps[0] = tps1.getAverage();
 -                    this.recentTps[1] = tps5.getAverage();
 -                    this.recentTps[2] = tps15.getAverage();
-+                        // Purpur start
-+                        this.recentTps[0] = tps5s.getAverage();
-+                        this.recentTps[1] = tps1.getAverage();
-+                        this.recentTps[2] = tps5.getAverage();
-+                        this.recentTps[3] = tps15.getAverage();
-+                        // Purpur end
-                     // Paper end
-                         lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
-                     tickSection = curTime;
++                    // Purpur start
++                    this.recentTps[0] = tps5s.getAverage();
++                    this.recentTps[1] = tps1.getAverage();
++                    this.recentTps[2] = tps5.getAverage();
++                    this.recentTps[3] = tps15.getAverage();
++                    // Purpur end
+                     lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
+                     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 096c89bd01cec2abd151bf6fffc4847d1bcd548f..cd0a8a6a1be75cab8bbb8ee3ac17bb732b9e7108 100644
+--- a/src/main/java/net/minecraft/server/gui/StatsComponent.java
++++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java
+@@ -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
+         this.values[this.vp++ & 0xFF] = (int)(l * 100L / Runtime.getRuntime().maxMemory());
+         this.repaint();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dbe110d95095e5230d1711181e4b7a762662c2bb..da114737b3515b3f39aaa36c23a0d76699eb4239 100644
+index 6d8b433af8596dd5b5a3b04e901527cd50a31dec..6a61d03ca1e88f4d8fe66bfa6c29e1550b88a103 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2876,6 +2876,7 @@ public final class CraftServer implements Server {
+@@ -3092,6 +3092,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
-+                net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage(), // Purpur
-                 net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
-                 net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
-                 net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
++            net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage(), // Purpur
+             net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
+             net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
+             net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index bf970bf3356a914459c2d6db93537ce2d32c7e18..08221c7256f41ca511a4a61ffb2b979325aebee9 100644
+index 9eb2823cc8f83bad2626fc77578b0162d9ed5782..f144a08e88f8268b84eb188a36bf470457f59958 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -39,7 +39,7 @@ public class TicksPerSecondCommand extends Command
@@ -89,7 +94,7 @@ index bf970bf3356a914459c2d6db93537ce2d32c7e18..08221c7256f41ca511a4a61ffb2b9793
  
          net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
 -        builder.append(net.kyori.adventure.text.Component.text("TPS from last 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD));
-+        builder.append(net.kyori.adventure.text.Component.text("TPS from last 5s, 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD));
++        builder.append(net.kyori.adventure.text.Component.text("TPS from last 5s, 1m, 5m, 15m: ", net.kyori.adventure.text.format.NamedTextColor.GOLD)); // Purpur
          builder.append(net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.commas(true), tpsAvg));
          sender.sendMessage(builder.asComponent());
          if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
diff --git a/patches/server/0060-Implement-elytra-settings.patch b/patches/server/0057-Implement-elytra-settings.patch
similarity index 67%
rename from patches/server/0060-Implement-elytra-settings.patch
rename to patches/server/0057-Implement-elytra-settings.patch
index c1bdc9558..e2c58c260 100644
--- a/patches/server/0060-Implement-elytra-settings.patch
+++ b/patches/server/0057-Implement-elytra-settings.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8b25c2f8b089caf3fa03ff73d65be5c2f442a5d3..ee41bfa1a851340f291182f520c9cf1925a355af 100644
+index ed8833ed95584cdf9be2b931915277c04beac6ee..9a2725e3f61a7d37943518cc760b17859a0938bb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3559,7 +3559,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3554,7 +3554,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      int j = i / 10;
  
                      if (j % 2 == 0) {
--                        itemstack.hurtAndBreak(1, this, (entityliving) -> {
+-                        itemstack.hurtAndBreak(1, this, EquipmentSlot.CHEST);
 +                        // Purpur start
 +                        int damage = level().purpurConfig.elytraDamagePerSecond;
 +                        if (level().purpurConfig.elytraDamageMultiplyBySpeed > 0) {
@@ -21,43 +21,35 @@ index 8b25c2f8b089caf3fa03ff73d65be5c2f442a5d3..ee41bfa1a851340f291182f520c9cf19
 +                                damage *= (int) speed;
 +                            }
 +                        }
-+                        itemstack.hurtAndBreak(damage, this, (entityliving) -> {
++                        itemstack.hurtAndBreak(damage, this, EquipmentSlot.CHEST);
 +                        // Purpur end
-                             entityliving.broadcastBreakEvent(EquipmentSlot.CHEST);
-                         });
                      }
+ 
+                     this.gameEvent(GameEvent.ELYTRA_GLIDE);
 diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecbe113cf96 100644
+index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6978015dd 100644
 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-@@ -15,6 +15,7 @@ import net.minecraft.util.ByIdMap;
- import net.minecraft.world.InteractionHand;
- import net.minecraft.world.InteractionResult;
- import net.minecraft.world.InteractionResultHolder;
-+import net.minecraft.world.entity.EquipmentSlot;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.entity.projectile.FireworkRocketEntity;
- import net.minecraft.world.item.context.UseOnContext;
-@@ -69,6 +70,14 @@ public class FireworkRocketItem extends Item {
-                 com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity());
+@@ -65,6 +65,14 @@ public class FireworkRocketItem extends Item implements ProjectileItem {
+                 com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand));
                  if (event.callEvent() && world.addFreshEntity(fireworkRocketEntity)) {
                      user.awardStat(Stats.ITEM_USED.get(this));
 +                    // Purpur start
 +                    if (world.purpurConfig.elytraDamagePerFireworkBoost > 0) {
-+                        ItemStack chestItem = user.getItemBySlot(EquipmentSlot.CHEST);
++                        ItemStack chestItem = user.getItemBySlot(net.minecraft.world.entity.EquipmentSlot.CHEST);
 +                        if (chestItem.getItem() == Items.ELYTRA) {
-+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerFireworkBoost, user, (entityliving) -> entityliving.broadcastBreakEvent(EquipmentSlot.CHEST));
++                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerFireworkBoost, user, net.minecraft.world.entity.EquipmentSlot.CHEST);
 +                        }
 +                    }
 +                    // Purpur end
-                     if (event.shouldConsume() && !user.getAbilities().instabuild) {
-                     itemStack.shrink(1);
+                     if (event.shouldConsume() && !user.hasInfiniteMaterials()) {
+                         itemStack.shrink(1);
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 25be1927304e497a6ebf9d9ec09525a5418095db..6e6f60554b36117a833949ef2f9a4b68f6518a1d 100644
+index e51bbab02b816a431f18c520fc67eeb1880fbfa0..b2c5581b126ceb9e47a13f6eda8cc132d11bfb09 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -618,7 +618,7 @@ public final class ItemStack {
+@@ -663,7 +663,7 @@ public final class ItemStack implements DataComponentHolder {
              int j;
  
              if (amount > 0) {
@@ -66,32 +58,32 @@ index 25be1927304e497a6ebf9d9ec09525a5418095db..6e6f60554b36117a833949ef2f9a4b68
                  int k = 0;
  
                  for (int l = 0; j > 0 && l < amount; ++l) {
-@@ -673,6 +673,12 @@ public final class ItemStack {
-                 if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
-                     breakCallback.accept(entity);
-                     Item item = this.getItem();
-+                    // Purpur start
-+                    if (item == Items.ELYTRA) {
-+                        setDamageValue(item.getMaxDamage() - 1);
-+                        return;
-+                    }
-+                    // Purpur end
-                     // CraftBukkit start - Check for item breaking
-                     if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
-                         org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((net.minecraft.world.entity.player.Player) entity, this);
+@@ -739,6 +739,12 @@ public final class ItemStack implements DataComponentHolder {
+             this.hurtAndBreak(amount, randomsource, entity, () -> { // Paper - Add EntityDamageItemEvent
+                 entity.broadcastBreakEvent(slot);
+                 Item item = this.getItem();
++                // Purpur start
++                if (item == Items.ELYTRA) {
++                    setDamageValue(getMaxDamage() - 1);
++                    return;
++                }
++                // Purpur end
+                 // CraftBukkit start - Check for item breaking
+                 if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
+                     org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((net.minecraft.world.entity.player.Player) entity, this);
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 8078f127ff4b6e0aafb5804b9c02e237f79445b5..06c2f30b77a2c8aecc65e0c305f643d53798f364 100644
+index 47de500fddb0716d142f8f5876a82a95afaa06fa..b094f4ec513194e10442156d8f7f2205da2384ac 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
-@@ -130,6 +130,14 @@ public class TridentItem extends Item implements Vanishable {
-                         f2 *= f6 / f5;
+@@ -123,6 +123,14 @@ public class TridentItem extends Item implements ProjectileItem {
                          f3 *= f6 / f5;
                          f4 *= f6 / f5;
+                         org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerRiptideEvent(entityhuman, stack, f2, f3, f4); // CraftBukkit
 +
 +                        // Purpur start
 +                        ItemStack chestItem = entityhuman.getItemBySlot(EquipmentSlot.CHEST);
 +                        if (chestItem.getItem() == Items.ELYTRA && world.purpurConfig.elytraDamagePerTridentBoost > 0) {
-+                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerTridentBoost, entityhuman, (entity) -> entity.broadcastBreakEvent(EquipmentSlot.CHEST));
++                            chestItem.hurtAndBreak(world.purpurConfig.elytraDamagePerTridentBoost, entityhuman, EquipmentSlot.CHEST);
 +                        }
 +                        // Purpur end
 +
@@ -99,7 +91,7 @@ index 8078f127ff4b6e0aafb5804b9c02e237f79445b5..06c2f30b77a2c8aecc65e0c305f643d5
                          entityhuman.startAutoSpinAttack(20);
                          if (entityhuman.onGround()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c48fae071a538a11739193f782232edfafb14de4..b34f95b6104b1aebd8c07cf279e168cdb074efb9 100644
+index 6705d722e1abe678a5cb90503904dc7888bf55ee..88aabe09118cbbad3add3cee44e237580294f685 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0061-Item-entity-immunities.patch b/patches/server/0058-Item-entity-immunities.patch
similarity index 83%
rename from patches/server/0061-Item-entity-immunities.patch
rename to patches/server/0058-Item-entity-immunities.patch
index 76b5620f1..c45cb2d67 100644
--- a/patches/server/0061-Item-entity-immunities.patch
+++ b/patches/server/0058-Item-entity-immunities.patch
@@ -5,26 +5,26 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index d46e61640b241d32df05240dedd2c23f138725e6..c6ef510d335b8baea58c4491853414a52a06b66b 100644
+index 4f103f731623a8570238a6867fda1c5f83fca4e4..39e7dcf3c92c9203c190782be401c00c010b8aeb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -73,7 +73,7 @@ public class ServerEntity {
+@@ -77,7 +77,7 @@ public class ServerEntity {
      @Nullable
      private List<SynchedEntityData.DataValue<?>> trackedDataValues;
      // CraftBukkit start
--    final Set<ServerPlayerConnection> trackedPlayers; // Paper - private -> package
-+    public final Set<ServerPlayerConnection> trackedPlayers; // Paper - private -> package // Purpur - package -> public
+-    private final Set<ServerPlayerConnection> trackedPlayers;
++    public final Set<ServerPlayerConnection> trackedPlayers; // Purpur - private -> public
  
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..4f01fede54a3150798812d6e5116631bf897a29b 100644
+index 8fd3845c4965843be9c37498760d93f1ebdff541..7dae2a7c759fc3e004f806c59e083f52c3a460b2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -56,6 +56,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
-     public boolean canMobPickup = true; // Paper
-     private int despawnRate = -1; // Paper
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
+@@ -63,6 +63,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+     public boolean canMobPickup = true; // Paper - Item#canEntityPickup
+     private int despawnRate = -1; // Paper - Alternative item-despawn-rate
+     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
 +    // Purpur start
 +    public boolean immuneToCactus = false;
 +    public boolean immuneToExplosion = false;
@@ -34,7 +34,7 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..4f01fede54a3150798812d6e5116631b
  
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
-@@ -346,7 +352,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -371,7 +377,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      @Override
      public boolean hurt(DamageSource source, float amount) {
@@ -52,10 +52,10 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..4f01fede54a3150798812d6e5116631b
              return false;
          } else if (!this.getItem().isEmpty() && this.getItem().is(Items.NETHER_STAR) && source.is(DamageTypeTags.IS_EXPLOSION)) {
              return false;
-@@ -548,6 +563,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -579,6 +594,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public void setItem(ItemStack stack) {
          this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
-         this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper
+         this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper - Alternative item-despawn-rate
 +        // Purpur start
 +        if (level().purpurConfig.itemImmuneToCactus.contains(stack.getItem())) immuneToCactus = true;
 +        if (level().purpurConfig.itemImmuneToExplosion.contains(stack.getItem())) immuneToExplosion = true;
@@ -66,10 +66,10 @@ index eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..4f01fede54a3150798812d6e5116631b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 5e83fabb20bc2b0668cbf48530053ca1bb9092f3..8fcee0e426cd598ddfd7e12df4382d57d2016780 100644
+index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..01e4395f1669d21c30465aa1366bd2f1ae17678f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -154,4 +154,46 @@ public class CraftItem extends CraftEntity implements Item {
+@@ -151,4 +151,46 @@ public class CraftItem extends CraftEntity implements Item {
      public String toString() {
          return "CraftItem";
      }
@@ -77,22 +77,22 @@ index 5e83fabb20bc2b0668cbf48530053ca1bb9092f3..8fcee0e426cd598ddfd7e12df4382d57
 +    // Purpur start
 +    @Override
 +    public void setImmuneToCactus(boolean immuneToCactus) {
-+        item.immuneToCactus = immuneToCactus;
++        this.getHandle().immuneToCactus = immuneToCactus;
 +    }
 +
 +    @Override
 +    public boolean isImmuneToCactus() {
-+        return item.immuneToCactus;
++        return this.getHandle().immuneToCactus;
 +    }
 +
 +    @Override
 +    public void setImmuneToExplosion(boolean immuneToExplosion) {
-+        item.immuneToExplosion = immuneToExplosion;
++        this.getHandle().immuneToExplosion = immuneToExplosion;
 +    }
 +
 +    @Override
 +    public boolean isImmuneToExplosion() {
-+        return item.immuneToExplosion;
++        return this.getHandle().immuneToExplosion;
 +    }
 +
 +    @Override
@@ -102,22 +102,22 @@ index 5e83fabb20bc2b0668cbf48530053ca1bb9092f3..8fcee0e426cd598ddfd7e12df4382d57
 +
 +    @Override
 +    public boolean isImmuneToFire() {
-+        return item.immuneToFire;
++        return this.getHandle().immuneToFire;
 +    }
 +
 +    @Override
 +    public void setImmuneToLightning(boolean immuneToLightning) {
-+        item.immuneToLightning = immuneToLightning;
++        this.getHandle().immuneToLightning = immuneToLightning;
 +    }
 +
 +    @Override
 +    public boolean isImmuneToLightning() {
-+        return item.immuneToLightning;
++        return this.getHandle().immuneToLightning;
 +    }
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b34f95b6104b1aebd8c07cf279e168cdb074efb9..fb6d7e6917e0b8648b5192d83f7aa6a3e3742eae 100644
+index 88aabe09118cbbad3add3cee44e237580294f685..62074152a0a494bbde4c39074942425a8b850ffd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -125,6 +125,49 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0062-Add-ping-command.patch b/patches/server/0059-Add-ping-command.patch
similarity index 92%
rename from patches/server/0062-Add-ping-command.patch
rename to patches/server/0059-Add-ping-command.patch
index 1b786366d..2c351459d 100644
--- a/patches/server/0062-Add-ping-command.patch
+++ b/patches/server/0059-Add-ping-command.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Add ping command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index a5829f0726fd92faae04f978c82b2f0736bcd50b..32fbe67a2dceda1a165edc7397a64beffc537488 100644
+index 5c7287ef8c2d59215aff81cb138a55676bfa6356..a5f1bfd8a6a6c374fbb72ea7957dd7d05073b93d 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -230,6 +230,7 @@ public class Commands {
-             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
+@@ -252,6 +252,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
+             TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
 +            org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e2edbb0842862b8ffdf30cec104a1d71a71e92e0..35400f352d44be9a32eb69eb87a3ffdeef9a20b3 100644
+index 909cfeba89c2370adc2eebf72ba8ad46d33bce7b..e8160e63470cf2f3d15eeb2e7f83d3694cfc4db8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -179,6 +179,7 @@ public class PurpurConfig {
diff --git a/patches/server/0063-Add-demo-command.patch b/patches/server/0060-Add-demo-command.patch
similarity index 93%
rename from patches/server/0063-Add-demo-command.patch
rename to patches/server/0060-Add-demo-command.patch
index 6a34ca340..0b3873fc7 100644
--- a/patches/server/0063-Add-demo-command.patch
+++ b/patches/server/0060-Add-demo-command.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Add demo command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 32fbe67a2dceda1a165edc7397a64beffc537488..4794bb7f80d3419c6da12ee0f608ba05080a409a 100644
+index a5f1bfd8a6a6c374fbb72ea7957dd7d05073b93d..4568c4b02a87deb299ffd77b8e76329bb2b1dd70 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -230,6 +230,7 @@ public class Commands {
-             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
+@@ -252,6 +252,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
+             TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
 +            org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 35400f352d44be9a32eb69eb87a3ffdeef9a20b3..00fb3507118960046a61d8a21f9654f279d53874 100644
+index e8160e63470cf2f3d15eeb2e7f83d3694cfc4db8..994da2c5bbba190507bbcee7029bee974eb3c641 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -179,6 +179,7 @@ public class PurpurConfig {
diff --git a/patches/server/0064-Add-credits-command.patch b/patches/server/0061-Add-credits-command.patch
similarity index 93%
rename from patches/server/0064-Add-credits-command.patch
rename to patches/server/0061-Add-credits-command.patch
index 5c0c78156..9f08a380f 100644
--- a/patches/server/0064-Add-credits-command.patch
+++ b/patches/server/0061-Add-credits-command.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Add credits command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 4794bb7f80d3419c6da12ee0f608ba05080a409a..637648e03985868c1fe420f84fa778b06deb23ee 100644
+index 4568c4b02a87deb299ffd77b8e76329bb2b1dd70..6af3e1e08048869ac28ab4a93e03d086872f866b 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -230,6 +230,7 @@ public class Commands {
-             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
+@@ -252,6 +252,7 @@ public class Commands {
              StopCommand.register(this.dispatcher);
+             TransferCommand.register(this.dispatcher);
              WhitelistCommand.register(this.dispatcher);
 +            org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 00fb3507118960046a61d8a21f9654f279d53874..d98e16bc47d3bc458281956bf538f4a37bd0f4b7 100644
+index 994da2c5bbba190507bbcee7029bee974eb3c641..2e78d67201e66c1f3fd1f45ed625e682ea074848 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -179,6 +179,7 @@ public class PurpurConfig {
diff --git a/patches/server/0065-Configurable-jockey-options.patch b/patches/server/0062-Configurable-jockey-options.patch
similarity index 89%
rename from patches/server/0065-Configurable-jockey-options.patch
rename to patches/server/0062-Configurable-jockey-options.patch
index 6a1910ef6..8b8ec6285 100644
--- a/patches/server/0065-Configurable-jockey-options.patch
+++ b/patches/server/0062-Configurable-jockey-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable jockey options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 3cde608a222ab2ef2b5fc7f543e97ba71e440ea9..6ec7d0f5e525f9e04b6fa0fb6d4da5fcc22fe653 100644
+index 02bceb31c517b94653573380ed29d9401a6b9ce8..1d283484be270497859e23e3bb4ab38c09af23e6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -95,6 +95,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -98,6 +98,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.drownedSpawnReinforcements);
      }
  
@@ -31,10 +31,10 @@ index 3cde608a222ab2ef2b5fc7f543e97ba71e440ea9..6ec7d0f5e525f9e04b6fa0fb6d4da5fc
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 469ad6f0d73add7b005217b2ae39b201c7679a27..ede13fe38fb97b94180ea8557d8a45d2ae5954d3 100644
+index 805bfee8b061445de5b5d8aeb13c792178e25f7b..6673c0bff3a4e3d11a09e9dc8aeb0c2418dc7f59 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -51,6 +51,21 @@ public class Husk extends Zombie {
+@@ -49,6 +49,21 @@ public class Husk extends Zombie {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.huskSpawnReinforcements);
      }
  
@@ -54,13 +54,13 @@ index 469ad6f0d73add7b005217b2ae39b201c7679a27..ede13fe38fb97b94180ea8557d8a45d2
 +    }
 +
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
+         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (MobSpawnType.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 56f9d91ba48c501fbcdbb959f683ce8728a36503..971abbfdff555a569ad54b9db5947c3ec50408d2 100644
+index 9af1c4b794ddaf8640076f172cf0317acad6bcb2..555b86925b8d848fad40a838dd98607db8741e3b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -129,6 +129,18 @@ public class Zombie extends Monster {
+@@ -126,6 +126,18 @@ public class Zombie extends Monster {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.zombieMaxHealth);
      }
  
@@ -79,10 +79,10 @@ index 56f9d91ba48c501fbcdbb959f683ce8728a36503..971abbfdff555a569ad54b9db5947c3e
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-@@ -544,19 +556,20 @@ public class Zombie extends Monster {
-         if (object instanceof Zombie.ZombieGroupData) {
-             Zombie.ZombieGroupData entityzombie_groupdatazombie = (Zombie.ZombieGroupData) object;
+@@ -533,19 +545,20 @@ public class Zombie extends Monster {
+         }
  
+         if (object instanceof Zombie.ZombieGroupData entityzombie_groupdatazombie) {
 -            if (entityzombie_groupdatazombie.isBaby) {
 -                this.setBaby(true);
 +            // Purpur start
@@ -106,7 +106,7 @@ index 56f9d91ba48c501fbcdbb959f683ce8728a36503..971abbfdff555a569ad54b9db5947c3e
                          Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level());
  
                          if (entitychicken1 != null) {
-@@ -566,6 +579,7 @@ public class Zombie extends Monster {
+@@ -555,6 +568,7 @@ public class Zombie extends Monster {
                              this.startRiding(entitychicken1);
                              world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
                          }
@@ -115,10 +115,10 @@ index 56f9d91ba48c501fbcdbb959f683ce8728a36503..971abbfdff555a569ad54b9db5947c3e
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index a205c668d0d7b428622fbcaa1598f01c685b516e..01f6b7eb50870f9bcac9bbd3b6a87382d6aa1f1b 100644
+index 8e7f0f2069c3382f3a7b08b80f829398e62377f7..ffe2144e307acebd4a8bed043db0ee0bb6bf611c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -109,6 +109,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+@@ -107,6 +107,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.zombieVillagerSpawnReinforcements);
      }
  
@@ -138,13 +138,13 @@ index a205c668d0d7b428622fbcaa1598f01c685b516e..01f6b7eb50870f9bcac9bbd3b6a87382
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index fa5fa58ee03243054a38475634a6aa67815ca77d..764477c39e690d6373e17c77687809418e0de884 100644
+index 138f3f6a9b0754d54e5f8000962bb52b224f677d..75c34d9fcc4b33d30b18f1ce4c8749a068744abc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -86,6 +86,21 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -84,6 +84,21 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.zombifiedPiglinMaxHealth);
      }
  
@@ -167,7 +167,7 @@ index fa5fa58ee03243054a38475634a6aa67815ca77d..764477c39e690d6373e17c7768780941
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fb6d7e6917e0b8648b5192d83f7aa6a3e3742eae..6da08454de6f0932971a230471d3558578a4b2a3 100644
+index 62074152a0a494bbde4c39074942425a8b850ffd..7fabef36d3f9a5294a62ed956010d7ef853e00ab 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -588,6 +588,9 @@ public class PurpurWorldConfig {
@@ -229,8 +229,8 @@ index fb6d7e6917e0b8648b5192d83f7aa6a3e3742eae..6da08454de6f0932971a230471d35585
 +        zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
      }
  
-     public boolean zombieHorseRidableInWater = false;
-@@ -1719,6 +1737,9 @@ public class PurpurWorldConfig {
+     public boolean zombieHorseRidable = false;
+@@ -1721,6 +1739,9 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerControllable = true;
      public double zombieVillagerMaxHealth = 20.0D;
      public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index fb6d7e6917e0b8648b5192d83f7aa6a3e3742eae..6da08454de6f0932971a230471d35585
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1730,6 +1751,9 @@ public class PurpurWorldConfig {
+@@ -1732,6 +1753,9 @@ public class PurpurWorldConfig {
          }
          zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
          zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index fb6d7e6917e0b8648b5192d83f7aa6a3e3742eae..6da08454de6f0932971a230471d35585
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -1737,6 +1761,9 @@ public class PurpurWorldConfig {
+@@ -1739,6 +1763,9 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinControllable = true;
      public double zombifiedPiglinMaxHealth = 20.0D;
      public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index fb6d7e6917e0b8648b5192d83f7aa6a3e3742eae..6da08454de6f0932971a230471d35585
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1748,5 +1775,8 @@ public class PurpurWorldConfig {
+@@ -1750,5 +1777,8 @@ public class PurpurWorldConfig {
          }
          zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
          zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);
diff --git a/patches/server/0066-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0063-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 93%
rename from patches/server/0066-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/server/0063-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 62da4293e..b8b783a89 100644
--- a/patches/server/0066-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0063-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-index ffc5b68c4246a7111845230a75552bb15875a209..ef0098e46bda8abc456f2bb5929d874c6aeb8698 100644
+index d8e440e14b72dc48ae97244f1bed2c06abd997ab..2bac39e5ba09e08d23d2a4be37f7fe0da0ce71a6 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-@@ -30,6 +30,12 @@ public class EndCrystal extends Entity {
+@@ -31,6 +31,12 @@ public class EndCrystal extends Entity {
      private static final EntityDataAccessor<Boolean> DATA_SHOW_BOTTOM = SynchedEntityData.defineId(EndCrystal.class, EntityDataSerializers.BOOLEAN);
      public int time;
      public boolean generatedByDragonFight = false; // Paper - Fix invulnerable end crystals
@@ -21,11 +21,11 @@ index ffc5b68c4246a7111845230a75552bb15875a209..ef0098e46bda8abc456f2bb5929d874c
  
      public EndCrystal(EntityType<? extends EndCrystal> type, Level world) {
          super(type, world);
-@@ -79,7 +85,50 @@ public class EndCrystal extends Entity {
-             // Paper end
+@@ -80,6 +86,49 @@ public class EndCrystal extends Entity {
+             // Paper end - Fix invulnerable end crystals
          }
  
-+        // Purpur start
++    // Purpur start
 +        if (level().purpurConfig.phantomAttackedByCrystalRadius <= 0 || --idleCooldown > 0) {
 +            return; // on cooldown
 +        }
@@ -67,16 +67,15 @@ index ffc5b68c4246a7111845230a75552bb15875a209..ef0098e46bda8abc456f2bb5929d874c
 +        phantomBeamTicks = 0;
 +        phantomDamageCooldown = 0;
 +        idleCooldown = 60;
-     }
 +    // Purpur end
+     }
  
      @Override
-     protected void addAdditionalSaveData(CompoundTag nbt) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 8446ce22139fa2473c789cab67f4031a23f0d31d..ef41a462b102981d30207299d0279fd51b433a22 100644
+index 01e8eaecec61e664838b5d7f18a9c3e730f00ddf..e0b1b0106fd3bbb6764d1b0a58ab2810181cac02 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -48,6 +48,7 @@ public class Phantom extends FlyingMob implements Enemy {
      Vec3 moveTargetPoint;
      public BlockPos anchorPoint;
      Phantom.AttackPhase attackPhase;
@@ -84,7 +83,7 @@ index 8446ce22139fa2473c789cab67f4031a23f0d31d..ef41a462b102981d30207299d0279fd5
  
      public Phantom(EntityType<? extends Phantom> type, Level world) {
          super(type, world);
-@@ -117,6 +118,23 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -115,6 +116,23 @@ public class Phantom extends FlyingMob implements Enemy {
          level().addFreshEntity(flames);
          return true;
      }
@@ -108,7 +107,7 @@ index 8446ce22139fa2473c789cab67f4031a23f0d31d..ef41a462b102981d30207299d0279fd5
      // Purpur end
  
      @Override
-@@ -131,11 +149,17 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -129,11 +147,17 @@ public class Phantom extends FlyingMob implements Enemy {
  
      @Override
      protected void registerGoals() {
@@ -131,7 +130,7 @@ index 8446ce22139fa2473c789cab67f4031a23f0d31d..ef41a462b102981d30207299d0279fd5
          this.targetSelector.addGoal(1, new Phantom.PhantomAttackPlayerTargetGoal());
      }
  
-@@ -353,6 +377,124 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -333,6 +357,124 @@ public class Phantom extends FlyingMob implements Enemy {
          private AttackPhase() {}
      }
  
@@ -257,7 +256,7 @@ index 8446ce22139fa2473c789cab67f4031a23f0d31d..ef41a462b102981d30207299d0279fd5
  
          private float speed = 0.1F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6da08454de6f0932971a230471d3558578a4b2a3..fdb2d2f67d6356c010e430fc4aee5593811cbf17 100644
+index 7fabef36d3f9a5294a62ed956010d7ef853e00ab..e1652079b92a5c951b5191997803e9d486892c61 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1065,6 +1065,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0067-Add-phantom-spawning-options.patch b/patches/server/0064-Add-phantom-spawning-options.patch
similarity index 89%
rename from patches/server/0067-Add-phantom-spawning-options.patch
rename to patches/server/0064-Add-phantom-spawning-options.patch
index ea5475409..3bd99a5d7 100644
--- a/patches/server/0067-Add-phantom-spawning-options.patch
+++ b/patches/server/0064-Add-phantom-spawning-options.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Add phantom spawning options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index dfeb3e336e06ef01f5401a362755030db942bb07..f74c5eda91a3d521763ec7bc33f23e0c62458cc2 100644
+index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..04f67f7b43d2f461c776c76614dc3e5f060aea63 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-@@ -49,7 +49,7 @@ public class PhantomSpawner implements CustomSpawner {
+@@ -48,7 +48,7 @@ public class PhantomSpawner implements CustomSpawner {
                  int spawnAttemptMaxSeconds = world.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds;
                  this.nextTick += (spawnAttemptMinSeconds + randomsource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20;
-                 // Paper end
+                 // Paper end - Ability to control player's insomnia and phantoms
 -                if (world.getSkyDarken() < 5 && world.dimensionType().hasSkyLight()) {
 +                if (world.getSkyDarken() < world.purpurConfig.phantomSpawnMinSkyDarkness && world.dimensionType().hasSkyLight()) { // Purpur
                      return 0;
                  } else {
                      int i = 0;
-@@ -61,10 +61,10 @@ public class PhantomSpawner implements CustomSpawner {
-                         if (!entityplayer.isSpectator() && (!world.paperConfig().entities.behavior.phantomsDoNotSpawnOnCreativePlayers || !entityplayer.isCreative())) { // Paper
+@@ -60,10 +60,10 @@ public class PhantomSpawner implements CustomSpawner {
+                         if (!entityplayer.isSpectator() && (!world.paperConfig().entities.behavior.phantomsDoNotSpawnOnCreativePlayers || !entityplayer.isCreative())) { // Paper - Add phantom creative and insomniac controls
                              BlockPos blockposition = entityplayer.blockPosition();
  
 -                            if (!world.dimensionType().hasSkyLight() || blockposition.getY() >= world.getSeaLevel() && world.canSeeSky(blockposition)) {
@@ -30,7 +30,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..f74c5eda91a3d521763ec7bc33f23e0c
                                      ServerStatsCounter serverstatisticmanager = entityplayer.getStats();
                                      int j = Mth.clamp(serverstatisticmanager.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
                                      boolean flag2 = true;
-@@ -76,7 +76,7 @@ public class PhantomSpawner implements CustomSpawner {
+@@ -75,7 +75,7 @@ public class PhantomSpawner implements CustomSpawner {
  
                                          if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
                                              SpawnGroupData groupdataentity = null;
@@ -38,9 +38,9 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..f74c5eda91a3d521763ec7bc33f23e0c
 +                                            int k = world.purpurConfig.phantomSpawnMinPerAttempt + world.random.nextInt((world.purpurConfig.phantomSpawnMaxPerAttempt < 0 ? difficultydamagescaler.getDifficulty().getId() : world.purpurConfig.phantomSpawnMaxPerAttempt - world.purpurConfig.phantomSpawnMinPerAttempt) + 1); // Purpur
  
                                              for (int l = 0; l < k; ++l) {
-                                                 // Paper start
+                                                 // Paper start - PhantomPreSpawnEvent
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fdb2d2f67d6356c010e430fc4aee5593811cbf17..efd10d6f2b3d342e2cb817b1e7fa7f5f86075b8c 100644
+index e1652079b92a5c951b5191997803e9d486892c61..10de2140aa89f75e7f67b38f6c1286f4330d127b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1068,6 +1068,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0068-Implement-bed-explosion-options.patch b/patches/server/0065-Implement-bed-explosion-options.patch
similarity index 72%
rename from patches/server/0068-Implement-bed-explosion-options.patch
rename to patches/server/0065-Implement-bed-explosion-options.patch
index b9b420b80..bdfcce98a 100644
--- a/patches/server/0068-Implement-bed-explosion-options.patch
+++ b/patches/server/0065-Implement-bed-explosion-options.patch
@@ -5,29 +5,29 @@ Subject: [PATCH] Implement bed explosion options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index d40500f9a807cab0b2fb6fa9032f33f4fb74c895..e8405a57fb88e63b63baaf00645c417633bdc0f2 100644
+index 4459685d1fb655f93a523ae50b62d6b97785ed90..549e3dd09a91ddf319fe0c1ec09924cbb600c1b8 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -96,7 +96,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -104,7 +104,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
                  Vec3 vec3d = pos.getCenter();
  
--                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
+-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
++                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
                  return InteractionResult.SUCCESS;
              } else if ((Boolean) state.getValue(BedBlock.OCCUPIED)) {
                  if (!BedBlock.canSetSpawn(world)) return this.explodeBed(state, world, pos); // Paper - check explode first
-@@ -149,7 +149,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -157,7 +157,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
                  Vec3 vec3d = blockposition.getCenter();
  
--                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK);
-+                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // Purpur
+-                world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, iblockdata, blockposition, blockEntity), (ExplosionDamageCalculator) null, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state // Paper - add BlockEntity
++                if (world.purpurConfig.bedExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, iblockdata, blockposition, blockEntity), (ExplosionDamageCalculator) null, vec3d, (float) world.purpurConfig.bedExplosionPower, world.purpurConfig.bedExplosionFire, world.purpurConfig.bedExplosionEffect); // CraftBukkit - add state // Paper - add BlockEntity // Purpur
                  return InteractionResult.SUCCESS;
              }
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index efd10d6f2b3d342e2cb817b1e7fa7f5f86075b8c..461627c87d514b8a936ad5675abb849aa49c569d 100644
+index 10de2140aa89f75e7f67b38f6c1286f4330d127b..95f016b7c127129b71e266a3daefd55502fdb299 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -284,6 +284,27 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0069-Implement-respawn-anchor-explosion-options.patch b/patches/server/0066-Implement-respawn-anchor-explosion-options.patch
similarity index 72%
rename from patches/server/0069-Implement-respawn-anchor-explosion-options.patch
rename to patches/server/0066-Implement-respawn-anchor-explosion-options.patch
index db3f81e2c..c8af656e0 100644
--- a/patches/server/0069-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0066-Implement-respawn-anchor-explosion-options.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Implement respawn anchor explosion options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 2ed78cf83c0ae66a6ddba1ff307da89a24b0d0a8..ae17d6a54fad0bd2d71d306f418b5ced2f11b863 100644
+index 0699211428f182d8d56a2ba019d89ce05c920430..351fb74d2cccd7f63c2efee197a2968f822eda42 100644
 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -141,7 +141,7 @@ public class RespawnAnchorBlock extends Block {
+@@ -149,7 +149,7 @@ public class RespawnAnchorBlock extends Block {
          };
          Vec3 vec3d = explodedPos.getCenter();
  
--        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // Paper
-+        if (world.purpurConfig.respawnAnchorExplode)world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, explodedBlockState), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect); // Paper // Purpur
+-        world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, state, explodedPos, null), explosiondamagecalculator, vec3d, 5.0F, true, Level.ExplosionInteraction.BLOCK); // CraftBukkit - add state // Paper
++        if (world.purpurConfig.respawnAnchorExplode) world.explode((Entity) null, world.damageSources().badRespawnPointExplosion(vec3d, world, state, explodedPos, null), explosiondamagecalculator, vec3d, (float) world.purpurConfig.respawnAnchorExplosionPower, world.purpurConfig.respawnAnchorExplosionFire, world.purpurConfig.respawnAnchorExplosionEffect); // CraftBukkit - add state // Paper // Purpur
      }
  
      public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 461627c87d514b8a936ad5675abb849aa49c569d..3bfdc7ba270762ec114450d30e94457405d8bc19 100644
+index 95f016b7c127129b71e266a3daefd55502fdb299..55ae989ae13ae9c0730f6f8df5f7eba52a560b1f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -324,6 +324,27 @@ public class PurpurWorldConfig {
@@ -46,6 +46,6 @@ index 461627c87d514b8a936ad5675abb849aa49c569d..3bfdc7ba270762ec114450d30e944574
 +        }
 +    }
 +
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
diff --git a/patches/server/0070-Add-allow-water-in-end-world-option.patch b/patches/server/0067-Add-allow-water-in-end-world-option.patch
similarity index 84%
rename from patches/server/0070-Add-allow-water-in-end-world-option.patch
rename to patches/server/0067-Add-allow-water-in-end-world-option.patch
index 643655e11..6cc34bdc5 100644
--- a/patches/server/0070-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0067-Add-allow-water-in-end-world-option.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add allow water in end world option
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BucketItem.java b/src/main/java/net/minecraft/world/item/BucketItem.java
-index 277555a26e8281dd1a626e572794b08cf51d00c5..48e4fecf5ae5538004e3f53093b8be7c4be1cbee 100644
+index 49557d6f22c5725c663a231deab019d4f6fe95fa..046652e8f9c5dcdf7c90acb9391214cac46bd7d8 100644
 --- a/src/main/java/net/minecraft/world/item/BucketItem.java
 +++ b/src/main/java/net/minecraft/world/item/BucketItem.java
-@@ -195,7 +195,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
+@@ -194,7 +194,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
              // CraftBukkit end
              if (!flag2) {
                  return movingobjectpositionblock != null && this.emptyContents(entityhuman, world, movingobjectpositionblock.getBlockPos().relative(movingobjectpositionblock.getDirection()), (BlockHitResult) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit
@@ -17,7 +17,7 @@ index 277555a26e8281dd1a626e572794b08cf51d00c5..48e4fecf5ae5538004e3f53093b8be7c
                  int i = blockposition.getX();
                  int j = blockposition.getY();
                  int k = blockposition.getZ();
-@@ -203,7 +203,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
+@@ -202,7 +202,7 @@ public class BucketItem extends Item implements DispensibleContainerItem {
                  world.playSound(entityhuman, blockposition, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
  
                  for (int l = 0; l < 8; ++l) {
@@ -27,14 +27,13 @@ index 277555a26e8281dd1a626e572794b08cf51d00c5..48e4fecf5ae5538004e3f53093b8be7c
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index eccc55372a7a52a92dd9418a47ece0fd2adcd6ed..4f950128114b8fb6ad145a7302ce6be327c8b6c1 100644
+index 04f7f6743aabdca54892b2b155386f86032cf807..2e44e9ea9558ebc1456d9bbf53561988e33ce845 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1883,4 +1883,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         }
+@@ -1902,4 +1902,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         return null;
      }
-     // Paper end - notify observers even if grow failed
-+
+     // Paper end - optimize redstone (Alternate Current)
 +    // Purpur start
 +    public boolean isNether() {
 +        return getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER;
@@ -46,19 +45,19 @@ index eccc55372a7a52a92dd9418a47ece0fd2adcd6ed..4f950128114b8fb6ad145a7302ce6be3
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/IceBlock.java b/src/main/java/net/minecraft/world/level/block/IceBlock.java
-index 04089e6f7d6e3d532b00585870283922b6be5246..61e6d14abd54ecd5e43a5459f8daa7d86adedf44 100644
+index 013302623d3ca3ff88f242d740af935dcf4844a6..13dd8bc7d2f6b71a5f1779dde53c5c84d83538ce 100644
 --- a/src/main/java/net/minecraft/world/level/block/IceBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/IceBlock.java
-@@ -33,7 +33,7 @@ public class IceBlock extends HalfTransparentBlock {
+@@ -41,7 +41,7 @@ public class IceBlock extends HalfTransparentBlock {
      public void afterDestroy(Level world, BlockPos pos, ItemStack tool) {
-         // Paper end
+         // Paper end - Improve Block#breakNaturally API
          if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, tool) == 0) {
 -            if (world.dimensionType().ultraWarm()) {
 +            if (world.isNether() || (world.isTheEnd() && !org.purpurmc.purpur.PurpurConfig.allowWaterPlacementInTheEnd)) { // Purpur
                  world.removeBlock(pos, false);
                  return;
              }
-@@ -61,7 +61,7 @@ public class IceBlock extends HalfTransparentBlock {
+@@ -69,7 +69,7 @@ public class IceBlock extends HalfTransparentBlock {
              return;
          }
          // CraftBukkit end
@@ -68,7 +67,7 @@ index 04089e6f7d6e3d532b00585870283922b6be5246..61e6d14abd54ecd5e43a5459f8daa7d8
          } else {
              world.setBlockAndUpdate(pos, IceBlock.meltsInto());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index d98e16bc47d3bc458281956bf538f4a37bd0f4b7..387da71594b75a43100790e8e8d69d9246598537 100644
+index 2e78d67201e66c1f3fd1f45ed625e682ea074848..de202a20cdc133d68fb44c56ee017cca153e1cf8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -244,6 +244,11 @@ public class PurpurConfig {
diff --git a/patches/server/0068-Allow-color-codes-in-books.patch b/patches/server/0068-Allow-color-codes-in-books.patch
new file mode 100644
index 000000000..2122c64dd
--- /dev/null
+++ b/patches/server/0068-Allow-color-codes-in-books.patch
@@ -0,0 +1,89 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Tue, 3 Nov 2020 01:25:06 -0600
+Subject: [PATCH] Allow color codes in books
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 510a4391463026dd0c896027a579a94174c24299..c647629ef404e983240577c87306bb76bf0cc4a5 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1234,10 +1234,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ 
+             Objects.requireNonNull(list);
+             stream.forEach(list::add);
++            // Purpur start
++            boolean hasEditPerm = getCraftPlayer().hasPermission("purpur.book.color.edit");
++            boolean hasSignPerm = hasEditPerm || getCraftPlayer().hasPermission("purpur.book.color.sign");
++            // Purpur end
+             Consumer<List<FilteredText>> consumer = optional.isPresent() ? (list1) -> {
+-                this.signBook((FilteredText) list1.get(0), list1.subList(1, list1.size()), i);
++                this.signBook((FilteredText) list1.get(0), list1.subList(1, list1.size()), i, hasSignPerm); // Purpur
+             } : (list1) -> {
+-                this.updateBookContents(list1, i);
++                this.updateBookContents(list1, i, hasEditPerm); // Purpur
+             };
+ 
+             this.filterTextPacket((List) list).thenAcceptAsync(consumer, this.server);
+@@ -1245,13 +1249,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     }
+ 
+     private void updateBookContents(List<FilteredText> pages, int slotId) {
++    // Purpur start
++        updateBookContents(pages, slotId, false);
++    }
++    private void updateBookContents(List<FilteredText> pages, int slotId, boolean hasPerm) {
++    // Purpur end
+         // CraftBukkit start
+         ItemStack handItem = this.player.getInventory().getItem(slotId);
+         ItemStack itemstack = handItem.copy();
+         // CraftBukkit end
+ 
+         if (itemstack.is(Items.WRITABLE_BOOK)) {
+-            List<Filterable<String>> list1 = pages.stream().map(this::filterableFromOutgoing).toList();
++            List<Filterable<String>> list1 = pages.stream().map(filteredText -> filterableFromOutgoing(filteredText).map(s -> color(s, hasPerm))).toList(); // Purpur
+ 
+             itemstack.set(DataComponents.WRITABLE_BOOK_CONTENT, new WritableBookContent(list1));
+             this.player.getInventory().setItem(slotId, CraftEventFactory.handleEditBookEvent(this.player, slotId, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
+@@ -1259,6 +1268,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     }
+ 
+     private void signBook(FilteredText title, List<FilteredText> pages, int slotId) {
++    // Purpur start
++        signBook(title, pages, slotId, false);
++    }
++    private void signBook(FilteredText title, List<FilteredText> pages, int slotId, boolean hasPerm) {
++    // Purpur end
+         ItemStack itemstack = this.player.getInventory().getItem(slotId);
+ 
+         if (itemstack.is(Items.WRITABLE_BOOK)) {
+@@ -1266,10 +1280,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ 
+             itemstack1.remove(DataComponents.WRITABLE_BOOK_CONTENT);
+             List<Filterable<Component>> list1 = (List<Filterable<Component>>) (List) pages.stream().map((filteredtext1) -> { // CraftBukkit - decompile error
+-                return this.filterableFromOutgoing(filteredtext1).map(Component::literal);
++                return this.filterableFromOutgoing(filteredtext1).map(s -> hexColor(s, hasPerm)); // Purpur
+             }).toList();
+ 
+-            itemstack1.set(DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getName().getString(), 0, list1, true));
++            itemstack1.set(DataComponents.WRITTEN_BOOK_CONTENT, new WrittenBookContent(this.filterableFromOutgoing(title).map(s -> color(s, hasPerm)), this.player.getName().getString(), 0, list1, true)); // Purpur
+             CraftEventFactory.handleEditBookEvent(this.player, slotId, itemstack, itemstack1); // CraftBukkit
+             this.player.getInventory().setItem(slotId, itemstack); // CraftBukkit - event factory updates the hand book
+         }
+@@ -1279,6 +1293,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         return this.player.isTextFilteringEnabled() ? Filterable.passThrough(message.filteredOrEmpty()) : Filterable.from(message);
+     }
+ 
++    // Purpur start
++    private Component hexColor(String str, boolean hasPerm) {
++        return hasPerm ? PaperAdventure.asVanilla(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().deserialize(str)) : Component.literal(str);
++    }
++
++    private String color(String str, boolean hasPerm) {
++        return hasPerm ? org.bukkit.ChatColor.color(str, false) : str;
++    }
++    // Purpur end
++
+     @Override
+     public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0072-Entity-lifespan.patch b/patches/server/0069-Entity-lifespan.patch
similarity index 77%
rename from patches/server/0072-Entity-lifespan.patch
rename to patches/server/0069-Entity-lifespan.patch
index 85faf5c1c..de7376432 100644
--- a/patches/server/0072-Entity-lifespan.patch
+++ b/patches/server/0069-Entity-lifespan.patch
@@ -5,22 +5,22 @@ 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 fb887cbbd5d5ca0a29bd31672b38a18db2f2e8db..14f6abe6e7eeaf5d3053bf3ecb540b898813c267 100644
+index c647629ef404e983240577c87306bb76bf0cc4a5..e5df5583ef6084e59c8375c82c9909ff2d2bdc3f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2740,6 +2740,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2824,6 +2824,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              AABB axisalignedbb = entity.getBoundingBox();
  
-             if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
+             if (this.player.canInteractWithEntity(axisalignedbb, 1.0D)) {
 +                if (entity instanceof Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur
                  packet.dispatch(new ServerboundInteractPacket.Handler() {
                      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 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951eeaa2b5ce 100644
+index c4392a997061aa4939e5ad7dcacf5e39cbecc55a..e7251ac940b49564c83b4b603e49c3990fc85db1 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -135,6 +135,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -152,6 +152,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
      private BlockPos restrictCenter;
      private float restrictRadius;
  
@@ -28,7 +28,7 @@ index 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951e
      public boolean aware = true; // CraftBukkit
  
      protected Mob(EntityType<? extends Mob> type, Level world) {
-@@ -324,6 +325,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -339,6 +340,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
                  entityliving = null;
              }
          }
@@ -36,7 +36,7 @@ index 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951e
          this.target = entityliving;
          return true;
          // CraftBukkit end
-@@ -371,8 +373,28 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -381,8 +383,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
          }
  
          this.level().getProfiler().pop();
@@ -57,15 +57,15 @@ index 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951e
 +            return; // mob persistent
 +        }
 +        if (this.ticksSinceLastInteraction > this.level().purpurConfig.entityLifeSpan) {
-+            this.discard();
++            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +        }
 +    }
 +    // Purpur end
 +
      @Override
-     protected void playHurtSound(DamageSource source) {
+     protected void playHurtSound(DamageSource damageSource) {
          this.resetAmbientSoundTime();
-@@ -562,6 +584,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -585,6 +607,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
          }
  
          nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -73,7 +73,7 @@ index 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951e
      }
  
      @Override
-@@ -632,6 +655,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -669,6 +692,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
              this.aware = nbt.getBoolean("Bukkit.Aware");
          }
          // CraftBukkit end
@@ -85,7 +85,7 @@ index 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951e
      }
  
      @Override
-@@ -1710,6 +1738,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1848,6 +1876,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
              this.setLastHurtMob(target);
          }
  
@@ -94,7 +94,7 @@ index 92e74dd04e715650b435537014bb89f15a112e19..3e954a04e3ccdfcd495d0c56535c951e
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3bfdc7ba270762ec114450d30e94457405d8bc19..5afe1d5977f1bbc2b2c2aa5982c4eb23d82e7644 100644
+index 55ae989ae13ae9c0730f6f8df5f7eba52a560b1f..9ba3a90e1af9c733949c52988c56c05af46356e8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -125,6 +125,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 90%
rename from patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index 79ac1dd33..21154237b 100644
--- a/patches/server/0073-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 85383b6a9d16b7cf7e928c4d9aaf7af932540091..8b05588b480af39d25bfcb84a5241e9e055c81f8 100644
+index a17de781053a2c2caf615e5ac48a45c14386b0af..03b206289d103a36d19dcf3154f10ad98f976ba2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2744,4 +2744,26 @@ public class ServerPlayer extends Player {
+@@ -2956,4 +2956,26 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -36,10 +36,10 @@ index 85383b6a9d16b7cf7e928c4d9aaf7af932540091..8b05588b480af39d25bfcb84a5241e9e
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ee41bfa1a851340f291182f520c9cf1925a355af..3fe857ddd4dbaa73f9556f547f03e9f747a52c40 100644
+index 9a2725e3f61a7d37943518cc760b17859a0938bb..9a912752b12730a8fb09f5a6ab5a8638b555e3e3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -427,6 +427,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -440,6 +440,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                          double d1 = this.level().getWorldBorder().getDamagePerBlock();
  
                          if (d1 > 0.0D) {
@@ -48,7 +48,7 @@ index ee41bfa1a851340f291182f520c9cf1925a355af..3fe857ddd4dbaa73f9556f547f03e9f7
                          }
                      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5afe1d5977f1bbc2b2c2aa5982c4eb23d82e7644..8cc7e83e6272ed9c3f005c76aa3432fb2d3c76a6 100644
+index 9ba3a90e1af9c733949c52988c56c05af46356e8..98e6faaeeaf8a983f9d730591a9d85c314c112d3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -242,6 +242,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0071-Allow-color-codes-in-books.patch b/patches/server/0071-Allow-color-codes-in-books.patch
deleted file mode 100644
index 2e7c832ef..000000000
--- a/patches/server/0071-Allow-color-codes-in-books.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 3 Nov 2020 01:25:06 -0600
-Subject: [PATCH] Allow color codes in books
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d4908a8686804a43e114d4720d7295107659e47..fb887cbbd5d5ca0a29bd31672b38a18db2f2e8db 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1228,13 +1228,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                 itemstack1.setTag(nbttagcompound.copy());
-             }
- 
-+            // Purpur start
-+            boolean hasPerm = getCraftPlayer().hasPermission("purpur.book.color.edit") || getCraftPlayer().hasPermission("purpur.book.color.sign");
-             itemstack1.addTagElement("author", StringTag.valueOf(this.player.getName().getString()));
-             if (this.player.isTextFilteringEnabled()) {
--                itemstack1.addTagElement("title", StringTag.valueOf(title.filteredOrEmpty()));
-+                itemstack1.addTagElement("title", StringTag.valueOf(color(title.filteredOrEmpty(), hasPerm)));
-             } else {
--                itemstack1.addTagElement("filtered_title", StringTag.valueOf(title.filteredOrEmpty()));
--                itemstack1.addTagElement("title", StringTag.valueOf(title.raw()));
-+                itemstack1.addTagElement("filtered_title", StringTag.valueOf(color(title.filteredOrEmpty(), hasPerm)));
-+                itemstack1.addTagElement("title", StringTag.valueOf(color(title.raw(), hasPerm)));
-             }
-+            // Purpur end
- 
-             this.updateBookPages(pages, (s) -> {
-                 return Component.Serializer.toJson(Component.literal(s));
-@@ -1246,10 +1249,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     private void updateBookPages(List<FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
-         ListTag nbttaglist = new ListTag();
- 
-+        // Purpur start
-+        boolean hasPerm = getCraftPlayer().hasPermission("purpur.book.color.edit");
-         if (this.player.isTextFilteringEnabled()) {
--            Stream<StringTag> stream = list.stream().map((filteredtext) -> { // CraftBukkit - decompile error
--                return StringTag.valueOf((String) unaryoperator.apply(filteredtext.filteredOrEmpty()));
-+            Stream<StringTag> stream = list.stream().map(s -> color(s.filteredOrEmpty(), hasPerm, false)).map((s) -> { // CraftBukkit - decompile error
-+                return StringTag.valueOf((String) unaryoperator.apply(s));
-             });
-+            // Purpur end
- 
-             Objects.requireNonNull(nbttaglist);
-             stream.forEach(nbttaglist::add);
-@@ -1259,11 +1265,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-             for (int j = list.size(); i < j; ++i) {
-                 FilteredText filteredtext = (FilteredText) list.get(i);
--                String s = filteredtext.raw();
-+                String s = color(filteredtext.raw(), hasPerm, false); // Purpur
- 
-                 nbttaglist.add(StringTag.valueOf((String) unaryoperator.apply(s)));
-                 if (filteredtext.isFiltered()) {
--                    nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply(filteredtext.filteredOrEmpty()));
-+                    nbttagcompound.putString(String.valueOf(i), (String) unaryoperator.apply((String) color(filteredtext.filteredOrEmpty(), hasPerm, false))); // Purpur
-                 }
-             }
- 
-@@ -1276,6 +1282,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
-     }
- 
-+    // Purpur start
-+    private String color(String str, boolean hasPerm) {
-+        return color(str, hasPerm, true);
-+    }
-+
-+    private String color(String str, boolean hasPerm, boolean parseHex) {
-+        return hasPerm ? org.bukkit.ChatColor.color(str, parseHex) : str;
-+    }
-+    // Purpur end
-+
-     @Override
-     public void handleEntityTagQuery(ServerboundEntityTagQuery packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0074-Squid-EAR-immunity.patch b/patches/server/0071-Squid-EAR-immunity.patch
similarity index 90%
rename from patches/server/0074-Squid-EAR-immunity.patch
rename to patches/server/0071-Squid-EAR-immunity.patch
index cdad4e39d..6e6183b7a 100644
--- a/patches/server/0074-Squid-EAR-immunity.patch
+++ b/patches/server/0071-Squid-EAR-immunity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity
 
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8cc7e83e6272ed9c3f005c76aa3432fb2d3c76a6..b9ba53461de687070dda3c0bcccbee240017033a 100644
+index 98e6faaeeaf8a983f9d730591a9d85c314c112d3..27d279d76fd3632fd023edded3b10630629ec132 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1453,6 +1453,7 @@ public class PurpurWorldConfig {
@@ -25,7 +25,7 @@ index 8cc7e83e6272ed9c3f005c76aa3432fb2d3c76a6..b9ba53461de687070dda3c0bcccbee24
  
      public boolean spiderRidable = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d1448f50a9c03bd779f4bcd6b4fc896365316b78..925cd6e07efc3a42ff5787823b046726ce863104 100644
+index a9a39f0da7b09410d8171172a4219c7d509fdb99..a8fc07e06039e1418e020f7c1ad2cd36b9b94eb4 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
@@ -36,7 +36,7 @@ index d1448f50a9c03bd779f4bcd6b4fc896365316b78..925cd6e07efc3a42ff5787823b046726
  import net.minecraft.world.entity.animal.WaterAnimal;
  import net.minecraft.world.entity.animal.horse.Llama;
  import net.minecraft.world.entity.boss.EnderDragonPart;
-@@ -402,6 +403,7 @@ public class ActivationRange
+@@ -380,6 +381,7 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {
diff --git a/patches/server/0075-Phantoms-burn-in-light.patch b/patches/server/0072-Phantoms-burn-in-light.patch
similarity index 85%
rename from patches/server/0075-Phantoms-burn-in-light.patch
rename to patches/server/0072-Phantoms-burn-in-light.patch
index 71c92c188..d35474462 100644
--- a/patches/server/0075-Phantoms-burn-in-light.patch
+++ b/patches/server/0072-Phantoms-burn-in-light.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms burn in light
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index ef41a462b102981d30207299d0279fd51b433a22..6849b2ad3b2db840a1af35ef069490506449c861 100644
+index e0b1b0106fd3bbb6764d1b0a58ab2810181cac02..1ddccb9fa438682c2ebad7c071c7a4f8dd00b463 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -48,6 +48,7 @@ public class Phantom extends FlyingMob implements Enemy {
      Vec3 moveTargetPoint;
      public BlockPos anchorPoint;
      Phantom.AttackPhase attackPhase;
@@ -16,21 +16,20 @@ index ef41a462b102981d30207299d0279fd51b433a22..6849b2ad3b2db840a1af35ef06949050
      Vec3 crystalPosition; // Purpur
  
      public Phantom(EntityType<? extends Phantom> type, Level world) {
-@@ -247,7 +248,12 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -240,7 +241,11 @@ public class Phantom extends FlyingMob implements Enemy {
  
      @Override
      public void aiStep() {
--        if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
+-        if (this.isAlive() && this.shouldBurnInDay && this.isSunBurnTick()) { // Paper - shouldBurnInDay API
 +        // Purpur start
-+        boolean burnFromDaylight = this.shouldBurnInDay && this.level().purpurConfig.phantomBurnInDaylight;
++        boolean burnFromDaylight = this.shouldBurnInDay && this.isSunBurnTick() && this.level().purpurConfig.phantomBurnInDaylight;
 +        boolean burnFromLightSource = this.level().purpurConfig.phantomBurnInLight > 0 && this.level().getMaxLocalRawBrightness(blockPosition()) >= this.level().purpurConfig.phantomBurnInLight;
-+        if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - Configurable Burning
-+            if (getRider() == null || !this.isControllable())
-+            // Purpur end
++        if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - shouldBurnInDay API
++        // Purpur end
              if (getRider() == null || !this.isControllable()) // Purpur
-             this.setSecondsOnFire(8);
+             this.igniteForSeconds(8);
          }
-@@ -661,6 +667,12 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -641,6 +646,12 @@ public class Phantom extends FlyingMob implements Enemy {
                  return false;
              } else if (!entityliving.isAlive()) {
                  return false;
@@ -43,7 +42,7 @@ index ef41a462b102981d30207299d0279fd51b433a22..6849b2ad3b2db840a1af35ef06949050
              } else {
                  if (entityliving instanceof Player) {
                      Player entityhuman = (Player) entityliving;
-@@ -806,6 +818,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -786,6 +797,7 @@ public class Phantom extends FlyingMob implements Enemy {
                  this.nextScanTick = reducedTickDelay(60);
                  List<Player> list = Phantom.this.level().getNearbyPlayers(this.attackTargeting, Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
  
@@ -52,7 +51,7 @@ index ef41a462b102981d30207299d0279fd51b433a22..6849b2ad3b2db840a1af35ef06949050
                      list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error
                      Iterator iterator = list.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b9ba53461de687070dda3c0bcccbee240017033a..35be76739cda5aa4a075dc665e7702a9269d4333 100644
+index 27d279d76fd3632fd023edded3b10630629ec132..dcd9f80eb69e34b514f57158568e4cb59e9860ec 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1123,6 +1123,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0076-Configurable-villager-breeding.patch b/patches/server/0073-Configurable-villager-breeding.patch
similarity index 89%
rename from patches/server/0076-Configurable-villager-breeding.patch
rename to patches/server/0073-Configurable-villager-breeding.patch
index fa7119344..71c318976 100644
--- a/patches/server/0076-Configurable-villager-breeding.patch
+++ b/patches/server/0073-Configurable-villager-breeding.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable villager breeding
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 616a6c78a056839575b4dabfeebb7cb2dce25026..1754c88d9b3bdbce721062c564a5f61c2ad14e86 100644
+index 051940da69567274f48485f060cbc3ac21a0907f..6de74d992bd8b2845ab98d56201e7eeabd1dfc6b 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -786,7 +786,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -777,7 +777,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      public boolean canBreed() {
@@ -18,7 +18,7 @@ index 616a6c78a056839575b4dabfeebb7cb2dce25026..1754c88d9b3bdbce721062c564a5f61c
  
      private boolean hungry() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 35be76739cda5aa4a075dc665e7702a9269d4333..9cd4d38da512f209db7196f632031d51acc5947c 100644
+index dcd9f80eb69e34b514f57158568e4cb59e9860ec..df4f384032f398fc9852e753dee820ffa33e10bb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1611,6 +1611,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0077-Redstone-deactivates-spawners.patch b/patches/server/0074-Redstone-deactivates-spawners.patch
similarity index 77%
rename from patches/server/0077-Redstone-deactivates-spawners.patch
rename to patches/server/0074-Redstone-deactivates-spawners.patch
index b41ab812c..41653f9a7 100644
--- a/patches/server/0077-Redstone-deactivates-spawners.patch
+++ b/patches/server/0074-Redstone-deactivates-spawners.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Redstone deactivates spawners
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 633500aefd515df5dadda3802b94079f75a03fa0..64d911bee1607880514061c75116d8672df8bb8f 100644
+index f57e1b78204dff661ad5d3ee93a88a00330af2dc..967af8771ff8564c715d89f4b4b69b16c25add59 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -55,6 +55,7 @@ public abstract class BaseSpawner {
+@@ -59,6 +59,7 @@ public abstract class BaseSpawner {
      }
  
      public boolean isNearPlayer(Level world, BlockPos pos) {
@@ -17,7 +17,7 @@ index 633500aefd515df5dadda3802b94079f75a03fa0..64d911bee1607880514061c75116d867
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9cd4d38da512f209db7196f632031d51acc5947c..669454dd9ad60116b664f4432f4fef9662ba170c 100644
+index df4f384032f398fc9852e753dee820ffa33e10bb..85d2030c58fb97be82c97a042bc5d73e76274268 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -352,6 +352,11 @@ public class PurpurWorldConfig {
@@ -29,6 +29,6 @@ index 9cd4d38da512f209db7196f632031d51acc5947c..669454dd9ad60116b664f4432f4fef96
 +        spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
 +    }
 +
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
diff --git a/patches/server/0078-Totems-work-in-inventory.patch b/patches/server/0075-Totems-work-in-inventory.patch
similarity index 91%
rename from patches/server/0078-Totems-work-in-inventory.patch
rename to patches/server/0075-Totems-work-in-inventory.patch
index ba2fd9de8..1babbff8a 100644
--- a/patches/server/0078-Totems-work-in-inventory.patch
+++ b/patches/server/0075-Totems-work-in-inventory.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3fe857ddd4dbaa73f9556f547f03e9f747a52c40..3271c1a14fba90ab2e6467d907dfaf8cf5c12b65 100644
+index 9a912752b12730a8fb09f5a6ab5a8638b555e3e3..2ea60043f3bbf6cce77799f6c74ffe1f4b226374 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1626,6 +1626,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1653,6 +1653,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
              }
  
@@ -28,7 +28,7 @@ index 3fe857ddd4dbaa73f9556f547f03e9f747a52c40..3271c1a14fba90ab2e6467d907dfaf8c
              EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
              event.setCancelled(itemstack == null);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 669454dd9ad60116b664f4432f4fef9662ba170c..2cf49e7cb1d128c9dfec76c33d2c9a88c09ae2ca 100644
+index 85d2030c58fb97be82c97a042bc5d73e76274268..be916fe3a8bc8996be8b0835e3bd8f7920c15055 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -243,6 +243,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0076-Add-vindicator-johnny-spawn-chance.patch
similarity index 89%
rename from patches/server/0079-Add-vindicator-johnny-spawn-chance.patch
rename to patches/server/0076-Add-vindicator-johnny-spawn-chance.patch
index 3ed6e8905..34abb4304 100644
--- a/patches/server/0079-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0076-Add-vindicator-johnny-spawn-chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add vindicator johnny spawn chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index fece613e9c182c6658f9df1d333a5b7e1e862218..a3db9c351b9cb06340458811c006d53796d96ab5 100644
+index e270da29fdab5060b6a936bba67c433a78c54b5b..61f1778d454cebaab5580179614ff48ab67b8fe6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -154,6 +154,12 @@ public class Vindicator extends AbstractIllager {
+@@ -148,6 +148,12 @@ public class Vindicator extends AbstractIllager {
          RandomSource randomSource = world.getRandom();
          this.populateDefaultEquipmentSlots(randomSource, difficulty);
          this.populateDefaultEquipmentEnchantments(randomSource, difficulty);
@@ -22,7 +22,7 @@ index fece613e9c182c6658f9df1d333a5b7e1e862218..a3db9c351b9cb06340458811c006d537
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2cf49e7cb1d128c9dfec76c33d2c9a88c09ae2ca..008ae05e639b38a28d27a6dacbb6ef25a5c9ecbf 100644
+index be916fe3a8bc8996be8b0835e3bd8f7920c15055..7b584d5c8460e90dfea250591e4ca36cb1db004a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1638,6 +1638,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0080-Dispensers-place-anvils-option.patch b/patches/server/0077-Dispensers-place-anvils-option.patch
similarity index 84%
rename from patches/server/0080-Dispensers-place-anvils-option.patch
rename to patches/server/0077-Dispensers-place-anvils-option.patch
index def613771..0dbf632e9 100644
--- a/patches/server/0080-Dispensers-place-anvils-option.patch
+++ b/patches/server/0077-Dispensers-place-anvils-option.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dispensers place anvils option
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index a0c7c6208314d981e8577ad69ef1c5193290a085..603eac94296c32d87dccf2c6b5fd7183864346f2 100644
+index 5dab1e10303177e5a4d97a91ee46ede66f30ae35..68236139e3571791b891dbbef6e3ee20031e16d9 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -1188,6 +1188,23 @@ public interface DispenseItemBehavior {
+@@ -1048,5 +1048,22 @@ public interface DispenseItemBehavior {
                  }
              }
          });
@@ -16,7 +16,7 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..603eac94296c32d87dccf2c6b5fd7183
 +        DispenserBlock.registerBehavior(Items.ANVIL, (new OptionalDispenseItemBehavior() {
 +            @Override
 +            public ItemStack execute(BlockSource dispenser, ItemStack stack) {
-+                Level level = dispenser.level();
++                net.minecraft.world.level.Level level = dispenser.level();
 +                if (!level.purpurConfig.dispenserPlaceAnvils) return super.execute(dispenser, stack);
 +                Direction facing = dispenser.blockEntity().getBlockState().getValue(DispenserBlock.FACING);
 +                BlockPos pos = dispenser.pos().relative(facing);
@@ -30,10 +30,9 @@ index a0c7c6208314d981e8577ad69ef1c5193290a085..603eac94296c32d87dccf2c6b5fd7183
 +        }));
 +        // Purpur end
      }
- 
-     static Vec3 getEntityPokingOutOfBlockPos(BlockSource pointer, EntityType<?> entityType, Direction direction) {
+ }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 008ae05e639b38a28d27a6dacbb6ef25a5c9ecbf..8ee713af7d57bbf52a9aacf11385c0a325a24aa8 100644
+index 7b584d5c8460e90dfea250591e4ca36cb1db004a..00c4cda4ca21195c4fbfeb47f92e197be18aa4c6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -315,8 +315,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0081-Allow-anvil-colors.patch b/patches/server/0078-Allow-anvil-colors.patch
similarity index 88%
rename from patches/server/0081-Allow-anvil-colors.patch
rename to patches/server/0078-Allow-anvil-colors.patch
index 20da3beeb..cdcf19f9a 100644
--- a/patches/server/0081-Allow-anvil-colors.patch
+++ b/patches/server/0078-Allow-anvil-colors.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Allow anvil colors
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index b500a04b8135604f0159a741b3d228c9e87b2a46..8a7c30e316db4960b0b62ca0e366c19febead214 100644
+index 9036426256f87b3ba4a78e6fa2cea4e028f84481..5cadd69bcae33b1de58806fcf40533850d976154 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -294,6 +294,54 @@ public class AnvilMenu extends ItemCombinerMenu {
+@@ -279,6 +279,54 @@ public class AnvilMenu extends ItemCombinerMenu {
                  if (!this.itemName.equals(itemstack.getHoverName().getString())) {
-                     b1 = 1;
-                     i += b1;
+                     b0 = 1;
+                     i += b0;
 +                    // Purpur start
 +                    if (this.player != null) {
 +                        org.bukkit.craftbukkit.entity.CraftHumanEntity player = this.player.getBukkitEntity();
@@ -56,15 +56,15 @@ index b500a04b8135604f0159a741b3d228c9e87b2a46..8a7c30e316db4960b0b62ca0e366c19f
 +                        if (removeItalics) {
 +                            component = component.decoration(net.kyori.adventure.text.format.TextDecoration.ITALIC, false);
 +                        }
-+                        itemstack1.setHoverName(io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
++                        itemstack1.set(DataComponents.CUSTOM_NAME, io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
 +                    }
 +                    else
 +                    // Purpur end
-                     itemstack1.setHoverName(Component.literal(this.itemName));
+                     itemstack1.set(DataComponents.CUSTOM_NAME, Component.literal(this.itemName));
                  }
-             } else if (itemstack.hasCustomHoverName()) {
+             } else if (itemstack.has(DataComponents.CUSTOM_NAME)) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8ee713af7d57bbf52a9aacf11385c0a325a24aa8..4ac9e1c076d73e3964be68f4a550e3f8e2c96a7d 100644
+index 00c4cda4ca21195c4fbfeb47f92e197be18aa4c6..4c80796777c5a90c5e7a9e8ef0beedfcb49f0aa9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -293,6 +293,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0082-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0079-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 88%
rename from patches/server/0082-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/server/0079-Add-option-to-disable-dolphin-treasure-searching.patch
index f5d2bb8a1..23dbd04de 100644
--- a/patches/server/0082-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0079-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 89e3dbfddc739f97fdb6ec9a5714530f03cc7092..079fd78528377ee4236fb2e7189a5f0fc5ec4fb3 100644
+index 4f294b3ecf061f34046b52bf2b6a3d0ff1ed347b..366d583926e7e33a8c1e5a803bb75a456b4838d0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -485,6 +485,7 @@ public class Dolphin extends WaterAnimal {
+@@ -471,6 +471,7 @@ public class Dolphin extends WaterAnimal {
  
          @Override
          public boolean canUse() {
@@ -17,7 +17,7 @@ index 89e3dbfddc739f97fdb6ec9a5714530f03cc7092..079fd78528377ee4236fb2e7189a5f0f
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4ac9e1c076d73e3964be68f4a550e3f8e2c96a7d..f20c2daa8dabb5f6131eb6e6b8dba66cf5ad812b 100644
+index 4c80796777c5a90c5e7a9e8ef0beedfcb49f0aa9..b9faaf71e0cd5918b072d068bbc2096aa2805616 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -610,6 +610,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0083-Short-enderman-height.patch b/patches/server/0080-Short-enderman-height.patch
similarity index 81%
rename from patches/server/0083-Short-enderman-height.patch
rename to patches/server/0080-Short-enderman-height.patch
index 4088fc200..8bad988ef 100644
--- a/patches/server/0083-Short-enderman-height.patch
+++ b/patches/server/0080-Short-enderman-height.patch
@@ -5,24 +5,24 @@ Subject: [PATCH] Short enderman height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 518b927dac087000b5049bc61d43a46a7379e256..5d703e322bd220665c3ce3a41e40129b238ae150 100644
+index 9b3bf5ac043262c6cd00d83b750c3313122d92a9..3097529a9066841a58c899ce55b3bc0cd6af7e88 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -309,7 +309,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -322,7 +322,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
      private Component description;
      @Nullable
-     private ResourceLocation lootTable;
+     private ResourceKey<LootTable> lootTable;
 -    private final EntityDimensions dimensions;
 +    private EntityDimensions dimensions; // Purpur - remove final
 +    public void setDimensions(EntityDimensions dimensions) { this.dimensions = dimensions; } // Purpur
+     private final float spawnDimensionsScale;
      private final FeatureFlagSet requiredFeatures;
  
-     private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 86581579aed4d8bd18c7b7ea58e2dc4fee5315ba..ebef4f39af4928ed5bd206a82aa0e3992e67db78 100644
+index 89275ac02fcfab963b520efae6135d6f5ac13465..cb307a9419399e33a895376a584456f084691965 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -440,6 +440,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -419,6 +419,7 @@ public class EnderMan extends Monster implements NeutralMob {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else if (getRider() != null && this.isControllable()) { return super.hurt(source, amount); // Purpur - no teleporting on damage
@@ -31,7 +31,7 @@ index 86581579aed4d8bd18c7b7ea58e2dc4fee5315ba..ebef4f39af4928ed5bd206a82aa0e399
              boolean flag = source.getDirectEntity() instanceof ThrownPotion;
              boolean flag1;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 387da71594b75a43100790e8e8d69d9246598537..e813c87f4cc90fd31a4a48fcfffbe2b4407e5f5d 100644
+index 43f42895c745be0fb809db856083dbea5def5776..68b19f66b38ffecfa05aaa7ec1187fb0967ebd57 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -244,6 +244,12 @@ public class PurpurConfig {
diff --git a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch b/patches/server/0081-Stop-squids-floating-on-top-of-water.patch
similarity index 78%
rename from patches/server/0084-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0081-Stop-squids-floating-on-top-of-water.patch
index f59c727ff..0ce118bf6 100644
--- a/patches/server/0084-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0081-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ea1ecc287a75860fd8275d604fb9b130d355894b..267e3ddaed711ee275bf64855c0382df81d1f12c 100644
+index a99d04b820c230422bc82a3e0e094a79ab0c5c33..9a3796a69dd8745a498be5f2bb06c50355af44ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4368,6 +4368,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4511,6 +4511,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.yRotO = this.getYRot();
      }
  
@@ -19,13 +19,13 @@ index ea1ecc287a75860fd8275d604fb9b130d355894b..267e3ddaed711ee275bf64855c0382df
 +    // Purpur end
 +
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
-         if (false && this.touchingUnloadedChunk()) { // Pufferfish - cost of a lookup here is the same cost as below, so skip
+         if (this.touchingUnloadedChunk()) {
              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 913b66be2111da862e706d4978825c64cfe8b00b..f68c18b6645981126329b58379946308bbb8ccf8 100644
+index e38416189d9dc72f0b5951a1f6430dbc4578c422..c562eeb5e865a57fbc595de47c5d4e2b90430026 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 {
+@@ -73,6 +73,12 @@ public class Squid extends WaterAnimal {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.squidMaxHealth);
      }
  
@@ -39,12 +39,12 @@ index 913b66be2111da862e706d4978825c64cfe8b00b..f68c18b6645981126329b58379946308
      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 e3dbf3066337a482460238f8a94d854cf88adfa2..5c70aa2ce1a9e89c8c271201b6755ea1325058ac 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
-@@ -374,4 +374,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.0D, center.y - dy / 2.0D, center.z - dz / 2.0D, center.x + dx / 2.0D, center.y + dy / 2.0D, center.z + dz / 2.0D);
+         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);
      }
 +
 +    // Purpur - tuinity added method
@@ -54,7 +54,7 @@ index e3dbf3066337a482460238f8a94d854cf88adfa2..5c70aa2ce1a9e89c8c271201b6755ea1
 +    // Purpur
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f20c2daa8dabb5f6131eb6e6b8dba66cf5ad812b..5bdd0d69eb2efcc6dbe0a3d48870e1906763948b 100644
+index b9faaf71e0cd5918b072d068bbc2096aa2805616..56f34c0a0f7bc94a90bb1db32f8e30a590a3b38c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1478,6 +1478,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0085-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0082-Crying-obsidian-valid-for-portal-frames.patch
similarity index 90%
rename from patches/server/0085-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0082-Crying-obsidian-valid-for-portal-frames.patch
index 1ecc6916a..f67874c24 100644
--- a/patches/server/0085-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0082-Crying-obsidian-valid-for-portal-frames.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Crying obsidian valid for portal frames
 
 
 diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-index c461e0d04047db9c0c5ecc04063cebd38bf96ec2..e7554ec800f321e4e34c926c53f2375a8c3aa979 100644
+index af24467ee37cfc06f692b3b02e68f6cfbaaa8d59..afe6b2170846273b41b694aa53dca4c31bf78b3f 100644
 --- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
 +++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-@@ -34,7 +34,7 @@ public class PortalShape {
+@@ -33,7 +33,7 @@ public class PortalShape {
      private static final int MIN_HEIGHT = 3;
      public static final int MAX_HEIGHT = 21;
      private static final BlockBehaviour.StatePredicate FRAME = (iblockdata, iblockaccess, blockposition) -> {
@@ -18,7 +18,7 @@ index c461e0d04047db9c0c5ecc04063cebd38bf96ec2..e7554ec800f321e4e34c926c53f2375a
      private static final float SAFE_TRAVEL_MAX_ENTITY_XY = 4.0F;
      private static final double SAFE_TRAVEL_MAX_VERTICAL_DELTA = 1.0D;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e813c87f4cc90fd31a4a48fcfffbe2b4407e5f5d..6470f383b6f044877f0a4d8c91119d0eae451b8f 100644
+index 68b19f66b38ffecfa05aaa7ec1187fb0967ebd57..2f68cf2fc064a38ca059504a39d563d95d01643e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -212,6 +212,7 @@ public class PurpurConfig {
diff --git a/patches/server/0086-Entities-can-use-portals-configuration.patch b/patches/server/0083-Entities-can-use-portals-configuration.patch
similarity index 83%
rename from patches/server/0086-Entities-can-use-portals-configuration.patch
rename to patches/server/0083-Entities-can-use-portals-configuration.patch
index be3efe2f7..571526817 100644
--- a/patches/server/0086-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0083-Entities-can-use-portals-configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 267e3ddaed711ee275bf64855c0382df81d1f12c..f2b06c4930c39a3e47f0ea35dfa5997f21654674 100644
+index 9a3796a69dd8745a498be5f2bb06c50355af44ce..a93ae9de698ce97e8603deb1075e6dc5aeaab274 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3087,7 +3087,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3220,7 +3220,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public void handleInsidePortal(BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
@@ -17,17 +17,17 @@ index 267e3ddaed711ee275bf64855c0382df81d1f12c..f2b06c4930c39a3e47f0ea35dfa5997f
              if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3792,7 +3792,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3914,7 +3914,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean canChangeDimensions() {
--        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid; // Paper
-+        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid && (level().purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer); // Paper // Purpur
+-        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid; // Paper - Fix item duplication and teleport issues
++        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid && (level().purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer); // Paper - Fix item duplication and teleport issues // Purpur
      }
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5bdd0d69eb2efcc6dbe0a3d48870e1906763948b..3a4b67415d2e86d2d3d3709dd669c0d6ee56644a 100644
+index 56f34c0a0f7bc94a90bb1db32f8e30a590a3b38c..1f25407aafba71762a482f0b1982302fed14387f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,6 +98,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0087-LivingEntity-broadcastItemBreak.patch b/patches/server/0084-LivingEntity-broadcastItemBreak.patch
similarity index 72%
rename from patches/server/0087-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0084-LivingEntity-broadcastItemBreak.patch
index a65c9a12b..d815a2657 100644
--- a/patches/server/0087-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0084-LivingEntity-broadcastItemBreak.patch
@@ -5,18 +5,19 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3c65041eed148fe30be3c73e423433e37ae58cc5..07cbcb7f5a77b75ba10ccb470502c73fab17784e 100644
+index aa351df679f300018367244c7ccb3e5a59e9276f..11bd76d79bbfff68734d8ee1095f21c5c50e7bde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1110,5 +1110,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public void setSafeFallDistance(float safeFallDistance) {
-         getHandle().safeFallDistance = safeFallDistance;
+@@ -1173,4 +1173,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         this.getHandle().setYBodyRot(bodyYaw);
      }
+     // Paper end - body yaw API
 +
++    // Purpur start
 +    @Override
 +    public void broadcastItemBreak(org.bukkit.inventory.EquipmentSlot slot) {
 +        if (slot == null) return;
 +        getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
 +    }
-     // Purpur end
++    // Purpur end
  }
diff --git a/patches/server/0088-Customizable-wither-health-and-healing.patch b/patches/server/0085-Customizable-wither-health-and-healing.patch
similarity index 90%
rename from patches/server/0088-Customizable-wither-health-and-healing.patch
rename to patches/server/0085-Customizable-wither-health-and-healing.patch
index 0fdfe7eb6..0ce62c319 100644
--- a/patches/server/0088-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0085-Customizable-wither-health-and-healing.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Customizable wither health and healing
 Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index e6d6341f895c763fee05db3a7a7e05a68b9d36e9..8796b779ac0550e32c7313b1280278de48070baf 100644
+index 0cc32342cf6c65466dd1e45f9097ca89b01036e4..8d2894bb1ae70f63c8fa67de3e9f7c6a9c940f3e 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -525,8 +525,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -520,8 +520,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                  }
              }
  
@@ -23,7 +23,7 @@ index e6d6341f895c763fee05db3a7a7e05a68b9d36e9..8796b779ac0550e32c7313b1280278de
  
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3a4b67415d2e86d2d3d3709dd669c0d6ee56644a..2495cf8d28a2f11ddd1efefd6d772fccf1e488ba 100644
+index 1f25407aafba71762a482f0b1982302fed14387f..beea39d7cdbca783de7248a5c40ea2c7ab02e5b5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1717,6 +1717,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0089-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 90%
rename from patches/server/0089-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch
index 98a341d23..a123bfffa 100644
--- a/patches/server/0089-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c0f11d06e077c41d65b25396a14a4d81a39993e2..8824d5e4b6d0ab504dd80b0cceef743b456d7e2e 100644
+index b02d9db8442b209a9df27e417be71b11d426878b..1c74802577e056b9023dcc2cbec5885d02fe2c92 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -707,7 +707,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -714,7 +714,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.dragonParts = new Int2ObjectOpenHashMap();
          this.tickTime = flag1;
          this.server = minecraftserver;
@@ -36,10 +36,10 @@ index c0f11d06e077c41d65b25396a14a4d81a39993e2..8824d5e4b6d0ab504dd80b0cceef743b
          ChunkGenerator chunkgenerator = worlddimension.generator();
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 8385eb1d60f377da94e3178ab506feefb43563fd..a5443f92786427c42092aec8350e7ab37704db7a 100644
+index c72b6ea5530e54fc373c701028e1c147cea34b59..96e9fce5f9084737d2fcf4deb83305733b480179 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-@@ -159,7 +159,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
+@@ -160,7 +160,17 @@ public class WanderingTraderSpawner implements CustomSpawner {
              int k = pos.getX() + this.random.nextInt(range * 2) - range;
              int l = pos.getZ() + this.random.nextInt(range * 2) - range;
              int i1 = world.getHeight(Heightmap.Types.WORLD_SURFACE, k, l);
@@ -56,10 +56,10 @@ index 8385eb1d60f377da94e3178ab506feefb43563fd..a5443f92786427c42092aec8350e7ab3
 +            }
 +            // Purpur end
  
-             if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
+             if (spawnplacementtype.isSpawnPositionOk(world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2495cf8d28a2f11ddd1efefd6d772fccf1e488ba..8b1b424a61397f7e3c002611de961718046f0149 100644
+index beea39d7cdbca783de7248a5c40ea2c7ab02e5b5..ce5db64c233bac3800a715e66aada4740bdad95b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -69,6 +69,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0090-Raid-cooldown-setting.patch b/patches/server/0087-Raid-cooldown-setting.patch
similarity index 78%
rename from patches/server/0090-Raid-cooldown-setting.patch
rename to patches/server/0087-Raid-cooldown-setting.patch
index 15742d765..439cbff14 100644
--- a/patches/server/0090-Raid-cooldown-setting.patch
+++ b/patches/server/0087-Raid-cooldown-setting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Raid cooldown setting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java
-index 31831811ce16265e9828fa34d9e67d8ac195d723..a1f74718240da3dfb0fc53f337ec3bf1636def75 100644
+index 8c60f71270d909c10e6617eb64b8fdb42deb73e9..eedce2a3d67d875d5174ee125e2679480d4d412c 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raids.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raids.java
-@@ -29,6 +29,7 @@ import net.minecraft.world.phys.Vec3;
+@@ -26,6 +26,7 @@ import net.minecraft.world.phys.Vec3;
  public class Raids extends SavedData {
  
      private static final String RAID_FILE_ID = "raids";
@@ -16,7 +16,7 @@ index 31831811ce16265e9828fa34d9e67d8ac195d723..a1f74718240da3dfb0fc53f337ec3bf1
      public final Map<Integer, Raid> raidMap = Maps.newHashMap();
      private final ServerLevel level;
      private int nextAvailableID;
-@@ -54,6 +55,17 @@ public class Raids extends SavedData {
+@@ -51,6 +52,17 @@ public class Raids extends SavedData {
  
      public void tick() {
          ++this.tick;
@@ -31,25 +31,25 @@ index 31831811ce16265e9828fa34d9e67d8ac195d723..a1f74718240da3dfb0fc53f337ec3bf1
 +            });
 +        }
 +        // Purpur end
-         Iterator iterator = this.raidMap.values().iterator();
+         Iterator<Raid> iterator = this.raidMap.values().iterator();
  
          while (iterator.hasNext()) {
-@@ -138,11 +150,13 @@ public class Raids extends SavedData {
-                 }
+@@ -122,11 +134,13 @@ public class Raids extends SavedData {
+                 */
  
-                 if (flag) {
+                 if (!raid.isStarted() || (raid.isInProgress() && raid.getRaidOmenLevel() < raid.getMaxRaidOmenLevel())) { // CraftBukkit - fixed a bug with raid: players could add up Bad Omen level even when the raid had finished
 +                    if (level.purpurConfig.raidCooldownSeconds != 0 && playerCooldowns.containsKey(player.getUUID())) return null; // Purpur
                      // CraftBukkit start
                      if (!org.bukkit.craftbukkit.event.CraftEventFactory.callRaidTriggerEvent(raid, player)) {
-                         player.removeEffect(MobEffects.BAD_OMEN);
+                         player.removeEffect(net.minecraft.world.effect.MobEffects.RAID_OMEN);
                          return null;
                      }
 +                    if (level.purpurConfig.raidCooldownSeconds != 0) playerCooldowns.put(player.getUUID(), level.purpurConfig.raidCooldownSeconds); // Purpur
  
-                     if (!this.raidMap.containsKey(raid.getId())) {
+                     if (!raid.isStarted() && !this.raidMap.containsKey(raid.getId())) {
                          this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8b1b424a61397f7e3c002611de961718046f0149..bcee031a53e24a6c3731c2e0555f53ad2c5d81e8 100644
+index ce5db64c233bac3800a715e66aada4740bdad95b..9654023afbb0569d5d814368b93b74dedda905a4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -109,6 +109,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0091-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0088-Despawn-rate-config-options-per-projectile-type.patch
similarity index 83%
rename from patches/server/0091-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0088-Despawn-rate-config-options-per-projectile-type.patch
index 4f958f567..b197ba556 100644
--- a/patches/server/0091-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0088-Despawn-rate-config-options-per-projectile-type.patch
@@ -7,11 +7,11 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
 The config remains for migration purposes.
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bcee031a53e24a6c3731c2e0555f53ad2c5d81e8..472f3cb5775aed6d902928b9dafe99a139d475d5 100644
+index 9654023afbb0569d5d814368b93b74dedda905a4..8a577d78d63adc799de71f96b45320372c346552 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -286,6 +286,39 @@ public class PurpurWorldConfig {
-         totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);
+@@ -318,6 +318,40 @@ public class PurpurWorldConfig {
+         });
      }
  
 +    private static boolean projectileDespawnRateSettingsMigrated = false;
@@ -30,7 +30,7 @@ index bcee031a53e24a6c3731c2e0555f53ad2c5d81e8..472f3cb5775aed6d902928b9dafe99a1
 +            migrateProjectileDespawnRateSettings(EntityType.SMALL_FIREBALL);
 +            migrateProjectileDespawnRateSettings(EntityType.SNOWBALL);
 +            migrateProjectileDespawnRateSettings(EntityType.WITHER_SKULL);
-+            //PufferfishConfig.save();
++            //PufferfishConfig.save(); // TODO: Pufferfish
 +            set("gameplay-mechanics.projectile-despawn-rates", null);
 +            // pufferfish's entity_timeout is a global config
 +            // we only want to migrate values from the
@@ -39,6 +39,7 @@ index bcee031a53e24a6c3731c2e0555f53ad2c5d81e8..472f3cb5775aed6d902928b9dafe99a1
 +        }
 +    }
 +    private void migrateProjectileDespawnRateSettings(EntityType<?> type) {
++        // TODO: Pufferfish
 +        //String pufferName = "entity_timeouts." + type.id.toUpperCase(Locale.ROOT);
 +        //int value = getInt("gameplay-mechanics.projectile-despawn-rates." + type.id, -1);
 +        //if (value != -1 && PufferfishConfig.getRawInt(pufferName, -1) == -1) {
@@ -47,6 +48,6 @@ index bcee031a53e24a6c3731c2e0555f53ad2c5d81e8..472f3cb5775aed6d902928b9dafe99a1
 +        //}
 +    }
 +
-     public boolean silkTouchEnabled = false;
-     public String silkTouchSpawnerName = "<reset><white>Monster Spawner";
-     public List<String> silkTouchSpawnerLore = new ArrayList<>();
+     public boolean anvilAllowColors = false;
+     public boolean anvilColorsUseMiniMessage;
+     private void anvilSettings() {
diff --git a/patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0089-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 86%
rename from patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0089-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index ccfdea160..af48746e7 100644
--- a/patches/server/0092-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0089-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index a08c00b8c0488d18be5e182f7892e5ab71d12247..338f693d098b6ab507c30f6411c9a952c34ba8e3 100644
+index c72d6bccf7d72d08d388c65936a89c92261c7860..ee746753515c9cea8dd246f4f56e6781956726c1 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -136,6 +136,10 @@ public class MobGoalHelper {
+@@ -137,6 +137,10 @@ public class MobGoalHelper {
      static {
          // TODO these kinda should be checked on each release, in case obfuscation changes
          deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
@@ -20,16 +20,16 @@ index a08c00b8c0488d18be5e182f7892e5ab71d12247..338f693d098b6ab507c30f6411c9a952
          ignored.add("goal_selector_1");
          ignored.add("goal_selector_2");
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 6ec7d0f5e525f9e04b6fa0fb6d4da5fcc22fe653..64acb2e81ef65acb0d41db8b5f7c924c2e2a5e00 100644
+index 1d283484be270497859e23e3bb4ab38c09af23e6..b02cdbaa0455319b1e8a7e777e64ff4a56590388 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -120,7 +120,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -123,7 +123,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0D));
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Drowned.class})).setAlertOthers(ZombifiedPiglin.class));
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::okTarget));
--        if (this.level().spigotConfig.zombieAggressiveTowardsVillager) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)); // Paper
+-        if (this.level().spigotConfig.zombieAggressiveTowardsVillager) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)); // Paper - Check drowned for villager aggression config
 +        // Purpur start
-+        if (this.level().spigotConfig.zombieAggressiveTowardsVillager) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false) { // Spigot
++        if (this.level().spigotConfig.zombieAggressiveTowardsVillager) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false) { // Paper - Check drowned for villager aggression config
 +            @Override
 +            public boolean canUse() {
 +                return (level().purpurConfig.zombieAggressiveTowardsVillagerWhenLagging || !level().getServer().server.isLagging()) && super.canUse();
@@ -45,10 +45,10 @@ index 6ec7d0f5e525f9e04b6fa0fb6d4da5fcc22fe653..64acb2e81ef65acb0d41db8b5f7c924c
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Axolotl.class, true, false));
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 971abbfdff555a569ad54b9db5947c3ec50408d2..46fec497e411e3160d9ae9553ae52654d10a9dd3 100644
+index 555b86925b8d848fad40a838dd98607db8741e3b..3d42b2ea26217243dba96174ff0eadbcdd81a6cd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -157,7 +157,19 @@ public class Zombie extends Monster {
+@@ -154,7 +154,19 @@ public class Zombie extends Monster {
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(ZombifiedPiglin.class));
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
@@ -70,10 +70,10 @@ index 971abbfdff555a569ad54b9db5947c3ec50408d2..46fec497e411e3160d9ae9553ae52654
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 472f3cb5775aed6d902928b9dafe99a139d475d5..45fc13436aa43da593704d142202eb43e5cbe4b3 100644
+index 8a577d78d63adc799de71f96b45320372c346552..69c433dd27be4a67052d73620c80d48ed6566034 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1850,6 +1850,7 @@ public class PurpurWorldConfig {
+@@ -1851,6 +1851,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
@@ -81,11 +81,11 @@ index 472f3cb5775aed6d902928b9dafe99a139d475d5..45fc13436aa43da593704d142202eb43
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1864,6 +1865,7 @@ public class PurpurWorldConfig {
+@@ -1865,6 +1866,7 @@ public class PurpurWorldConfig {
          zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
          zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
 +        zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
      }
  
-     public boolean zombieHorseRidableInWater = false;
+     public boolean zombieHorseRidable = false;
diff --git a/patches/server/0093-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0090-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 84%
rename from patches/server/0093-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0090-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
index c0c6e71ef..4358026f2 100644
--- a/patches/server/0093-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/server/0090-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
 
 
 diff --git a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
-index 06fe5b056d78d42cdf78437eeabe1786d596b7f8..3532db21cee82c18f95c540d24b2071585d71c4e 100644
+index e314f36951e9ac15c57137e24fce8c410373130a..21dfb8e91c5427ac12133de2c05d923d87adf5ba 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/Ingredient.java
-@@ -39,6 +39,7 @@ public final class Ingredient implements Predicate<ItemStack> {
+@@ -41,6 +41,7 @@ public final class Ingredient implements Predicate<ItemStack> {
      @Nullable
      private IntList stackingIds;
      public boolean exact; // CraftBukkit
@@ -16,7 +16,7 @@ index 06fe5b056d78d42cdf78437eeabe1786d596b7f8..3532db21cee82c18f95c540d24b20715
      public static final Codec<Ingredient> CODEC = Ingredient.codec(true);
      public static final Codec<Ingredient> CODEC_NONEMPTY = Ingredient.codec(false);
  
-@@ -70,6 +71,12 @@ public final class Ingredient implements Predicate<ItemStack> {
+@@ -72,6 +73,12 @@ public final class Ingredient implements Predicate<ItemStack> {
          } else if (this.isEmpty()) {
              return itemstack.isEmpty();
          } else {
@@ -30,10 +30,10 @@ index 06fe5b056d78d42cdf78437eeabe1786d596b7f8..3532db21cee82c18f95c540d24b20715
              int i = aitemstack.length;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-index 13d25d118eb4d3ef35a4cdfb9bbde9ed83f6c04b..553ecc9b5631ffc0848a798bb3295f16d1722c1f 100644
+index 6ba29875d78ede4aa7978ff689e588f7fed11528..4afec4387971612f62b825e9e56c2ead7424a7c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
-@@ -30,6 +30,7 @@ public interface CraftRecipe extends Recipe {
+@@ -29,6 +29,7 @@ public interface CraftRecipe extends Recipe {
          } else if (bukkit instanceof RecipeChoice.ExactChoice) {
              stack = new Ingredient(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> new net.minecraft.world.item.crafting.Ingredient.ItemValue(CraftItemStack.asNMSCopy(mat))));
              stack.exact = true;
diff --git a/patches/server/0094-Flying-squids-Oh-my.patch b/patches/server/0091-Flying-squids-Oh-my.patch
similarity index 82%
rename from patches/server/0094-Flying-squids-Oh-my.patch
rename to patches/server/0091-Flying-squids-Oh-my.patch
index 097f745e3..b0907f34a 100644
--- a/patches/server/0094-Flying-squids-Oh-my.patch
+++ b/patches/server/0091-Flying-squids-Oh-my.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying squids! Oh my!
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index dc99e7f0e6f173c1313c0d5e9ea5dd6bdbdac169..19f95ddb2fa9dd264947a8b0033dd7437ee66c7f 100644
+index 8211c152e6f4232e82e452b08047e4579465d770..4cd57672c548950cb4e0aa97af75ecca84be6823 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -41,6 +41,11 @@ public class GlowSquid extends Squid {
@@ -21,10 +21,10 @@ index dc99e7f0e6f173c1313c0d5e9ea5dd6bdbdac169..19f95ddb2fa9dd264947a8b0033dd743
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 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 f68c18b6645981126329b58379946308bbb8ccf8..80bdc93cba675d6c1286618f14fc33e0344c601f 100644
+index c562eeb5e865a57fbc595de47c5d4e2b90430026..f0261117a4f8ae240b3b991053deaf8d6419b5b4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -81,6 +81,15 @@ public class Squid extends WaterAnimal {
+@@ -79,6 +79,15 @@ public class Squid extends WaterAnimal {
          return super.getAxisForFluidCheck().offsetY(level().purpurConfig.squidOffsetWaterCheck);
      }
  
@@ -40,28 +40,28 @@ index f68c18b6645981126329b58379946308bbb8ccf8..80bdc93cba675d6c1286618f14fc33e0
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-@@ -153,6 +162,7 @@ public class Squid extends WaterAnimal {
+@@ -151,6 +160,7 @@ public class Squid extends WaterAnimal {
          }
  
          if (this.isInWaterOrBubble()) {
 +            if (canFly()) setNoGravity(!wasTouchingWater); // Purpur
-             if (this.tentacleMovement < (float)Math.PI) {
-                 float f = this.tentacleMovement / (float)Math.PI;
-                 this.tentacleAngle = Mth.sin(f * f * (float)Math.PI) * (float)Math.PI * 0.25F;
-@@ -366,7 +376,7 @@ public class Squid extends WaterAnimal {
+             if (this.tentacleMovement < (float) Math.PI) {
+                 float f = this.tentacleMovement / (float) Math.PI;
+                 this.tentacleAngle = Mth.sin(f * f * (float) Math.PI) * (float) Math.PI * 0.25F;
+@@ -358,7 +368,7 @@ public class Squid extends WaterAnimal {
              int i = this.squid.getNoActionTime();
              if (i > 100) {
                  this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
 -            } else if (this.squid.getRandom().nextInt(reducedTickDelay(50)) == 0 || !this.squid.wasTouchingWater || !this.squid.hasMovementVector()) {
 +            } else if (this.squid.getRandom().nextInt(reducedTickDelay(50)) == 0 || !this.squid.isInWater() || !this.squid.hasMovementVector()) { // Purpur
-                 float f = this.squid.getRandom().nextFloat() * ((float)Math.PI * 2F);
+                 float f = this.squid.getRandom().nextFloat() * (float) (Math.PI * 2);
                  float g = Mth.cos(f) * 0.2F;
                  float h = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 45fc13436aa43da593704d142202eb43e5cbe4b3..a85d4a9c2583f8233032b680c89b147a230bca41 100644
+index 69c433dd27be4a67052d73620c80d48ed6566034..636f1a2962ee48a42a644b241569f08e7d57097c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -902,10 +902,12 @@ public class PurpurWorldConfig {
+@@ -903,10 +903,12 @@ public class PurpurWorldConfig {
      public boolean glowSquidRidable = false;
      public boolean glowSquidControllable = true;
      public double glowSquidMaxHealth = 10.0D;
@@ -74,7 +74,7 @@ index 45fc13436aa43da593704d142202eb43e5cbe4b3..a85d4a9c2583f8233032b680c89b147a
      }
  
      public boolean goatRidable = false;
-@@ -1537,6 +1539,7 @@ public class PurpurWorldConfig {
+@@ -1538,6 +1540,7 @@ public class PurpurWorldConfig {
      public double squidMaxHealth = 10.0D;
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;
@@ -82,7 +82,7 @@ index 45fc13436aa43da593704d142202eb43e5cbe4b3..a85d4a9c2583f8233032b680c89b147a
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1548,6 +1551,7 @@ public class PurpurWorldConfig {
+@@ -1549,6 +1552,7 @@ public class PurpurWorldConfig {
          squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth);
          squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
diff --git a/patches/server/0095-Infinity-bow-settings.patch b/patches/server/0092-Infinity-bow-settings.patch
similarity index 54%
rename from patches/server/0095-Infinity-bow-settings.patch
rename to patches/server/0092-Infinity-bow-settings.patch
index 3ce820a59..69e964faf 100644
--- a/patches/server/0095-Infinity-bow-settings.patch
+++ b/patches/server/0092-Infinity-bow-settings.patch
@@ -5,29 +5,29 @@ Subject: [PATCH] Infinity bow settings
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
-index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c8ebe6366 100644
+index 5ca843df5b4caa668953e5e36a9b20fabeb35046..4ae6b98b6a0d41e949b055f0678200a672a1df38 100644
 --- a/src/main/java/net/minecraft/world/item/BowItem.java
 +++ b/src/main/java/net/minecraft/world/item/BowItem.java
-@@ -38,7 +38,7 @@ public class BowItem extends ProjectileWeaponItem implements Vanishable {
-                 float f = BowItem.getPowerForTime(j);
- 
-                 if ((double) f >= 0.1D) {
--                    boolean flag1 = flag && itemstack1.is(Items.ARROW);
-+                    boolean flag1 = flag && ((itemstack1.is(Items.ARROW) && world.purpurConfig.infinityWorksWithNormalArrows) || (itemstack1.is(Items.TIPPED_ARROW) && world.purpurConfig.infinityWorksWithTippedArrows) || (itemstack1.is(Items.SPECTRAL_ARROW) && world.purpurConfig.infinityWorksWithSpectralArrows)); // Purpur                    if (!world.isClientSide) {
- 
-                     if (!world.isClientSide) {
-                         ArrowItem itemarrow = (ArrowItem) (itemstack1.getItem() instanceof ArrowItem ? itemstack1.getItem() : Items.ARROW);
-@@ -132,7 +132,7 @@ public class BowItem extends ProjectileWeaponItem implements Vanishable {
-         ItemStack itemstack = user.getItemInHand(hand);
-         boolean flag = !user.getProjectile(itemstack).isEmpty();
- 
--        if (!user.getAbilities().instabuild && !flag) {
-+        if (!(world.purpurConfig.infinityWorksWithoutArrows && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, itemstack) > 0) && !user.getAbilities().instabuild && !flag) { // Purpur
-             return InteractionResultHolder.fail(itemstack);
+@@ -29,7 +29,7 @@ public class BowItem extends ProjectileWeaponItem {
+                 int i = this.getUseDuration(stack) - remainingUseTicks;
+                 float f = getPowerForTime(i);
+                 if (!((double)f < 0.1)) {
+-                    List<ItemStack> list = draw(stack, itemStack, player);
++                    List<ItemStack> list = draw(stack, itemStack, player, !((itemStack.is(Items.ARROW) && world.purpurConfig.infinityWorksWithNormalArrows) || (itemStack.is(Items.TIPPED_ARROW) && world.purpurConfig.infinityWorksWithTippedArrows) || (itemStack.is(Items.SPECTRAL_ARROW) && world.purpurConfig.infinityWorksWithSpectralArrows)));
+                     if (!world.isClientSide() && !list.isEmpty()) {
+                         this.shoot(world, player, player.getUsedItemHand(), stack, list, f * 3.0F, 1.0F, f == 1.0F, null);
+                     }
+@@ -81,7 +81,7 @@ public class BowItem extends ProjectileWeaponItem {
+     public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
+         ItemStack itemStack = user.getItemInHand(hand);
+         boolean bl = !user.getProjectile(itemStack).isEmpty();
+-        if (!user.hasInfiniteMaterials() && !bl) {
++        if (!(world.purpurConfig.infinityWorksWithoutArrows && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.INFINITY, itemStack) > 0) && !user.hasInfiniteMaterials() && !bl) {
+             return InteractionResultHolder.fail(itemStack);
          } else {
              user.startUsingItem(hand);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a85d4a9c2583f8233032b680c89b147a230bca41..598a9f2dae899513cf10e33c8baad5991597b55c 100644
+index 636f1a2962ee48a42a644b241569f08e7d57097c..b66182a7b52d16aac78b61cd9c077236a2abbe33 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -140,6 +140,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0096-Configurable-daylight-cycle.patch b/patches/server/0093-Configurable-daylight-cycle.patch
similarity index 85%
rename from patches/server/0096-Configurable-daylight-cycle.patch
rename to patches/server/0093-Configurable-daylight-cycle.patch
index 18b7454d5..c0d9a51e8 100644
--- a/patches/server/0096-Configurable-daylight-cycle.patch
+++ b/patches/server/0093-Configurable-daylight-cycle.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Configurable daylight cycle
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaaec05a2791 100644
+index 76ef195a5074006b009acd9cc1744667c6aecbb9..659577549e132754281df76a7a1bfd884443c56a 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTimePacket.java
-@@ -5,7 +5,7 @@ import net.minecraft.network.protocol.Packet;
- 
- public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener> {
+@@ -10,7 +10,7 @@ public class ClientboundSetTimePacket implements Packet<ClientGamePacketListener
+         ClientboundSetTimePacket::write, ClientboundSetTimePacket::new
+     );
      private final long gameTime;
 -    private final long dayTime;
 +    private long dayTime; public void setDayTime(long dayTime) { this.dayTime = dayTime; } // Purpur
@@ -18,10 +18,10 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c29f8291b43a2e92e3444ab72dd23065a006f11f..cdf770adf641844caf0290a8354046aeb8e00cb3 100644
+index 3a622f5274f036608950702291c1e624488a6faa..6dd29845955b65e269a0487501330917effe7688 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1523,7 +1523,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1754,7 +1754,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -31,10 +31,10 @@ index c29f8291b43a2e92e3444ab72dd23065a006f11f..cdf770adf641844caf0290a8354046ae
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8824d5e4b6d0ab504dd80b0cceef743b456d7e2e..0535faa8d95e75e3848ece4d756428a50b6c19f3 100644
+index 1c74802577e056b9023dcc2cbec5885d02fe2c92..aef5157d183b69903fd215a5ce30c0705ba8fa3e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -214,6 +214,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -220,6 +220,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
      private final StructureManager structureManager;
      private final StructureCheck structureCheck;
      private final boolean tickTime;
@@ -43,7 +43,7 @@ index 8824d5e4b6d0ab504dd80b0cceef743b456d7e2e..0535faa8d95e75e3848ece4d756428a5
      private final RandomSequences randomSequences;
      public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
  
-@@ -786,6 +788,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -793,6 +795,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          this.chunkTaskScheduler = new io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler(this, io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.workerThreads); // Paper - rewrite chunk system
          this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
@@ -51,7 +51,7 @@ index 8824d5e4b6d0ab504dd80b0cceef743b456d7e2e..0535faa8d95e75e3848ece4d756428a5
      }
  
      // Paper start
-@@ -961,6 +964,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -969,6 +972,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.serverLevelData.setGameTime(i);
              this.serverLevelData.getScheduledEvents().tick(this.server, i);
              if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -65,7 +65,7 @@ index 8824d5e4b6d0ab504dd80b0cceef743b456d7e2e..0535faa8d95e75e3848ece4d756428a5
                  this.setDayTime(this.levelData.getDayTime() + 1L);
              }
  
-@@ -969,7 +979,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -977,7 +987,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public void setDayTime(long timeOfDay) {
          this.serverLevelData.setDayTime(timeOfDay);
@@ -88,7 +88,7 @@ index 8824d5e4b6d0ab504dd80b0cceef743b456d7e2e..0535faa8d95e75e3848ece4d756428a5
      public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
          Iterator iterator = this.customSpawners.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 598a9f2dae899513cf10e33c8baad5991597b55c..7e8816a3bd9c60844ca0fbb8674abf6c53b4d81c 100644
+index b66182a7b52d16aac78b61cd9c077236a2abbe33..d2ab4fe9ccb19f837a41bddddf29cfcc96fc3f96 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -122,6 +122,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0097-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0094-Allow-infinite-and-mending-enchantments-together.patch
similarity index 77%
rename from patches/server/0097-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0094-Allow-infinite-and-mending-enchantments-together.patch
index 270808d3a..b5f4be4d7 100644
--- a/patches/server/0097-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0094-Allow-infinite-and-mending-enchantments-together.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Allow infinite and mending enchantments together
 
 
 diff --git a/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java b/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-index 518d85a13c37a2f7d32ca0718323181048559986..2c4ce164ab3011f372ff1719c8d4a3331d8db55f 100644
+index 81cc05c929d612898609965d82454b89cd18f9f5..fa73c3d4b58ad8379963a9866d8f09e1d6abd663 100644
 --- a/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
 +++ b/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-@@ -19,6 +19,6 @@ public class ArrowInfiniteEnchantment extends Enchantment {
+@@ -7,6 +7,6 @@ public class ArrowInfiniteEnchantment extends Enchantment {
  
      @Override
      public boolean checkCompatibility(Enchantment other) {
--        return other instanceof MendingEnchantment ? false : super.checkCompatibility(other);
-+        return other instanceof MendingEnchantment ? org.purpurmc.purpur.PurpurConfig.allowInfinityMending : super.checkCompatibility(other);
+-        return !(other instanceof MendingEnchantment) && super.checkCompatibility(other);
++        return !(other instanceof MendingEnchantment) && super.checkCompatibility(other) || other instanceof MendingEnchantment && org.purpurmc.purpur.PurpurConfig.allowInfinityMending; // Purpur
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 6470f383b6f044877f0a4d8c91119d0eae451b8f..de1a9b08946005d1235264c7658b51bbdc2c47c2 100644
+index 2f68cf2fc064a38ca059504a39d563d95d01643e..6d621a93aaf94927fa6c73e649dcdb8bbbaadd2a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -246,6 +246,16 @@ public class PurpurConfig {
diff --git a/patches/server/0098-Furnace-uses-lava-from-underneath.patch b/patches/server/0095-Furnace-uses-lava-from-underneath.patch
similarity index 89%
rename from patches/server/0098-Furnace-uses-lava-from-underneath.patch
rename to patches/server/0095-Furnace-uses-lava-from-underneath.patch
index 959ee5d6f..e5d2aa6fe 100644
--- a/patches/server/0098-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0095-Furnace-uses-lava-from-underneath.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Furnace uses lava from underneath
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index a18aadbf7ae83713e1f2b21553185d8000bc7699..b0afc384907bb75dfa26e432a2328fe080660019 100644
+index a99fe191c429bb528209dd0f31b509acf9cccbb5..ce2c424068001eec16032361baa206f6a5aa5332 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -44,6 +44,7 @@ import net.minecraft.world.level.Level;
+@@ -45,6 +45,7 @@ import net.minecraft.world.level.Level;
  import net.minecraft.world.level.block.AbstractFurnaceBlock;
  import net.minecraft.world.level.block.Blocks;
  import net.minecraft.world.level.block.state.BlockState;
@@ -16,7 +16,7 @@ index a18aadbf7ae83713e1f2b21553185d8000bc7699..b0afc384907bb75dfa26e432a2328fe0
  import net.minecraft.world.phys.Vec3;
  // CraftBukkit start
  import org.bukkit.craftbukkit.block.CraftBlock;
-@@ -324,6 +325,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -335,6 +336,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
          }
  
          ItemStack itemstack = (ItemStack) blockEntity.items.get(1);
@@ -38,7 +38,7 @@ index a18aadbf7ae83713e1f2b21553185d8000bc7699..b0afc384907bb75dfa26e432a2328fe0
          boolean flag2 = !((ItemStack) blockEntity.items.get(0)).isEmpty();
          boolean flag3 = !itemstack.isEmpty();
  
-@@ -409,6 +425,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -420,6 +436,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
              setChanged(world, pos, state);
          }
  
@@ -47,10 +47,10 @@ index a18aadbf7ae83713e1f2b21553185d8000bc7699..b0afc384907bb75dfa26e432a2328fe0
  
      private static boolean canBurn(RegistryAccess registryManager, @Nullable RecipeHolder<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7e8816a3bd9c60844ca0fbb8674abf6c53b4d81c..02aa54fbd0605b92de9263ba852ac04e24b2fdef 100644
+index d2ab4fe9ccb19f837a41bddddf29cfcc96fc3f96..163d2cfaeaa301c34f04ed13d8ff881ecb868224 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -409,6 +409,17 @@ public class PurpurWorldConfig {
+@@ -410,6 +410,17 @@ public class PurpurWorldConfig {
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
      }
  
diff --git a/patches/server/0099-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0096-Arrows-should-not-reset-despawn-counter.patch
similarity index 88%
rename from patches/server/0099-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0096-Arrows-should-not-reset-despawn-counter.patch
index 0b60a6696..6fe03557a 100644
--- a/patches/server/0099-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0096-Arrows-should-not-reset-despawn-counter.patch
@@ -7,10 +7,10 @@ This prevents keeping arrows alive indefinitely (such as when the block
 the arrow is stuck in gets removed, like a piston head going up/down)
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 8affdd74769aed9aa92a76ba539cd9d27208827c..9710d1cd31d263b29c80923c56134b1f8f6702b0 100644
+index 31b8a8bf78d52b5f11b68e780ec09bf78e7bda84..342eaa0e3b053e9b39dc58fa92cd18cac446a844 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -332,7 +332,7 @@ public abstract class AbstractArrow extends Projectile {
          Vec3 vec3d = this.getDeltaMovement();
  
          this.setDeltaMovement(vec3d.multiply((double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F)));
@@ -20,7 +20,7 @@ index 8affdd74769aed9aa92a76ba539cd9d27208827c..9710d1cd31d263b29c80923c56134b1f
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 02aa54fbd0605b92de9263ba852ac04e24b2fdef..41d694ec386530f97044ff6aa98f4e436cadddd7 100644
+index 163d2cfaeaa301c34f04ed13d8ff881ecb868224..5a49ea28eb227c6d550f3d7e589fb1e98fa2d285 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -101,6 +101,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0100-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0097-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 84%
rename from patches/server/0100-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0097-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index 1d51e5a29..a10dc92f4 100644
--- a/patches/server/0100-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0097-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ability to re-add farmland mechanics from Alpha
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 1776906e886edd511bfbe96b8a345438a3cd66f8..7efae60a9a9269703a1fa7cd280b5b96557ec73e 100644
+index da85fabd75e9bd5ebece7127ef5b512df16fe3ac..dc356bd0931af9bdab9ec71e3de66e88a67375ad 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -115,6 +115,14 @@ public class FarmBlock extends Block {
+@@ -125,6 +125,14 @@ public class FarmBlock extends Block {
                  return;
              }
  
@@ -24,10 +24,10 @@ index 1776906e886edd511bfbe96b8a345438a3cd66f8..7efae60a9a9269703a1fa7cd280b5b96
                  return;
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 41d694ec386530f97044ff6aa98f4e436cadddd7..957fb2554554be7912f434b999a9ddd31681b92a 100644
+index 5a49ea28eb227c6d550f3d7e589fb1e98fa2d285..543c7679cf1ac50ff103be3366421d4faa542319 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -410,8 +410,10 @@ public class PurpurWorldConfig {
+@@ -411,8 +411,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean farmlandGetsMoistFromBelow = false;
diff --git a/patches/server/0101-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 90%
rename from patches/server/0101-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch
index 7e6ceed50..50177cb6b 100644
--- a/patches/server/0101-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0098-Add-adjustable-breeding-cooldown-to-config.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Add adjustable breeding cooldown to config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-index be105a4460e9bf2ef4b72a307fa31291c37d5e0e..5fe0b2301dbd1bedaa26254f7f88931c2022d709 100644
+index 5193cf1d3c922d750a11e492b7636215e23ad0d6..b1f0fda942559b6d12c12a77088da6ce4a233963 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-@@ -149,7 +149,7 @@ public abstract class Animal extends AgeableMob {
+@@ -146,7 +146,7 @@ public abstract class Animal extends AgeableMob {
          if (this.isFood(itemstack)) {
              int i = this.getAge();
  
 -            if (!this.level().isClientSide && i == 0 && this.canFallInLove()) {
 +            if (!this.level().isClientSide && i == 0 && this.canFallInLove() && (this.level().purpurConfig.animalBreedingCooldownSeconds <= 0 || !this.level().hasBreedingCooldown(player.getUUID(), this.getClass()))) { // Purpur
+                 final ItemStack breedCopy = itemstack.copy(); // Paper - Fix EntityBreedEvent copying
                  this.usePlayerItem(player, hand, itemstack);
-                 this.setInLove(player);
-                 return InteractionResult.SUCCESS;
-@@ -231,12 +231,20 @@ public abstract class Animal extends AgeableMob {
+                 this.setInLove(player, breedCopy); // Paper - Fix EntityBreedEvent copying
+@@ -234,12 +234,20 @@ public abstract class Animal extends AgeableMob {
          AgeableMob entityageable = this.getBreedOffspring(world, other);
  
          if (entityageable != null) {
@@ -42,10 +42,10 @@ index be105a4460e9bf2ef4b72a307fa31291c37d5e0e..5fe0b2301dbd1bedaa26254f7f88931c
              EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience);
              if (entityBreedEvent.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4f950128114b8fb6ad145a7302ce6be327c8b6c1..b486008e2ef64648064aa365fb98bd5878f9c379 100644
+index 2e44e9ea9558ebc1456d9bbf53561988e33ce845..edd9762e2475aa8828930ada59eb331a8e8d3970 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -194,6 +194,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -188,6 +188,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
      // Paper end - fix and optimise world upgrading
  
@@ -95,16 +95,16 @@ index 4f950128114b8fb6ad145a7302ce6be327c8b6c1..b486008e2ef64648064aa365fb98bd58
      public CraftWorld getWorld() {
          return this.world;
      }
-@@ -217,6 +260,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -218,6 +261,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
-         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
+         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
          this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
 +        this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
          this.generator = gen;
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 957fb2554554be7912f434b999a9ddd31681b92a..ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194 100644
+index 543c7679cf1ac50ff103be3366421d4faa542319..37292c309b465fce3b601a3ff8400e58c5a74308 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -115,6 +115,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0102-Make-entity-breeding-times-configurable.patch b/patches/server/0099-Make-entity-breeding-times-configurable.patch
similarity index 83%
rename from patches/server/0102-Make-entity-breeding-times-configurable.patch
rename to patches/server/0099-Make-entity-breeding-times-configurable.patch
index 4bafe0a57..5ef15b6c9 100644
--- a/patches/server/0102-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0099-Make-entity-breeding-times-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make entity breeding times configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
-index 0cc411dd39d981187c9e9a3c5eb8043b19a09b98..f7032f4ea55f5aca293c2640686238b7af0f9c80 100644
+index 0a608418f87b71d5d71706712e1f82da0d7e4d34..03e7ca83e4c28dfaa5b52bcb100bd542db105970 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerMakeLove.java
-@@ -127,8 +127,10 @@ public class VillagerMakeLove extends Behavior<Villager> {
+@@ -125,8 +125,10 @@ public class VillagerMakeLove extends Behavior<Villager> {
                  return Optional.empty();
              }
              // Move age setting down
@@ -22,7 +22,7 @@ index 0cc411dd39d981187c9e9a3c5eb8043b19a09b98..f7032f4ea55f5aca293c2640686238b7
              // CraftBukkit end
              world.broadcastEntityEvent(entityvillager2, (byte) 12);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-index 5fe0b2301dbd1bedaa26254f7f88931c2022d709..2e268aa614522b40fbffabce4017b228db5bcba8 100644
+index b1f0fda942559b6d12c12a77088da6ce4a233963..7f90a0d8f65c96844df06b7c4fa3da28a6f51dd1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
 @@ -42,6 +42,7 @@ public abstract class Animal extends AgeableMob {
@@ -33,7 +33,7 @@ index 5fe0b2301dbd1bedaa26254f7f88931c2022d709..2e268aa614522b40fbffabce4017b228
  
      protected Animal(EntityType<? extends Animal> type, Level world) {
          super(type, world);
-@@ -272,8 +273,10 @@ public abstract class Animal extends AgeableMob {
+@@ -275,8 +276,10 @@ public abstract class Animal extends AgeableMob {
              entityplayer.awardStat(Stats.ANIMALS_BRED);
              CriteriaTriggers.BRED_ANIMALS.trigger(entityplayer, this, entityanimal, entityageable);
          } // Paper
@@ -47,10 +47,10 @@ index 5fe0b2301dbd1bedaa26254f7f88931c2022d709..2e268aa614522b40fbffabce4017b228
          entityanimal.resetLove();
          worldserver.broadcastEntityEvent(this, (byte) 18);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index ee9a12a0285f43535b377e5aea2c3e9e5f64b496..cd53ac9806f80409082f394e978295fd414d745d 100644
+index ae4b53f4cdd78368deb7d510be4936ffefce4d9c..cbcfe8177362d9b8af97f21e716a4dce9e227465 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -476,6 +476,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -472,6 +472,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.beeMaxHealth);
      }
  
@@ -63,26 +63,26 @@ index ee9a12a0285f43535b377e5aea2c3e9e5f64b496..cd53ac9806f80409082f394e978295fd
      public int getRemainingPersistentAngerTime() {
          return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 87642c1c2c1f39a1c2029797bab73f60c19a1080..a5b1cc957b824f8cc36693128ce05f5d556cf7d7 100644
+index 7930e9735abf8357df737798e80b08295c2e06ec..b23d6683bab3d257febb57a6c9c8be4db926af7f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -128,6 +128,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -134,6 +134,11 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+     public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.catMaxHealth);
      }
- 
++
 +    @Override
 +    public int getPurpurBreedTime() {
 +        return this.level().purpurConfig.catBreedingTicks;
 +    }
-+
-     public ResourceLocation getResourceLocation() {
-         return this.getVariant().texture();
-     }
+     // Purpur end
+ 
+     public ResourceLocation getTextureId() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index bc3094493d7d25eaf50da8fdd74eacae25692b09..b142e5c489e9fe65b7258f541ef121b2cd020886 100644
+index 14210dac8a4fa8caaf69ec830f83d15525bb1bea..a440e9cc8973d6116652a0871251c421a633ba6d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -80,6 +80,11 @@ public class Chicken extends Animal {
+@@ -79,6 +79,11 @@ public class Chicken extends Animal {
          }
      }
  
@@ -95,10 +95,10 @@ index bc3094493d7d25eaf50da8fdd74eacae25692b09..b142e5c489e9fe65b7258f541ef121b2
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index d42c8bcd85ffb1e00d2883485bf22981611b0bc3..c501704251e5b23f697efc307ebdc906cd2e5acd 100644
+index bda0d933ccbee613aa7fb31534351a0d2dbab0a7..64866ca220f4c0b6350e92473cd013658a7de974 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -69,6 +69,11 @@ public class Cow extends Animal {
+@@ -68,6 +68,11 @@ public class Cow extends Animal {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.cowMaxHealth);
      }
  
@@ -111,10 +111,10 @@ index d42c8bcd85ffb1e00d2883485bf22981611b0bc3..c501704251e5b23f697efc307ebdc906
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index f26fa004e1372f8711e76bc7fa4cdb383b989755..b13429e254bd056cf942f39d46976ff0ef2a97f3 100644
+index d2be8c1c23f291e98b9a31a63ba5fa7d44fc7402..0140dc8a58903bd802ea8ffb029392215e95cdf4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -188,6 +188,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -189,6 +189,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.foxMaxHealth);
      }
  
@@ -124,8 +124,8 @@ index f26fa004e1372f8711e76bc7fa4cdb383b989755..b13429e254bd056cf942f39d46976ff0
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 @@ -991,8 +996,10 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
                      CriteriaTriggers.BRED_ANIMALS.trigger(entityplayer2, this.animal, this.partner, entityfox);
                  }
@@ -140,10 +140,10 @@ index f26fa004e1372f8711e76bc7fa4cdb383b989755..b13429e254bd056cf942f39d46976ff0
                  this.partner.resetLove();
                  worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index c83e5d58ca5db1e63e099f36006043f7e78ea56f..cdf2bd4b2aa43b1d45fb0f0e8c4a14057ca39525 100644
+index 41b52f128fbc174939a7f2d1cd937ab19432de25..22a2328fe5159c8fed635a62334a3f1028c346a5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -85,6 +85,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -86,6 +86,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.mooshroomMaxHealth);
      }
  
@@ -156,10 +156,10 @@ index c83e5d58ca5db1e63e099f36006043f7e78ea56f..cdf2bd4b2aa43b1d45fb0f0e8c4a1405
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 14daac1a87e32e0ff0a610aef256e20cbfe50001..3fe751839e4a1bc266b0d9508e1e3384e8f7f41e 100644
+index 31f3982359a00f55a7fc053becc4043dcf423c50..fc74c21d2c506df2134fc4ce61917af65fa89466 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -92,6 +92,11 @@ public class Ocelot extends Animal {
+@@ -88,6 +88,11 @@ public class Ocelot extends Animal {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.ocelotMaxHealth);
      }
  
@@ -172,10 +172,10 @@ index 14daac1a87e32e0ff0a610aef256e20cbfe50001..3fe751839e4a1bc266b0d9508e1e3384
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 2832d7cbcfad43b3f0f6c33504cff68add85601d..e91f950b64f80fb86795c570f7f119c159315472 100644
+index d2410da0b453e0128ff8b00956cae89cabff1d5d..e90fc016fc7e0e9aac2c2d0cf081748100f225f3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -146,6 +146,11 @@ public class Panda extends Animal {
+@@ -152,6 +152,11 @@ public class Panda extends Animal {
          setAttributes();
      }
  
@@ -188,10 +188,10 @@ index 2832d7cbcfad43b3f0f6c33504cff68add85601d..e91f950b64f80fb86795c570f7f119c1
      public boolean canTakeItem(ItemStack stack) {
          EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index fa8f9fdb873a65d3685b808c20b2d069dc1f3a90..2e671558ddeb7602c16c3684f87a9ce850e95aa2 100644
+index 04507e05b499e536faa3c55179bb91913f7cda81..22b8701accc76d806819433a8511172e13a9ed9e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -197,6 +197,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -191,6 +191,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.parrotMaxHealth);
      }
  
@@ -202,12 +202,12 @@ index fa8f9fdb873a65d3685b808c20b2d069dc1f3a90..2e671558ddeb7602c16c3684f87a9ce8
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index dc27fa0df90f8eefc20bf76ff58b1b2ebaacf120..42bf69eb86b9ccfb5afaf17e319bf34ce055e033 100644
+index 4f84406304114abbaff9f96a5df6a48616983fa9..a9cd2b75eeb192d7343bc06a1c3fa03748178f5f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -89,6 +89,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -86,6 +86,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.pigMaxHealth);
      }
  
@@ -220,10 +220,10 @@ index dc27fa0df90f8eefc20bf76ff58b1b2ebaacf120..42bf69eb86b9ccfb5afaf17e319bf34c
      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 0377d40198b88512b1f204a31367c2db039a7f9c..6eefdf7de7edee63b14bffc60557e9779312270c 100644
+index 067bb175c457d6de089f18826dfce6c3661dad67..7288b9f1a46d6c1556e2653b990d6ce4beaf5949 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -120,6 +120,11 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -119,6 +119,11 @@ public class PolarBear extends Animal implements NeutralMob {
          }
      }
  
@@ -236,10 +236,10 @@ index 0377d40198b88512b1f204a31367c2db039a7f9c..6eefdf7de7edee63b14bffc60557e977
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 106600ad9712d9a4fdf6770e81b40606b2f9b9b2..c25776ef9805f3f4e31ca5b027e6577526e48819 100644
+index 4abcde662ed78b16632ee575f695ee4329f11b2f..b5297b1d7223af622636a7defdb98b5bc6e6a3c9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -143,6 +143,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -142,6 +142,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.rabbitMaxHealth);
      }
@@ -252,10 +252,10 @@ index 106600ad9712d9a4fdf6770e81b40606b2f9b9b2..c25776ef9805f3f4e31ca5b027e65775
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index c24299cb482beaef3e2e860475c66e068fa03eb1..284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288 100644
+index b68886cc72d3055e7745fe4a955192bbad90dc13..c3cc949291d11ae707fa5175d666df2ee81cdcce 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -141,6 +141,11 @@ public class Sheep extends Animal implements Shearable {
+@@ -139,6 +139,11 @@ public class Sheep extends Animal implements Shearable {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.sheepMaxHealth);
      }
  
@@ -268,10 +268,10 @@ index c24299cb482beaef3e2e860475c66e068fa03eb1..284c9780e18f51b6ebd32b7eb7a9d3e4
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 4b76c207c7f1eee6bdceebeeba50779557a2662a..6ff7d09066e3f175c3b9404febac9ef9940dc8d5 100644
+index b8dcf3d632c79585ec7e9f50fa040fa9fac5d7c5..a577ec78b2f5bca0166277c499da4fa7988d5395 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -108,6 +108,11 @@ public class Turtle extends Animal {
+@@ -109,6 +109,11 @@ public class Turtle extends Animal {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.turtleMaxHealth);
      }
  
@@ -284,10 +284,10 @@ index 4b76c207c7f1eee6bdceebeeba50779557a2662a..6ff7d09066e3f175c3b9404febac9ef9
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index eecdb1f1d49951cb8a294d176afd12c68fb6c3b1..39a923e48750bd960f64aad248c10dd390afc239 100644
+index 3235ed40d502722e888656776ba1a218f198f53e..2267f8da1c27ff54b2ced59ef15eb45357b7075d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -132,6 +132,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -151,6 +151,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.wolfMaxHealth);
      }
  
@@ -299,11 +299,27 @@ index eecdb1f1d49951cb8a294d176afd12c68fb6c3b1..39a923e48750bd960f64aad248c10dd3
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
+diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index b38281f963377cc82b360e8457da7cad033b8c36..29412208e329e9fc211b844822a2fc3328a5bc89 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -469,4 +469,11 @@ public class Armadillo extends Animal {
+             return this.animationDuration;
+         }
+     }
++
++    // Purpur start
++    @Override
++    public int getPurpurBreedTime() {
++        return 6000;
++    }
++    // Purpur end
+ }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 882c8fe0d9dc2e34eed2f1b11bb2c1b4d72319d2..c217a4b78eb53af8b8c011bfabbbddcc31c88df4 100644
+index 414ff28670c3d36dc78e3df4d39b6d4eb3ec1e77..97ba327398d84db09c81cee860b40642b428ea48 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -120,6 +120,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -118,6 +118,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.axolotlMaxHealth);
      }
  
@@ -316,10 +332,10 @@ index 882c8fe0d9dc2e34eed2f1b11bb2c1b4d72319d2..c217a4b78eb53af8b8c011bfabbbddcc
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 85a557b50498bb83eeec4125aa2ae14f3bfaaab8..f44261137f12354640170206ca7bfb6d991dc7a0 100644
+index 07a5599a9370ba167e985006d74caa3c80288e28..ed67fcd2b67bfe581863cc6748692c3348f6c883 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -91,6 +91,10 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -89,6 +89,10 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
      public boolean dismountsUnderwater() {
          return level().purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level().purpurConfig.camelRidableInWater;
      }
@@ -331,10 +347,10 @@ index 85a557b50498bb83eeec4125aa2ae14f3bfaaab8..f44261137f12354640170206ca7bfb6d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 3098f90ef97f69dbaf482ce0acd0c0c7ba3572b9..3cef040c0e8869ca2ca2cb83c8f60a0f15582ae8 100644
+index b6a4b4e66ca67e4dcb4b14a13ab6586a94e1b020..b0f8115b328eda1e3571051870b5310c5a7e115a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -138,6 +138,10 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -162,6 +162,10 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
      }
      // Purpur end
  
@@ -346,10 +362,10 @@ index 3098f90ef97f69dbaf482ce0acd0c0c7ba3572b9..3cef040c0e8869ca2ca2cb83c8f60a0f
      protected Brain.Provider<Frog> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index fef3b7d193d20c4fdd50b38c6a0371f05165a49d..93295d9683293121f2267350194f18e97b2421c2 100644
+index 9cd8220a1e5e43c141ad27df4969e66ef3746ecd..84c04603d50e190430e4e6cf2a7b613537a0c341 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -109,6 +109,11 @@ public class Goat extends Animal {
+@@ -108,6 +108,11 @@ public class Goat extends Animal {
      }
      // Purpur end
  
@@ -362,7 +378,7 @@ index fef3b7d193d20c4fdd50b38c6a0371f05165a49d..93295d9683293121f2267350194f18e9
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index 365273173e37e74470a1cf511334ea8cb25f8302..6932d0eafbeca9de80728c6b0ae42340d2297ad0 100644
+index b47a72ffb8b947cea5d4bc6ee37b824c4161be31..2990d50fd5209b272e0cfbd5dd633124048e8129 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -37,6 +37,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -378,10 +394,10 @@ index 365273173e37e74470a1cf511334ea8cb25f8302..6932d0eafbeca9de80728c6b0ae42340
      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 92339f5a07dcb6bf7eb1bce6d584464ebd8430b5..0251ded48eb5bdf96f0e67f6456aa15909c8a4ff 100644
+index 9ad0d3972d1970b11687da174a83e3a0a4180c0e..16d4278d49dad84f72c968ca36914e93d46dc5f6 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> {
+@@ -66,6 +66,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          return generateSpeed(this.level().purpurConfig.horseMovementSpeedMin, this.level().purpurConfig.horseMovementSpeedMax);
      }
  
@@ -394,7 +410,7 @@ index 92339f5a07dcb6bf7eb1bce6d584464ebd8430b5..0251ded48eb5bdf96f0e67f6456aa159
      protected void randomizeAttributes(RandomSource random) {
          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 15a08abe94cb97de1450ff42cfb924a537b9eb5c..1c0d0f14659e0a64e6b3b3998f59f90cd5b59726 100644
+index 05614fb50a5509331ac15bb819e827365a4cefcf..81d614cf14512464b376575fd2d7e7fbf93d9e03 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -140,6 +140,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -410,7 +426,7 @@ index 15a08abe94cb97de1450ff42cfb924a537b9eb5c..1c0d0f14659e0a64e6b3b3998f59f90c
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index abbeb305b2d09e9c4c02ade603adac5ceb34bdd0..1de48560ac5a1db8845c98c812b2e9f9eb972123 100644
+index 68fe99ea6d683dd18171d35764b4cb319433f6e0..8c52cbd47b90da51f3d5b84b8df4113fecc598df 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -36,6 +36,11 @@ public class Mule extends AbstractChestedHorse {
@@ -426,10 +442,10 @@ index abbeb305b2d09e9c4c02ade603adac5ceb34bdd0..1de48560ac5a1db8845c98c812b2e9f9
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index 8ffba7c368f936ea5cdfc46c5fa76c3feb63e1ac..bd83a2b82908d0beb91bd2937e263d6681a691f6 100644
+index 6180f750ed159e35d20bbaefc57bdd7293c657ec..5686bb0b537650e7d89292cef4e7e82bc7383748 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -53,6 +53,11 @@ public class SkeletonHorse extends AbstractHorse {
+@@ -64,6 +64,11 @@ public class SkeletonHorse extends AbstractHorse {
          return generateSpeed(this.level().purpurConfig.skeletonHorseMovementSpeedMin, this.level().purpurConfig.skeletonHorseMovementSpeedMax);
      }
  
@@ -439,13 +455,13 @@ index 8ffba7c368f936ea5cdfc46c5fa76c3feb63e1ac..bd83a2b82908d0beb91bd2937e263d66
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index 4abb9d5fedf63eba9dc3f716d44ea11806607af0..3632fcb124be8cf77d9bebf7b861a48196252ed0 100644
+index af29ba1512bfda03718fb01ecff8d86b4e927611..d22f429f3de9c68a189087f23a483a561454cc54 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -64,6 +64,11 @@ public class TraderLlama extends Llama {
+@@ -67,6 +67,11 @@ public class TraderLlama extends Llama {
          return generateSpeed(this.level().purpurConfig.traderLlamaMovementSpeedMin, this.level().purpurConfig.traderLlamaMovementSpeedMax);
      }
  
@@ -458,10 +474,10 @@ index 4abb9d5fedf63eba9dc3f716d44ea11806607af0..3632fcb124be8cf77d9bebf7b861a481
      public boolean isTraderLlama() {
          return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index 2e6b55a01e022252245c16ed310920bcba072975..fba4eec4490e389b8b102d40542b9340d8ac559e 100644
+index d2b3859f9c69e6d73fa859db858d38dd41fa35cd..fbad3b11223ee5dac4af15584e5dfd808a149545 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-@@ -49,6 +49,11 @@ public class ZombieHorse extends AbstractHorse {
+@@ -60,6 +60,11 @@ public class ZombieHorse extends AbstractHorse {
          return generateSpeed(this.level().purpurConfig.zombieHorseMovementSpeedMin, this.level().purpurConfig.zombieHorseMovementSpeedMax);
      }
  
@@ -471,29 +487,29 @@ index 2e6b55a01e022252245c16ed310920bcba072975..fba4eec4490e389b8b102d40542b9340
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index a5fd822713b56ebb2bec51364be715570ec056bb..42bfc59462f320e95c13075c8541c4c4c98a6879 100644
+index d63913cca12a008ceb4bffc97ba08b8d800102c3..0cc5b9e44dd6f1e0afdbb62ef41aa749c0c79b18 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -113,6 +113,11 @@ public class Sniffer extends Animal {
+@@ -114,6 +114,11 @@ public class Sniffer extends Animal {
+     public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.snifferMaxHealth);
      }
- 
++
 +    @Override
 +    public int getPurpurBreedTime() {
 +        return this.level().purpurConfig.snifferBreedingTicks;
 +    }
-+
-     // CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
+     // Purpur end
+ 
      @Override
-     protected void defineSynchedData() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 9b853fd05a3a851cb08d7f849b51f2b220780982..10136a5062d154456c962e7d1a99c2dedbd568ed 100644
+index 4abbeaf9f88511f37bd14c17dbd9a107648a5534..5f1166ccd64509a70323e2713f3ab58674d83105 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -122,6 +122,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+@@ -119,6 +119,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.striderMaxHealth);
      }
  
@@ -506,10 +522,10 @@ index 9b853fd05a3a851cb08d7f849b51f2b220780982..10136a5062d154456c962e7d1a99c2de
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 22788892f7286f3fa6b40059b2bedaf0c6ec5ef3..80f91a11c04763c1c9ed2bd242b88b5a473560d7 100644
+index 3bfc073fb142e3446044a42c33be6c30587cc3c4..a770ae0e13c4dad296dfb8f33259408ee1531c70 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -91,6 +91,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -112,6 +112,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.hoglinMaxHealth);
      }
  
@@ -522,10 +538,10 @@ index 22788892f7286f3fa6b40059b2bedaf0c6ec5ef3..80f91a11c04763c1c9ed2bd242b88b5a
      public boolean canBeLeashed(Player player) {
          return !this.isLeashed();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374cead07f655 100644
+index 37292c309b465fce3b601a3ff8400e58c5a74308..8ba5fc8813ef1cb34f7df801f6d7b2ed42b1c052 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -501,10 +501,12 @@ public class PurpurWorldConfig {
+@@ -502,10 +502,12 @@ public class PurpurWorldConfig {
      public boolean axolotlRidable = false;
      public boolean axolotlControllable = true;
      public double axolotlMaxHealth = 14.0D;
@@ -538,7 +554,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean batRidable = false;
-@@ -544,6 +546,7 @@ public class PurpurWorldConfig {
+@@ -545,6 +547,7 @@ public class PurpurWorldConfig {
      public boolean beeControllable = true;
      public double beeMaxY = 320D;
      public double beeMaxHealth = 10.0D;
@@ -546,7 +562,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -555,6 +558,7 @@ public class PurpurWorldConfig {
+@@ -556,6 +559,7 @@ public class PurpurWorldConfig {
              set("mobs.bee.attributes.max_health", oldValue);
          }
          beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -554,7 +570,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean blazeRidable = false;
-@@ -582,6 +586,7 @@ public class PurpurWorldConfig {
+@@ -583,6 +587,7 @@ public class PurpurWorldConfig {
      public double camelJumpStrengthMax = 0.42D;
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
@@ -562,7 +578,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void camelSettings() {
          camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
          camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
-@@ -590,6 +595,7 @@ public class PurpurWorldConfig {
+@@ -591,6 +596,7 @@ public class PurpurWorldConfig {
          camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
          camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
          camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
@@ -570,7 +586,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean catRidable = false;
-@@ -599,6 +605,7 @@ public class PurpurWorldConfig {
+@@ -600,6 +606,7 @@ public class PurpurWorldConfig {
      public int catSpawnDelay = 1200;
      public int catSpawnSwampHutScanRange = 16;
      public int catSpawnVillageScanRange = 48;
@@ -578,7 +594,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void catSettings() {
          catRidable = getBoolean("mobs.cat.ridable", catRidable);
          catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
-@@ -612,6 +619,7 @@ public class PurpurWorldConfig {
+@@ -613,6 +620,7 @@ public class PurpurWorldConfig {
          catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
          catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
          catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -586,7 +602,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean caveSpiderRidable = false;
-@@ -635,6 +643,7 @@ public class PurpurWorldConfig {
+@@ -636,6 +644,7 @@ public class PurpurWorldConfig {
      public boolean chickenControllable = true;
      public double chickenMaxHealth = 4.0D;
      public boolean chickenRetaliate = false;
@@ -594,7 +610,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void chickenSettings() {
          chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
          chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
-@@ -646,6 +655,7 @@ public class PurpurWorldConfig {
+@@ -647,6 +656,7 @@ public class PurpurWorldConfig {
          }
          chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
          chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -602,7 +618,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean codRidable = false;
-@@ -667,6 +677,7 @@ public class PurpurWorldConfig {
+@@ -668,6 +678,7 @@ public class PurpurWorldConfig {
      public boolean cowControllable = true;
      public double cowMaxHealth = 10.0D;
      public int cowFeedMushrooms = 0;
@@ -610,7 +626,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void cowSettings() {
          cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
          cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
-@@ -678,6 +689,7 @@ public class PurpurWorldConfig {
+@@ -679,6 +690,7 @@ public class PurpurWorldConfig {
          }
          cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
          cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -618,7 +634,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean creeperRidable = false;
-@@ -729,6 +741,7 @@ public class PurpurWorldConfig {
+@@ -730,6 +742,7 @@ public class PurpurWorldConfig {
      public double donkeyJumpStrengthMax = 0.5D;
      public double donkeyMovementSpeedMin = 0.175D;
      public double donkeyMovementSpeedMax = 0.175D;
@@ -626,7 +642,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void donkeySettings() {
          donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -744,6 +757,7 @@ public class PurpurWorldConfig {
+@@ -745,6 +758,7 @@ public class PurpurWorldConfig {
          donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
          donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
          donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -634,7 +650,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean drownedRidable = false;
-@@ -863,6 +877,7 @@ public class PurpurWorldConfig {
+@@ -864,6 +878,7 @@ public class PurpurWorldConfig {
      public boolean foxControllable = true;
      public double foxMaxHealth = 10.0D;
      public boolean foxTypeChangesWithTulips = false;
@@ -642,7 +658,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -874,17 +889,20 @@ public class PurpurWorldConfig {
+@@ -875,17 +890,20 @@ public class PurpurWorldConfig {
          }
          foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
          foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -663,7 +679,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean ghastRidable = false;
-@@ -952,11 +970,13 @@ public class PurpurWorldConfig {
+@@ -953,11 +971,13 @@ public class PurpurWorldConfig {
      public boolean goatRidableInWater = true;
      public boolean goatControllable = true;
      public double goatMaxHealth = 10.0D;
@@ -677,7 +693,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean guardianRidable = false;
-@@ -977,6 +997,7 @@ public class PurpurWorldConfig {
+@@ -978,6 +998,7 @@ public class PurpurWorldConfig {
      public boolean hoglinRidableInWater = true;
      public boolean hoglinControllable = true;
      public double hoglinMaxHealth = 40.0D;
@@ -685,7 +701,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void hoglinSettings() {
          hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
          hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
-@@ -987,6 +1008,7 @@ public class PurpurWorldConfig {
+@@ -988,6 +1009,7 @@ public class PurpurWorldConfig {
              set("mobs.hoglin.attributes.max_health", oldValue);
          }
          hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -693,7 +709,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean horseRidableInWater = false;
-@@ -996,6 +1018,7 @@ public class PurpurWorldConfig {
+@@ -997,6 +1019,7 @@ public class PurpurWorldConfig {
      public double horseJumpStrengthMax = 1.0D;
      public double horseMovementSpeedMin = 0.1125D;
      public double horseMovementSpeedMax = 0.3375D;
@@ -701,7 +717,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void horseSettings() {
          horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1011,6 +1034,7 @@ public class PurpurWorldConfig {
+@@ -1012,6 +1035,7 @@ public class PurpurWorldConfig {
          horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
          horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
          horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -709,7 +725,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean huskRidable = false;
-@@ -1088,6 +1112,7 @@ public class PurpurWorldConfig {
+@@ -1089,6 +1113,7 @@ public class PurpurWorldConfig {
      public double llamaJumpStrengthMax = 0.5D;
      public double llamaMovementSpeedMin = 0.175D;
      public double llamaMovementSpeedMax = 0.175D;
@@ -717,7 +733,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1105,6 +1130,7 @@ public class PurpurWorldConfig {
+@@ -1106,6 +1131,7 @@ public class PurpurWorldConfig {
          llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
          llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -725,7 +741,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean magmaCubeRidable = false;
-@@ -1133,6 +1159,7 @@ public class PurpurWorldConfig {
+@@ -1134,6 +1160,7 @@ public class PurpurWorldConfig {
      public boolean mooshroomRidableInWater = true;
      public boolean mooshroomControllable = true;
      public double mooshroomMaxHealth = 10.0D;
@@ -733,7 +749,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void mooshroomSettings() {
          mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
          mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
-@@ -1143,6 +1170,7 @@ public class PurpurWorldConfig {
+@@ -1144,6 +1171,7 @@ public class PurpurWorldConfig {
              set("mobs.mooshroom.attributes.max_health", oldValue);
          }
          mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -741,7 +757,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean muleRidableInWater = false;
-@@ -1152,6 +1180,7 @@ public class PurpurWorldConfig {
+@@ -1153,6 +1181,7 @@ public class PurpurWorldConfig {
      public double muleJumpStrengthMax = 0.5D;
      public double muleMovementSpeedMin = 0.175D;
      public double muleMovementSpeedMax = 0.175D;
@@ -749,7 +765,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void muleSettings() {
          muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1167,12 +1196,14 @@ public class PurpurWorldConfig {
+@@ -1168,12 +1197,14 @@ public class PurpurWorldConfig {
          muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
          muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
          muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -764,7 +780,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void ocelotSettings() {
          ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
          ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
-@@ -1183,12 +1214,14 @@ public class PurpurWorldConfig {
+@@ -1184,12 +1215,14 @@ public class PurpurWorldConfig {
              set("mobs.ocelot.attributes.max_health", oldValue);
          }
          ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -779,7 +795,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void pandaSettings() {
          pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
          pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
-@@ -1199,6 +1232,7 @@ public class PurpurWorldConfig {
+@@ -1200,6 +1233,7 @@ public class PurpurWorldConfig {
              set("mobs.panda.attributes.max_health", oldValue);
          }
          pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -787,7 +803,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean parrotRidable = false;
-@@ -1282,6 +1316,7 @@ public class PurpurWorldConfig {
+@@ -1283,6 +1317,7 @@ public class PurpurWorldConfig {
      public boolean pigControllable = true;
      public double pigMaxHealth = 10.0D;
      public boolean pigGiveSaddleBack = false;
@@ -795,7 +811,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void pigSettings() {
          pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
          pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
-@@ -1293,6 +1328,7 @@ public class PurpurWorldConfig {
+@@ -1294,6 +1329,7 @@ public class PurpurWorldConfig {
          }
          pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
          pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -803,7 +819,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean piglinRidable = false;
-@@ -1349,6 +1385,7 @@ public class PurpurWorldConfig {
+@@ -1350,6 +1386,7 @@ public class PurpurWorldConfig {
      public double polarBearMaxHealth = 30.0D;
      public String polarBearBreedableItemString = "";
      public Item polarBearBreedableItem = null;
@@ -811,7 +827,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void polarBearSettings() {
          polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
          polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
-@@ -1362,6 +1399,7 @@ public class PurpurWorldConfig {
+@@ -1363,6 +1400,7 @@ public class PurpurWorldConfig {
          polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
          Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
          if (item != Items.AIR) polarBearBreedableItem = item;
@@ -819,7 +835,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean pufferfishRidable = false;
-@@ -1384,6 +1422,7 @@ public class PurpurWorldConfig {
+@@ -1385,6 +1423,7 @@ public class PurpurWorldConfig {
      public double rabbitMaxHealth = 3.0D;
      public double rabbitNaturalToast = 0.0D;
      public double rabbitNaturalKiller = 0.0D;
@@ -827,7 +843,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1396,6 +1435,7 @@ public class PurpurWorldConfig {
+@@ -1397,6 +1436,7 @@ public class PurpurWorldConfig {
          rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
          rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -835,7 +851,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean ravagerRidable = false;
-@@ -1432,6 +1472,7 @@ public class PurpurWorldConfig {
+@@ -1433,6 +1473,7 @@ public class PurpurWorldConfig {
      public boolean sheepRidableInWater = true;
      public boolean sheepControllable = true;
      public double sheepMaxHealth = 8.0D;
@@ -843,7 +859,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -1442,6 +1483,7 @@ public class PurpurWorldConfig {
+@@ -1443,6 +1484,7 @@ public class PurpurWorldConfig {
              set("mobs.sheep.attributes.max_health", oldValue);
          }
          sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -851,7 +867,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean shulkerRidable = false;
-@@ -1565,11 +1607,13 @@ public class PurpurWorldConfig {
+@@ -1566,11 +1608,13 @@ public class PurpurWorldConfig {
      public boolean snifferRidableInWater = true;
      public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
@@ -865,7 +881,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean squidRidable = false;
-@@ -1628,6 +1672,7 @@ public class PurpurWorldConfig {
+@@ -1629,6 +1673,7 @@ public class PurpurWorldConfig {
      public boolean striderRidableInWater = false;
      public boolean striderControllable = true;
      public double striderMaxHealth = 20.0D;
@@ -873,7 +889,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1638,6 +1683,7 @@ public class PurpurWorldConfig {
+@@ -1639,6 +1684,7 @@ public class PurpurWorldConfig {
              set("mobs.strider.attributes.max_health", oldValue);
          }
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -881,7 +897,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean tadpoleRidable = false;
-@@ -1658,6 +1704,7 @@ public class PurpurWorldConfig {
+@@ -1659,6 +1705,7 @@ public class PurpurWorldConfig {
      public double traderLlamaJumpStrengthMax = 0.5D;
      public double traderLlamaMovementSpeedMin = 0.175D;
      public double traderLlamaMovementSpeedMax = 0.175D;
@@ -889,7 +905,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -1675,6 +1722,7 @@ public class PurpurWorldConfig {
+@@ -1676,6 +1723,7 @@ public class PurpurWorldConfig {
          traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
          traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
          traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -897,7 +913,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean tropicalFishRidable = false;
-@@ -1695,6 +1743,7 @@ public class PurpurWorldConfig {
+@@ -1696,6 +1744,7 @@ public class PurpurWorldConfig {
      public boolean turtleRidableInWater = true;
      public boolean turtleControllable = true;
      public double turtleMaxHealth = 30.0D;
@@ -905,7 +921,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void turtleSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -1705,6 +1754,7 @@ public class PurpurWorldConfig {
+@@ -1706,6 +1755,7 @@ public class PurpurWorldConfig {
              set("mobs.turtle.attributes.max_health", oldValue);
          }
          turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -913,7 +929,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean vexRidable = false;
-@@ -1732,6 +1782,7 @@ public class PurpurWorldConfig {
+@@ -1733,6 +1783,7 @@ public class PurpurWorldConfig {
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
      public boolean villagerCanBreed = true;
@@ -921,7 +937,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1745,6 +1796,7 @@ public class PurpurWorldConfig {
+@@ -1746,6 +1797,7 @@ public class PurpurWorldConfig {
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -929,7 +945,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      }
  
      public boolean vindicatorRidable = false;
-@@ -1856,6 +1908,7 @@ public class PurpurWorldConfig {
+@@ -1857,6 +1909,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
      public double wolfMaxHealth = 8.0D;
@@ -937,7 +953,7 @@ index ff50c24f3a6e2dd0eb5d4e23cc9a38647e2c1194..48de43f61f90e2610e04d04803b374ce
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -1866,6 +1919,7 @@ public class PurpurWorldConfig {
+@@ -1867,6 +1920,7 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0103-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 67%
rename from patches/server/0103-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch
index 08750963b..f746e667a 100644
--- a/patches/server/0103-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0100-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -6,31 +6,30 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 14424afdb708df7f93caf6df45412ec721b5e1dd..a164e13ddfe64b212fc5937b455096287d3151d8 100644
+index 5abbc0caf90cafc1a06dfff158c158b1538f827c..8b25bb80a913cd002cdaeadf076d811172f10488 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -619,7 +619,7 @@ public class ArmorStand extends LivingEntity {
+@@ -613,6 +613,7 @@ public class ArmorStand extends LivingEntity {
      private org.bukkit.event.entity.EntityDeathEvent brokenByPlayer(DamageSource damageSource) { // Paper
          ItemStack itemstack = new ItemStack(Items.ARMOR_STAND);
  
--        if (this.hasCustomName()) {
-+        if (this.level().purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) { // Purpur
-             itemstack.setHoverName(this.getCustomName());
-         }
- 
++        if (this.level().purpurConfig.persistentDroppableEntityDisplayNames)
+         itemstack.set(DataComponents.CUSTOM_NAME, this.getCustomName());
+         this.drops.add(new DefaultDrop(itemstack, stack -> Block.popResource(this.level(), this.blockPosition(), stack))); // CraftBukkit - add to drops // Paper - Restore vanilla drops behavior
+         return this.brokenByAnything(damageSource); // Paper
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 759ecd79534a7706f7d4a63eb9dacbefcfe54674..182faba889dc15a3500c5919cad8a5483a53033a 100644
+index da0d1c9a1c4ae081bff9ca4230c9a1503885c354..9af8fcf6abb9b768829592bc1b091ebe4599ed2e 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -273,7 +273,13 @@ public class ItemFrame extends HangingEntity {
+@@ -262,7 +262,13 @@ public class ItemFrame extends HangingEntity {
                  }
  
                  if (alwaysDrop) {
 -                    this.spawnAtLocation(this.getFrameItemStack());
 +                    // Purpur start
 +                    final ItemStack itemFrame = this.getFrameItemStack();
-+                    if (this.level().purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) {
-+                        itemFrame.setHoverName(this.getCustomName());
++                    if (!this.level().purpurConfig.persistentDroppableEntityDisplayNames) {
++                        itemFrame.set(DataComponents.CUSTOM_NAME, null);
 +                    }
 +                    this.spawnAtLocation(itemFrame);
 +                    // Purpur end
@@ -38,18 +37,18 @@ index 759ecd79534a7706f7d4a63eb9dacbefcfe54674..182faba889dc15a3500c5919cad8a548
  
                  if (!itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-index 03c065d0ad97d29f3586ba2bf3cd207b867ed634..62cdc36a21c0203ed98d2946a1efdf549a5ca3ea 100644
+index 40e7112669abb58a0ab6df1846afec3979e95e55..183464f202d4c2774840edfde1dfcab44d05d0d3 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
-@@ -159,7 +159,13 @@ public class Painting extends HangingEntity implements VariantHolder<Holder<Pain
-                 }
+@@ -151,7 +151,13 @@ public class Painting extends HangingEntity implements VariantHolder<Holder<Pain
+                 return;
              }
  
 -            this.spawnAtLocation(Items.PAINTING);
 +            // Purpur start
 +            final ItemStack painting = new ItemStack(Items.PAINTING);
-+            if (this.level().purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) {
-+                painting.setHoverName(this.getCustomName());
++            if (!this.level().purpurConfig.persistentDroppableEntityDisplayNames) {
++                painting.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, null);
 +            }
 +            this.spawnAtLocation(painting);
 +            // Purpur end
@@ -57,26 +56,26 @@ index 03c065d0ad97d29f3586ba2bf3cd207b867ed634..62cdc36a21c0203ed98d2946a1efdf54
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 96f4ef06d16483bd4bb88cc36207d5bdc4bd1280..c314febb75a85ef12051bde392c5b57e9c5d85ac 100644
+index 0b23e05f936cab7a9867828c2d69417cfde1d2ce..105e2b7d7cd7c64a9164e4114476e44f29433f49 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -242,7 +242,13 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
-     }
+@@ -963,7 +963,13 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
  
-     protected void destroy(DamageSource source) {
--        this.spawnAtLocation((ItemLike) this.getDropItem());
+     @Override
+     public ItemStack getPickResult() {
+-        return new ItemStack(this.getDropItem());
 +        // Purpur start
 +        final ItemStack boat = new ItemStack(this.getDropItem());
-+        if (this.level().purpurConfig.persistentDroppableEntityDisplayNames && this.hasCustomName()) {
-+            boat.setHoverName(this.getCustomName());
++        if (!this.level().purpurConfig.persistentDroppableEntityDisplayNames) {
++            boat.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, null);
 +        }
-+        this.spawnAtLocation(boat);
++        return boat;
 +        // Purpur end
      }
  
-     @Override
+     public static enum Type implements StringRepresentable {
 diff --git a/src/main/java/net/minecraft/world/item/ArmorStandItem.java b/src/main/java/net/minecraft/world/item/ArmorStandItem.java
-index 7cffc64573008502bdd14ae4906fe51166b12fb3..1feafdbb48cf760cb6ebf95d5be2c32bdb1ad44f 100644
+index 1634a7d5ff06583408cf2f02f2b5f90931b1e02a..dfe8473a880cbddfc3ac6a9c97f1a500624eeb38 100644
 --- a/src/main/java/net/minecraft/world/item/ArmorStandItem.java
 +++ b/src/main/java/net/minecraft/world/item/ArmorStandItem.java
 @@ -58,6 +58,14 @@ public class ArmorStandItem extends Item {
@@ -84,59 +83,50 @@ index 7cffc64573008502bdd14ae4906fe51166b12fb3..1feafdbb48cf760cb6ebf95d5be2c32b
                      }
                      // CraftBukkit end
 +                    // Purpur start
-+                    if (world.purpurConfig.persistentDroppableEntityDisplayNames && itemstack.hasCustomHoverName()) {
-+                        entityarmorstand.setCustomName(itemstack.getHoverName());
-+                        if (world.purpurConfig.armorstandSetNameVisible) {
-+                            entityarmorstand.setCustomNameVisible(true);
-+                        }
++                    if (!world.purpurConfig.persistentDroppableEntityDisplayNames) {
++                        entityarmorstand.setCustomName(null);
++                    }
++                    if (world.purpurConfig.armorstandSetNameVisible) {
++                        entityarmorstand.setCustomNameVisible(true);
 +                    }
 +                    // Purpur end
                      worldserver.addFreshEntityWithPassengers(entityarmorstand);
                      world.playSound((Player) null, entityarmorstand.getX(), entityarmorstand.getY(), entityarmorstand.getZ(), SoundEvents.ARMOR_STAND_PLACE, SoundSource.BLOCKS, 0.75F, 0.8F);
                      entityarmorstand.gameEvent(GameEvent.ENTITY_PLACE, context.getPlayer());
 diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java
-index aec7ac31a35b1cc81f40b3fbeb5cf95c0f2c8a6c..cbcd35e60a2c344c83978abf0b94c2120ff53dee 100644
+index eb74d45ad458b80cf8455297c3bc550186adaea3..ef01856c487e4ab982996e01537618233592ac32 100644
 --- a/src/main/java/net/minecraft/world/item/BoatItem.java
 +++ b/src/main/java/net/minecraft/world/item/BoatItem.java
-@@ -69,6 +69,11 @@ public class BoatItem extends Item {
+@@ -72,6 +72,11 @@ public class BoatItem extends Item {
  
                  entityboat.setVariant(this.type);
                  entityboat.setYRot(user.getYRot());
 +                // Purpur start
-+                if (world.purpurConfig.persistentDroppableEntityDisplayNames && itemstack.hasCustomHoverName()) {
-+                    entityboat.setCustomName(itemstack.getHoverName());
++                if (!world.purpurConfig.persistentDroppableEntityDisplayNames) {
++                    entityboat.setCustomName(null);
 +                }
 +                // Purpur end
                  if (!world.noCollision(entityboat, entityboat.getBoundingBox())) {
                      return InteractionResultHolder.fail(itemstack);
                  } else {
 diff --git a/src/main/java/net/minecraft/world/item/HangingEntityItem.java b/src/main/java/net/minecraft/world/item/HangingEntityItem.java
-index b2ad6d230de2c29f371178bccde1111c7532ee70..6667926519a0f1c151e53f59cce36e7417dfc1cd 100644
+index 530167ce8e5bb72a418f8ec61411e38a5892fd72..35dc7546793dba34bf6debad3f214f61a8fb4f4e 100644
 --- a/src/main/java/net/minecraft/world/item/HangingEntityItem.java
 +++ b/src/main/java/net/minecraft/world/item/HangingEntityItem.java
-@@ -48,7 +48,7 @@ public class HangingEntityItem extends Item {
-             return InteractionResult.FAIL;
-         } else {
-             Level world = context.getLevel();
--            Object object;
-+            Entity object; // Purpur
+@@ -73,6 +73,11 @@ public class HangingEntityItem extends Item {
  
-             if (this.type == EntityType.PAINTING) {
-                 Optional<Painting> optional = Painting.create(world, blockposition1, enumdirection);
-@@ -72,6 +72,11 @@ public class HangingEntityItem extends Item {
- 
-             if (nbttagcompound != null) {
-                 EntityType.updateCustomEntityTag(world, entityhuman, (Entity) object, nbttagcompound);
+             if (!customdata.isEmpty()) {
+                 EntityType.updateCustomEntityTag(world, entityhuman, (Entity) object, customdata);
 +                // Purpur start
-+                if (world.purpurConfig.persistentDroppableEntityDisplayNames && itemstack.hasCustomHoverName()) {
-+                    object.setCustomName(itemstack.getHoverName());
++                if (!world.purpurConfig.persistentDroppableEntityDisplayNames) {
++                    ((Entity) object).setCustomName(null);
 +                }
 +                // Purpur end
              }
  
              if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 48de43f61f90e2610e04d04803b374cead07f655..6f08b0556b0c8e4d4547ee7982c083972a8e1043 100644
+index 8ba5fc8813ef1cb34f7df801f6d7b2ed42b1c052..1f5cfaf07e0fd86a530b57fd0198ade2b1d0d999 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -97,8 +97,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0104-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0101-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 70%
rename from patches/server/0104-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0101-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
index 05866acfb..aef93925b 100644
--- a/patches/server/0104-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0101-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Set name visible when using a Name Tag on an Armor Stand
 
 
 diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java
-index 2941c16ef486345b57ab2dfcd26f0272285d3b5a..7cc6812bf6f2ba015f65fd1fc1eaac02dd0f53e2 100644
+index 774c982f28b4f127fc3f036c19dfb47fb9ae3264..d49b60e7e643498b49c03593dc0da2f8e4459902 100644
 --- a/src/main/java/net/minecraft/world/item/NameTagItem.java
 +++ b/src/main/java/net/minecraft/world/item/NameTagItem.java
-@@ -20,6 +20,7 @@ public class NameTagItem extends Item {
+@@ -23,6 +23,7 @@ public class NameTagItem extends Item {
                  if (!event.callEvent()) return InteractionResult.PASS;
-                 LivingEntity newEntityLiving = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
-                 newEntityLiving.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
+                 LivingEntity newEntity = ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getEntity()).getHandle();
+                 newEntity.setCustomName(event.getName() != null ? io.papermc.paper.adventure.PaperAdventure.asVanilla(event.getName()) : null);
 +                if (user.level().purpurConfig.armorstandFixNametags && entity instanceof net.minecraft.world.entity.decoration.ArmorStand) entity.setCustomNameVisible(true); // Purpur
-                 if (event.isPersistent() && newEntityLiving instanceof Mob) {
-                     ((Mob) newEntityLiving).setPersistenceRequired();
-                     // Paper end
+                 if (event.isPersistent() && newEntity instanceof Mob mob) {
+                 // Paper end - Add PlayerNameEntityEvent
+                     mob.setPersistenceRequired();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6f08b0556b0c8e4d4547ee7982c083972a8e1043..28584fe38e7eebf6c4a4e5e84ff064db18067d63 100644
+index 1f5cfaf07e0fd86a530b57fd0198ade2b1d0d999..548ad445ed73c5009c93cadb0ee8e39acdbd737c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,9 +98,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0105-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0102-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 85%
rename from patches/server/0105-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0102-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
index fb4ad129e..c83b3b0e5 100644
--- a/patches/server/0105-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0102-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -8,10 +8,10 @@ This should help to reduce the amount of dirt, gravel, grass, and etc.
 that Endermen like to randomly place all over the world.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index ebef4f39af4928ed5bd206a82aa0e3992e67db78..aecccc96a1ea7fbd774a4ccbd45c11be1da1b43b 100644
+index cb307a9419399e33a895376a584456f084691965..052a0c168268b7e788953063f54c3769023f3c03 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -501,7 +501,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -478,7 +478,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      @Override
      public boolean requiresCustomPersistence() {
@@ -21,10 +21,10 @@ index ebef4f39af4928ed5bd206a82aa0e3992e67db78..aecccc96a1ea7fbd774a4ccbd45c11be
  
      private static class EndermanFreezeWhenLookedAt extends Goal {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 28584fe38e7eebf6c4a4e5e84ff064db18067d63..da8485add57441b426a526cde2a83fd7d0cd8d22 100644
+index 548ad445ed73c5009c93cadb0ee8e39acdbd737c..2afd56fd352f7a0bd2028a2b9b238f3d1d8fe14a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -833,6 +833,7 @@ public class PurpurWorldConfig {
+@@ -834,6 +834,7 @@ public class PurpurWorldConfig {
      public boolean endermanControllable = true;
      public double endermanMaxHealth = 40.0D;
      public boolean endermanAllowGriefing = true;
@@ -32,7 +32,7 @@ index 28584fe38e7eebf6c4a4e5e84ff064db18067d63..da8485add57441b426a526cde2a83fd7
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -844,6 +845,7 @@ public class PurpurWorldConfig {
+@@ -845,6 +846,7 @@ public class PurpurWorldConfig {
          }
          endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
diff --git a/patches/server/0106-Add-configurable-snowball-damage.patch b/patches/server/0103-Add-configurable-snowball-damage.patch
similarity index 73%
rename from patches/server/0106-Add-configurable-snowball-damage.patch
rename to patches/server/0103-Add-configurable-snowball-damage.patch
index fc62adeca..226d4c521 100644
--- a/patches/server/0106-Add-configurable-snowball-damage.patch
+++ b/patches/server/0103-Add-configurable-snowball-damage.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Add configurable snowball damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-index 718e120c9768cf716b32d3d652f53f1dda925168..b90cedad282e95a067aca176fafa9f72a726f520 100644
+index 2b4d206c0d31ba38d7b2af654bd420e85145d441..f59a2903bfb8ae591a638ea5bb387caaa93ce664 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-@@ -53,7 +53,7 @@ public class Snowball extends ThrowableItemProjectile {
+@@ -58,7 +58,7 @@ public class Snowball extends ThrowableItemProjectile {
      protected void onHitEntity(EntityHitResult entityHitResult) {
          super.onHitEntity(entityHitResult);
          Entity entity = entityHitResult.getEntity();
 -        int i = entity instanceof Blaze ? 3 : 0;
 +        int i = entity.level().purpurConfig.snowballDamage >= 0 ? entity.level().purpurConfig.snowballDamage : entity instanceof Blaze ? 3 : 0; // Purpur
-         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i);
-     }
  
+         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
+     }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index da8485add57441b426a526cde2a83fd7d0cd8d22..d6c4a63fad4bf17ea2aa2f0e364ccd99478e5c70 100644
+index 2afd56fd352f7a0bd2028a2b9b238f3d1d8fe14a..f87abb5d0572b8d51c91dd90638e7a728c49a69a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -350,6 +350,11 @@ public class PurpurWorldConfig {
+@@ -383,6 +383,11 @@ public class PurpurWorldConfig {
          //}
      }
  
@@ -30,6 +30,6 @@ index da8485add57441b426a526cde2a83fd7d0cd8d22..d6c4a63fad4bf17ea2aa2f0e364ccd99
 +        snowballDamage = getInt("gameplay-mechanics.projectile-damage.snowball", snowballDamage);
 +    }
 +
-     public boolean silkTouchEnabled = false;
-     public String silkTouchSpawnerName = "<reset><white>Monster Spawner";
-     public List<String> silkTouchSpawnerLore = new ArrayList<>();
+     public boolean anvilAllowColors = false;
+     public boolean anvilColorsUseMiniMessage;
+     private void anvilSettings() {
diff --git a/patches/server/0107-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0104-Changeable-Mob-Left-Handed-Chance.patch
similarity index 71%
rename from patches/server/0107-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0104-Changeable-Mob-Left-Handed-Chance.patch
index 81f8b8df1..1fd4f031c 100644
--- a/patches/server/0107-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0104-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 3e954a04e3ccdfcd495d0c56535c951eeaa2b5ce..1ce3ba7f703b5627e2761865c0e133dbf5df8712 100644
+index e7251ac940b49564c83b4b603e49c3990fc85db1..34d00acc43d2541307aa90a77a3c5d19a3057a94 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1305,7 +1305,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1438,7 +1438,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
          RandomSource randomsource = world.getRandom();
  
-         this.getAttribute(Attributes.FOLLOW_RANGE).addPermanentModifier(new AttributeModifier("Random spawn bonus", randomsource.triangle(0.0D, 0.11485000000000001D), AttributeModifier.Operation.MULTIPLY_BASE));
--        if (randomsource.nextFloat() < 0.05F) {
-+        if (randomsource.nextFloat() < world.getLevel().purpurConfig.entityLeftHandedChance) { // Purpur
-             this.setLeftHanded(true);
-         } else {
-             this.setLeftHanded(false);
+         this.getAttribute(Attributes.FOLLOW_RANGE).addPermanentModifier(new AttributeModifier("Random spawn bonus", randomsource.triangle(0.0D, 0.11485000000000001D), AttributeModifier.Operation.ADD_MULTIPLIED_BASE));
+-        this.setLeftHanded(randomsource.nextFloat() < 0.05F);
++        this.setLeftHanded(randomsource.nextFloat() < world.getLevel().purpurConfig.entityLeftHandedChance); // Purpur
+         return entityData;
+     }
+ 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d6c4a63fad4bf17ea2aa2f0e364ccd99478e5c70..ed11a1ca61ef0401936cd612e463a2ad4111585f 100644
+index f87abb5d0572b8d51c91dd90638e7a728c49a69a..4ac5d5469312b5f9e0203551baa085317189553b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -156,8 +156,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0108-Add-boat-fall-damage-config.patch b/patches/server/0105-Add-boat-fall-damage-config.patch
similarity index 92%
rename from patches/server/0108-Add-boat-fall-damage-config.patch
rename to patches/server/0105-Add-boat-fall-damage-config.patch
index 69b7d65be..6282219c2 100644
--- a/patches/server/0108-Add-boat-fall-damage-config.patch
+++ b/patches/server/0105-Add-boat-fall-damage-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8b05588b480af39d25bfcb84a5241e9e055c81f8..48337c143a825c2107b9f1c4b086050ad02e553a 100644
+index 03b206289d103a36d19dcf3154f10ad98f976ba2..fe250c154aed8b10e33c6b916cabedb0dda3d5d6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1109,7 +1109,16 @@ public class ServerPlayer extends Player {
+@@ -1189,7 +1189,16 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {
@@ -27,7 +27,7 @@ index 8b05588b480af39d25bfcb84a5241e9e055c81f8..48337c143a825c2107b9f1c4b086050a
  
              if (!flag && this.spawnInvulnerableTime > 0 && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ed11a1ca61ef0401936cd612e463a2ad4111585f..3ecf34286db35cebad22bf09bd1f15d61908a2a1 100644
+index 4ac5d5469312b5f9e0203551baa085317189553b..8a0a018ff9119afe4ada2f30f98b260a523f2e70 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -112,6 +112,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0109-Snow-Golem-rate-of-fire-config.patch b/patches/server/0106-Snow-Golem-rate-of-fire-config.patch
similarity index 85%
rename from patches/server/0109-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0106-Snow-Golem-rate-of-fire-config.patch
index 0e9b27ee5..2c258fc94 100644
--- a/patches/server/0109-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0106-Snow-Golem-rate-of-fire-config.patch
@@ -10,10 +10,10 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index bd9dd01e9140c2ad0ab9859b9a455f73ab04a253..d3da7487f911ff791dca5f7b546dccda751fe44c 100644
+index 0060414b1d5afde56372ce121e9d37a1668cd03b..ee4d4a4fe314ee9bce69c96dd65d84ed1ace0543 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -79,7 +79,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -77,7 +77,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -23,12 +23,12 @@ index bd9dd01e9140c2ad0ab9859b9a455f73ab04a253..d3da7487f911ff791dca5f7b546dccda
          this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3ecf34286db35cebad22bf09bd1f15d61908a2a1..30635734e1109b0313039f01b46f0836eb5bdd70 100644
+index 8a0a018ff9119afe4ada2f30f98b260a523f2e70..51d9cdfce0cdcf2daa882fdcc75123c925396d10 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1605,6 +1605,10 @@ public class PurpurWorldConfig {
+@@ -1607,6 +1607,10 @@ public class PurpurWorldConfig {
+     public boolean snowGolemLeaveTrailWhenRidden = false;
      public double snowGolemMaxHealth = 4.0D;
-     public boolean snowGolemDropsPumpkin = true;
      public boolean snowGolemPutPumpkinBack = false;
 +    public int snowGolemSnowBallMin = 20;
 +    public int snowGolemSnowBallMax = 20;
@@ -37,9 +37,9 @@ index 3ecf34286db35cebad22bf09bd1f15d61908a2a1..30635734e1109b0313039f01b46f0836
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1618,6 +1622,10 @@ public class PurpurWorldConfig {
+@@ -1619,6 +1623,10 @@ public class PurpurWorldConfig {
+         }
          snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
-         snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
          snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
 +        snowGolemSnowBallMin = getInt("mobs.snow_golem.min-shoot-interval-ticks", snowGolemSnowBallMin);
 +        snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
diff --git a/patches/server/0110-EMC-Configurable-disable-give-dropping.patch b/patches/server/0107-EMC-Configurable-disable-give-dropping.patch
similarity index 83%
rename from patches/server/0110-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0107-EMC-Configurable-disable-give-dropping.patch
index f9d7076a4..30a396354 100644
--- a/patches/server/0110-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0107-EMC-Configurable-disable-give-dropping.patch
@@ -8,19 +8,19 @@ purpur.yml to disable the /give command from dropping items on the
 floor when a player's inventory is full.
 
 diff --git a/src/main/java/net/minecraft/server/commands/GiveCommand.java b/src/main/java/net/minecraft/server/commands/GiveCommand.java
-index d601d287e94a59ff93b8a83a44dac02544d211df..0ff3b06a98b2f4514b2d861b92dd70fe678ae86c 100644
+index 47355158e5e762540a10dc67b23092a0fc53bce3..9f1c8a62bda242781a0966fa2fc01534261423c7 100644
 --- a/src/main/java/net/minecraft/server/commands/GiveCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/GiveCommand.java
-@@ -59,6 +59,7 @@ public class GiveCommand {
+@@ -92,6 +92,7 @@ public class GiveCommand {
                      boolean flag = entityplayer.getInventory().add(itemstack1);
                      ItemEntity entityitem;
  
 +                    if (org.purpurmc.purpur.PurpurConfig.disableGiveCommandDrops) continue; // Purpur - add config option for toggling give command dropping
                      if (flag && itemstack1.isEmpty()) {
-                         itemstack1.setCount(1);
-                         entityitem = entityplayer.drop(itemstack1, false, false, false); // SPIGOT-2942: Add boolean to call event
+                         entityitem = entityplayer.drop(itemstack, false, false, false); // CraftBukkit - SPIGOT-2942: Add boolean to call event
+                         if (entityitem != null) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index de1a9b08946005d1235264c7658b51bbdc2c47c2..aaf96399f937fbca30f1ce5d64be4af265a4ed29 100644
+index 6d621a93aaf94927fa6c73e649dcdb8bbbaadd2a..4d747759e2bfaebb02a875ff46159d0ae16acad6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -209,6 +209,11 @@ public class PurpurConfig {
diff --git a/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 86%
rename from patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
index eed70111d..527b784f4 100644
--- a/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0108-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -8,10 +8,10 @@ farm Nether Wart. Reimplemented based on a feature of the carpet-extra
 mod.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-index d3a2a6dee2d83b3df0ddc521c080f7d72b709461..66a568e6803b91040f3933d4598c52fa518badab 100644
+index 2ade08d1466660ee1787fa97908002ef56389712..4fa4ec34963730507253182cad1c2bf04090ad50 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-@@ -40,6 +40,7 @@ public class HarvestFarmland extends Behavior<Villager> {
+@@ -41,6 +41,7 @@ public class HarvestFarmland extends Behavior<Villager> {
      private long nextOkStartTime;
      private int timeWorkedSoFar;
      private final List<BlockPos> validFarmlandAroundVillager = Lists.newArrayList();
@@ -19,7 +19,7 @@ index d3a2a6dee2d83b3df0ddc521c080f7d72b709461..66a568e6803b91040f3933d4598c52fa
  
      public HarvestFarmland() {
          super(ImmutableMap.of(MemoryModuleType.LOOK_TARGET, MemoryStatus.VALUE_ABSENT, MemoryModuleType.WALK_TARGET, MemoryStatus.VALUE_ABSENT, MemoryModuleType.SECONDARY_JOB_SITE, MemoryStatus.VALUE_PRESENT));
-@@ -48,9 +49,10 @@ public class HarvestFarmland extends Behavior<Villager> {
+@@ -49,9 +50,10 @@ public class HarvestFarmland extends Behavior<Villager> {
      protected boolean checkExtraStartConditions(ServerLevel world, Villager entity) {
          if (!world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
              return false;
@@ -31,7 +31,7 @@ index d3a2a6dee2d83b3df0ddc521c080f7d72b709461..66a568e6803b91040f3933d4598c52fa
              BlockPos.MutableBlockPos blockposition_mutableblockposition = entity.blockPosition().mutable();
  
              this.validFarmlandAroundVillager.clear();
-@@ -81,6 +83,7 @@ public class HarvestFarmland extends Behavior<Villager> {
+@@ -82,6 +84,7 @@ public class HarvestFarmland extends Behavior<Villager> {
          Block block = iblockdata.getBlock();
          Block block1 = world.getBlockState(pos.below()).getBlock();
  
@@ -39,7 +39,7 @@ index d3a2a6dee2d83b3df0ddc521c080f7d72b709461..66a568e6803b91040f3933d4598c52fa
          return block instanceof CropBlock && ((CropBlock) block).isMaxAge(iblockdata) || iblockdata.isAir() && block1 instanceof FarmBlock;
      }
  
-@@ -106,20 +109,20 @@ public class HarvestFarmland extends Behavior<Villager> {
+@@ -107,20 +110,20 @@ public class HarvestFarmland extends Behavior<Villager> {
                  Block block = iblockdata.getBlock();
                  Block block1 = world.getBlockState(this.aboveFarmlandPos.below()).getBlock();
  
@@ -63,7 +63,7 @@ index d3a2a6dee2d83b3df0ddc521c080f7d72b709461..66a568e6803b91040f3933d4598c52fa
                              Item item = itemstack.getItem();
  
                              if (item instanceof BlockItem) {
-@@ -135,7 +138,7 @@ public class HarvestFarmland extends Behavior<Villager> {
+@@ -136,7 +139,7 @@ public class HarvestFarmland extends Behavior<Villager> {
                          }
  
                          if (flag) {
@@ -73,15 +73,15 @@ index d3a2a6dee2d83b3df0ddc521c080f7d72b709461..66a568e6803b91040f3933d4598c52fa
                              if (itemstack.isEmpty()) {
                                  inventorysubcontainer.setItem(j, ItemStack.EMPTY);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java b/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
-index 3af715e2f3f3949af614a8fcebbc4a835d48ca49..ade1e411ea1f3b4c9a417265e77b0d6861b222f9 100644
+index 8508ac7de8cda3127b73e11ff4aee62502e65ead..b1544e028d5a9b84b944e1fb5a12bb163067fb54 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/TradeWithVillager.java
-@@ -56,6 +56,12 @@ public class TradeWithVillager extends Behavior<Villager> {
+@@ -59,6 +59,12 @@ public class TradeWithVillager extends Behavior<Villager> {
                  throwHalfStack(entity, ImmutableSet.of(Items.WHEAT), villager);
              }
  
 +            // Purpur start
-+            if (world.purpurConfig.villagerClericsFarmWarts && world.purpurConfig.villagerClericFarmersThrowWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC && entity.getInventory().countItem(Items.NETHER_WART) > Items.NETHER_WART.getMaxStackSize() / 2) {
++            if (world.purpurConfig.villagerClericsFarmWarts && world.purpurConfig.villagerClericFarmersThrowWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC && entity.getInventory().countItem(Items.NETHER_WART) > Items.NETHER_WART.getDefaultMaxStackSize() / 2) {
 +                throwHalfStack(entity, ImmutableSet.of(Items.NETHER_WART), villager);
 +            }
 +            // Purpur end
@@ -90,10 +90,10 @@ index 3af715e2f3f3949af614a8fcebbc4a835d48ca49..ade1e411ea1f3b4c9a417265e77b0d68
                  throwHalfStack(entity, this.trades, villager);
              }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
-index cd7a90ec1073b2b452ca70decefe6a594445003b..47672e48c1cae73cffe532d622b296343fc12ef0 100644
+index f000a6c1e61198e6dd06ae5f084d12fdf309f50a..3091d985ba9c55d404332576320718840538722e 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
-@@ -30,8 +30,13 @@ public class VillagerGoalPackages {
+@@ -52,8 +52,13 @@ public class VillagerGoalPackages {
      }
  
      public static ImmutableList<Pair<Integer, ? extends BehaviorControl<? super Villager>>> getWorkPackage(VillagerProfession profession, float speed) {
@@ -109,7 +109,7 @@ index cd7a90ec1073b2b452ca70decefe6a594445003b..47672e48c1cae73cffe532d622b29634
          } else {
              workAtPoi = new WorkAtPoi();
 diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
-index cb1d91f9fe98f21c2afbe3894dfd9bca3bdd3ba6..d2703432af207c74ea8d298a784329c3219d2f13 100644
+index a0e0692d17760f440fe81d52887284c787e562db..ab9bebc07b5228dbc0d3ba4b0f7d1bbe41814c9b 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
 @@ -22,6 +22,13 @@ public class SecondaryPoiSensor extends Sensor<Villager> {
@@ -136,10 +136,10 @@ index cb1d91f9fe98f21c2afbe3894dfd9bca3bdd3ba6..d2703432af207c74ea8d298a784329c3
              brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 1754c88d9b3bdbce721062c564a5f61c2ad14e86..7fcf3cf145828b610dec15dcc2cf469a48de9317 100644
+index 6de74d992bd8b2845ab98d56201e7eeabd1dfc6b..f7d8f672a680cf2dfebba5677f97895e4a8c209f 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -224,7 +224,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -223,7 +223,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              brain.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5F));
          } else {
              brain.setSchedule(Schedule.VILLAGER_DEFAULT);
@@ -148,7 +148,7 @@ index 1754c88d9b3bdbce721062c564a5f61c2ad14e86..7fcf3cf145828b610dec15dcc2cf469a
          }
  
          brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F));
-@@ -979,6 +979,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -970,6 +970,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      public boolean hasFarmSeeds() {
          return this.getInventory().hasAnyMatching((itemstack) -> {
@@ -161,23 +161,23 @@ index 1754c88d9b3bdbce721062c564a5f61c2ad14e86..7fcf3cf145828b610dec15dcc2cf469a
          });
      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
-index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3fcb1a907 100644
+index 1316f4475802e17039800cc6128e1b065328beb7..d02e2d1aceac651e06a3a3698b7ac64dd30d4b12 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java
-@@ -26,7 +26,7 @@ public record VillagerProfession(String name, Predicate<Holder<PoiType>> heldJob
+@@ -31,7 +31,7 @@ public record VillagerProfession(
      public static final VillagerProfession ARMORER = register("armorer", PoiTypes.ARMORER, SoundEvents.VILLAGER_WORK_ARMORER);
      public static final VillagerProfession BUTCHER = register("butcher", PoiTypes.BUTCHER, SoundEvents.VILLAGER_WORK_BUTCHER);
      public static final VillagerProfession CARTOGRAPHER = register("cartographer", PoiTypes.CARTOGRAPHER, SoundEvents.VILLAGER_WORK_CARTOGRAPHER);
 -    public static final VillagerProfession CLERIC = register("cleric", PoiTypes.CLERIC, SoundEvents.VILLAGER_WORK_CLERIC);
 +    public static final VillagerProfession CLERIC = register("cleric", PoiTypes.CLERIC, ImmutableSet.of(Items.NETHER_WART), ImmutableSet.of(Blocks.SOUL_SAND), SoundEvents.VILLAGER_WORK_CLERIC); // Purpur
-     public static final VillagerProfession FARMER = register("farmer", PoiTypes.FARMER, ImmutableSet.of(Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT_SEEDS, Items.BONE_MEAL), ImmutableSet.of(Blocks.FARMLAND), SoundEvents.VILLAGER_WORK_FARMER);
-     public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
-     public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
+     public static final VillagerProfession FARMER = register(
+         "farmer",
+         PoiTypes.FARMER,
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 30635734e1109b0313039f01b46f0836eb5bdd70..fe18b304ae649e93aefea3461a22151e7b7bdb40 100644
+index 51d9cdfce0cdcf2daa882fdcc75123c925396d10..f20f4622871b840ba18a78bb0806028ba706f74e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1808,6 +1808,8 @@ public class PurpurWorldConfig {
+@@ -1809,6 +1809,8 @@ public class PurpurWorldConfig {
      public boolean villagerCanBeLeashed = false;
      public boolean villagerCanBreed = true;
      public int villagerBreedingTicks = 6000;
@@ -186,7 +186,7 @@ index 30635734e1109b0313039f01b46f0836eb5bdd70..fe18b304ae649e93aefea3461a22151e
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1822,6 +1824,8 @@ public class PurpurWorldConfig {
+@@ -1823,6 +1825,8 @@ public class PurpurWorldConfig {
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
          villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
diff --git a/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0109-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 87%
rename from patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0109-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
index 4596fd32d..2f898ce18 100644
--- a/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0109-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -13,10 +13,10 @@ to the Piglin being angry, even though the player never hit them.
 This patch adds a toggle to disable this behavior.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 764477c39e690d6373e17c77687809418e0de884..b2d77117309e81db60e7e50911247793fa829755 100644
+index 75c34d9fcc4b33d30b18f1ce4c8749a068744abc..6be751e2d434982a35bbbece4f4fc4631fb3d8e0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -148,7 +148,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -146,7 +146,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
              this.maybeAlertOthers();
          }
  
@@ -25,7 +25,7 @@ index 764477c39e690d6373e17c77687809418e0de884..b2d77117309e81db60e7e50911247793
              this.lastHurtByPlayerTime = this.tickCount;
          }
  
-@@ -203,7 +203,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -201,7 +201,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
              this.ticksUntilNextAlert = ZombifiedPiglin.ALERT_INTERVAL.sample(this.random);
          }
  
@@ -35,10 +35,10 @@ index 764477c39e690d6373e17c77687809418e0de884..b2d77117309e81db60e7e50911247793
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fe18b304ae649e93aefea3461a22151e7b7bdb40..592ad59fb71d6d638301f5dd0c1b5b9f01fb1df8 100644
+index f20f4622871b840ba18a78bb0806028ba706f74e..d621f330f954a12635d8c87c5ff66dae7448a856 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2052,6 +2052,7 @@ public class PurpurWorldConfig {
+@@ -2055,6 +2055,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyOnlyBaby = true;
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index fe18b304ae649e93aefea3461a22151e7b7bdb40..592ad59fb71d6d638301f5dd0c1b5b9f
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2066,5 +2067,6 @@ public class PurpurWorldConfig {
+@@ -2069,5 +2070,6 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
          zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
diff --git a/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0110-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 67%
rename from patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/server/0110-Configurable-chance-for-wolves-to-spawn-rabid.patch
index b760916d9..fe20c8c8d 100644
--- a/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0110-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,63 +7,27 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f698354a205b0b 100644
+index 2267f8da1c27ff54b2ced59ef15eb45357b7075d..74ed226b5037f3258106f07384e14baf087be1c3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -10,6 +10,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;
- import net.minecraft.network.syncher.EntityDataSerializers;
- import net.minecraft.network.syncher.SynchedEntityData;
- import net.minecraft.server.level.ServerLevel;
-+import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.sounds.SoundEvent;
- import net.minecraft.sounds.SoundEvents;
- import net.minecraft.tags.BlockTags;
-@@ -17,9 +18,12 @@ import net.minecraft.util.Mth;
- import net.minecraft.util.RandomSource;
- import net.minecraft.util.TimeUtil;
- import net.minecraft.util.valueproviders.UniformInt;
-+import net.minecraft.world.DifficultyInstance;
+@@ -30,6 +30,8 @@ import net.minecraft.world.DifficultyInstance;
  import net.minecraft.world.InteractionHand;
  import net.minecraft.world.InteractionResult;
  import net.minecraft.world.damagesource.DamageSource;
 +import net.minecraft.world.effect.MobEffectInstance;
 +import net.minecraft.world.effect.MobEffects;
  import net.minecraft.world.entity.AgeableMob;
+ import net.minecraft.world.entity.Crackiness;
  import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityDimensions;
-@@ -29,6 +33,7 @@ import net.minecraft.world.entity.Mob;
- import net.minecraft.world.entity.MobSpawnType;
- import net.minecraft.world.entity.NeutralMob;
- import net.minecraft.world.entity.Pose;
-+import net.minecraft.world.entity.SpawnGroupData;
- import net.minecraft.world.entity.TamableAnimal;
- import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
- import net.minecraft.world.entity.ai.attributes.Attributes;
-@@ -37,6 +42,7 @@ import net.minecraft.world.entity.ai.goal.BegGoal;
- import net.minecraft.world.entity.ai.goal.BreedGoal;
- import net.minecraft.world.entity.ai.goal.FloatGoal;
- import net.minecraft.world.entity.ai.goal.FollowOwnerGoal;
-+import net.minecraft.world.entity.ai.goal.Goal;
- import net.minecraft.world.entity.ai.goal.LeapAtTargetGoal;
- import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal;
- import net.minecraft.world.entity.ai.goal.MeleeAttackGoal;
-@@ -64,6 +70,7 @@ import net.minecraft.world.item.ItemStack;
- import net.minecraft.world.item.Items;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.level.LevelAccessor;
-+import net.minecraft.world.level.ServerLevelAccessor;
- import net.minecraft.world.level.block.state.BlockState;
- import net.minecraft.world.level.gameevent.GameEvent;
- import net.minecraft.world.level.pathfinder.BlockPathTypes;
-@@ -86,6 +93,37 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -104,6 +106,37 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
  
          return entitytypes == EntityType.SHEEP || entitytypes == EntityType.RABBIT || entitytypes == EntityType.FOX;
      };
 +    // Purpur start - rabid wolf spawn chance
 +    private boolean isRabid = false;
-+    private static final Predicate<LivingEntity> RABID_PREDICATE = entity -> entity instanceof ServerPlayer || entity instanceof Mob;
-+    private final Goal PATHFINDER_VANILLA = new NonTameRandomTargetGoal<>(this, Animal.class, false, PREY_SELECTOR);
-+    private final Goal PATHFINDER_RABID = new NonTameRandomTargetGoal<>(this, LivingEntity.class, false, RABID_PREDICATE);
++    private static final Predicate<LivingEntity> RABID_PREDICATE = entity -> entity instanceof net.minecraft.server.level.ServerPlayer || entity instanceof Mob;
++    private final net.minecraft.world.entity.ai.goal.Goal PATHFINDER_VANILLA = new NonTameRandomTargetGoal<>(this, Animal.class, false, PREY_SELECTOR);
++    private final net.minecraft.world.entity.ai.goal.Goal PATHFINDER_RABID = new NonTameRandomTargetGoal<>(this, LivingEntity.class, false, RABID_PREDICATE);
 +    private static final class AvoidRabidWolfGoal extends AvoidEntityGoal<Wolf> {
 +        private final Wolf wolf;
 +
@@ -91,9 +55,9 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
 +    }
 +    // Purpur end
      private static final float START_HEALTH = 8.0F;
-     private static final float TAME_HEALTH = 20.0F;
-     private float interestedAngle;
-@@ -137,6 +175,37 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+     private static final float TAME_HEALTH = 40.0F;
+     private static final float ARMOR_REPAIR_UNIT = 0.125F;
+@@ -156,6 +189,30 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          return this.level().purpurConfig.wolfBreedingTicks;
      }
  
@@ -110,8 +74,8 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
 +        this.targetSelector.removeGoal(PATHFINDER_VANILLA);
 +        this.targetSelector.removeGoal(PATHFINDER_RABID);
 +        if (this.isRabid) {
-+            setTame(false);
 +            setOwnerUUID(null);
++            setTame(false, true);
 +            this.targetSelector.addGoal(5, PATHFINDER_RABID);
 +            if (modifyEffects) this.addEffect(new MobEffectInstance(MobEffects.CONFUSION, 1200));
 +        } else {
@@ -120,26 +84,19 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
 +            if (modifyEffects) this.removeEffect(MobEffects.CONFUSION);
 +        }
 +    }
-+
-+    @Override
-+    public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType type, @Nullable SpawnGroupData data, @Nullable CompoundTag nbt) {
-+        this.isRabid = world.getLevel().purpurConfig.wolfNaturalRabid > 0.0D && random.nextDouble() <= world.getLevel().purpurConfig.wolfNaturalRabid;
-+        this.updatePathfinders(false);
-+        return super.finalizeSpawn(world, difficulty, type, data, nbt);
-+    }
 +
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-@@ -144,6 +213,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
-         this.goalSelector.addGoal(1, new Wolf.WolfPanicGoal(1.5D));
+@@ -163,6 +220,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+         this.goalSelector.addGoal(1, new Wolf.WolfPanicGoal(this, 1.5D));
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(3, new Wolf.WolfAvoidEntityGoal<>(this, Llama.class, 24.0F, 1.5D, 1.5D));
 +        this.goalSelector.addGoal(3, new AvoidRabidWolfGoal(this, 24.0F, 1.5D, 1.5D)); // Purpur
          this.goalSelector.addGoal(4, new LeapAtTargetGoal(this, 0.4F));
          this.goalSelector.addGoal(5, new MeleeAttackGoal(this, 1.0D, true));
          this.goalSelector.addGoal(6, new FollowOwnerGoal(this, 1.0D, 10.0F, 2.0F, false));
-@@ -157,7 +227,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -176,7 +234,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
          this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
          this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
@@ -148,15 +105,15 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
          this.targetSelector.addGoal(6, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
          this.targetSelector.addGoal(7, new NearestAttackableTargetGoal<>(this, AbstractSkeleton.class, false));
          this.targetSelector.addGoal(8, new ResetUniversalAngerTargetGoal<>(this, true));
-@@ -184,6 +254,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -219,6 +277,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
          nbt.putByte("CollarColor", (byte) this.getCollarColor().getId());
 +        nbt.putBoolean("Purpur.IsRabid", this.isRabid); // Purpur
+         nbt.putString("variant", ((ResourceKey) this.getVariant().unwrapKey().orElse(WolfVariants.PALE)).location().toString());
          this.addPersistentAngerSaveData(nbt);
      }
- 
-@@ -193,6 +264,10 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -234,6 +293,10 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          if (nbt.contains("CollarColor", 99)) {
              this.setCollarColor(DyeColor.byId(nbt.getInt("CollarColor")));
          }
@@ -167,7 +124,20 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
  
          this.readPersistentAngerSaveData(this.level(), nbt);
      }
-@@ -237,6 +312,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -252,6 +315,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+         }
+ 
+         this.setVariant(holder1);
++
++        // Purpur start
++        this.isRabid = world.getLevel().purpurConfig.wolfNaturalRabid > 0.0D && random.nextDouble() <= world.getLevel().purpurConfig.wolfNaturalRabid;
++        this.updatePathfinders(false);
++        // Purpur end
++
+         return super.finalizeSpawn(world, difficulty, spawnReason, (SpawnGroupData) entityData);
+     }
+ 
+@@ -295,6 +364,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
      public void tick() {
          super.tick();
          if (this.isAlive()) {
@@ -179,9 +149,9 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
              this.interestedAngleO = this.interestedAngle;
              if (this.isInterested()) {
                  this.interestedAngle += (1.0F - this.interestedAngle) * 0.4F;
-@@ -452,6 +532,19 @@ public class Wolf extends TamableAnimal implements NeutralMob {
-             }
- 
+@@ -541,6 +615,19 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+             itemstack.consume(1, player);
+             this.tryToTame(player);
              return InteractionResult.SUCCESS;
 +        // Purpur start
 +        } else if (this.level().purpurConfig.wolfMilkCuresRabies && itemstack.getItem() == Items.MILK_BUCKET && this.isRabid()) {
@@ -200,12 +170,12 @@ index 39a923e48750bd960f64aad248c10dd390afc239..6a822abe936aed83da595980e0f69835
              return super.mobInteract(player, hand);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-index e16459c9cfcac790edd6d912750d32c68387cbbc..890938ad866e2c588f3f819230ba121b0b436401 100644
+index 86574da257731de7646a712ed73384955fe35aa3..e223234dd64b0e41441c3b9f649f0b64dc6d98c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-@@ -57,4 +57,16 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
-     public void setInterested(boolean flag) {
-         this.getHandle().setIsInterested(flag);
+@@ -146,4 +146,16 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
+             return this.getKey().hashCode();
+         }
      }
 +
 +    // Purpur start
@@ -221,10 +191,10 @@ index e16459c9cfcac790edd6d912750d32c68387cbbc..890938ad866e2c588f3f819230ba121b
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 592ad59fb71d6d638301f5dd0c1b5b9f01fb1df8..0c0d5c6dd4d2ed8c5b71acc47fcc9faafd3212b7 100644
+index d621f330f954a12635d8c87c5ff66dae7448a856..fc0a733df7f0e851681bed1b22bfa6836812272a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1937,6 +1937,8 @@ public class PurpurWorldConfig {
+@@ -1938,6 +1938,8 @@ public class PurpurWorldConfig {
      public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
      public double wolfMaxHealth = 8.0D;
@@ -233,7 +203,7 @@ index 592ad59fb71d6d638301f5dd0c1b5b9f01fb1df8..0c0d5c6dd4d2ed8c5b71acc47fcc9faa
      public int wolfBreedingTicks = 6000;
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
-@@ -1948,6 +1950,8 @@ public class PurpurWorldConfig {
+@@ -1949,6 +1951,8 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0114-Configurable-default-collar-color.patch b/patches/server/0111-Configurable-default-collar-color.patch
similarity index 83%
rename from patches/server/0114-Configurable-default-collar-color.patch
rename to patches/server/0111-Configurable-default-collar-color.patch
index 1842260b8..08235e1a5 100644
--- a/patches/server/0114-Configurable-default-collar-color.patch
+++ b/patches/server/0111-Configurable-default-collar-color.patch
@@ -7,10 +7,10 @@ This allows for the server to set a default collar color when a wolf or cat is t
 Resets to RED when the value is invalid.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index a5b1cc957b824f8cc36693128ce05f5d556cf7d7..fff1da136b618ca8b9256b55996dc1d01dacd7b8 100644
+index b23d6683bab3d257febb57a6c9c8be4db926af7f..27e448a38377ea3cc2e527dbe48a23d233f1ea13 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -346,6 +346,14 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -357,6 +357,14 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
          return Mth.lerp(tickDelta, this.relaxStateOneAmountO, this.relaxStateOneAmount);
      }
  
@@ -26,11 +26,11 @@ index a5b1cc957b824f8cc36693128ce05f5d556cf7d7..fff1da136b618ca8b9256b55996dc1d0
      @Override
      public Cat getBreedOffspring(ServerLevel world, AgeableMob entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 6a822abe936aed83da595980e0f698354a205b0b..bbecb3894d0f4a24442e8833f4d828e6173287da 100644
+index 74ed226b5037f3258106f07384e14baf087be1c3..580bff2b4308f97acf402c9539755aee7aa8b3d8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -206,6 +206,12 @@ public class Wolf extends TamableAnimal implements NeutralMob {
-         return super.finalizeSpawn(world, difficulty, type, data, nbt);
+@@ -213,6 +213,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
+         }
      }
  
 +    @Override
@@ -43,10 +43,10 @@ index 6a822abe936aed83da595980e0f698354a205b0b..bbecb3894d0f4a24442e8833f4d828e6
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0c0d5c6dd4d2ed8c5b71acc47fcc9faafd3212b7..96d21c69da492eb6646e3cc71029cbe6208c6406 100644
+index fc0a733df7f0e851681bed1b22bfa6836812272a..d73268340e5201181f42084fbe47883a22d062cc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -621,6 +621,7 @@ public class PurpurWorldConfig {
+@@ -622,6 +622,7 @@ public class PurpurWorldConfig {
      public int catSpawnSwampHutScanRange = 16;
      public int catSpawnVillageScanRange = 48;
      public int catBreedingTicks = 6000;
@@ -54,7 +54,7 @@ index 0c0d5c6dd4d2ed8c5b71acc47fcc9faafd3212b7..96d21c69da492eb6646e3cc71029cbe6
      private void catSettings() {
          catRidable = getBoolean("mobs.cat.ridable", catRidable);
          catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
-@@ -635,6 +636,11 @@ public class PurpurWorldConfig {
+@@ -636,6 +637,11 @@ public class PurpurWorldConfig {
          catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
          catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
          catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks);
@@ -66,7 +66,7 @@ index 0c0d5c6dd4d2ed8c5b71acc47fcc9faafd3212b7..96d21c69da492eb6646e3cc71029cbe6
      }
  
      public boolean caveSpiderRidable = false;
-@@ -1937,6 +1943,7 @@ public class PurpurWorldConfig {
+@@ -1938,6 +1944,7 @@ public class PurpurWorldConfig {
      public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
      public double wolfMaxHealth = 8.0D;
@@ -74,7 +74,7 @@ index 0c0d5c6dd4d2ed8c5b71acc47fcc9faafd3212b7..96d21c69da492eb6646e3cc71029cbe6
      public boolean wolfMilkCuresRabies = true;
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
-@@ -1950,6 +1957,11 @@ public class PurpurWorldConfig {
+@@ -1951,6 +1958,11 @@ public class PurpurWorldConfig {
              set("mobs.wolf.attributes.max_health", oldValue);
          }
          wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
diff --git a/patches/server/0115-Phantom-flames-on-swoop.patch b/patches/server/0112-Phantom-flames-on-swoop.patch
similarity index 79%
rename from patches/server/0115-Phantom-flames-on-swoop.patch
rename to patches/server/0112-Phantom-flames-on-swoop.patch
index 74e54c201..2c374a8b6 100644
--- a/patches/server/0115-Phantom-flames-on-swoop.patch
+++ b/patches/server/0112-Phantom-flames-on-swoop.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Phantom flames on swoop
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 6849b2ad3b2db840a1af35ef069490506449c861..0f13a3f38760f1117bd545702db7a5b168d9e273 100644
+index 1ddccb9fa438682c2ebad7c071c7a4f8dd00b463..c15d75472d4d92baeb87a147832e17e363c360be 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -244,6 +244,7 @@ public class Phantom extends FlyingMob implements Enemy {
-             this.level().addParticle(ParticleTypes.MYCELIUM, this.getX() - (double) f2, this.getY() + (double) f4, this.getZ() - (double) f3, 0.0D, 0.0D, 0.0D);
+@@ -237,6 +237,7 @@ public class Phantom extends FlyingMob implements Enemy {
+             this.level().addParticle(ParticleTypes.MYCELIUM, this.getX() - (double) f3, this.getY() + (double) f5, this.getZ() - (double) f4, 0.0D, 0.0D, 0.0D);
          }
  
 +        if (level().purpurConfig.phantomFlamesOnSwoop && attackPhase == AttackPhase.SWOOP) shoot(); // Purpur
@@ -17,10 +17,10 @@ index 6849b2ad3b2db840a1af35ef069490506449c861..0f13a3f38760f1117bd545702db7a5b1
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 96d21c69da492eb6646e3cc71029cbe6208c6406..e7a9a9c1a5261076f810d58a7be137354ac14d1a 100644
+index d73268340e5201181f42084fbe47883a22d062cc..4fbd94117f356388a40d1a7f7faf75b08e6b7dbe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1299,6 +1299,7 @@ public class PurpurWorldConfig {
+@@ -1300,6 +1300,7 @@ public class PurpurWorldConfig {
      public int phantomBurnInLight = 0;
      public boolean phantomIgnorePlayersWithTorch = false;
      public boolean phantomBurnInDaylight = true;
@@ -28,7 +28,7 @@ index 96d21c69da492eb6646e3cc71029cbe6208c6406..e7a9a9c1a5261076f810d58a7be13735
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -1332,6 +1333,7 @@ public class PurpurWorldConfig {
+@@ -1333,6 +1334,7 @@ public class PurpurWorldConfig {
          phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
          phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
          phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
diff --git a/patches/server/0116-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0113-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 78%
rename from patches/server/0116-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/server/0113-Option-for-chests-to-open-even-with-a-solid-block-on.patch
index b843cf0e6..5245fd9c2 100644
--- a/patches/server/0116-Option-for-chests-to-open-even-with-a-solid-block-on.patch
+++ b/patches/server/0113-Option-for-chests-to-open-even-with-a-solid-block-on.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Option for chests to open even with a solid block on top
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-index 5e22d175b1048a58802cdf64ac70a8b56329e915..d81946b400f208c39941128ce823ff7709741c10 100644
+index 8fbfd18b3caeed769396b3ffb1b1778b2f38edc0..dbfe8f5d4df244cb694b73ea8763628c5f2507a3 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
-@@ -355,6 +355,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
+@@ -343,6 +343,7 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
      }
  
-     private static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) {
+     public static boolean isBlockedChestByBlock(BlockGetter world, BlockPos pos) {
 +        if (world instanceof Level && ((Level) world).purpurConfig.chestOpenWithBlockOnTop) return false; // Purpur
          BlockPos blockposition1 = pos.above();
  
          return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e7a9a9c1a5261076f810d58a7be137354ac14d1a..74a210a911211d38be77a6d00a0c032c14f48aad 100644
+index 4fbd94117f356388a40d1a7f7faf75b08e6b7dbe..50bf456b7e87a77e50b938488abde4cf577d1228 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -419,6 +419,11 @@ public class PurpurWorldConfig {
+@@ -420,6 +420,11 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0117-Implement-TPSBar.patch b/patches/server/0114-Implement-TPSBar.patch
similarity index 92%
rename from patches/server/0117-Implement-TPSBar.patch
rename to patches/server/0114-Implement-TPSBar.patch
index 35d4c5d72..97533f4e8 100644
--- a/patches/server/0117-Implement-TPSBar.patch
+++ b/patches/server/0114-Implement-TPSBar.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement TPSBar
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 637648e03985868c1fe420f84fa778b06deb23ee..e1887523b0b6a0479544385932f54ab1de0295ae 100644
+index 6af3e1e08048869ac28ab4a93e03d086872f866b..d0a81669ac20dc86e888aa34e246c251b8886ba2 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -233,6 +233,7 @@ public class Commands {
+@@ -255,6 +255,7 @@ public class Commands {
              org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
@@ -17,58 +17,58 @@ index 637648e03985868c1fe420f84fa778b06deb23ee..e1887523b0b6a0479544385932f54ab1
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cdf770adf641844caf0290a8354046aeb8e00cb3..a3675f1ef2317c1a0e9addd9280fe928a45b2736 100644
+index 6dd29845955b65e269a0487501330917effe7688..b68db217c8765fa029244bf2701757bd31a5db2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1008,6 +1008,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1060,6 +1060,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(waitForShutdown, false);
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
 +        org.purpurmc.purpur.task.BossBarTask.stopAll(); // Purpur
          this.isRestarting = isRestarting;
-         this.hasLoggedStop = true; // Paper
-         if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
+         this.hasLoggedStop = true; // Paper - Debugging
+         if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6908e2165c4e4b43408a93963b4585d7cabf41dd..3b0e5b4bb1b24cd2d1931af39ec4f421d5ac3511 100644
+index 6d47aa73788eef78aa6714384db879b4e907de9b..8a132fcdeb620d2e7f1c0c8b9e592ff233cd0568 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -350,6 +350,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -363,6 +363,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+                 DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
  
-             if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
 +            org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur
              return true;
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 48337c143a825c2107b9f1c4b086050ad02e553a..baf508a942b02d94dfe2c1fffc3cde930a492367 100644
+index fe250c154aed8b10e33c6b916cabedb0dda3d5d6..07d08bc8d95025fda0859c84b9ea84fe6870d004 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
-     public @Nullable String clientBrandName = null; // Paper - Brand name
-     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
+@@ -299,6 +299,7 @@ public class ServerPlayer extends Player {
+     public @Nullable String clientBrandName = null; // Paper - Brand support
+     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
      public boolean purpurClient = false; // Purpur
 +    private boolean tpsBar = false; // Purpur
  
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
-@@ -562,6 +563,7 @@ public class ServerPlayer extends Player {
-             }
+@@ -609,6 +610,7 @@ public class ServerPlayer extends Player {
+             });
          }
  
 +        if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
      }
  
      @Override
-@@ -628,6 +630,7 @@ public class ServerPlayer extends Player {
+@@ -685,6 +687,7 @@ public class ServerPlayer extends Player {
+             });
          }
-         this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
  
 +        nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2774,5 +2777,13 @@ public class ServerPlayer extends Player {
+@@ -2986,5 +2989,13 @@ public class ServerPlayer extends Player {
              this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
          }
      }
@@ -83,27 +83,27 @@ index 48337c143a825c2107b9f1c4b086050ad02e553a..baf508a942b02d94dfe2c1fffc3cde93
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1eafc1854d47002d683f625f4c164290eee59181..265889514d2959731440ec180f6e47b19bb83cfb 100644
+index 338808ba1138f62d89f3f1338a4c5068426df0e4..f2a7eba2618ea9c1acaf93c0ef8f6f5f737de6fe 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -467,6 +467,7 @@ public abstract class PlayerList {
+@@ -486,6 +486,7 @@ public abstract class PlayerList {
              scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
          }
-         // Paper end
+         // Paper end - Configurable player collision
 +        org.purpurmc.purpur.task.BossBarTask.addToAll(player); // Purpur
-         // CraftBukkit - Moved from above, added world
          PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
      }
-@@ -580,6 +581,7 @@ public abstract class PlayerList {
+ 
+@@ -597,6 +598,7 @@ public abstract class PlayerList {
      }
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
-         // Paper end
+         // Paper end - Fix kick event leave message not being sent
 +        org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
          ServerLevel worldserver = entityplayer.serverLevel();
  
          entityplayer.awardStat(Stats.LEAVE_GAME);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index aaf96399f937fbca30f1ce5d64be4af265a4ed29..61e3bce901bdbf111ffc06521b0e6d5369fce051 100644
+index 4d747759e2bfaebb02a875ff46159d0ae16acad6..a4404782f0456a0bd05b385372ea920bd437eb35 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -182,6 +182,7 @@ public class PurpurConfig {
diff --git a/patches/server/0118-Striders-give-saddle-back.patch b/patches/server/0115-Striders-give-saddle-back.patch
similarity index 89%
rename from patches/server/0118-Striders-give-saddle-back.patch
rename to patches/server/0115-Striders-give-saddle-back.patch
index dbf0cea34..2455ebac4 100644
--- a/patches/server/0118-Striders-give-saddle-back.patch
+++ b/patches/server/0115-Striders-give-saddle-back.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Striders give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 10136a5062d154456c962e7d1a99c2dedbd568ed..64503362c42daa39dcfa270bc50b0e2187f13a01 100644
+index 5f1166ccd64509a70323e2713f3ab58674d83105..741eedcd9e0e29b57d2b3caf5aef1aef18ae5118 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -484,6 +484,19 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -29,10 +29,10 @@ index 10136a5062d154456c962e7d1a99c2dedbd568ed..64503362c42daa39dcfa270bc50b0e21
              if (!this.level().isClientSide) {
                  player.startRiding(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 74a210a911211d38be77a6d00a0c032c14f48aad..a877974c3b3336ae49da1bcf56b66427d1748c35 100644
+index 50bf456b7e87a77e50b938488abde4cf577d1228..3f83dee1fc6a847d8f56cc230a6de1223d4f3964 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1711,6 +1711,7 @@ public class PurpurWorldConfig {
+@@ -1712,6 +1712,7 @@ public class PurpurWorldConfig {
      public boolean striderControllable = true;
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
@@ -40,7 +40,7 @@ index 74a210a911211d38be77a6d00a0c032c14f48aad..a877974c3b3336ae49da1bcf56b66427
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1722,6 +1723,7 @@ public class PurpurWorldConfig {
+@@ -1723,6 +1724,7 @@ public class PurpurWorldConfig {
          }
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
diff --git a/patches/server/0119-PlayerBookTooLargeEvent.patch b/patches/server/0116-PlayerBookTooLargeEvent.patch
similarity index 83%
rename from patches/server/0119-PlayerBookTooLargeEvent.patch
rename to patches/server/0116-PlayerBookTooLargeEvent.patch
index 6e7540df2..dc4e5a9c7 100644
--- a/patches/server/0119-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0116-PlayerBookTooLargeEvent.patch
@@ -5,14 +5,17 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 14f6abe6e7eeaf5d3053bf3ecb540b898813c267..65c9e83063c84ccff38d52049160bb093a7a50e7 100644
+index e5df5583ef6084e59c8375c82c9909ff2d2bdc3f..b3cecec8a93bd0de1a74e693b7c103fdbc87eba2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1148,10 +1148,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1183,10 +1183,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              int maxBookPageSize = io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.pageMax;
              double multiplier = Math.max(0.3D, Math.min(1D, io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier));
              long byteAllowed = maxBookPageSize;
-+            ItemStack itemstack = this.player.getInventory().getItem(packet.getSlot()); // Purpur
++            // Purpur start
++            int slot = packet.slot();
++            ItemStack itemstack = Inventory.isHotbarSlot(slot) || slot == Inventory.SLOT_OFFHAND ? this.player.getInventory().getItem(slot) : ItemStack.EMPTY;
++            // Purpur end
              for (String testString : pageList) {
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
@@ -21,7 +24,7 @@ index 14f6abe6e7eeaf5d3053bf3ecb540b898813c267..65c9e83063c84ccff38d52049160bb09
                      server.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
                      return;
                  }
-@@ -1175,6 +1177,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1210,6 +1215,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
diff --git a/patches/server/0120-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0117-Full-netherite-armor-grants-fire-resistance.patch
similarity index 93%
rename from patches/server/0120-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/server/0117-Full-netherite-armor-grants-fire-resistance.patch
index 05957c47a..b7a8b3d84 100644
--- a/patches/server/0120-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server/0117-Full-netherite-armor-grants-fire-resistance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Full netherite armor grants fire resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index dd7e47ddde00e0b4f3b9833c1793246547ba0cf2..a21feaa31c6aa3c7f2198b3b4a84af101aa16988 100644
+index d98f5e4323859f9eae0caac04865a78719f5befc..579a9c7d914015ef74c6147f2e17962a7aea2a78 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -367,6 +367,16 @@ public abstract class Player extends LivingEntity {
+@@ -381,6 +381,16 @@ public abstract class Player extends LivingEntity {
              this.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 200, 0, false, false, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TURTLE_HELMET); // CraftBukkit
          }
  
@@ -26,7 +26,7 @@ index dd7e47ddde00e0b4f3b9833c1793246547ba0cf2..a21feaa31c6aa3c7f2198b3b4a84af10
  
      protected ItemCooldowns createItemCooldowns() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a877974c3b3336ae49da1bcf56b66427d1748c35..be24ad68043d014d23879dfe4730c582a7b81689 100644
+index 3f83dee1fc6a847d8f56cc230a6de1223d4f3964..66c4906cb9c3da6f111b96f0ad6be17772764125 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -295,6 +295,19 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0118-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 85%
rename from patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/server/0118-Add-mobGriefing-bypass-to-everything-affected.patch
index c20818174..019668575 100644
--- a/patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0118-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3271c1a14fba90ab2e6467d907dfaf8cf5c12b65..82a8b3d6392fffae9ad3440045129c77119e3e84 100644
+index 2ea60043f3bbf6cce77799f6c74ffe1f4b226374..dc1c7c55fd13cc1a8ade803bfb1b7c385cf29132 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1805,7 +1805,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1831,7 +1831,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              boolean flag = false;
  
              if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -18,10 +18,10 @@ index 3271c1a14fba90ab2e6467d907dfaf8cf5c12b65..82a8b3d6392fffae9ad3440045129c77
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 1ce3ba7f703b5627e2761865c0e133dbf5df8712..4454241862598048abd4e8bf321f9a066be15067 100644
+index 34d00acc43d2541307aa90a77a3c5d19a3057a94..77cf0d92212d11b9036f9f9cf23b23f71f1d590d 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -704,7 +704,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -748,7 +748,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
      public void aiStep() {
          super.aiStep();
          this.level().getProfiler().push("looting");
@@ -31,10 +31,10 @@ index 1ce3ba7f703b5627e2761865c0e133dbf5df8712..4454241862598048abd4e8bf321f9a06
              List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ()));
              Iterator iterator = list.iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-index 66a568e6803b91040f3933d4598c52fa518badab..a1acc479c9d6a838e3180da3ac8a3a02d22db5c1 100644
+index 4fa4ec34963730507253182cad1c2bf04090ad50..8d4e206aa05b95b7bfec5d23496085cf55a3e1de 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
-@@ -47,7 +47,7 @@ public class HarvestFarmland extends Behavior<Villager> {
+@@ -48,7 +48,7 @@ public class HarvestFarmland extends Behavior<Villager> {
      }
  
      protected boolean checkExtraStartConditions(ServerLevel world, Villager entity) {
@@ -57,7 +57,7 @@ index a85885ee51df585fa11ae9f8fcd67ff2a71c5a18..d81509e08e70ec5b2f837c9dc66b1254
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
-index 93bbda61f0eb2dd52573602b1f9cc7b031d1fc5a..63f9e5e2490e5b2fec6f2395077e21e601804ca5 100644
+index 4e2c23ccdf4e4a4d65b291dbe20952bae1838bff..0da884a833f6c707fea512e826658c3bb73f7a77 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java
 @@ -74,7 +74,7 @@ public class EatBlockGoal extends Goal {
@@ -79,7 +79,7 @@ index 93bbda61f0eb2dd52573602b1f9cc7b031d1fc5a..63f9e5e2490e5b2fec6f2395077e21e6
                          this.level.setBlock(blockposition1, Blocks.DIRT.defaultBlockState(), 2);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
-index 509317a26c79f453335df1c19dc4c9ec570046af..8e4d673e4f2d7f50ea5ed13794da08b1d20e6665 100644
+index 6634228ef002cbef67980272a26be4a75c954116..a61abba840a55fb4fbc9716a5e05eb2778068785 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
 @@ -40,7 +40,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
@@ -92,7 +92,7 @@ index 509317a26c79f453335df1c19dc4c9ec570046af..8e4d673e4f2d7f50ea5ed13794da08b1
          } else if (this.nextStartTick > 0) {
              --this.nextStartTick;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index b13429e254bd056cf942f39d46976ff0ef2a97f3..948760c9ee6ba921a7f1b4200fc77aa13f198984 100644
+index 0140dc8a58903bd802ea8ffb029392215e95cdf4..c246148b9851654d796f472462677a60498c7b8d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -1385,7 +1385,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -105,10 +105,10 @@ index b13429e254bd056cf942f39d46976ff0ef2a97f3..948760c9ee6ba921a7f1b4200fc77aa1
  
                  if (iblockdata.is(Blocks.SWEET_BERRY_BUSH)) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index c25776ef9805f3f4e31ca5b027e6577526e48819..86502ef70f2213191d1348ef98969c5c93a6cb95 100644
+index b5297b1d7223af622636a7defdb98b5bc6e6a3c9..ce424d046d7c4abd2371154b00624aa6a9ca3ae3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -634,7 +634,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -631,7 +631,7 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
          @Override
          public boolean canUse() {
              if (this.nextStartTick <= 0) {
@@ -118,11 +118,11 @@ index c25776ef9805f3f4e31ca5b027e6577526e48819..86502ef70f2213191d1348ef98969c5c
                  }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index d3da7487f911ff791dca5f7b546dccda751fe44c..84e0a41620fd52af0cd22dc92fd13ee4efd206fb 100644
+index ee4d4a4fe314ee9bce69c96dd65d84ed1ace0543..cdb6657d30d224709aec3921c5fb8380f8acd93e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -127,7 +127,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-                 this.hurt(this.damageSources().melting, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING
+@@ -125,7 +125,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+                 this.hurt(this.damageSources().melting(), 1.0F); // CraftBukkit - DamageSources.ON_FIRE -> CraftEventFactory.MELTING
              }
  
 -            if (!this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
@@ -131,7 +131,7 @@ index d3da7487f911ff791dca5f7b546dccda751fe44c..84e0a41620fd52af0cd22dc92fd13ee4
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 4149a7aea12cac04a2dfe29e071047de461eb3f4..0d16d486c7efc9a8c4c0db648175cacee5aa3a04 100644
+index f751444603e4a1a2ef53e7232b5abfff82c316e8..0478469343c30d2b8d79bda78aef9ff1348de19b 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -603,7 +603,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -144,23 +144,23 @@ index 4149a7aea12cac04a2dfe29e071047de461eb3f4..0d16d486c7efc9a8c4c0db648175cace
                              // flag1 = this.level().removeBlock(blockposition, false) || flag1;
                              flag1 = true;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 8796b779ac0550e32c7313b1280278de48070baf..97be7061d3cccac7b64f4b1a234ccbd83e2b7407 100644
+index 8d2894bb1ae70f63c8fa67de3e9f7c6a9c940f3e..2f0c44a0b97e9ad7591c5b66c2560f3e405c61c4 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -492,7 +492,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -493,7 +493,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
  
              if (this.destroyBlocksTick > 0) {
                  --this.destroyBlocksTick;
 -                if (this.destroyBlocksTick == 0 && this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
 +                if (this.destroyBlocksTick == 0 && (this.level().purpurConfig.witherBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // Purpur
-                     i = Mth.floor(this.getY());
-                     j = Mth.floor(this.getX());
-                     int i1 = Mth.floor(this.getZ());
+                     boolean flag = false;
+ 
+                     j = Mth.floor(this.getBbWidth() / 2.0F + 1.0F);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index aecccc96a1ea7fbd774a4ccbd45c11be1da1b43b..580e7c149e24f0bcbb8c21284869f78e485d091d 100644
+index 052a0c168268b7e788953063f54c3769023f3c03..de1fe3b115c1b3936b79c8900389542a8c8a2c90 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -549,7 +549,15 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -526,7 +526,15 @@ public class EnderMan extends Monster implements NeutralMob {
          @Override
          public boolean canUse() {
              if (!enderman.level().purpurConfig.endermanAllowGriefing) return false; // Purpur
@@ -177,7 +177,7 @@ index aecccc96a1ea7fbd774a4ccbd45c11be1da1b43b..580e7c149e24f0bcbb8c21284869f78e
          }
  
          @Override
-@@ -595,7 +603,15 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -572,7 +580,15 @@ public class EnderMan extends Monster implements NeutralMob {
          @Override
          public boolean canUse() {
              if (!enderman.level().purpurConfig.endermanAllowGriefing) return false; // Purpur
@@ -195,10 +195,10 @@ index aecccc96a1ea7fbd774a4ccbd45c11be1da1b43b..580e7c149e24f0bcbb8c21284869f78e
  
          @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 86999c7932216871b4b6e06d68168e3b48038a18..fbcb6b4cf4234d6eba989210012ab360c1b323a4 100644
+index 8f0c685790aa59b7f2352c3bac6ede444d0ede22..ce2e5c16db13accb082b3f2403661c65411c7a80 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-@@ -345,7 +345,7 @@ public class Evoker extends SpellcasterIllager {
+@@ -364,7 +364,7 @@ public class Evoker extends SpellcasterIllager {
                  return false;
              } else if (Evoker.this.tickCount < this.nextAttackTickCount) {
                  return false;
@@ -208,10 +208,10 @@ index 86999c7932216871b4b6e06d68168e3b48038a18..fbcb6b4cf4234d6eba989210012ab360
              } else {
                  List<Sheep> list = Evoker.this.level().getNearbyEntities(Sheep.class, this.wololoTargeting, Evoker.this, Evoker.this.getBoundingBox().inflate(16.0D, 4.0D, 16.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 28795558000d76fd255faabc79cc45600efa2c92..5aa00878c4c7be4a38137a93b1a2cf1c468422ea 100644
+index 32d547a4430a8f524a7fc0bd1aa063bbebfaeb7f..cebe89b0868043b819fb3e9987f899926961be52 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -176,7 +176,7 @@ public class Ravager extends Raider {
+@@ -168,7 +168,7 @@ public class Ravager extends Raider {
                  this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(Mth.lerp(0.1D, d1, d0));
              }
  
@@ -221,10 +221,10 @@ index 28795558000d76fd255faabc79cc45600efa2c92..5aa00878c4c7be4a38137a93b1a2cf1c
                  AABB axisalignedbb = this.getBoundingBox().inflate(0.2D);
                  Iterator iterator = BlockPos.betweenClosed(Mth.floor(axisalignedbb.minX), Mth.floor(axisalignedbb.minY), Mth.floor(axisalignedbb.minZ), Mth.floor(axisalignedbb.maxX), Mth.floor(axisalignedbb.maxY), Mth.floor(axisalignedbb.maxZ)).iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 1738f0a251e4cab2eb3f122e83366afb02201765..49a37d294bac8205ac0a795daa300ccc8170c8a8 100644
+index 75f82922260b2c0666021e7ed42dfde401e1a9d6..a175144d5480b7af091787c6ab366fb3e8d70587 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -210,7 +210,7 @@ public class Silverfish extends Monster {
+@@ -191,7 +191,7 @@ public class Silverfish extends Monster {
                                      continue;
                                  }
                                  // CraftBukkit end
@@ -233,7 +233,7 @@ index 1738f0a251e4cab2eb3f122e83366afb02201765..49a37d294bac8205ac0a795daa300ccc
                                      world.destroyBlock(blockposition1, true, this.silverfish);
                                  } else {
                                      world.setBlock(blockposition1, ((InfestedBlock) block).hostStateByInfested(world.getBlockState(blockposition1)), 3);
-@@ -248,7 +248,7 @@ public class Silverfish extends Monster {
+@@ -229,7 +229,7 @@ public class Silverfish extends Monster {
              } else {
                  RandomSource randomsource = this.mob.getRandom();
  
@@ -243,10 +243,10 @@ index 1738f0a251e4cab2eb3f122e83366afb02201765..49a37d294bac8205ac0a795daa300ccc
                      BlockPos blockposition = BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ()).relative(this.selectedDirection);
                      BlockState iblockdata = this.mob.level().getBlockState(blockposition);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index d9b1bde3ce458b7e50f7645d07ee578d13006a0a..d133820c47ecda733aa8242acdb2cd3ba0f0b677 100644
+index 06e0f737615c90bd733a89a731156598ccfe447f..57089ba787731ddda853dce959ba015abe135bfd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -424,7 +424,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -412,7 +412,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
  
      @Override
      public boolean wantsToPickUp(ItemStack stack) {
@@ -256,22 +256,22 @@ index d9b1bde3ce458b7e50f7645d07ee578d13006a0a..d133820c47ecda733aa8242acdb2cd3b
  
      protected boolean canReplaceCurrentItem(ItemStack stack) {
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java b/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java
-index 251e6bc87eb02ec4372062ef22b21249ac5164ff..6b60597a0e837054b0d1891c1e6e5e7cd3af9539 100644
+index 9d89872c5958f3e8d6c1ef4fd93f9b8b85296851..6a94c86acce5afbf1e9c8e7d664b3eb2d79ab5ab 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/LargeFireball.java
-@@ -16,20 +16,20 @@ public class LargeFireball extends Fireball {
+@@ -19,20 +19,20 @@ public class LargeFireball extends Fireball {
  
      public LargeFireball(EntityType<? extends LargeFireball> type, Level world) {
          super(type, world);
--        isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
-+        isIncendiary = this.level().purpurConfig.fireballsBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit // Purpur
+-        this.isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
++        this.isIncendiary = this.level().purpurConfig.fireballsBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit // Purpur
      }
  
      public LargeFireball(Level world, LivingEntity owner, double velocityX, double velocityY, double velocityZ, int explosionPower) {
          super(EntityType.FIREBALL, owner, velocityX, velocityY, velocityZ, world);
          this.explosionPower = explosionPower;
--        isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
-+        isIncendiary = this.level().purpurConfig.fireballsBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit // Purpur
+-        this.isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
++        this.isIncendiary = this.level().purpurConfig.fireballsBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit // Purpur
      }
  
      @Override
@@ -284,35 +284,36 @@ index 251e6bc87eb02ec4372062ef22b21249ac5164ff..6b60597a0e837054b0d1891c1e6e5e7c
              // CraftBukkit start - fire ExplosionPrimeEvent
              ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index cd0629581bae5f805842157af36c2d838e01bee3..b0a559dfefac693bda8692a30fbaa5ac8062ef27 100644
+index 74c596264d4da551437bd2a23e1c70022cfc73fc..e4d4ff0ef4a0f3283aa42fe2304816cd6d9475a8 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -326,6 +326,6 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -343,7 +343,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      public boolean mayInteract(Level world, BlockPos pos) {
          Entity entity = this.getOwner();
  
 -        return entity instanceof Player ? entity.mayInteract(world, pos) : entity == null || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
 +        return entity instanceof Player ? entity.mayInteract(world, pos) : entity == null || world.purpurConfig.projectilesBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
      }
- }
+ 
+     public boolean mayBreak(Level world) {
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java b/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
-index 04c2ea1ff44af72ae48e2d6b7b912b1c14285038..7839d856b3f924f0c87b298d9a1e3b15ab0693d6 100644
+index 3a11ad32d95088a5aca713a1a6a984cc22d4fa9a..c078ccad4aabe469a9611331b415a4cef241973e 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/SmallFireball.java
-@@ -24,7 +24,7 @@ public class SmallFireball extends Fireball {
+@@ -27,7 +27,7 @@ public class SmallFireball extends Fireball {
          super(EntityType.SMALL_FIREBALL, owner, velocityX, velocityY, velocityZ, world);
          // CraftBukkit start
          if (this.getOwner() != null && this.getOwner() instanceof Mob) {
--            isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
-+            isIncendiary = this.level().purpurConfig.fireballsBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // Purpur
+-            this.isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
++            this.isIncendiary = this.level().purpurConfig.fireballsBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // Purpur
          }
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index cdbc925ef61b8b439415f0a89368227890bcecb2..300411e88cdaef7e0ce280edbd5f18fa8d004a33 100644
+index 98e558338b5d9fb03869d2cc21b3e90eb45b95f6..4a8fa7e5844b5cd12ef6b113f988b715c7a3ef64 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-@@ -319,7 +319,7 @@ public abstract class Raider extends PatrollingMonster {
+@@ -341,7 +341,7 @@ public abstract class Raider extends PatrollingMonster {
  
          @Override
          public boolean canUse() {
@@ -320,25 +321,25 @@ index cdbc925ef61b8b439415f0a89368227890bcecb2..300411e88cdaef7e0ce280edbd5f18fa
 +            if ((!this.mob.level().purpurConfig.pillagerBypassMobGriefing && !this.mob.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) || !this.mob.canPickUpLoot()) return false; // Paper - respect game and entity rules for picking up items // Purpur
              Raid raid = this.mob.getCurrentRaid();
  
-             if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBannerInstance())) {
+             if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBannerInstance(this.mob.registryAccess().lookupOrThrow(Registries.BANNER_PATTERN)))) {
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 6365ddea0c23bc5d4009d98915f2b39aed2a0328..c7ba8503b2722e5d9ce0699b959cd6be01128055 100644
+index 112d2feba5f75a2a873b595617780515945c10e4..2af4c365743b2956939335512f74e0a1d84298f7 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-@@ -172,7 +172,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
+@@ -179,7 +179,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
      @Override
-     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
+     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
+         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
 -        if (entity instanceof Ravager && CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) { // CraftBukkit
 +        if (entity instanceof Ravager && CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), (!world.purpurConfig.ravagerBypassMobGriefing && !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)))) { // CraftBukkit // Purpur
              world.destroyBlock(pos, true, entity);
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 7efae60a9a9269703a1fa7cd280b5b96557ec73e..e7b5f54d2fc53878e9466ccca972df21f10a7d67 100644
+index dc356bd0931af9bdab9ec71e3de66e88a67375ad..99798220b6e0ad06db2ba5c9b74bfb72af185fee 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -101,7 +101,7 @@ public class FarmBlock extends Block {
+@@ -111,7 +111,7 @@ public class FarmBlock extends Block {
      @Override
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
          super.fallOn(world, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
@@ -348,10 +349,10 @@ index 7efae60a9a9269703a1fa7cd280b5b96557ec73e..e7b5f54d2fc53878e9466ccca972df21
              org.bukkit.event.Cancellable cancellable;
              if (entity instanceof Player) {
 diff --git a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-index e6fcea4482d5d87ed78beefad4c57bc86089460f..1626eb90a6b348ad9735b82452f52d4560075a03 100644
+index a6e6545402904141ffc6218a0158b0e9c67217c8..5eac1a54398dfa5571b98fb6eefca9d2bf9b2793 100644
 --- a/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PowderSnowBlock.java
-@@ -73,7 +73,7 @@ public class PowderSnowBlock extends Block implements BucketPickup {
+@@ -80,7 +80,7 @@ public class PowderSnowBlock extends Block implements BucketPickup {
          if (!world.isClientSide) {
              // CraftBukkit start
              if (entity.isOnFire() && entity.mayInteract(world, pos)) {
@@ -361,10 +362,10 @@ index e6fcea4482d5d87ed78beefad4c57bc86089460f..1626eb90a6b348ad9735b82452f52d45
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 18feb559f9fd157dd4a01faf2b2bb18df2a64675..9c834e3deed07eb70e6a57df2db732c1e2334737 100644
+index c7377d04ceac3ea624117439783a443c6d6f6d08..0c732cfbd9ce50198a3f85ae8ef2263d7ae0bc1a 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-@@ -213,7 +213,7 @@ public class TurtleEggBlock extends Block {
+@@ -221,7 +221,7 @@ public class TurtleEggBlock extends Block {
          }
          if (entity instanceof Player) return true;
  
@@ -374,7 +375,7 @@ index 18feb559f9fd157dd4a01faf2b2bb18df2a64675..9c834e3deed07eb70e6a57df2db732c1
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b75506d9d 100644
+index 66c4906cb9c3da6f111b96f0ad6be17772764125..51002cc2901b432123dfc6b3c130e26b3c3486a3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -115,8 +115,11 @@ public class PurpurWorldConfig {
@@ -401,7 +402,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
          tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
          voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
-@@ -444,9 +450,11 @@ public class PurpurWorldConfig {
+@@ -445,9 +451,11 @@ public class PurpurWorldConfig {
          dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
      }
  
@@ -413,7 +414,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
          farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
      }
-@@ -471,6 +479,11 @@ public class PurpurWorldConfig {
+@@ -472,6 +480,11 @@ public class PurpurWorldConfig {
          lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  
@@ -425,10 +426,10 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      public boolean respawnAnchorExplode = true;
      public double respawnAnchorExplosionPower = 5.0D;
      public boolean respawnAnchorExplosionFire = true;
-@@ -500,10 +513,12 @@ public class PurpurWorldConfig {
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+@@ -501,10 +514,12 @@ public class PurpurWorldConfig {
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
 +    public boolean turtleEggsBypassMobGriefing = false;
      private void turtleEggSettings() {
          turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
@@ -438,7 +439,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public int waterInfiniteRequiredSources = 2;
-@@ -737,6 +752,7 @@ public class PurpurWorldConfig {
+@@ -738,6 +753,7 @@ public class PurpurWorldConfig {
      public double creeperMaxHealth = 20.0D;
      public double creeperChargedChance = 0.0D;
      public boolean creeperAllowGriefing = true;
@@ -446,7 +447,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -749,6 +765,7 @@ public class PurpurWorldConfig {
+@@ -750,6 +766,7 @@ public class PurpurWorldConfig {
          creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -454,7 +455,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean dolphinRidable = false;
-@@ -843,6 +860,7 @@ public class PurpurWorldConfig {
+@@ -844,6 +861,7 @@ public class PurpurWorldConfig {
      public double enderDragonMaxY = 320D;
      public double enderDragonMaxHealth = 200.0D;
      public boolean enderDragonAlwaysDropsFullExp = false;
@@ -462,7 +463,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -859,6 +877,7 @@ public class PurpurWorldConfig {
+@@ -860,6 +878,7 @@ public class PurpurWorldConfig {
          }
          enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -470,7 +471,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean endermanRidable = false;
-@@ -867,6 +886,7 @@ public class PurpurWorldConfig {
+@@ -868,6 +887,7 @@ public class PurpurWorldConfig {
      public double endermanMaxHealth = 40.0D;
      public boolean endermanAllowGriefing = true;
      public boolean endermanDespawnEvenWithBlock = false;
@@ -478,7 +479,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -879,6 +899,7 @@ public class PurpurWorldConfig {
+@@ -880,6 +900,7 @@ public class PurpurWorldConfig {
          endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
          endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -486,7 +487,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean endermiteRidable = false;
-@@ -901,6 +922,7 @@ public class PurpurWorldConfig {
+@@ -902,6 +923,7 @@ public class PurpurWorldConfig {
      public boolean evokerRidableInWater = true;
      public boolean evokerControllable = true;
      public double evokerMaxHealth = 24.0D;
@@ -494,7 +495,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void evokerSettings() {
          evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
          evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
-@@ -911,6 +933,7 @@ public class PurpurWorldConfig {
+@@ -912,6 +934,7 @@ public class PurpurWorldConfig {
              set("mobs.evoker.attributes.max_health", oldValue);
          }
          evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -502,7 +503,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean foxRidable = false;
-@@ -919,6 +942,7 @@ public class PurpurWorldConfig {
+@@ -920,6 +943,7 @@ public class PurpurWorldConfig {
      public double foxMaxHealth = 10.0D;
      public boolean foxTypeChangesWithTulips = false;
      public int foxBreedingTicks = 6000;
@@ -510,7 +511,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -931,6 +955,7 @@ public class PurpurWorldConfig {
+@@ -932,6 +956,7 @@ public class PurpurWorldConfig {
          foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
          foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
          foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -518,7 +519,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean frogRidable = false;
-@@ -1378,6 +1403,7 @@ public class PurpurWorldConfig {
+@@ -1379,6 +1404,7 @@ public class PurpurWorldConfig {
      public boolean piglinRidableInWater = true;
      public boolean piglinControllable = true;
      public double piglinMaxHealth = 16.0D;
@@ -526,7 +527,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1388,6 +1414,7 @@ public class PurpurWorldConfig {
+@@ -1389,6 +1415,7 @@ public class PurpurWorldConfig {
              set("mobs.piglin.attributes.max_health", oldValue);
          }
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -534,7 +535,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean piglinBruteRidable = false;
-@@ -1410,6 +1437,7 @@ public class PurpurWorldConfig {
+@@ -1411,6 +1438,7 @@ public class PurpurWorldConfig {
      public boolean pillagerRidableInWater = true;
      public boolean pillagerControllable = true;
      public double pillagerMaxHealth = 24.0D;
@@ -542,7 +543,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void pillagerSettings() {
          pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
          pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
-@@ -1420,6 +1448,7 @@ public class PurpurWorldConfig {
+@@ -1421,6 +1449,7 @@ public class PurpurWorldConfig {
              set("mobs.pillager.attributes.max_health", oldValue);
          }
          pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -550,7 +551,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean polarBearRidable = false;
-@@ -1466,6 +1495,7 @@ public class PurpurWorldConfig {
+@@ -1467,6 +1496,7 @@ public class PurpurWorldConfig {
      public double rabbitNaturalToast = 0.0D;
      public double rabbitNaturalKiller = 0.0D;
      public int rabbitBreedingTicks = 6000;
@@ -558,7 +559,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1479,12 +1509,14 @@ public class PurpurWorldConfig {
+@@ -1480,12 +1510,14 @@ public class PurpurWorldConfig {
          rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
          rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -573,7 +574,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1495,6 +1527,7 @@ public class PurpurWorldConfig {
+@@ -1496,6 +1528,7 @@ public class PurpurWorldConfig {
              set("mobs.ravager.attributes.max_health", oldValue);
          }
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -581,7 +582,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean salmonRidable = false;
-@@ -1516,6 +1549,7 @@ public class PurpurWorldConfig {
+@@ -1517,6 +1550,7 @@ public class PurpurWorldConfig {
      public boolean sheepControllable = true;
      public double sheepMaxHealth = 8.0D;
      public int sheepBreedingTicks = 6000;
@@ -589,7 +590,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -1527,6 +1561,7 @@ public class PurpurWorldConfig {
+@@ -1528,6 +1562,7 @@ public class PurpurWorldConfig {
          }
          sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
          sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -597,7 +598,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean shulkerRidable = false;
-@@ -1549,6 +1584,7 @@ public class PurpurWorldConfig {
+@@ -1550,6 +1585,7 @@ public class PurpurWorldConfig {
      public boolean silverfishRidableInWater = true;
      public boolean silverfishControllable = true;
      public double silverfishMaxHealth = 8.0D;
@@ -605,7 +606,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void silverfishSettings() {
          silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
          silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
-@@ -1559,6 +1595,7 @@ public class PurpurWorldConfig {
+@@ -1560,6 +1596,7 @@ public class PurpurWorldConfig {
              set("mobs.silverfish.attributes.max_health", oldValue);
          }
          silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -613,7 +614,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean skeletonRidable = false;
-@@ -1635,6 +1672,7 @@ public class PurpurWorldConfig {
+@@ -1637,6 +1674,7 @@ public class PurpurWorldConfig {
      public int snowGolemSnowBallMax = 20;
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
@@ -621,7 +622,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1652,6 +1690,7 @@ public class PurpurWorldConfig {
+@@ -1653,6 +1691,7 @@ public class PurpurWorldConfig {
          snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
          snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -629,7 +630,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean snifferRidable = false;
-@@ -1838,6 +1877,7 @@ public class PurpurWorldConfig {
+@@ -1839,6 +1878,7 @@ public class PurpurWorldConfig {
      public int villagerBreedingTicks = 6000;
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
@@ -637,7 +638,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1854,6 +1894,7 @@ public class PurpurWorldConfig {
+@@ -1855,6 +1895,7 @@ public class PurpurWorldConfig {
          villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -645,7 +646,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean vindicatorRidable = false;
-@@ -1926,6 +1967,7 @@ public class PurpurWorldConfig {
+@@ -1927,6 +1968,7 @@ public class PurpurWorldConfig {
      public double witherMaxHealth = 300.0D;
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
@@ -653,7 +654,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1943,6 +1985,7 @@ public class PurpurWorldConfig {
+@@ -1944,6 +1986,7 @@ public class PurpurWorldConfig {
          witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
          witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -661,7 +662,7 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -2014,6 +2057,7 @@ public class PurpurWorldConfig {
+@@ -2015,6 +2058,7 @@ public class PurpurWorldConfig {
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,11 +670,11 @@ index be24ad68043d014d23879dfe4730c582a7b81689..499595ee7ab97559f562ecfbf4479a6b
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2029,6 +2073,7 @@ public class PurpurWorldConfig {
+@@ -2030,6 +2074,7 @@ public class PurpurWorldConfig {
          zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
          zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
 +        zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
      }
  
-     public boolean zombieHorseRidableInWater = false;
+     public boolean zombieHorseRidable = false;
diff --git a/patches/server/0123-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0119-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 92%
rename from patches/server/0123-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/server/0119-Config-to-allow-Note-Block-sounds-when-blocked.patch
index 7d3285485..fe5cc46f7 100644
--- a/patches/server/0123-Config-to-allow-Note-Block-sounds-when-blocked.patch
+++ b/patches/server/0119-Config-to-allow-Note-Block-sounds-when-blocked.patch
@@ -9,10 +9,10 @@ Normally, the sounds will only play when the block directly above is air.
 With this patch enabled, players can place any block above the Note Block and it will still work.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/NoteBlock.java b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-index e46d84750bdd7c940f400efda226e12a3fdc3848..6343cd0c33cafb30225cfae17ea1cf15859073b1 100644
+index 1d82cfe7af0dc42f88901fb0c44896771fdf8a93..43dd972b374daa1072608f3a68e812e7fb733a2b 100644
 --- a/src/main/java/net/minecraft/world/level/block/NoteBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NoteBlock.java
-@@ -87,7 +87,7 @@ public class NoteBlock extends Block {
+@@ -95,7 +95,7 @@ public class NoteBlock extends Block {
      }
  
      private void playNote(@Nullable Entity entity, BlockState state, Level world, BlockPos pos) {
@@ -22,7 +22,7 @@ index e46d84750bdd7c940f400efda226e12a3fdc3848..6343cd0c33cafb30225cfae17ea1cf15
              // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE));
              // if (event.isCancelled()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 499595ee7ab97559f562ecfbf4479a6b75506d9d..8c624ac93c3a24bb472217ae89dc8c9c82192407 100644
+index 51002cc2901b432123dfc6b3c130e26b3c3486a3..30a95d4b18964c6b25beb4dbec84f03effc2145b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -118,6 +118,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0124-Add-EntityTeleportHinderedEvent.patch b/patches/server/0120-Add-EntityTeleportHinderedEvent.patch
similarity index 85%
rename from patches/server/0124-Add-EntityTeleportHinderedEvent.patch
rename to patches/server/0120-Add-EntityTeleportHinderedEvent.patch
index df0ec7cfa..c3a3264a8 100644
--- a/patches/server/0124-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0120-Add-EntityTeleportHinderedEvent.patch
@@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 41d7cff39fc37955877668337689b4b26cd8c7cf..f80f6da484f4144e743079e5104bf503419074b2 100644
+index 7272d70c672b54dcf595beafd7a2ed33c96e35cb..d7f33c676bba279661583d908d3a58c86d853545 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -46,6 +46,14 @@ public class EndPortalBlock extends BaseEntityBlock {
-     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
+@@ -54,6 +54,14 @@ public class EndPortalBlock extends BaseEntityBlock {
+     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
+         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
          if (world instanceof ServerLevel && entity.canChangeDimensions() && Shapes.joinIsNotEmpty(Shapes.create(entity.getBoundingBox().move((double) (-pos.getX()), (double) (-pos.getY()), (double) (-pos.getZ()))), state.getShape(world, pos), BooleanOp.AND)) {
 +            // Purpur start
 +            if (entity.isPassenger() || entity.isVehicle()) {
@@ -36,12 +36,12 @@ index 41d7cff39fc37955877668337689b4b26cd8c7cf..f80f6da484f4144e743079e5104bf503
              ServerLevel worldserver = ((ServerLevel) world).getServer().getLevel(resourcekey);
  
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index a6ab0d0defc05e56a91084c49897059670a1324b..2c085c4a154cb0f8a1d38453f43474a764398784 100644
+index a9e3078cefcae8cc4672d514a7add162590d48df..67060b7446535fc352d221d9fe3928d1d6ffcf54 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-@@ -84,6 +84,14 @@ public class NetherPortalBlock extends Block {
-     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
+@@ -92,6 +92,14 @@ public class NetherPortalBlock extends Block {
+     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
+         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
          if (entity.canChangeDimensions()) {
 +            // Purpur start
 +            if (entity.isPassenger() || entity.isVehicle()) {
@@ -55,12 +55,12 @@ index a6ab0d0defc05e56a91084c49897059670a1324b..2c085c4a154cb0f8a1d38453f43474a7
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
              world.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 9717b37aef9f487502e696c209ae209ab3b8f000..7291e4056b8e46ab59b71818388ac55fbb12993f 100644
+index 60b343edc4383c8bc450f106f483349850432fa3..fb9611866671880fc7a1a969da928b8f2ad15269 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -178,6 +178,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -168,6 +168,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
      public static void teleportEntity(Level world, BlockPos pos, BlockState state, Entity entity, TheEndGatewayBlockEntity blockEntity) {
-         if (world instanceof ServerLevel && !blockEntity.isCoolingDown()) {
+         if (world instanceof ServerLevel worldserver && !blockEntity.isCoolingDown()) {
              if (!entity.canChangeDimensions()) return; // Purpur
 +            // Purpur start
 +            if (world.purpurConfig.imposeTeleportRestrictionsOnGateways && (entity.isVehicle() || entity.isPassenger())) {
@@ -70,14 +70,14 @@ index 9717b37aef9f487502e696c209ae209ab3b8f000..7291e4056b8e46ab59b71818388ac55f
 +                return;
 +            }
 +            // Purpur end
-             ServerLevel worldserver = (ServerLevel) world;
- 
              blockEntity.teleportCooldown = 100;
+             BlockPos blockposition1;
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6092004f91e1a4a143df1a82bcad9c16760f5096..d1a550aa5905d26e5b0f534338b3f30f1f2db67c 100644
+index a6268b3df9691278606501284b5504da718703c2..befe3372d5f1550b7bde3b63b5e7aef9035c5379 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -600,6 +600,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -253,6 +253,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          // Paper end
  
          if ((!ignorePassengers && this.entity.isVehicle()) || this.entity.isRemoved()) { // Paper - Teleport passenger API
@@ -89,10 +89,10 @@ index 6092004f91e1a4a143df1a82bcad9c16760f5096..d1a550aa5905d26e5b0f534338b3f30f
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 12012dd42a9c1faffcad55c9786a9f99e426600a..4895293d3dfd294d278c79932d354bf9fe780361 100644
+index a4e4babedbf5bbf09bfbabd4f55ecd6301dae302..925b8260bb2b1c94e544d6e082ea3b02e613d224 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1357,6 +1357,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1443,6 +1443,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -104,7 +104,7 @@ index 12012dd42a9c1faffcad55c9786a9f99e426600a..4895293d3dfd294d278c79932d354bf9
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8c624ac93c3a24bb472217ae89dc8c9c82192407..d430af5942337e7f19a5085dc9124c9266c137c7 100644
+index 30a95d4b18964c6b25beb4dbec84f03effc2145b..bed0ee3cac8d2acda872f5f3fcbd2b75a6ca3a0d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -117,6 +117,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0125-Farmland-trampling-changes.patch b/patches/server/0121-Farmland-trampling-changes.patch
similarity index 88%
rename from patches/server/0125-Farmland-trampling-changes.patch
rename to patches/server/0121-Farmland-trampling-changes.patch
index 16a6842c8..e48e6ca91 100644
--- a/patches/server/0125-Farmland-trampling-changes.patch
+++ b/patches/server/0121-Farmland-trampling-changes.patch
@@ -12,10 +12,10 @@ necessary to trample in the first place. Feather Falling 1 requires
 you to fall over 3+ blocks to trample. FF 2 requires 4+, etc.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index e7b5f54d2fc53878e9466ccca972df21f10a7d67..56e66fcd840d0d3681ba671d1ffc51b232631461 100644
+index 99798220b6e0ad06db2ba5c9b74bfb72af185fee..12a0c69f8fec30fad64cbb00af2ca1bbf0ea5153 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -116,12 +116,20 @@ public class FarmBlock extends Block {
+@@ -126,12 +126,20 @@ public class FarmBlock extends Block {
              }
  
              // Purpur start
@@ -28,8 +28,8 @@ index e7b5f54d2fc53878e9466ccca972df21f10a7d67..56e66fcd840d0d3681ba671d1ffc51b2
                  }
              }
 +            if (world.purpurConfig.farmlandTramplingFeatherFalling) {
-+                Iterator<net.minecraft.world.item.ItemStack> armor = entity.getArmorSlots().iterator();
-+                if (armor.hasNext() && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FALL_PROTECTION, armor.next()) >= (int) entity.fallDistance) {
++                Iterator<net.minecraft.world.item.ItemStack> armor = ((LivingEntity) entity).getArmorSlots().iterator();
++                if (armor.hasNext() && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FEATHER_FALLING, armor.next()) >= (int) entity.fallDistance) {
 +                    return;
 +                }
 +            }
@@ -37,10 +37,10 @@ index e7b5f54d2fc53878e9466ccca972df21f10a7d67..56e66fcd840d0d3681ba671d1ffc51b2
              if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState())) {
                  return;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d430af5942337e7f19a5085dc9124c9266c137c7..a27a2fb4d9643ed0d2cb4bbad8c09052978e123c 100644
+index bed0ee3cac8d2acda872f5f3fcbd2b75a6ca3a0d..91f204f313ee4b5a1f16416670e855d4e7177e51 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -457,10 +457,16 @@ public class PurpurWorldConfig {
+@@ -458,10 +458,16 @@ public class PurpurWorldConfig {
      public boolean farmlandBypassMobGriefing = false;
      public boolean farmlandGetsMoistFromBelow = false;
      public boolean farmlandAlpha = false;
diff --git a/patches/server/0121-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0121-Fix-rotating-UP-DOWN-CW-and-CCW.patch
deleted file mode 100644
index 3aa798929..000000000
--- a/patches/server/0121-Fix-rotating-UP-DOWN-CW-and-CCW.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Wed, 6 Jan 2021 02:19:29 -0600
-Subject: [PATCH] Fix rotating UP/DOWN CW and CCW
-
-
-diff --git a/src/main/java/net/minecraft/core/Direction.java b/src/main/java/net/minecraft/core/Direction.java
-index 392406722b0a040c1d41fdc1154d75d39f6e9c86..b805e57d5a67d77d226cd8154e970050e2e8ef4a 100644
---- a/src/main/java/net/minecraft/core/Direction.java
-+++ b/src/main/java/net/minecraft/core/Direction.java
-@@ -253,6 +253,12 @@ public enum Direction implements StringRepresentable {
-             case EAST:
-                 var10000 = SOUTH;
-                 break;
-+        // Purpur start
-+        case UP:
-+            return UP;
-+        case DOWN:
-+            return DOWN;
-+        // Purpur end
-             default:
-                 throw new IllegalStateException("Unable to get Y-rotated facing of " + this);
-         }
-@@ -365,6 +371,12 @@ public enum Direction implements StringRepresentable {
-             case EAST:
-                 var10000 = NORTH;
-                 break;
-+        // Purpur start
-+        case UP:
-+            return UP;
-+        case DOWN:
-+            return DOWN;
-+        // Purpur end
-             default:
-                 throw new IllegalStateException("Unable to get CCW facing of " + this);
-         }
diff --git a/patches/server/0126-Movement-options-for-armor-stands.patch b/patches/server/0122-Movement-options-for-armor-stands.patch
similarity index 82%
rename from patches/server/0126-Movement-options-for-armor-stands.patch
rename to patches/server/0122-Movement-options-for-armor-stands.patch
index 307a2e99a..2e06519b9 100644
--- a/patches/server/0126-Movement-options-for-armor-stands.patch
+++ b/patches/server/0122-Movement-options-for-armor-stands.patch
@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f2b06c4930c39a3e47f0ea35dfa5997f21654674..b7a619f93c7d48633dffea58204e135547778ab3 100644
+index a93ae9de698ce97e8603deb1075e6dc5aeaab274..2f8b5646222b86fa7ef908c9796d28e034702ec7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1837,7 +1837,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1936,7 +1936,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.isInWater() || flag;
      }
  
@@ -28,34 +28,34 @@ index f2b06c4930c39a3e47f0ea35dfa5997f21654674..b7a619f93c7d48633dffea58204e1355
 +    public void updateInWaterStateAndDoWaterCurrentPushing() { // Purpur - package-private -> public
          Entity entity = this.getVehicle();
  
-         if (entity instanceof Boat) {
+         if (entity instanceof Boat entityboat) {
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index a164e13ddfe64b212fc5937b455096287d3151d8..ba2fe129aaf25c54b624f282f8994c6a884abad8 100644
+index 8b25bb80a913cd002cdaeadf076d811172f10488..89f600edda9a1c5d1b132355fefb7eaed77c52f5 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -99,10 +99,12 @@ public class ArmorStand extends LivingEntity {
+@@ -103,10 +103,12 @@ public class ArmorStand extends LivingEntity {
      private boolean noTickPoseDirty = false;
      private boolean noTickEquipmentDirty = false;
-     // Paper end
+     // Paper end - Allow ArmorStands not to tick
 +    public boolean canMovementTick = true; // Purpur
  
      public ArmorStand(EntityType<? extends ArmorStand> type, Level world) {
          super(type, world);
-         if (world != null) this.canTick = world.paperConfig().entities.armorStands.tick; // Paper - armour stand ticking
+         if (world != null) this.canTick = world.paperConfig().entities.armorStands.tick; // Paper - Allow ArmorStands not to tick
 +        if (world != null) this.canMovementTick = world.purpurConfig.armorstandMovement; // Purpur
          this.handItems = NonNullList.withSize(2, ItemStack.EMPTY);
          this.armorItems = NonNullList.withSize(4, ItemStack.EMPTY);
          this.headPose = ArmorStand.DEFAULT_HEAD_POSE;
-@@ -1025,4 +1027,18 @@ public class ArmorStand extends LivingEntity {
+@@ -1005,4 +1007,18 @@ public class ArmorStand extends LivingEntity {
+         }
      }
      // Paper end
-     // Paper end
 +
 +    // Purpur start
 +    @Override
 +    public void updateInWaterStateAndDoWaterCurrentPushing() {
 +        if (this.level().purpurConfig.armorstandWaterMovement &&
-+                (this.level().purpurConfig.armorstandWaterFence || !(level().getBlockState(blockPosition().below()).getBlock() instanceof net.minecraft.world.level.block.FenceBlock)))
++            (this.level().purpurConfig.armorstandWaterFence || !(level().getBlockState(blockPosition().below()).getBlock() instanceof net.minecraft.world.level.block.FenceBlock)))
 +            super.updateInWaterStateAndDoWaterCurrentPushing();
 +    }
 +
@@ -66,7 +66,7 @@ index a164e13ddfe64b212fc5937b455096287d3151d8..ba2fe129aaf25c54b624f282f8994c6a
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a27a2fb4d9643ed0d2cb4bbad8c09052978e123c..4352f37b8568c7e9ce8cce66c2a1b36d6d9f8520 100644
+index 91f204f313ee4b5a1f16416670e855d4e7177e51..c0f62102bb2147d08666013c5ca5360a5bcf8e8b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -99,10 +99,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0127-Fix-stuck-in-portals.patch b/patches/server/0123-Fix-stuck-in-portals.patch
similarity index 85%
rename from patches/server/0127-Fix-stuck-in-portals.patch
rename to patches/server/0123-Fix-stuck-in-portals.patch
index e618f4796..79213b490 100644
--- a/patches/server/0127-Fix-stuck-in-portals.patch
+++ b/patches/server/0123-Fix-stuck-in-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index baf508a942b02d94dfe2c1fffc3cde930a492367..4c68d45f481d97d9fba7ac2eee44ca9c9261591e 100644
+index 07d08bc8d95025fda0859c84b9ea84fe6870d004..146c2e46e0fb9a9358484a054f716d72b9750ed8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1268,6 +1268,7 @@ public class ServerPlayer extends Player {
+@@ -1348,6 +1348,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
@@ -17,10 +17,10 @@ index baf508a942b02d94dfe2c1fffc3cde930a492367..4c68d45f481d97d9fba7ac2eee44ca9c
                  // CraftBukkit end
                  this.setServerLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b7a619f93c7d48633dffea58204e135547778ab3..c5b89e797f614bf388c7ec2ae3e6751180425ba2 100644
+index 2f8b5646222b86fa7ef908c9796d28e034702ec7..1ec1f023d7eee5714c94dbb6c842444f70603f40 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3084,12 +3084,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3217,12 +3217,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
@@ -37,7 +37,7 @@ index b7a619f93c7d48633dffea58204e135547778ab3..c5b89e797f614bf388c7ec2ae3e67511
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4352f37b8568c7e9ce8cce66c2a1b36d6d9f8520..10c019d14fb20835a01c31dc4546d1c70cde6948 100644
+index c0f62102bb2147d08666013c5ca5360a5bcf8e8b..780a13db057456e49690d90c368284752bafde3f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -333,6 +333,7 @@ public class PurpurWorldConfig {
@@ -55,4 +55,4 @@ index 4352f37b8568c7e9ce8cce66c2a1b36d6d9f8520..10c019d14fb20835a01c31dc4546d1c7
 +        playerFixStuckPortal = getBoolean("gameplay-mechanics.player.fix-stuck-in-portal", playerFixStuckPortal);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch
similarity index 84%
rename from patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch
index e4cb0c56d..ef95121ec 100644
--- a/patches/server/0128-Toggle-for-water-sensitive-mob-damage.patch
+++ b/patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for water sensitive mob damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 19f95ddb2fa9dd264947a8b0033dd7437ee66c7f..d04e48d6a0a6dc7825a3e3d4cf854e294a75d19c 100644
+index 4cd57672c548950cb4e0aa97af75ecca84be6823..70e3d583f7a039a5c67428ce9e8beb1922574c7b 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -46,6 +46,11 @@ public class GlowSquid extends Squid {
@@ -21,10 +21,10 @@ index 19f95ddb2fa9dd264947a8b0033dd7437ee66c7f..d04e48d6a0a6dc7825a3e3d4cf854e29
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index c283900e6c43fda62428a6e6d8b70e512458e779..c3d1d77a5703db4e1e3eb38fdd0b8903f691bf25 100644
+index 49adf3f230fa34289a2ce09a9d829f5dbf952fc8..a7847b6ca5b203fd693337928f31a9043be163d7 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -276,6 +276,11 @@ public class Bat extends AmbientCreature {
+@@ -277,6 +277,11 @@ public class Bat extends AmbientCreature {
          this.getAttribute(Attributes.ATTACK_KNOCKBACK).setBaseValue(this.level().purpurConfig.batAttackKnockback);
      }
  
@@ -37,19 +37,19 @@ index c283900e6c43fda62428a6e6d8b70e512458e779..c3d1d77a5703db4e1e3eb38fdd0b8903
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index cd53ac9806f80409082f394e978295fd414d745d..baeea251e8f6a23bbd41987fffeb60bac157c363 100644
+index cbcfe8177362d9b8af97f21e716a4dce9e227465..0978f519177ce2f0991402dafb9a22c5a8686168 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -180,7 +180,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
-         // Paper end
+@@ -175,7 +175,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+         // Paper end - Fix MC-167279
          this.lookControl = new Bee.BeeLookControl(this);
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0F);
--        this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
-+        if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
-         this.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 16.0F);
-         this.setPathfindingMalus(BlockPathTypes.COCOA, -1.0F);
-         this.setPathfindingMalus(BlockPathTypes.FENCE, -1.0F);
-@@ -481,6 +481,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+         this.setPathfindingMalus(PathType.DANGER_FIRE, -1.0F);
+-        this.setPathfindingMalus(PathType.WATER, -1.0F);
++        if (isSensitiveToWater()) this.setPathfindingMalus(PathType.WATER, -1.0F); // Purpur
+         this.setPathfindingMalus(PathType.WATER_BORDER, 16.0F);
+         this.setPathfindingMalus(PathType.COCOA, -1.0F);
+         this.setPathfindingMalus(PathType.FENCE, -1.0F);
+@@ -477,6 +477,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          return this.level().purpurConfig.beeBreedingTicks;
      }
  
@@ -62,26 +62,26 @@ index cd53ac9806f80409082f394e978295fd414d745d..baeea251e8f6a23bbd41987fffeb60ba
      public int getRemainingPersistentAngerTime() {
          return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index fff1da136b618ca8b9256b55996dc1d01dacd7b8..9279eb3c7a8affbecba1a8b27ca0685021676f39 100644
+index 27e448a38377ea3cc2e527dbe48a23d233f1ea13..446aec4d10e614f136fe6ae4bb5a7dd0ac6d0f18 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -133,6 +133,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -139,6 +139,11 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+     public int getPurpurBreedTime() {
          return this.level().purpurConfig.catBreedingTicks;
      }
- 
++
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return this.level().purpurConfig.catTakeDamageFromWater;
 +    }
-+
-     public ResourceLocation getResourceLocation() {
-         return this.getVariant().texture();
-     }
+     // Purpur end
+ 
+     public ResourceLocation getTextureId() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index b142e5c489e9fe65b7258f541ef121b2cd020886..2dc2486e2b5e046ab8f23976b7bf0202f61756ec 100644
+index a440e9cc8973d6116652a0871251c421a633ba6d..2c0fbc86a49213eedd92a62197c79633ff1c6cb2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -85,6 +85,11 @@ public class Chicken extends Animal {
+@@ -84,6 +84,11 @@ public class Chicken extends Animal {
          return this.level().purpurConfig.chickenBreedingTicks;
      }
  
@@ -110,10 +110,10 @@ index 3d61c2d5da103de68242c16d85c703813979d179..2343325fa9a771de7b9445cda24a2bcd
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index c501704251e5b23f697efc307ebdc906cd2e5acd..f76b0d92150fd985a8fc699f6f884527d589dfd3 100644
+index 64866ca220f4c0b6350e92473cd013658a7de974..8c908891c6c683332d8877ab3fa084a0849b17a9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -74,6 +74,11 @@ public class Cow extends Animal {
+@@ -73,6 +73,11 @@ public class Cow extends Animal {
          return this.level().purpurConfig.cowBreedingTicks;
      }
  
@@ -126,10 +126,10 @@ index c501704251e5b23f697efc307ebdc906cd2e5acd..f76b0d92150fd985a8fc699f6f884527
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 079fd78528377ee4236fb2e7189a5f0fc5ec4fb3..77746eeffdc612793a6c907f222753bce5cd0ed4 100644
+index 366d583926e7e33a8c1e5a803bb75a456b4838d0..38112239035b0c66c429c0762199867e70e0a67a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -163,6 +163,11 @@ public class Dolphin extends WaterAnimal {
+@@ -162,6 +162,11 @@ public class Dolphin extends WaterAnimal {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.dolphinMaxHealth);
      }
  
@@ -140,12 +140,12 @@ index 079fd78528377ee4236fb2e7189a5f0fc5ec4fb3..77746eeffdc612793a6c907f222753bc
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 948760c9ee6ba921a7f1b4200fc77aa13f198984..7bd1177b58bd5ecc5659266eece39a49ec08ffa9 100644
+index c246148b9851654d796f472462677a60498c7b8d..ee691437da9571900039f90c1700cd33e31c03bc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -193,6 +193,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -194,6 +194,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
          return this.level().purpurConfig.foxBreedingTicks;
      }
  
@@ -155,13 +155,13 @@ index 948760c9ee6ba921a7f1b4200fc77aa13f198984..7bd1177b58bd5ecc5659266eece39a49
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 95ff109511c97d603aeaf9e73c49397a841fcbce..58539d29b8e2a8c0676cc574f64e7d61613e1451 100644
+index 2919d055e2136a956aa038bd0bf4c1a2ff5afa2f..9c86d86a6d89585cfbdace89e66866f496da86cb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -88,6 +88,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -83,6 +83,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      }
      // Purpur end
  
@@ -174,10 +174,10 @@ index 95ff109511c97d603aeaf9e73c49397a841fcbce..58539d29b8e2a8c0676cc574f64e7d61
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index cdf2bd4b2aa43b1d45fb0f0e8c4a14057ca39525..6b635c997a8052f6ea9b6dc39bef70000edbd782 100644
+index 22a2328fe5159c8fed635a62334a3f1028c346a5..6cb8d85986f4d891dfbb66b83163ed23bac694f6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -90,6 +90,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -91,6 +91,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          return this.level().purpurConfig.mooshroomBreedingTicks;
      }
  
@@ -190,10 +190,10 @@ index cdf2bd4b2aa43b1d45fb0f0e8c4a14057ca39525..6b635c997a8052f6ea9b6dc39bef7000
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 3fe751839e4a1bc266b0d9508e1e3384e8f7f41e..c91ade7f4b1f04f12e38cf2c5fda1a92b129bec8 100644
+index fc74c21d2c506df2134fc4ce61917af65fa89466..a1b7661ae0676007d59d202493efc5a0c795045f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -97,6 +97,11 @@ public class Ocelot extends Animal {
+@@ -93,6 +93,11 @@ public class Ocelot extends Animal {
          return this.level().purpurConfig.ocelotBreedingTicks;
      }
  
@@ -206,10 +206,10 @@ index 3fe751839e4a1bc266b0d9508e1e3384e8f7f41e..c91ade7f4b1f04f12e38cf2c5fda1a92
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index e91f950b64f80fb86795c570f7f119c159315472..632041e2804f98a1954cf1268c6fd0427696d4a3 100644
+index e90fc016fc7e0e9aac2c2d0cf081748100f225f3..4895bd2566605ab3986f35d43345f29ce78e81e0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -151,6 +151,11 @@ public class Panda extends Animal {
+@@ -157,6 +157,11 @@ public class Panda extends Animal {
          return this.level().purpurConfig.pandaBreedingTicks;
      }
  
@@ -222,10 +222,10 @@ index e91f950b64f80fb86795c570f7f119c159315472..632041e2804f98a1954cf1268c6fd042
      public boolean canTakeItem(ItemStack stack) {
          EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 2e671558ddeb7602c16c3684f87a9ce850e95aa2..a2c2c453c83bcc99ffebe8566f04288f01fa120a 100644
+index 22b8701accc76d806819433a8511172e13a9ed9e..7b139028ae5c590960e6b8a74b6ba667f3db7f5d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -202,6 +202,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -196,6 +196,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          return 6000;
      }
  
@@ -236,12 +236,12 @@ index 2e671558ddeb7602c16c3684f87a9ce850e95aa2..a2c2c453c83bcc99ffebe8566f04288f
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 42bf69eb86b9ccfb5afaf17e319bf34ce055e033..60562089daf363f5af24fbf30a3ccd74311be289 100644
+index a9cd2b75eeb192d7343bc06a1c3fa03748178f5f..badee6aed2c07dbfc05fa31d74d53c4630295761 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -94,6 +94,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -91,6 +91,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          return this.level().purpurConfig.pigBreedingTicks;
      }
  
@@ -254,10 +254,10 @@ index 42bf69eb86b9ccfb5afaf17e319bf34ce055e033..60562089daf363f5af24fbf30a3ccd74
      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 6eefdf7de7edee63b14bffc60557e9779312270c..e03c84575360a65425d7ec375ea9bc17e33bdddb 100644
+index 7288b9f1a46d6c1556e2653b990d6ce4beaf5949..3abab3b4d5409cf2f0374c038fa6c0241b89b8e5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -125,6 +125,11 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -124,6 +124,11 @@ public class PolarBear extends Animal implements NeutralMob {
          return this.level().purpurConfig.polarBearBreedingTicks;
      }
  
@@ -270,10 +270,10 @@ index 6eefdf7de7edee63b14bffc60557e9779312270c..e03c84575360a65425d7ec375ea9bc17
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index 8b5bf8ef4481ccc829d1a39c0921941581b2f045..ef3d0bbbeb6aa736f35c26066a1473c70ef028a2 100644
+index 0682df1037e23068c715f7bc06f1dc461641bb2f..91fd38aeafb4354e845b579988c7c9a6b3f6f551 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-@@ -62,6 +62,11 @@ public class Pufferfish extends AbstractFish {
+@@ -68,6 +68,11 @@ public class Pufferfish extends AbstractFish {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.pufferfishMaxHealth);
      }
  
@@ -283,13 +283,13 @@ index 8b5bf8ef4481ccc829d1a39c0921941581b2f045..ef3d0bbbeb6aa736f35c26066a1473c7
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 86502ef70f2213191d1348ef98969c5c93a6cb95..b58d9fadccbf4cd74abfc2449a9399277c876f59 100644
+index ce424d046d7c4abd2371154b00624aa6a9ca3ae3..c2510200507edd205bc3283bec98a0d6951f497f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -148,6 +148,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -147,6 +147,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      public int getPurpurBreedTime() {
          return this.level().purpurConfig.rabbitBreedingTicks;
      }
@@ -318,10 +318,10 @@ index 742805994f29a18af444912b10af631d2c60cacf..e101c3bf425902908c43ffa18867fb83
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288..6e951928482fb6d662f2b7aa37ebe7a0885b47de 100644
+index c3cc949291d11ae707fa5175d666df2ee81cdcce..afec39ba3b51b121fd7ae937e7bac060ef430dfd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -146,6 +146,11 @@ public class Sheep extends Animal implements Shearable {
+@@ -144,6 +144,11 @@ public class Sheep extends Animal implements Shearable {
          return this.level().purpurConfig.sheepBreedingTicks;
      }
  
@@ -334,10 +334,10 @@ index 284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288..6e951928482fb6d662f2b7aa37ebe7a0
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 84e0a41620fd52af0cd22dc92fd13ee4efd206fb..a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d 100644
+index cdb6657d30d224709aec3921c5fb8380f8acd93e..9f20eae7449c670b913cc3bbe1a89254a1d8cde2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -116,7 +116,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -114,7 +114,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
  
      @Override
      public boolean isSensitiveToWater() {
@@ -347,10 +347,10 @@ index 84e0a41620fd52af0cd22dc92fd13ee4efd206fb..a1efde792eaa3f80cd0c7c48e38bbd07
  
      @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 80bdc93cba675d6c1286618f14fc33e0344c601f..57b37ac40b4ffe6c5e27548755aaa15da89a0f0b 100644
+index f0261117a4f8ae240b3b991053deaf8d6419b5b4..0d05879eadeff8731028d78d89d5d32142818ea2 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 {
+@@ -88,6 +88,11 @@ public class Squid extends WaterAnimal {
          return this.wasTouchingWater || canFly();
      }
  
@@ -363,10 +363,10 @@ index 80bdc93cba675d6c1286618f14fc33e0344c601f..57b37ac40b4ffe6c5e27548755aaa15d
      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 7d02e552a27632939bb9c40a62f4e0df7bd60bbc..b16d075581a352714f86f1b87805f24c9e336aa3 100644
+index 327b1805d9d4069212a8772ff189c9ab24ae1183..4ac998e9d96aed3b0ea0ec3f9dcd5fdd74c45d24 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-@@ -59,6 +59,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
+@@ -84,6 +84,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.tropicalFishMaxHealth);
      }
  
@@ -379,10 +379,10 @@ index 7d02e552a27632939bb9c40a62f4e0df7bd60bbc..b16d075581a352714f86f1b87805f24c
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 6ff7d09066e3f175c3b9404febac9ef9940dc8d5..01375aede431c5023dd4a2d6667948c7bd056efe 100644
+index a577ec78b2f5bca0166277c499da4fa7988d5395..b146ac72584d998cee4279133b3b19051fbf14c9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -113,6 +113,11 @@ public class Turtle extends Animal {
+@@ -114,6 +114,11 @@ public class Turtle extends Animal {
          return this.level().purpurConfig.turtleBreedingTicks;
      }
  
@@ -395,10 +395,10 @@ index 6ff7d09066e3f175c3b9404febac9ef9940dc8d5..01375aede431c5023dd4a2d6667948c7
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index bbecb3894d0f4a24442e8833f4d828e6173287da..f79dff635b09300f8d2cff0562f71587496ed33d 100644
+index 580bff2b4308f97acf402c9539755aee7aa8b3d8..db0d71da579752bfb8246f5fa2ec9d360f53c7a8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -212,6 +212,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -219,6 +219,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          super.tame(player);
      }
  
@@ -411,10 +411,10 @@ index bbecb3894d0f4a24442e8833f4d828e6173287da..f79dff635b09300f8d2cff0562f71587
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index c217a4b78eb53af8b8c011bfabbbddcc31c88df4..8aae4bda1c39853c972bf17cd2ed5b940ef7ba27 100644
+index 97ba327398d84db09c81cee860b40642b428ea48..ab3727c336cc7e268a2f7b2c04dac3e5d259b454 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -125,6 +125,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -123,6 +123,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
          return this.level().purpurConfig.axolotlBreedingTicks;
      }
  
@@ -427,10 +427,10 @@ index c217a4b78eb53af8b8c011bfabbbddcc31c88df4..8aae4bda1c39853c972bf17cd2ed5b94
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 93295d9683293121f2267350194f18e97b2421c2..26062173d137e26abdc452f7b2e0be0ee6dddfa3 100644
+index 84c04603d50e190430e4e6cf2a7b613537a0c341..412b44ea2d33ef68721b91da9f550738c6c780ba 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -114,6 +114,11 @@ public class Goat extends Animal {
+@@ -113,6 +113,11 @@ public class Goat extends Animal {
          return this.level().purpurConfig.goatBreedingTicks;
      }
  
@@ -443,7 +443,7 @@ index 93295d9683293121f2267350194f18e97b2421c2..26062173d137e26abdc452f7b2e0be0e
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index 6932d0eafbeca9de80728c6b0ae42340d2297ad0..af4bac165cbc39fb6959983a1116a6fb65af0ecb 100644
+index 2990d50fd5209b272e0cfbd5dd633124048e8129..891ea1cca8495c08a1817096c8c4277f5311d6c7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -42,6 +42,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -459,10 +459,10 @@ index 6932d0eafbeca9de80728c6b0ae42340d2297ad0..af4bac165cbc39fb6959983a1116a6fb
      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 0251ded48eb5bdf96f0e67f6456aa15909c8a4ff..f8dbea402f723bf38d7ab3f2468d1b02b7124560 100644
+index 16d4278d49dad84f72c968ca36914e93d46dc5f6..e623284b353831d1a540af40e139ac16091dcbf6 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> {
+@@ -71,6 +71,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          return this.level().purpurConfig.horseBreedingTicks;
      }
  
@@ -475,7 +475,7 @@ index 0251ded48eb5bdf96f0e67f6456aa15909c8a4ff..f8dbea402f723bf38d7ab3f2468d1b02
      protected void randomizeAttributes(RandomSource random) {
          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 1c0d0f14659e0a64e6b3b3998f59f90cd5b59726..d0717a81ae7b3c55fb47917508b456408484658b 100644
+index 81d614cf14512464b376575fd2d7e7fbf93d9e03..87ec5bd632353ce364de29c5d56460551b6a4139 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -145,6 +145,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -491,7 +491,7 @@ index 1c0d0f14659e0a64e6b3b3998f59f90cd5b59726..d0717a81ae7b3c55fb47917508b45640
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index 1de48560ac5a1db8845c98c812b2e9f9eb972123..53546e904948d03882e5f5b0a8d4256c72698afb 100644
+index 8c52cbd47b90da51f3d5b84b8df4113fecc598df..f2b909029672c17362b2acf0ea54aa19385cff8f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -41,6 +41,11 @@ public class Mule extends AbstractChestedHorse {
@@ -507,10 +507,10 @@ index 1de48560ac5a1db8845c98c812b2e9f9eb972123..53546e904948d03882e5f5b0a8d4256c
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index bd83a2b82908d0beb91bd2937e263d6681a691f6..32ef5b8dc8bf1dd37f49b9d67fdde9feda37e6b5 100644
+index 5686bb0b537650e7d89292cef4e7e82bc7383748..7702af3c80ecc09318a25bb6c1acc5099fa10af4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -58,6 +58,11 @@ public class SkeletonHorse extends AbstractHorse {
+@@ -69,6 +69,11 @@ public class SkeletonHorse extends AbstractHorse {
          return 6000;
      }
  
@@ -520,13 +520,13 @@ index bd83a2b82908d0beb91bd2937e263d6681a691f6..32ef5b8dc8bf1dd37f49b9d67fdde9fe
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index 3632fcb124be8cf77d9bebf7b861a48196252ed0..17648925f97110f2439890388f4bfbbff0917c61 100644
+index d22f429f3de9c68a189087f23a483a561454cc54..a7261719c4608bdfbc43072ea5948b950f1bea0d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -69,6 +69,11 @@ public class TraderLlama extends Llama {
+@@ -72,6 +72,11 @@ public class TraderLlama extends Llama {
          return this.level().purpurConfig.traderLlamaBreedingTicks;
      }
  
@@ -539,10 +539,10 @@ index 3632fcb124be8cf77d9bebf7b861a48196252ed0..17648925f97110f2439890388f4bfbbf
      public boolean isTraderLlama() {
          return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index fba4eec4490e389b8b102d40542b9340d8ac559e..4a7c1ba529261e57acd01f83796ee8faa17d3a2f 100644
+index fbad3b11223ee5dac4af15584e5dfd808a149545..343632a030eb423367387750fabbdae53c4bb20b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-@@ -54,6 +54,11 @@ public class ZombieHorse extends AbstractHorse {
+@@ -65,6 +65,11 @@ public class ZombieHorse extends AbstractHorse {
          return 6000;
      }
  
@@ -552,10 +552,10 @@ index fba4eec4490e389b8b102d40542b9340d8ac559e..4a7c1ba529261e57acd01f83796ee8fa
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 0d16d486c7efc9a8c4c0db648175cacee5aa3a04..1588c4ec1ff1d9f1eca8b6c7971a2cdd1f98efb3 100644
+index 0478469343c30d2b8d79bda78aef9ff1348de19b..bf657ed6a27ce5da5621a3e14b0bf41ea0c4c8c9 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -190,6 +190,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -571,10 +571,10 @@ index 0d16d486c7efc9a8c4c0db648175cacee5aa3a04..1588c4ec1ff1d9f1eca8b6c7971a2cdd
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 97be7061d3cccac7b64f4b1a234ccbd83e2b7407..76f88b96e4965e61a620d8e8809411a0711bf02e 100644
+index 2f0c44a0b97e9ad7591c5b66c2560f3e405c61c4..948e5747d8d280695dd903a29b9c9f9dae9a44c1 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -117,6 +117,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -121,6 +121,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.witherMaxHealth);
      }
  
@@ -587,19 +587,19 @@ index 97be7061d3cccac7b64f4b1a234ccbd83e2b7407..76f88b96e4965e61a620d8e8809411a0
      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 04226492a5655e4a3a9716590e2af7fc79560ad9..eae0511698f383e11a0083c2b845479755f114f7 100644
+index 220deda05517fd200070f823ad7af075240bb623..1d7e37677d78695f94e8c9e0cae4d64498ffd7ee 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 {
      public Blaze(EntityType<? extends Blaze> type, Level world) {
          super(type, world);
          this.moveControl = new org.purpurmc.purpur.controller.FlyingWithSpacebarMoveControllerWASD(this, 0.3F); // Purpur
--        this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
-+        if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
-         this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
-         this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
-@@ -143,7 +143,7 @@ public class Blaze extends Monster {
+-        this.setPathfindingMalus(PathType.WATER, -1.0F);
++        if (isSensitiveToWater()) this.setPathfindingMalus(PathType.WATER, -1.0F); // Purpur
+         this.setPathfindingMalus(PathType.LAVA, 8.0F);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, 0.0F);
+         this.setPathfindingMalus(PathType.DAMAGE_FIRE, 0.0F);
+@@ -153,7 +153,7 @@ public class Blaze extends Monster {
  
      @Override
      public boolean isSensitiveToWater() {
@@ -609,10 +609,10 @@ index 04226492a5655e4a3a9716590e2af7fc79560ad9..eae0511698f383e11a0083c2b8454797
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-index c8bac8cb738ad96003a014b468681c43512ac4c4..5dc0b3d04bfc01cd2cb004c18279840861dc4a57 100644
+index 562f73dd5e617c10382c50be86ce88f4de1a4fe1..0604b7c68373ed071ac22cabd7a961161ad228f8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-@@ -51,6 +51,11 @@ public class CaveSpider extends Spider {
+@@ -48,6 +48,11 @@ public class CaveSpider extends Spider {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.caveSpiderMaxHealth);
      }
  
@@ -625,11 +625,11 @@ index c8bac8cb738ad96003a014b468681c43512ac4c4..5dc0b3d04bfc01cd2cb004c182798408
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 5bfeb39a23a72f57523a3c2db1d79c7aef70eb02..e8191f0df3420d5a531cf226547a177732ff65ea 100644
+index 98c93c46694f1e67be803a7ca0c0f55532df2e95..a9523b156eb88646ef82ee857d5f68360b12a753 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -263,6 +263,11 @@ public class Creeper extends Monster implements PowerableMob {
-         return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
+@@ -265,6 +265,11 @@ public class Creeper extends Monster implements PowerableMob {
+         return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
      }
  
 +    @Override
@@ -641,10 +641,10 @@ index 5bfeb39a23a72f57523a3c2db1d79c7aef70eb02..e8191f0df3420d5a531cf226547a1777
      protected SoundEvent getHurtSound(DamageSource source) {
          return SoundEvents.CREEPER_HURT;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 64acb2e81ef65acb0d41db8b5f7c924c2e2a5e00..902f831ea001145f73691b96f2fca8245a4fc05a 100644
+index b02cdbaa0455319b1e8a7e777e64ff4a56590388..f037d50f26f7532f11a71790448de7a71644b6ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -95,6 +95,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -98,6 +98,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.drownedSpawnReinforcements);
      }
  
@@ -657,10 +657,10 @@ index 64acb2e81ef65acb0d41db8b5f7c924c2e2a5e00..902f831ea001145f73691b96f2fca824
      public boolean jockeyOnlyBaby() {
          return level().purpurConfig.drownedJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index 971210c1199ec48f28446e75d8d796a1f3f9a734..cd1f830bf28b1c68e2b9cc7daa77f696234a22c9 100644
+index 6152117a3e13252068e16945b4346a73a3090dda..3651a720e4ae20686a91b4420fe4879f765935e4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-@@ -53,6 +53,11 @@ public class ElderGuardian extends Guardian {
+@@ -50,6 +50,11 @@ public class ElderGuardian extends Guardian {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.elderGuardianMaxHealth);
      }
  
@@ -673,19 +673,19 @@ index 971210c1199ec48f28446e75d8d796a1f3f9a734..cd1f830bf28b1c68e2b9cc7daa77f696
          return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 580e7c149e24f0bcbb8c21284869f78e485d091d..4fe5b9babd51a2123a76384c2fd9ec0147cac785 100644
+index de1fe3b115c1b3936b79c8900389542a8c8a2c90..17b044e58d2ed33ed16e60f4fd4f63b2ee3f854d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -95,7 +95,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -90,7 +90,7 @@ public class EnderMan extends Monster implements NeutralMob {
+ 
      public EnderMan(EntityType<? extends EnderMan> type, Level world) {
          super(type, world);
-         this.setMaxUpStep(1.0F);
--        this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
-+        if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
+-        this.setPathfindingMalus(PathType.WATER, -1.0F);
++        if (isSensitiveToWater()) this.setPathfindingMalus(PathType.WATER, -1.0F); // Purpur
      }
  
      // Purpur start
-@@ -313,7 +313,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -298,7 +298,7 @@ public class EnderMan extends Monster implements NeutralMob {
  
      @Override
      public boolean isSensitiveToWater() {
@@ -695,7 +695,7 @@ index 580e7c149e24f0bcbb8c21284869f78e485d091d..4fe5b9babd51a2123a76384c2fd9ec01
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 336a22876bcf1cdfcd9d17d22f615d45c2863589..936add0eb7204af7dc507c786cb82e0d7a76d5dc 100644
+index 52e2588b32b56b51bdbbdf63a290b2a4a4b02c13..514354bfcd0608554fd515248975fb107eddf427 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -60,6 +60,11 @@ public class Endermite extends Monster {
@@ -711,10 +711,10 @@ index 336a22876bcf1cdfcd9d17d22f615d45c2863589..936add0eb7204af7dc507c786cb82e0d
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index fbcb6b4cf4234d6eba989210012ab360c1b323a4..1ef547285cfb8e74404e4108a1403c8fda43cb1f 100644
+index ce2e5c16db13accb082b3f2403661c65411c7a80..a3e88c252b39a78a0759623f188dbdc8aa2fcc0b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-@@ -72,6 +72,11 @@ public class Evoker extends SpellcasterIllager {
+@@ -74,6 +74,11 @@ public class Evoker extends SpellcasterIllager {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.evokerMaxHealth);
      }
  
@@ -727,10 +727,10 @@ index fbcb6b4cf4234d6eba989210012ab360c1b323a4..1ef547285cfb8e74404e4108a1403c8f
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index edd3b7a855165eb090edb9ad95d36cdb649d231e..fa74eb7ee34f3f9b0026778bc0d37e977fc41d70 100644
+index 4bad5bdce2df5f5233465b30bcd3121b1dff0874..96f7c8fb4e49e7640aaa1adb466d67fc887a2dc5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-@@ -138,6 +138,11 @@ public class Ghast extends FlyingMob implements Enemy {
+@@ -136,6 +136,11 @@ public class Ghast extends FlyingMob implements Enemy {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.ghastMaxHealth);
      }
  
@@ -740,29 +740,29 @@ index edd3b7a855165eb090edb9ad95d36cdb649d231e..fa74eb7ee34f3f9b0026778bc0d37e97
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index d014731fe352246299253bf005e23673abe091bc..ecaccb4697bf2acaa6dc9034486fcf97c184aa71 100644
+index 3c1217d36522b1fd3d1a099d3a12d99016f34c4b..47e403a5986f77dbb3833acb9a3ea59e5c3740c6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -75,6 +75,11 @@ public class Giant extends Monster {
-             }
+@@ -72,6 +72,11 @@ public class Giant extends Monster {
          }
      }
-+
+ 
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return this.level().purpurConfig.giantTakeDamageFromWater;
 +    }
-     // Purpur end
- 
++
      @Override
+     protected void initAttributes() {
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.giantMaxHealth);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-index 74c4bcccb12b25eac50d061edbc2d2cb46ccb8df..93cd1129003b360ca40ad50fe849bd834a5f2a9b 100644
+index 7fa4e9761c6aad83848bf5e80a213689d728921d..6b0ff4ded5e8b62572d5889f0be5e3148243ed7d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-@@ -99,6 +99,11 @@ public class Guardian extends Monster {
+@@ -95,6 +95,11 @@ public class Guardian extends Monster {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.guardianMaxHealth);
      }
  
@@ -775,10 +775,10 @@ index 74c4bcccb12b25eac50d061edbc2d2cb46ccb8df..93cd1129003b360ca40ad50fe849bd83
      protected void registerGoals() {
          MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index ede13fe38fb97b94180ea8557d8a45d2ae5954d3..b361078339f01881ee6806049ecc2490fd5cf6bf 100644
+index 6673c0bff3a4e3d11a09e9dc8aeb0c2418dc7f59..cb96bd5769159e6c25968673ea07cd6d107cff46 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -66,6 +66,11 @@ public class Husk extends Zombie {
+@@ -64,6 +64,11 @@ public class Husk extends Zombie {
          return level().purpurConfig.huskJockeyTryExistingChickens;
      }
  
@@ -788,13 +788,13 @@ index ede13fe38fb97b94180ea8557d8a45d2ae5954d3..b361078339f01881ee6806049ecc2490
 +    }
 +
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
+         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (MobSpawnType.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index 0f3e6c19e55a18cde71f3cb84c1e92b433ebcb7f..91294d87521c884c402485b923691f9fd8985353 100644
+index c680e1efb73a6387aad6ecdab94f690c12451a32..e2393be574475377fd401d55ab0be9b483e705e6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-@@ -83,6 +83,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
+@@ -80,6 +80,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.illusionerMaxHealth);
      }
  
@@ -807,10 +807,10 @@ index 0f3e6c19e55a18cde71f3cb84c1e92b433ebcb7f..91294d87521c884c402485b923691f9f
      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 b472309f97b24f1d7b97d8b6d464c479c2d602d5..e0ebc4c2d8dd718ce78d981a1d099e7482221f1f 100644
+index 61cd97bc17802d3ab30999fc1f2b91e8b00652b2..adacdbf9fac7d1504be73e2e5a7526e8258a126d 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 {
+@@ -66,6 +66,11 @@ public class MagmaCube extends Slime {
          return level().purpurConfig.magmaCubeAttackDamageCache;
      }
  
@@ -820,13 +820,13 @@ index b472309f97b24f1d7b97d8b6d464c479c2d602d5..e0ebc4c2d8dd718ce78d981a1d099e74
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 0f13a3f38760f1117bd545702db7a5b168d9e273..030b81dd8c52ddb300e73d792f9c4cea4e8a8d46 100644
+index c15d75472d4d92baeb87a147832e17e363c360be..c52d40eb33a16e428c016a902faeb62aea0fd727 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -138,6 +138,11 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -136,6 +136,11 @@ public class Phantom extends FlyingMob implements Enemy {
      }
      // Purpur end
  
@@ -839,10 +839,10 @@ index 0f13a3f38760f1117bd545702db7a5b168d9e273..030b81dd8c52ddb300e73d792f9c4cea
      public boolean isFlapping() {
          return (this.getUniqueFlapTickOffset() + this.tickCount) % Phantom.TICKS_PER_FLAP == 0;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index 6a6349c7002439965422aa4979682b4ce6dfba1e..1f64dc8442de75447c17ae4fd5483345d4b7fd3e 100644
+index 8c06e648df453fdd4eea0aa4843fada9b6375f81..a405764724d7f4b586d8510450a6258417495942 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-@@ -84,6 +84,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
+@@ -80,6 +80,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.pillagerMaxHealth);
      }
  
@@ -855,10 +855,10 @@ index 6a6349c7002439965422aa4979682b4ce6dfba1e..1f64dc8442de75447c17ae4fd5483345
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 5aa00878c4c7be4a38137a93b1a2cf1c468422ea..0992e3729fdfa945660affb7eb7efcff63f37210 100644
+index cebe89b0868043b819fb3e9987f899926961be52..e592b5ee3a0bfce987557defed8250682373fe65 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -99,6 +99,11 @@ public class Ravager extends Raider {
+@@ -96,6 +96,11 @@ public class Ravager extends Raider {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.ravagerMaxHealth);
      }
  
@@ -871,7 +871,7 @@ index 5aa00878c4c7be4a38137a93b1a2cf1c468422ea..0992e3729fdfa945660affb7eb7efcff
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index fde2a69f489e12d9c1ccee4522258d2746dcb2e0..69e1f7d1737a8410ff36d4226c15090e72529658 100644
+index 1793c5f4e33fbab9d64d81bb1767b0e9b248106f..5b4ad4f64488ca5a21312caa3d13318f429401ea 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -119,6 +119,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -887,10 +887,10 @@ index fde2a69f489e12d9c1ccee4522258d2746dcb2e0..69e1f7d1737a8410ff36d4226c15090e
      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/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 49a37d294bac8205ac0a795daa300ccc8170c8a8..65203a502a970ffec622d91d25716f02e2a2fda2 100644
+index a175144d5480b7af091787c6ab366fb3e8d70587..18172d30a7a03d0bdef02878261639c0655f9475 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -69,6 +69,11 @@ public class Silverfish extends Monster {
+@@ -65,6 +65,11 @@ public class Silverfish extends Monster {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.silverfishMaxHealth);
      }
  
@@ -903,23 +903,25 @@ index 49a37d294bac8205ac0a795daa300ccc8170c8a8..65203a502a970ffec622d91d25716f02
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 6250d2bd682ce3c421aeea598cf8ec9032ac9785..1c7cd82540aa9566b04142c741d26b4f346073d4 100644
+index 1f751a9a079d59ee54afb43ec87284f0de8fa07a..a44896c87bb9f6f48cd9edeb31240692785b3a92 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-@@ -48,6 +48,11 @@ public class Skeleton extends AbstractSkeleton {
+@@ -48,6 +48,13 @@ public class Skeleton extends AbstractSkeleton {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.skeletonMaxHealth);
      }
  
++    // Purpur start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return this.level().purpurConfig.skeletonTakeDamageFromWater;
 +    }
++    // Purpur end
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 3870314f5d45ed1908b45ed08ff7932da66a0bad..38fc8668f3c9da15d97f2dd15bc3fad07299dcb1 100644
+index 8deddd8b543a30e295e6d55880d5051a63fef87b..0f79a99408e2d4c48c8a541f183b9201259f0b1f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -75,6 +75,11 @@ public class Slime extends Mob implements Enemy {
@@ -935,10 +937,10 @@ index 3870314f5d45ed1908b45ed08ff7932da66a0bad..38fc8668f3c9da15d97f2dd15bc3fad0
      public boolean dismountsUnderwater() {
          return level().purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level().purpurConfig.slimeRidableInWater;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 52fa3d5426bb44cc9b9c0ebfd9c9d3b1adbc17a4..c3caf3afa377474fe0a7d1f37ebee94ee5bb0e84 100644
+index 92276f6c015e60783f23f433466f50c918057f61..f2ec092b1b26ccc5a2a7868bb8add64b8280dd70 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -75,6 +75,11 @@ public class Spider extends Monster {
+@@ -73,6 +73,11 @@ public class Spider extends Monster {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.spiderMaxHealth);
      }
  
@@ -951,7 +953,7 @@ index 52fa3d5426bb44cc9b9c0ebfd9c9d3b1adbc17a4..c3caf3afa377474fe0a7d1f37ebee94e
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
-index 2bfc34d300627c17b2b34442665527c34ebea78a..2e01eb4a1a1c415dd5bd195086072b536c019eae 100644
+index e1327ea96fe394b1c27dbe88c49596256e4e61d3..509c7d79340673e213910ea74a5237332792a3b4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -43,6 +43,11 @@ public class Stray extends AbstractSkeleton {
@@ -967,18 +969,18 @@ index 2bfc34d300627c17b2b34442665527c34ebea78a..2e01eb4a1a1c415dd5bd195086072b53
          BlockPos blockPos = pos;
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 64503362c42daa39dcfa270bc50b0e2187f13a01..f0d7174eae482cef9311fb646f340af59fa1c743 100644
+index 741eedcd9e0e29b57d2b3caf5aef1aef18ae5118..585614f7825700da28c7c832bdfc6a9eb0b78b5f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -94,7 +94,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+@@ -91,7 +91,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          super(type, world);
          this.steering = new ItemBasedSteering(this.entityData, Strider.DATA_BOOST_TIME, Strider.DATA_SADDLE_ID);
          this.blocksBuilding = true;
--        this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
-+        if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
-         this.setPathfindingMalus(BlockPathTypes.LAVA, 0.0F);
-         this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
-         this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
+-        this.setPathfindingMalus(PathType.WATER, -1.0F);
++        if (isSensitiveToWater()) this.setPathfindingMalus(PathType.WATER, -1.0F); // Purpur
+         this.setPathfindingMalus(PathType.LAVA, 0.0F);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, 0.0F);
+         this.setPathfindingMalus(PathType.DAMAGE_FIRE, 0.0F);
 @@ -442,7 +442,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
  
      @Override
@@ -989,26 +991,26 @@ index 64503362c42daa39dcfa270bc50b0e2187f13a01..f0d7174eae482cef9311fb646f340af5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index 3f44b666a618d41b029905f463f507ad9217da0b..abf2f0fdc6895e4ddcc2c2c76db9388c5287fa9d 100644
+index ca6c688b31240863dfc5095c7b6187583cf2f6ce..d85e4baa892ebd987993bd39c895e5f1d310e30e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-@@ -112,6 +112,11 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -107,6 +107,11 @@ public class Vex extends Monster implements TraceableEntity {
+     public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.vexMaxHealth);
      }
- 
++
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return this.level().purpurConfig.vexTakeDamageFromWater;
 +    }
-+
+     // Purpur end
+ 
      @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return dimensions.height - 0.28125F;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index a3db9c351b9cb06340458811c006d53796d96ab5..c7e995c5e639a1fb42a77edea3491682b72d32f4 100644
+index 61f1778d454cebaab5580179614ff48ab67b8fe6..ded53c16dfd850c9c520878bc75414ebc188ea8a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -80,6 +80,11 @@ public class Vindicator extends AbstractIllager {
+@@ -72,6 +72,11 @@ public class Vindicator extends AbstractIllager {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.vindicatorMaxHealth);
      }
  
@@ -1021,10 +1023,10 @@ index a3db9c351b9cb06340458811c006d53796d96ab5..c7e995c5e639a1fb42a77edea3491682
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 710c6fb948407c7cc79a5a0492b7172550071e35..4b722c7b6c000c4f8156724b127c9df33f15f6db 100644
+index d99c52b4f0326421f90162d4894044394b3c49c4..51d35e7f510c76d1fc18c67dbb56707207b39e4e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -81,6 +81,11 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -77,6 +77,11 @@ public class Witch extends Raider implements RangedAttackMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.witchMaxHealth);
      }
  
@@ -1037,10 +1039,10 @@ index 710c6fb948407c7cc79a5a0492b7172550071e35..4b722c7b6c000c4f8156724b127c9df3
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 8eb43574faef713b876d36155775fe2fa2505497..87b42dff7d770cf04415301346674aad5e45081b 100644
+index 9fd9b95cbec010dafec261b5923938c5b39cd1e6..9865cc694e6ef02543a4b04cde37be3dc285475b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-@@ -57,6 +57,11 @@ public class WitherSkeleton extends AbstractSkeleton {
+@@ -54,6 +54,11 @@ public class WitherSkeleton extends AbstractSkeleton {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.witherSkeletonMaxHealth);
      }
  
@@ -1053,10 +1055,10 @@ index 8eb43574faef713b876d36155775fe2fa2505497..87b42dff7d770cf04415301346674aad
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 1d862dd019b2d024f61cfc8956430d18d94b1ebf..8cd6012b00dd5b307fd76ef0fd9c2cd92342a92a 100644
+index 698076b0e958aadf9736d7753df64a73dd3c17cd..76d47ba17dd140572a0be40dfda18c24851198bb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-@@ -91,6 +91,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+@@ -102,6 +102,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.zoglinMaxHealth);
      }
  
@@ -1069,10 +1071,10 @@ index 1d862dd019b2d024f61cfc8956430d18d94b1ebf..8cd6012b00dd5b307fd76ef0fd9c2cd9
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 46fec497e411e3160d9ae9553ae52654d10a9dd3..63c0f86469182de482b04a27741e4b6fe29f0e79 100644
+index 3d42b2ea26217243dba96174ff0eadbcdd81a6cd..de7a74f1e5181373da8dcc639245f35f77f4f09b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -141,6 +141,11 @@ public class Zombie extends Monster {
+@@ -138,6 +138,11 @@ public class Zombie extends Monster {
          return level().purpurConfig.zombieJockeyTryExistingChickens;
      }
  
@@ -1085,10 +1087,10 @@ index 46fec497e411e3160d9ae9553ae52654d10a9dd3..63c0f86469182de482b04a27741e4b6f
      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/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 01f6b7eb50870f9bcac9bbd3b6a87382d6aa1f1b..5933bff2db353644705f5e1cfec3b0f2dedbad87 100644
+index ffe2144e307acebd4a8bed043db0ee0bb6bf611c..2ec3a09135f85a5de68e77511f3f213adf08712c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -109,6 +109,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+@@ -107,6 +107,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level().purpurConfig.zombieVillagerSpawnReinforcements);
      }
  
@@ -1101,10 +1103,10 @@ index 01f6b7eb50870f9bcac9bbd3b6a87382d6aa1f1b..5933bff2db353644705f5e1cfec3b0f2
      public boolean jockeyOnlyBaby() {
          return level().purpurConfig.zombieVillagerJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index b2d77117309e81db60e7e50911247793fa829755..3574a1e641d8af34a0ff7ea8dcfb08641cf6ace0 100644
+index 6be751e2d434982a35bbbece4f4fc4631fb3d8e0..bd2953448e568b1a20bcc6a889cef83b88418548 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -86,6 +86,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -84,6 +84,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.zombifiedPiglinMaxHealth);
      }
  
@@ -1117,10 +1119,10 @@ index b2d77117309e81db60e7e50911247793fa829755..3574a1e641d8af34a0ff7ea8dcfb0864
      public boolean jockeyOnlyBaby() {
          return level().purpurConfig.zombifiedPiglinJockeyOnlyBaby;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 80f91a11c04763c1c9ed2bd242b88b5a473560d7..d0144c99cf5c755c81fc0f9457b462c98ff3e804 100644
+index a770ae0e13c4dad296dfb8f33259408ee1531c70..9ca294d5177ec7d541433d644d2fb90d937b011c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -96,6 +96,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -117,6 +117,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          return this.level().purpurConfig.hoglinBreedingTicks;
      }
  
@@ -1133,10 +1135,10 @@ index 80f91a11c04763c1c9ed2bd242b88b5a473560d7..d0144c99cf5c755c81fc0f9457b462c9
      public boolean canBeLeashed(Player player) {
          return !this.isLeashed();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index d133820c47ecda733aa8242acdb2cd3ba0f0b677..e506dcf390ecb5cce8ae6993df7ec91b3ebc125e 100644
+index 57089ba787731ddda853dce959ba015abe135bfd..e5b24bd8e31ca5748185181bb6741760c86a92a1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -118,6 +118,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -116,6 +116,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.piglinMaxHealth);
      }
  
@@ -1149,10 +1151,10 @@ index d133820c47ecda733aa8242acdb2cd3ba0f0b677..e506dcf390ecb5cce8ae6993df7ec91b
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index 04e54c241078e6cd6419a21ba1bf913fd3b413d1..b63d87df0f48dd63c89118f91b31dc4e3622e3b8 100644
+index 362f3fddd8090799278f4b4e58c5af5de00315f2..6c7e0f177382cb6329002dcde270f6ce51f08f9f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -63,6 +63,11 @@ public class PiglinBrute extends AbstractPiglin {
+@@ -84,6 +84,11 @@ public class PiglinBrute extends AbstractPiglin {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.piglinBruteMaxHealth);
      }
  
@@ -1162,13 +1164,13 @@ index 04e54c241078e6cd6419a21ba1bf913fd3b413d1..b63d87df0f48dd63c89118f91b31dc4e
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D);
+         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 7.0);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 7fcf3cf145828b610dec15dcc2cf469a48de9317..2215bd386a617996095f24192f05825d0201b2ec 100644
+index f7d8f672a680cf2dfebba5677f97895e4a8c209f..c9cfbc8817fe62e22cb165f856ed8569668c0a60 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -190,6 +190,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -189,6 +189,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return level().purpurConfig.villagerCanBeLeashed && !this.isLeashed();
      }
  
@@ -1181,10 +1183,10 @@ index 7fcf3cf145828b610dec15dcc2cf469a48de9317..2215bd386a617996095f24192f05825d
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 31daa61db84fcb3cde7ec4b18b32aba350ab2cfb..502ff11b909537f98339d3bef49f324e69d2f0fe 100644
+index 9d5eaaf1869a3ecb61947ab0c09af558fa1cd283..c192f4cc5fd9cb0cf40083c4297f649ab909649d 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -97,6 +97,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -98,6 +98,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          return level().purpurConfig.wanderingTraderCanBeLeashed && !this.isLeashed();
      }
  
@@ -1197,10 +1199,10 @@ index 31daa61db84fcb3cde7ec4b18b32aba350ab2cfb..502ff11b909537f98339d3bef49f324e
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c1eec6135 100644
+index 780a13db057456e49690d90c368284752bafde3f..7e520532aec1dc38da84dce2dc8679d977a030ea 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -568,11 +568,13 @@ public class PurpurWorldConfig {
+@@ -569,11 +569,13 @@ public class PurpurWorldConfig {
      public boolean axolotlControllable = true;
      public double axolotlMaxHealth = 14.0D;
      public int axolotlBreedingTicks = 6000;
@@ -1214,7 +1216,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean batRidable = false;
-@@ -587,6 +589,7 @@ public class PurpurWorldConfig {
+@@ -588,6 +590,7 @@ public class PurpurWorldConfig {
      public double batArmor = 0.0D;
      public double batArmorToughness = 0.0D;
      public double batAttackKnockback = 0.0D;
@@ -1222,7 +1224,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void batSettings() {
          batRidable = getBoolean("mobs.bat.ridable", batRidable);
          batRidableInWater = getBoolean("mobs.bat.ridable-in-water", batRidableInWater);
-@@ -605,6 +608,7 @@ public class PurpurWorldConfig {
+@@ -606,6 +609,7 @@ public class PurpurWorldConfig {
          batArmor = getDouble("mobs.bat.attributes.armor", batArmor);
          batArmorToughness = getDouble("mobs.bat.attributes.armor_toughness", batArmorToughness);
          batAttackKnockback = getDouble("mobs.bat.attributes.attack_knockback", batAttackKnockback);
@@ -1230,7 +1232,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean beeRidable = false;
-@@ -613,6 +617,7 @@ public class PurpurWorldConfig {
+@@ -614,6 +618,7 @@ public class PurpurWorldConfig {
      public double beeMaxY = 320D;
      public double beeMaxHealth = 10.0D;
      public int beeBreedingTicks = 6000;
@@ -1238,7 +1240,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -625,6 +630,7 @@ public class PurpurWorldConfig {
+@@ -626,6 +631,7 @@ public class PurpurWorldConfig {
          }
          beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
          beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);
@@ -1246,7 +1248,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean blazeRidable = false;
-@@ -632,6 +638,7 @@ public class PurpurWorldConfig {
+@@ -633,6 +639,7 @@ public class PurpurWorldConfig {
      public boolean blazeControllable = true;
      public double blazeMaxY = 320D;
      public double blazeMaxHealth = 20.0D;
@@ -1254,7 +1256,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void blazeSettings() {
          blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
          blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
-@@ -643,6 +650,7 @@ public class PurpurWorldConfig {
+@@ -644,6 +651,7 @@ public class PurpurWorldConfig {
              set("mobs.blaze.attributes.max_health", oldValue);
          }
          blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -1262,7 +1264,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean camelRidableInWater = false;
-@@ -673,6 +681,7 @@ public class PurpurWorldConfig {
+@@ -674,6 +682,7 @@ public class PurpurWorldConfig {
      public int catSpawnVillageScanRange = 48;
      public int catBreedingTicks = 6000;
      public DyeColor catDefaultCollarColor = DyeColor.RED;
@@ -1270,7 +1272,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void catSettings() {
          catRidable = getBoolean("mobs.cat.ridable", catRidable);
          catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
-@@ -692,12 +701,14 @@ public class PurpurWorldConfig {
+@@ -693,12 +702,14 @@ public class PurpurWorldConfig {
          } catch (IllegalArgumentException ignore) {
              catDefaultCollarColor = DyeColor.RED;
          }
@@ -1285,7 +1287,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void caveSpiderSettings() {
          caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable);
          caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater);
-@@ -708,6 +719,7 @@ public class PurpurWorldConfig {
+@@ -709,6 +720,7 @@ public class PurpurWorldConfig {
              set("mobs.cave_spider.attributes.max_health", oldValue);
          }
          caveSpiderMaxHealth = getDouble("mobs.cave_spider.attributes.max_health", caveSpiderMaxHealth);
@@ -1293,7 +1295,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean chickenRidable = false;
-@@ -716,6 +728,7 @@ public class PurpurWorldConfig {
+@@ -717,6 +729,7 @@ public class PurpurWorldConfig {
      public double chickenMaxHealth = 4.0D;
      public boolean chickenRetaliate = false;
      public int chickenBreedingTicks = 6000;
@@ -1301,7 +1303,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void chickenSettings() {
          chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
          chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
-@@ -728,11 +741,13 @@ public class PurpurWorldConfig {
+@@ -729,11 +742,13 @@ public class PurpurWorldConfig {
          chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
          chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
          chickenBreedingTicks = getInt("mobs.chicken.breeding-delay-ticks", chickenBreedingTicks);
@@ -1315,7 +1317,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void codSettings() {
          codRidable = getBoolean("mobs.cod.ridable", codRidable);
          codControllable = getBoolean("mobs.cod.controllable", codControllable);
-@@ -742,6 +757,7 @@ public class PurpurWorldConfig {
+@@ -743,6 +758,7 @@ public class PurpurWorldConfig {
              set("mobs.cod.attributes.max_health", oldValue);
          }
          codMaxHealth = getDouble("mobs.cod.attributes.max_health", codMaxHealth);
@@ -1323,7 +1325,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean cowRidable = false;
-@@ -750,6 +766,7 @@ public class PurpurWorldConfig {
+@@ -751,6 +767,7 @@ public class PurpurWorldConfig {
      public double cowMaxHealth = 10.0D;
      public int cowFeedMushrooms = 0;
      public int cowBreedingTicks = 6000;
@@ -1331,7 +1333,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void cowSettings() {
          cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
          cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
-@@ -762,6 +779,7 @@ public class PurpurWorldConfig {
+@@ -763,6 +780,7 @@ public class PurpurWorldConfig {
          cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
          cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
          cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
@@ -1339,7 +1341,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean creeperRidable = false;
-@@ -771,6 +789,7 @@ public class PurpurWorldConfig {
+@@ -772,6 +790,7 @@ public class PurpurWorldConfig {
      public double creeperChargedChance = 0.0D;
      public boolean creeperAllowGriefing = true;
      public boolean creeperBypassMobGriefing = false;
@@ -1347,7 +1349,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -784,6 +803,7 @@ public class PurpurWorldConfig {
+@@ -785,6 +804,7 @@ public class PurpurWorldConfig {
          creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
@@ -1355,7 +1357,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean dolphinRidable = false;
-@@ -793,6 +813,7 @@ public class PurpurWorldConfig {
+@@ -794,6 +814,7 @@ public class PurpurWorldConfig {
      public float dolphinSpitDamage = 2.0F;
      public double dolphinMaxHealth = 10.0D;
      public boolean dolphinDisableTreasureSearching = false;
@@ -1363,7 +1365,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void dolphinSettings() {
          dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
          dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
-@@ -806,6 +827,7 @@ public class PurpurWorldConfig {
+@@ -807,6 +828,7 @@ public class PurpurWorldConfig {
          }
          dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
          dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
@@ -1371,7 +1373,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean donkeyRidableInWater = false;
-@@ -816,6 +838,7 @@ public class PurpurWorldConfig {
+@@ -817,6 +839,7 @@ public class PurpurWorldConfig {
      public double donkeyMovementSpeedMin = 0.175D;
      public double donkeyMovementSpeedMax = 0.175D;
      public int donkeyBreedingTicks = 6000;
@@ -1379,7 +1381,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void donkeySettings() {
          donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -832,6 +855,7 @@ public class PurpurWorldConfig {
+@@ -833,6 +856,7 @@ public class PurpurWorldConfig {
          donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
          donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
          donkeyBreedingTicks = getInt("mobs.donkey.breeding-delay-ticks", donkeyBreedingTicks);
@@ -1387,7 +1389,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean drownedRidable = false;
-@@ -842,6 +866,7 @@ public class PurpurWorldConfig {
+@@ -843,6 +867,7 @@ public class PurpurWorldConfig {
      public boolean drownedJockeyOnlyBaby = true;
      public double drownedJockeyChance = 0.05D;
      public boolean drownedJockeyTryExistingChickens = true;
@@ -1395,7 +1397,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -856,11 +881,13 @@ public class PurpurWorldConfig {
+@@ -857,11 +882,13 @@ public class PurpurWorldConfig {
          drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby);
          drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
          drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
@@ -1409,7 +1411,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void elderGuardianSettings() {
          elderGuardianRidable = getBoolean("mobs.elder_guardian.ridable", elderGuardianRidable);
          elderGuardianControllable = getBoolean("mobs.elder_guardian.controllable", elderGuardianControllable);
-@@ -870,6 +897,7 @@ public class PurpurWorldConfig {
+@@ -871,6 +898,7 @@ public class PurpurWorldConfig {
              set("mobs.elder_guardian.attributes.max_health", oldValue);
          }
          elderGuardianMaxHealth = getDouble("mobs.elder_guardian.attributes.max_health", elderGuardianMaxHealth);
@@ -1417,7 +1419,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean enderDragonRidable = false;
-@@ -879,6 +907,7 @@ public class PurpurWorldConfig {
+@@ -880,6 +908,7 @@ public class PurpurWorldConfig {
      public double enderDragonMaxHealth = 200.0D;
      public boolean enderDragonAlwaysDropsFullExp = false;
      public boolean enderDragonBypassMobGriefing = false;
@@ -1425,7 +1427,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -896,6 +925,7 @@ public class PurpurWorldConfig {
+@@ -897,6 +926,7 @@ public class PurpurWorldConfig {
          enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
          enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
@@ -1433,7 +1435,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean endermanRidable = false;
-@@ -905,6 +935,7 @@ public class PurpurWorldConfig {
+@@ -906,6 +936,7 @@ public class PurpurWorldConfig {
      public boolean endermanAllowGriefing = true;
      public boolean endermanDespawnEvenWithBlock = false;
      public boolean endermanBypassMobGriefing = false;
@@ -1441,7 +1443,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -918,12 +949,14 @@ public class PurpurWorldConfig {
+@@ -919,12 +950,14 @@ public class PurpurWorldConfig {
          endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
          endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
          endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -1456,7 +1458,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void endermiteSettings() {
          endermiteRidable = getBoolean("mobs.endermite.ridable", endermiteRidable);
          endermiteRidableInWater = getBoolean("mobs.endermite.ridable-in-water", endermiteRidableInWater);
-@@ -934,6 +967,7 @@ public class PurpurWorldConfig {
+@@ -935,6 +968,7 @@ public class PurpurWorldConfig {
              set("mobs.endermite.attributes.max_health", oldValue);
          }
          endermiteMaxHealth = getDouble("mobs.endermite.attributes.max_health", endermiteMaxHealth);
@@ -1464,7 +1466,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean evokerRidable = false;
-@@ -941,6 +975,7 @@ public class PurpurWorldConfig {
+@@ -942,6 +976,7 @@ public class PurpurWorldConfig {
      public boolean evokerControllable = true;
      public double evokerMaxHealth = 24.0D;
      public boolean evokerBypassMobGriefing = false;
@@ -1472,7 +1474,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void evokerSettings() {
          evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
          evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
-@@ -952,6 +987,7 @@ public class PurpurWorldConfig {
+@@ -953,6 +988,7 @@ public class PurpurWorldConfig {
          }
          evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
          evokerBypassMobGriefing = getBoolean("mobs.evoker.bypass-mob-griefing", evokerBypassMobGriefing);
@@ -1480,7 +1482,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean foxRidable = false;
-@@ -961,6 +997,7 @@ public class PurpurWorldConfig {
+@@ -962,6 +998,7 @@ public class PurpurWorldConfig {
      public boolean foxTypeChangesWithTulips = false;
      public int foxBreedingTicks = 6000;
      public boolean foxBypassMobGriefing = false;
@@ -1488,7 +1490,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -974,6 +1011,7 @@ public class PurpurWorldConfig {
+@@ -975,6 +1012,7 @@ public class PurpurWorldConfig {
          foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
          foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
          foxBypassMobGriefing = getBoolean("mobs.fox.bypass-mob-griefing", foxBypassMobGriefing);
@@ -1496,7 +1498,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean frogRidable = false;
-@@ -994,6 +1032,7 @@ public class PurpurWorldConfig {
+@@ -995,6 +1033,7 @@ public class PurpurWorldConfig {
      public boolean ghastControllable = true;
      public double ghastMaxY = 320D;
      public double ghastMaxHealth = 10.0D;
@@ -1504,7 +1506,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void ghastSettings() {
          ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable);
          ghastRidableInWater = getBoolean("mobs.ghast.ridable-in-water", ghastRidableInWater);
-@@ -1005,6 +1044,7 @@ public class PurpurWorldConfig {
+@@ -1006,6 +1045,7 @@ public class PurpurWorldConfig {
              set("mobs.ghast.attributes.max_health", oldValue);
          }
          ghastMaxHealth = getDouble("mobs.ghast.attributes.max_health", ghastMaxHealth);
@@ -1512,7 +1514,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean giantRidable = false;
-@@ -1017,6 +1057,7 @@ public class PurpurWorldConfig {
+@@ -1018,6 +1058,7 @@ public class PurpurWorldConfig {
      public float giantJumpHeight = 1.0F;
      public boolean giantHaveAI = false;
      public boolean giantHaveHostileAI = false;
@@ -1520,7 +1522,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void giantSettings() {
          giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
          giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
-@@ -1037,17 +1078,20 @@ public class PurpurWorldConfig {
+@@ -1038,17 +1079,20 @@ public class PurpurWorldConfig {
          giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
          giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI);
          giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
@@ -1541,7 +1543,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean goatRidable = false;
-@@ -1055,17 +1099,20 @@ public class PurpurWorldConfig {
+@@ -1056,17 +1100,20 @@ public class PurpurWorldConfig {
      public boolean goatControllable = true;
      public double goatMaxHealth = 10.0D;
      public int goatBreedingTicks = 6000;
@@ -1562,7 +1564,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void guardianSettings() {
          guardianRidable = getBoolean("mobs.guardian.ridable", guardianRidable);
          guardianControllable = getBoolean("mobs.guardian.controllable", guardianControllable);
-@@ -1075,6 +1122,7 @@ public class PurpurWorldConfig {
+@@ -1076,6 +1123,7 @@ public class PurpurWorldConfig {
              set("mobs.guardian.attributes.max_health", oldValue);
          }
          guardianMaxHealth = getDouble("mobs.guardian.attributes.max_health", guardianMaxHealth);
@@ -1570,7 +1572,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean hoglinRidable = false;
-@@ -1082,6 +1130,7 @@ public class PurpurWorldConfig {
+@@ -1083,6 +1131,7 @@ public class PurpurWorldConfig {
      public boolean hoglinControllable = true;
      public double hoglinMaxHealth = 40.0D;
      public int hoglinBreedingTicks = 6000;
@@ -1578,7 +1580,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void hoglinSettings() {
          hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
          hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
-@@ -1093,6 +1142,7 @@ public class PurpurWorldConfig {
+@@ -1094,6 +1143,7 @@ public class PurpurWorldConfig {
          }
          hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
          hoglinBreedingTicks = getInt("mobs.hoglin.breeding-delay-ticks", hoglinBreedingTicks);
@@ -1586,7 +1588,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean horseRidableInWater = false;
-@@ -1103,6 +1153,7 @@ public class PurpurWorldConfig {
+@@ -1104,6 +1154,7 @@ public class PurpurWorldConfig {
      public double horseMovementSpeedMin = 0.1125D;
      public double horseMovementSpeedMax = 0.3375D;
      public int horseBreedingTicks = 6000;
@@ -1594,7 +1596,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void horseSettings() {
          horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1119,6 +1170,7 @@ public class PurpurWorldConfig {
+@@ -1120,6 +1171,7 @@ public class PurpurWorldConfig {
          horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
          horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
          horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
@@ -1602,7 +1604,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean huskRidable = false;
-@@ -1129,6 +1181,7 @@ public class PurpurWorldConfig {
+@@ -1130,6 +1182,7 @@ public class PurpurWorldConfig {
      public boolean huskJockeyOnlyBaby = true;
      public double huskJockeyChance = 0.05D;
      public boolean huskJockeyTryExistingChickens = true;
@@ -1610,7 +1612,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void huskSettings() {
          huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
          huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
-@@ -1143,6 +1196,7 @@ public class PurpurWorldConfig {
+@@ -1144,6 +1197,7 @@ public class PurpurWorldConfig {
          huskJockeyOnlyBaby = getBoolean("mobs.husk.jockey.only-babies", huskJockeyOnlyBaby);
          huskJockeyChance = getDouble("mobs.husk.jockey.chance", huskJockeyChance);
          huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
@@ -1618,7 +1620,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean illusionerRidable = false;
-@@ -1151,6 +1205,7 @@ public class PurpurWorldConfig {
+@@ -1152,6 +1206,7 @@ public class PurpurWorldConfig {
      public double illusionerMovementSpeed = 0.5D;
      public double illusionerFollowRange = 18.0D;
      public double illusionerMaxHealth = 32.0D;
@@ -1626,7 +1628,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void illusionerSettings() {
          illusionerRidable = getBoolean("mobs.illusioner.ridable", illusionerRidable);
          illusionerRidableInWater = getBoolean("mobs.illusioner.ridable-in-water", illusionerRidableInWater);
-@@ -1167,6 +1222,7 @@ public class PurpurWorldConfig {
+@@ -1168,6 +1223,7 @@ public class PurpurWorldConfig {
              set("mobs.illusioner.attributes.max_health", oldValue);
          }
          illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max_health", illusionerMaxHealth);
@@ -1634,7 +1636,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean ironGolemRidable = false;
-@@ -1174,6 +1230,7 @@ public class PurpurWorldConfig {
+@@ -1175,6 +1231,7 @@ public class PurpurWorldConfig {
      public boolean ironGolemControllable = true;
      public boolean ironGolemCanSwim = false;
      public double ironGolemMaxHealth = 100.0D;
@@ -1642,7 +1644,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void ironGolemSettings() {
          ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
          ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
-@@ -1185,6 +1242,7 @@ public class PurpurWorldConfig {
+@@ -1186,6 +1243,7 @@ public class PurpurWorldConfig {
              set("mobs.iron_golem.attributes.max_health", oldValue);
          }
          ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
@@ -1650,7 +1652,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean llamaRidable = false;
-@@ -1197,6 +1255,7 @@ public class PurpurWorldConfig {
+@@ -1198,6 +1256,7 @@ public class PurpurWorldConfig {
      public double llamaMovementSpeedMin = 0.175D;
      public double llamaMovementSpeedMax = 0.175D;
      public int llamaBreedingTicks = 6000;
@@ -1658,7 +1660,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1215,6 +1274,7 @@ public class PurpurWorldConfig {
+@@ -1216,6 +1275,7 @@ public class PurpurWorldConfig {
          llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
          llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
@@ -1666,7 +1668,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean magmaCubeRidable = false;
-@@ -1224,6 +1284,7 @@ public class PurpurWorldConfig {
+@@ -1225,6 +1285,7 @@ public class PurpurWorldConfig {
      public String magmaCubeAttackDamage = "size";
      public Map<Integer, Double> magmaCubeMaxHealthCache = new HashMap<>();
      public Map<Integer, Double> magmaCubeAttackDamageCache = new HashMap<>();
@@ -1674,7 +1676,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void magmaCubeSettings() {
          magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable);
          magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater);
-@@ -1237,6 +1298,7 @@ public class PurpurWorldConfig {
+@@ -1238,6 +1299,7 @@ public class PurpurWorldConfig {
          magmaCubeAttackDamage = getString("mobs.magma_cube.attributes.attack_damage", magmaCubeAttackDamage);
          magmaCubeMaxHealthCache.clear();
          magmaCubeAttackDamageCache.clear();
@@ -1682,7 +1684,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean mooshroomRidable = false;
-@@ -1244,6 +1306,7 @@ public class PurpurWorldConfig {
+@@ -1245,6 +1307,7 @@ public class PurpurWorldConfig {
      public boolean mooshroomControllable = true;
      public double mooshroomMaxHealth = 10.0D;
      public int mooshroomBreedingTicks = 6000;
@@ -1690,7 +1692,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void mooshroomSettings() {
          mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
          mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
-@@ -1255,6 +1318,7 @@ public class PurpurWorldConfig {
+@@ -1256,6 +1319,7 @@ public class PurpurWorldConfig {
          }
          mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
          mooshroomBreedingTicks = getInt("mobs.mooshroom.breeding-delay-ticks", mooshroomBreedingTicks);
@@ -1698,7 +1700,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean muleRidableInWater = false;
-@@ -1265,6 +1329,7 @@ public class PurpurWorldConfig {
+@@ -1266,6 +1330,7 @@ public class PurpurWorldConfig {
      public double muleMovementSpeedMin = 0.175D;
      public double muleMovementSpeedMax = 0.175D;
      public int muleBreedingTicks = 6000;
@@ -1706,7 +1708,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void muleSettings() {
          muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1281,6 +1346,7 @@ public class PurpurWorldConfig {
+@@ -1282,6 +1347,7 @@ public class PurpurWorldConfig {
          muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
          muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
          muleBreedingTicks = getInt("mobs.mule.breeding-delay-ticks", muleBreedingTicks);
@@ -1714,7 +1716,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean ocelotRidable = false;
-@@ -1288,6 +1354,7 @@ public class PurpurWorldConfig {
+@@ -1289,6 +1355,7 @@ public class PurpurWorldConfig {
      public boolean ocelotControllable = true;
      public double ocelotMaxHealth = 10.0D;
      public int ocelotBreedingTicks = 6000;
@@ -1722,7 +1724,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void ocelotSettings() {
          ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
          ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
-@@ -1299,6 +1366,7 @@ public class PurpurWorldConfig {
+@@ -1300,6 +1367,7 @@ public class PurpurWorldConfig {
          }
          ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
          ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks);
@@ -1730,7 +1732,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean pandaRidable = false;
-@@ -1306,6 +1374,7 @@ public class PurpurWorldConfig {
+@@ -1307,6 +1375,7 @@ public class PurpurWorldConfig {
      public boolean pandaControllable = true;
      public double pandaMaxHealth = 20.0D;
      public int pandaBreedingTicks = 6000;
@@ -1738,7 +1740,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void pandaSettings() {
          pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
          pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
-@@ -1317,6 +1386,7 @@ public class PurpurWorldConfig {
+@@ -1318,6 +1387,7 @@ public class PurpurWorldConfig {
          }
          pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
          pandaBreedingTicks = getInt("mobs.panda.breeding-delay-ticks", pandaBreedingTicks);
@@ -1746,7 +1748,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean parrotRidable = false;
-@@ -1324,6 +1394,7 @@ public class PurpurWorldConfig {
+@@ -1325,6 +1395,7 @@ public class PurpurWorldConfig {
      public boolean parrotControllable = true;
      public double parrotMaxY = 320D;
      public double parrotMaxHealth = 6.0D;
@@ -1754,7 +1756,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void parrotSettings() {
          parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
          parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
-@@ -1335,6 +1406,7 @@ public class PurpurWorldConfig {
+@@ -1336,6 +1407,7 @@ public class PurpurWorldConfig {
              set("mobs.parrot.attributes.max_health", oldValue);
          }
          parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
@@ -1762,7 +1764,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean phantomRidable = false;
-@@ -1361,6 +1433,7 @@ public class PurpurWorldConfig {
+@@ -1362,6 +1434,7 @@ public class PurpurWorldConfig {
      public boolean phantomIgnorePlayersWithTorch = false;
      public boolean phantomBurnInDaylight = true;
      public boolean phantomFlamesOnSwoop = false;
@@ -1770,7 +1772,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -1395,6 +1468,7 @@ public class PurpurWorldConfig {
+@@ -1396,6 +1469,7 @@ public class PurpurWorldConfig {
          phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
          phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
          phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
@@ -1778,7 +1780,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean pigRidable = false;
-@@ -1403,6 +1477,7 @@ public class PurpurWorldConfig {
+@@ -1404,6 +1478,7 @@ public class PurpurWorldConfig {
      public double pigMaxHealth = 10.0D;
      public boolean pigGiveSaddleBack = false;
      public int pigBreedingTicks = 6000;
@@ -1786,7 +1788,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void pigSettings() {
          pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
          pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
-@@ -1415,6 +1490,7 @@ public class PurpurWorldConfig {
+@@ -1416,6 +1491,7 @@ public class PurpurWorldConfig {
          pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
          pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
          pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks);
@@ -1794,7 +1796,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean piglinRidable = false;
-@@ -1422,6 +1498,7 @@ public class PurpurWorldConfig {
+@@ -1423,6 +1499,7 @@ public class PurpurWorldConfig {
      public boolean piglinControllable = true;
      public double piglinMaxHealth = 16.0D;
      public boolean piglinBypassMobGriefing = false;
@@ -1802,7 +1804,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1433,12 +1510,14 @@ public class PurpurWorldConfig {
+@@ -1434,12 +1511,14 @@ public class PurpurWorldConfig {
          }
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
          piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
@@ -1817,7 +1819,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void piglinBruteSettings() {
          piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
          piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
-@@ -1449,6 +1528,7 @@ public class PurpurWorldConfig {
+@@ -1450,6 +1529,7 @@ public class PurpurWorldConfig {
              set("mobs.piglin_brute.attributes.max_health", oldValue);
          }
          piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
@@ -1825,7 +1827,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean pillagerRidable = false;
-@@ -1456,6 +1536,7 @@ public class PurpurWorldConfig {
+@@ -1457,6 +1537,7 @@ public class PurpurWorldConfig {
      public boolean pillagerControllable = true;
      public double pillagerMaxHealth = 24.0D;
      public boolean pillagerBypassMobGriefing = false;
@@ -1833,7 +1835,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void pillagerSettings() {
          pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
          pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
-@@ -1467,6 +1548,7 @@ public class PurpurWorldConfig {
+@@ -1468,6 +1549,7 @@ public class PurpurWorldConfig {
          }
          pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
          pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing);
@@ -1841,7 +1843,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean polarBearRidable = false;
-@@ -1476,6 +1558,7 @@ public class PurpurWorldConfig {
+@@ -1477,6 +1559,7 @@ public class PurpurWorldConfig {
      public String polarBearBreedableItemString = "";
      public Item polarBearBreedableItem = null;
      public int polarBearBreedingTicks = 6000;
@@ -1849,7 +1851,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void polarBearSettings() {
          polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
          polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
-@@ -1490,11 +1573,13 @@ public class PurpurWorldConfig {
+@@ -1491,11 +1574,13 @@ public class PurpurWorldConfig {
          Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
          if (item != Items.AIR) polarBearBreedableItem = item;
          polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
@@ -1863,7 +1865,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void pufferfishSettings() {
          pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
          pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable);
-@@ -1504,6 +1589,7 @@ public class PurpurWorldConfig {
+@@ -1505,6 +1590,7 @@ public class PurpurWorldConfig {
              set("mobs.pufferfish.attributes.max_health", oldValue);
          }
          pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
@@ -1871,7 +1873,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean rabbitRidable = false;
-@@ -1514,6 +1600,7 @@ public class PurpurWorldConfig {
+@@ -1515,6 +1601,7 @@ public class PurpurWorldConfig {
      public double rabbitNaturalKiller = 0.0D;
      public int rabbitBreedingTicks = 6000;
      public boolean rabbitBypassMobGriefing = false;
@@ -1879,7 +1881,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -1528,6 +1615,7 @@ public class PurpurWorldConfig {
+@@ -1529,6 +1616,7 @@ public class PurpurWorldConfig {
          rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
          rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
          rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing);
@@ -1887,7 +1889,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean ravagerRidable = false;
-@@ -1535,6 +1623,7 @@ public class PurpurWorldConfig {
+@@ -1536,6 +1624,7 @@ public class PurpurWorldConfig {
      public boolean ravagerControllable = true;
      public double ravagerMaxHealth = 100.0D;
      public boolean ravagerBypassMobGriefing = false;
@@ -1895,7 +1897,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1546,11 +1635,13 @@ public class PurpurWorldConfig {
+@@ -1547,11 +1636,13 @@ public class PurpurWorldConfig {
          }
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
          ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
@@ -1909,7 +1911,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void salmonSettings() {
          salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
          salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable);
-@@ -1560,6 +1651,7 @@ public class PurpurWorldConfig {
+@@ -1561,6 +1652,7 @@ public class PurpurWorldConfig {
              set("mobs.salmon.attributes.max_health", oldValue);
          }
          salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
@@ -1917,7 +1919,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean sheepRidable = false;
-@@ -1568,6 +1660,7 @@ public class PurpurWorldConfig {
+@@ -1569,6 +1661,7 @@ public class PurpurWorldConfig {
      public double sheepMaxHealth = 8.0D;
      public int sheepBreedingTicks = 6000;
      public boolean sheepBypassMobGriefing = false;
@@ -1925,7 +1927,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -1580,12 +1673,14 @@ public class PurpurWorldConfig {
+@@ -1581,12 +1674,14 @@ public class PurpurWorldConfig {
          sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
          sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
          sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
@@ -1940,7 +1942,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -1596,6 +1691,7 @@ public class PurpurWorldConfig {
+@@ -1597,6 +1692,7 @@ public class PurpurWorldConfig {
              set("mobs.shulker.attributes.max_health", oldValue);
          }
          shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
@@ -1948,7 +1950,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean silverfishRidable = false;
-@@ -1603,6 +1699,7 @@ public class PurpurWorldConfig {
+@@ -1604,6 +1700,7 @@ public class PurpurWorldConfig {
      public boolean silverfishControllable = true;
      public double silverfishMaxHealth = 8.0D;
      public boolean silverfishBypassMobGriefing = false;
@@ -1956,7 +1958,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void silverfishSettings() {
          silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
          silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
-@@ -1614,12 +1711,14 @@ public class PurpurWorldConfig {
+@@ -1615,12 +1712,14 @@ public class PurpurWorldConfig {
          }
          silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
          silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing);
@@ -1971,23 +1973,23 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -1630,6 +1729,7 @@ public class PurpurWorldConfig {
+@@ -1631,6 +1730,7 @@ public class PurpurWorldConfig {
              set("mobs.skeleton.attributes.max_health", oldValue);
          }
          skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
 +        skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
      }
  
-     public boolean skeletonHorseRidableInWater = true;
-@@ -1640,6 +1740,7 @@ public class PurpurWorldConfig {
+     public boolean skeletonHorseRidable = false;
+@@ -1642,6 +1742,7 @@ public class PurpurWorldConfig {
      public double skeletonHorseJumpStrengthMax = 1.0D;
      public double skeletonHorseMovementSpeedMin = 0.2D;
      public double skeletonHorseMovementSpeedMax = 0.2D;
 +    public boolean skeletonHorseTakeDamageFromWater = false;
      private void skeletonHorseSettings() {
+         skeletonHorseRidable = getBoolean("mobs.skeleton_horse.ridable", skeletonHorseRidable);
          skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
-         skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
-@@ -1655,6 +1756,7 @@ public class PurpurWorldConfig {
+@@ -1658,6 +1759,7 @@ public class PurpurWorldConfig {
          skeletonHorseJumpStrengthMax = getDouble("mobs.skeleton_horse.attributes.jump_strength.max", skeletonHorseJumpStrengthMax);
          skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin);
          skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax);
@@ -1995,7 +1997,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean slimeRidable = false;
-@@ -1664,6 +1766,7 @@ public class PurpurWorldConfig {
+@@ -1667,6 +1769,7 @@ public class PurpurWorldConfig {
      public String slimeAttackDamage = "size";
      public Map<Integer, Double> slimeMaxHealthCache = new HashMap<>();
      public Map<Integer, Double> slimeAttackDamageCache = new HashMap<>();
@@ -2003,7 +2005,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void slimeSettings() {
          slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
          slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
-@@ -1677,6 +1780,7 @@ public class PurpurWorldConfig {
+@@ -1680,6 +1783,7 @@ public class PurpurWorldConfig {
          slimeAttackDamage = getString("mobs.slime.attributes.attack_damage", slimeAttackDamage);
          slimeMaxHealthCache.clear();
          slimeAttackDamageCache.clear();
@@ -2011,7 +2013,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean snowGolemRidable = false;
-@@ -1691,6 +1795,7 @@ public class PurpurWorldConfig {
+@@ -1693,6 +1797,7 @@ public class PurpurWorldConfig {
      public float snowGolemSnowBallModifier = 10.0F;
      public double snowGolemAttackDistance = 1.25D;
      public boolean snowGolemBypassMobGriefing = false;
@@ -2019,7 +2021,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -1709,6 +1814,7 @@ public class PurpurWorldConfig {
+@@ -1710,6 +1815,7 @@ public class PurpurWorldConfig {
          snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
          snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -2027,7 +2029,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean snifferRidable = false;
-@@ -1730,6 +1836,7 @@ public class PurpurWorldConfig {
+@@ -1731,6 +1837,7 @@ public class PurpurWorldConfig {
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;
      public boolean squidsCanFly = false;
@@ -2035,7 +2037,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1742,12 +1849,14 @@ public class PurpurWorldConfig {
+@@ -1743,12 +1850,14 @@ public class PurpurWorldConfig {
          squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
          squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
@@ -2050,7 +2052,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void spiderSettings() {
          spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
          spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
-@@ -1758,12 +1867,14 @@ public class PurpurWorldConfig {
+@@ -1759,12 +1868,14 @@ public class PurpurWorldConfig {
              set("mobs.spider.attributes.max_health", oldValue);
          }
          spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
@@ -2065,7 +2067,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void straySettings() {
          strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
          strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
-@@ -1774,6 +1885,7 @@ public class PurpurWorldConfig {
+@@ -1775,6 +1886,7 @@ public class PurpurWorldConfig {
              set("mobs.stray.attributes.max_health", oldValue);
          }
          strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
@@ -2073,7 +2075,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean striderRidable = false;
-@@ -1782,6 +1894,7 @@ public class PurpurWorldConfig {
+@@ -1783,6 +1895,7 @@ public class PurpurWorldConfig {
      public double striderMaxHealth = 20.0D;
      public int striderBreedingTicks = 6000;
      public boolean striderGiveSaddleBack = false;
@@ -2081,7 +2083,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -1794,6 +1907,7 @@ public class PurpurWorldConfig {
+@@ -1795,6 +1908,7 @@ public class PurpurWorldConfig {
          striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
          striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
@@ -2089,7 +2091,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean tadpoleRidable = false;
-@@ -1815,6 +1929,7 @@ public class PurpurWorldConfig {
+@@ -1816,6 +1930,7 @@ public class PurpurWorldConfig {
      public double traderLlamaMovementSpeedMin = 0.175D;
      public double traderLlamaMovementSpeedMax = 0.175D;
      public int traderLlamaBreedingTicks = 6000;
@@ -2097,7 +2099,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -1833,11 +1948,13 @@ public class PurpurWorldConfig {
+@@ -1834,11 +1949,13 @@ public class PurpurWorldConfig {
          traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
          traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
          traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
@@ -2111,7 +2113,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void tropicalFishSettings() {
          tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
          tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
-@@ -1847,6 +1964,7 @@ public class PurpurWorldConfig {
+@@ -1848,6 +1965,7 @@ public class PurpurWorldConfig {
              set("mobs.tropical_fish.attributes.max_health", oldValue);
          }
          tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
@@ -2119,7 +2121,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean turtleRidable = false;
-@@ -1854,6 +1972,7 @@ public class PurpurWorldConfig {
+@@ -1855,6 +1973,7 @@ public class PurpurWorldConfig {
      public boolean turtleControllable = true;
      public double turtleMaxHealth = 30.0D;
      public int turtleBreedingTicks = 6000;
@@ -2127,7 +2129,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void turtleSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -1865,6 +1984,7 @@ public class PurpurWorldConfig {
+@@ -1866,6 +1985,7 @@ public class PurpurWorldConfig {
          }
          turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
          turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
@@ -2135,7 +2137,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean vexRidable = false;
-@@ -1872,6 +1992,7 @@ public class PurpurWorldConfig {
+@@ -1873,6 +1993,7 @@ public class PurpurWorldConfig {
      public boolean vexControllable = true;
      public double vexMaxY = 320D;
      public double vexMaxHealth = 14.0D;
@@ -2143,7 +2145,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void vexSettings() {
          vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
          vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
-@@ -1883,6 +2004,7 @@ public class PurpurWorldConfig {
+@@ -1884,6 +2005,7 @@ public class PurpurWorldConfig {
              set("mobs.vex.attributes.max_health", oldValue);
          }
          vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2151,7 +2153,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean villagerRidable = false;
-@@ -1896,6 +2018,7 @@ public class PurpurWorldConfig {
+@@ -1897,6 +2019,7 @@ public class PurpurWorldConfig {
      public boolean villagerClericsFarmWarts = false;
      public boolean villagerClericFarmersThrowWarts = true;
      public boolean villagerBypassMobGriefing = false;
@@ -2159,7 +2161,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -1913,6 +2036,7 @@ public class PurpurWorldConfig {
+@@ -1914,6 +2037,7 @@ public class PurpurWorldConfig {
          villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -2167,7 +2169,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean vindicatorRidable = false;
-@@ -1920,6 +2044,7 @@ public class PurpurWorldConfig {
+@@ -1921,6 +2045,7 @@ public class PurpurWorldConfig {
      public boolean vindicatorControllable = true;
      public double vindicatorMaxHealth = 24.0D;
      public double vindicatorJohnnySpawnChance = 0D;
@@ -2175,7 +2177,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void vindicatorSettings() {
          vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
          vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -1931,6 +2056,7 @@ public class PurpurWorldConfig {
+@@ -1932,6 +2057,7 @@ public class PurpurWorldConfig {
          }
          vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
          vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
@@ -2183,7 +2185,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean wanderingTraderRidable = false;
-@@ -1939,6 +2065,7 @@ public class PurpurWorldConfig {
+@@ -1940,6 +2066,7 @@ public class PurpurWorldConfig {
      public double wanderingTraderMaxHealth = 20.0D;
      public boolean wanderingTraderFollowEmeraldBlock = false;
      public boolean wanderingTraderCanBeLeashed = false;
@@ -2191,7 +2193,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -1951,6 +2078,7 @@ public class PurpurWorldConfig {
+@@ -1952,6 +2079,7 @@ public class PurpurWorldConfig {
          wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
          wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
@@ -2199,7 +2201,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean wardenRidable = false;
-@@ -1966,6 +2094,7 @@ public class PurpurWorldConfig {
+@@ -1967,6 +2095,7 @@ public class PurpurWorldConfig {
      public boolean witchRidableInWater = true;
      public boolean witchControllable = true;
      public double witchMaxHealth = 26.0D;
@@ -2207,7 +2209,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void witchSettings() {
          witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
          witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
-@@ -1976,6 +2105,7 @@ public class PurpurWorldConfig {
+@@ -1977,6 +2106,7 @@ public class PurpurWorldConfig {
              set("mobs.witch.attributes.max_health", oldValue);
          }
          witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2215,7 +2217,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean witherRidable = false;
-@@ -1986,6 +2116,7 @@ public class PurpurWorldConfig {
+@@ -1987,6 +2117,7 @@ public class PurpurWorldConfig {
      public float witherHealthRegenAmount = 1.0f;
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
@@ -2223,7 +2225,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2004,12 +2135,14 @@ public class PurpurWorldConfig {
+@@ -2005,12 +2136,14 @@ public class PurpurWorldConfig {
          witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
@@ -2238,7 +2240,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void witherSkeletonSettings() {
          witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
          witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
-@@ -2020,6 +2153,7 @@ public class PurpurWorldConfig {
+@@ -2021,6 +2154,7 @@ public class PurpurWorldConfig {
              set("mobs.wither_skeleton.attributes.max_health", oldValue);
          }
          witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
@@ -2246,7 +2248,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean wolfRidable = false;
-@@ -2030,6 +2164,7 @@ public class PurpurWorldConfig {
+@@ -2031,6 +2165,7 @@ public class PurpurWorldConfig {
      public boolean wolfMilkCuresRabies = true;
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
@@ -2254,7 +2256,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -2048,12 +2183,14 @@ public class PurpurWorldConfig {
+@@ -2049,12 +2184,14 @@ public class PurpurWorldConfig {
          wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
          wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
          wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2269,7 +2271,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void zoglinSettings() {
          zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
          zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
-@@ -2064,6 +2201,7 @@ public class PurpurWorldConfig {
+@@ -2065,6 +2202,7 @@ public class PurpurWorldConfig {
              set("mobs.zoglin.attributes.max_health", oldValue);
          }
          zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2277,7 +2279,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean zombieRidable = false;
-@@ -2076,6 +2214,7 @@ public class PurpurWorldConfig {
+@@ -2077,6 +2215,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      public boolean zombieBypassMobGriefing = false;
@@ -2285,23 +2287,23 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2092,6 +2231,7 @@ public class PurpurWorldConfig {
+@@ -2093,6 +2232,7 @@ public class PurpurWorldConfig {
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
          zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
 +        zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
      }
  
-     public boolean zombieHorseRidableInWater = false;
-@@ -2103,6 +2243,7 @@ public class PurpurWorldConfig {
+     public boolean zombieHorseRidable = false;
+@@ -2105,6 +2245,7 @@ public class PurpurWorldConfig {
      public double zombieHorseMovementSpeedMin = 0.2D;
      public double zombieHorseMovementSpeedMax = 0.2D;
      public double zombieHorseSpawnChance = 0.0D;
 +    public boolean zombieHorseTakeDamageFromWater = false;
      private void zombieHorseSettings() {
+         zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
-         zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
-@@ -2119,6 +2260,7 @@ public class PurpurWorldConfig {
+@@ -2122,6 +2263,7 @@ public class PurpurWorldConfig {
          zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
          zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2309,7 +2311,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean zombieVillagerRidable = false;
-@@ -2129,6 +2271,7 @@ public class PurpurWorldConfig {
+@@ -2132,6 +2274,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2317,7 +2319,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2143,6 +2286,7 @@ public class PurpurWorldConfig {
+@@ -2146,6 +2289,7 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2325,7 +2327,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -2154,6 +2298,7 @@ public class PurpurWorldConfig {
+@@ -2157,6 +2301,7 @@ public class PurpurWorldConfig {
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2333,7 +2335,7 @@ index 10c019d14fb20835a01c31dc4546d1c70cde6948..8c16a4920f484fb0dfd58daf7d3ec87c
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2169,5 +2314,6 @@ public class PurpurWorldConfig {
+@@ -2172,5 +2317,6 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
diff --git a/patches/server/0129-Config-to-always-tame-in-Creative.patch b/patches/server/0125-Config-to-always-tame-in-Creative.patch
similarity index 60%
rename from patches/server/0129-Config-to-always-tame-in-Creative.patch
rename to patches/server/0125-Config-to-always-tame-in-Creative.patch
index e3736e49f..42de81d83 100644
--- a/patches/server/0129-Config-to-always-tame-in-Creative.patch
+++ b/patches/server/0125-Config-to-always-tame-in-Creative.patch
@@ -7,7 +7,7 @@ Adds a configuration option that ensures a player in Creative always tames a tam
 This essentially allows Creative mode players to tame animals on their first try.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
-index b0944fa1f3849dd24cd010fa0a6638f5fd7179d1..a3074ec9b430c9d0a0ef33fe353db643849fab7d 100644
+index b0944fa1f3849dd24cd010fa0a6638f5fd7179d1..d409ae987088df3d47192128401d7491aaabc87c 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java
 @@ -67,7 +67,7 @@ public class RunAroundLikeCrazyGoal extends Goal {
@@ -15,51 +15,51 @@ index b0944fa1f3849dd24cd010fa0a6638f5fd7179d1..a3074ec9b430c9d0a0ef33fe353db643
                  int j = this.horse.getMaxTemper();
  
 -                if (j > 0 && this.horse.getRandom().nextInt(j) < i && !CraftEventFactory.callEntityTameEvent(this.horse, ((CraftHumanEntity) this.horse.getBukkitEntity().getPassenger()).getHandle()).isCancelled()) { // CraftBukkit - fire EntityTameEvent
-+                if ((this.horse.level().purpurConfig.alwaysTameInCreative && ((Player) entity).getAbilities().instabuild) || (j > 0 && this.horse.getRandom().nextInt(j) < i && !CraftEventFactory.callEntityTameEvent(this.horse, ((CraftHumanEntity) this.horse.getBukkitEntity().getPassenger()).getHandle()).isCancelled())) { // CraftBukkit - fire EntityTameEvent // Purpur
++                if ((this.horse.level().purpurConfig.alwaysTameInCreative && entityhuman.hasInfiniteMaterials()) || (j > 0 && this.horse.getRandom().nextInt(j) < i && !CraftEventFactory.callEntityTameEvent(this.horse, ((CraftHumanEntity) this.horse.getBukkitEntity().getPassenger()).getHandle()).isCancelled())) { // CraftBukkit - fire EntityTameEvent // Purpur
                      this.horse.tameWithName(entityhuman);
                      return;
                  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 9279eb3c7a8affbecba1a8b27ca0685021676f39..9a40cd8d7d4789a8b43f5194bdc67dc6753eed21 100644
+index 446aec4d10e614f136fe6ae4bb5a7dd0ac6d0f18..17aaeb734a5c1b16bd7771c909958f3acc956b7a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -471,7 +471,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
-                 }
-             } else if (this.isFood(itemstack)) {
-                 this.usePlayerItem(player, hand, itemstack);
--                if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) { // CraftBukkit
-+                if ((this.level().purpurConfig.alwaysTameInCreative && player.getAbilities().instabuild) || (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled())) { // CraftBukkit // Purpur
-                     this.tame(player);
-                     this.setOrderedToSit(true);
-                     this.level().broadcastEntityEvent(this, (byte) 7);
+@@ -522,7 +522,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+     }
+ 
+     private void tryToTame(Player player) {
+-        if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) { // CraftBukkit
++        if ((this.level().purpurConfig.alwaysTameInCreative && player.hasInfiniteMaterials()) || this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) { // CraftBukkit
+             this.tame(player);
+             this.setOrderedToSit(true);
+             this.level().broadcastEntityEvent(this, (byte) 7);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index a2c2c453c83bcc99ffebe8566f04288f01fa120a..5c7400bab81b87e908010bab6684b072c51a8adc 100644
+index 7b139028ae5c590960e6b8a74b6ba667f3db7f5d..490d7f8ac402f50a2f2f90ca032169784a402c0f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -335,7 +335,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -321,7 +321,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
              }
  
              if (!this.level().isClientSide) {
 -                if (this.random.nextInt(10) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) { // CraftBukkit
-+                if ((this.level().purpurConfig.alwaysTameInCreative && player.getAbilities().instabuild) || (this.random.nextInt(10) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled())) { // CraftBukkit // Purpur
++                if ((this.level().purpurConfig.alwaysTameInCreative && player.hasInfiniteMaterials()) || (this.random.nextInt(10) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, player).isCancelled())) { // CraftBukkit // Purpur
                      this.tame(player);
                      this.level().broadcastEntityEvent(this, (byte) 7);
                  } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index f79dff635b09300f8d2cff0562f71587496ed33d..6b51886e383992f35e0313bd9cc012354190a87d 100644
+index db0d71da579752bfb8246f5fa2ec9d360f53c7a8..31b5d874fdc6f7d2eaabe877b32b64d360cb48e3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -532,7 +532,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
-             }
+@@ -646,7 +646,7 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
  
-             // CraftBukkit - added event call and isCancelled check.
--            if (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) {
-+            if ((this.level().purpurConfig.alwaysTameInCreative && player.getAbilities().instabuild) || (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, player).isCancelled())) { // Purpur
-                 this.tame(player);
-                 this.navigation.stop();
-                 this.setTarget((LivingEntity) null);
+     private void tryToTame(Player player) {
+         // CraftBukkit - added event call and isCancelled check.
+-        if (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) {
++        if ((this.level().purpurConfig.alwaysTameInCreative && player.hasInfiniteMaterials()) || this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, player).isCancelled()) {
+             this.tame(player);
+             this.navigation.stop();
+             this.setTarget((LivingEntity) null);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8c16a4920f484fb0dfd58daf7d3ec87c1eec6135..9a358b9fef97017d019a1779254221ff66ea0c9f 100644
+index 7e520532aec1dc38da84dce2dc8679d977a030ea..75c9c93f808b624370a2820a93f625a599093b5c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -117,6 +117,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0130-End-crystal-explosion-options.patch b/patches/server/0126-End-crystal-explosion-options.patch
similarity index 89%
rename from patches/server/0130-End-crystal-explosion-options.patch
rename to patches/server/0126-End-crystal-explosion-options.patch
index 98924d0a0..bb314bae2 100644
--- a/patches/server/0130-End-crystal-explosion-options.patch
+++ b/patches/server/0126-End-crystal-explosion-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] End crystal explosion options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-index ef0098e46bda8abc456f2bb5929d874c6aeb8698..564d17bc460e2a04947ff9676fbf4c8b1569659c 100644
+index 2bac39e5ba09e08d23d2a4be37f7fe0da0ce71a6..8c6ce06a1845832c8b0de654657788d2daf6b71b 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-@@ -48,6 +48,22 @@ public class EndCrystal extends Entity {
+@@ -49,6 +49,22 @@ public class EndCrystal extends Entity {
          this.setPos(x, y, z);
      }
  
@@ -31,9 +31,9 @@ index ef0098e46bda8abc456f2bb5929d874c6aeb8698..564d17bc460e2a04947ff9676fbf4c8b
      @Override
      protected Entity.MovementEmission getMovementEmission() {
          return Entity.MovementEmission.NONE;
-@@ -173,16 +189,18 @@ public class EndCrystal extends Entity {
+@@ -170,16 +186,18 @@ public class EndCrystal extends Entity {
+                 }
                  // CraftBukkit end
-                 this.remove(Entity.RemovalReason.KILLED);
                  if (!source.is(DamageTypeTags.IS_EXPLOSION)) {
 +                    if (shouldExplode()) {// Purpur
                      DamageSource damagesource1 = source.getEntity() != null ? this.damageSources().explosion(this, source.getEntity()) : null;
@@ -42,21 +42,21 @@ index ef0098e46bda8abc456f2bb5929d874c6aeb8698..564d17bc460e2a04947ff9676fbf4c8b
 -                    ExplosionPrimeEvent event = CraftEventFactory.callExplosionPrimeEvent(this, 6.0F, false);
 +                    ExplosionPrimeEvent event = CraftEventFactory.callExplosionPrimeEvent(this, getExplosionPower(), hasExplosionFire()); // Purpur
                      if (event.isCancelled()) {
-                         this.unsetRemoved();
                          return false;
                      }
+ 
+                     this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
 -                    this.level().explode(this, damagesource1, (ExplosionDamageCalculator) null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.BLOCK);
 +                    this.level().explode(this, damagesource1, (ExplosionDamageCalculator) null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), getExplosionEffect()); // Purpur
-                     // CraftBukkit end
 +                    } else this.unsetRemoved(); // Purpur
+                 } else {
+                     this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
                  }
- 
-                 this.onDestroyedBy(source);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9a358b9fef97017d019a1779254221ff66ea0c9f..af6ef0660e5d0a6c5c2033105ee29328dd06418a 100644
+index 75c9c93f808b624370a2820a93f625a599093b5c..9de44dd59e69d709490290cf07b7c75889ac8387 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -464,6 +464,43 @@ public class PurpurWorldConfig {
+@@ -465,6 +465,43 @@ public class PurpurWorldConfig {
          dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
      }
  
diff --git a/patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0127-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 84%
rename from patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/server/0127-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index f9596e176..8e440c4a0 100644
--- a/patches/server/0131-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0127-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 1588c4ec1ff1d9f1eca8b6c7971a2cdd1f98efb3..82d81fd2edff9df0bb4ff116d9274887a316d0a8 100644
+index bf657ed6a27ce5da5621a3e14b0bf41ea0c4c8c9..3da1f7a6e443954e4976dd59391ea19b9c903cf7 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -1187,6 +1187,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -1188,6 +1188,7 @@ public class EnderDragon extends Mob implements Enemy {
  
      @Override
      protected boolean canRide(Entity entity) {
@@ -17,10 +17,10 @@ index 1588c4ec1ff1d9f1eca8b6c7971a2cdd1f98efb3..82d81fd2edff9df0bb4ff116d9274887
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 76f88b96e4965e61a620d8e8809411a0711bf02e..8d882e6ef4e199258866f30f5548a6feae4582da 100644
+index 948e5747d8d280695dd903a29b9c9f9dae9a44c1..6752a0039fac041e9bdd25327cdf20d3f1922bd6 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -738,6 +738,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -730,6 +730,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
  
      @Override
      protected boolean canRide(Entity entity) {
@@ -29,10 +29,10 @@ index 76f88b96e4965e61a620d8e8809411a0711bf02e..8d882e6ef4e199258866f30f5548a6fe
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index af6ef0660e5d0a6c5c2033105ee29328dd06418a..55941d33fd619db4f25e29d51b1bc8a522bb29ba 100644
+index 9de44dd59e69d709490290cf07b7c75889ac8387..d56aa23ea97e6cd7e1b5824fc46d1b6c0ee23a2d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -947,6 +947,7 @@ public class PurpurWorldConfig {
+@@ -948,6 +948,7 @@ public class PurpurWorldConfig {
      public boolean enderDragonAlwaysDropsFullExp = false;
      public boolean enderDragonBypassMobGriefing = false;
      public boolean enderDragonTakeDamageFromWater = false;
@@ -40,7 +40,7 @@ index af6ef0660e5d0a6c5c2033105ee29328dd06418a..55941d33fd619db4f25e29d51b1bc8a5
      private void enderDragonSettings() {
          enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
          enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
-@@ -965,6 +966,7 @@ public class PurpurWorldConfig {
+@@ -966,6 +967,7 @@ public class PurpurWorldConfig {
          enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
          enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing);
          enderDragonTakeDamageFromWater = getBoolean("mobs.ender_dragon.takes-damage-from-water", enderDragonTakeDamageFromWater);
@@ -48,7 +48,7 @@ index af6ef0660e5d0a6c5c2033105ee29328dd06418a..55941d33fd619db4f25e29d51b1bc8a5
      }
  
      public boolean endermanRidable = false;
-@@ -2156,6 +2158,7 @@ public class PurpurWorldConfig {
+@@ -2157,6 +2159,7 @@ public class PurpurWorldConfig {
      public int witherHealthRegenDelay = 20;
      public boolean witherBypassMobGriefing = false;
      public boolean witherTakeDamageFromWater = false;
@@ -56,7 +56,7 @@ index af6ef0660e5d0a6c5c2033105ee29328dd06418a..55941d33fd619db4f25e29d51b1bc8a5
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2175,6 +2178,7 @@ public class PurpurWorldConfig {
+@@ -2176,6 +2179,7 @@ public class PurpurWorldConfig {
          witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
diff --git a/patches/server/0132-Dont-run-with-scissors.patch b/patches/server/0128-Dont-run-with-scissors.patch
similarity index 69%
rename from patches/server/0132-Dont-run-with-scissors.patch
rename to patches/server/0128-Dont-run-with-scissors.patch
index d8ca75471..0ab792c43 100644
--- a/patches/server/0132-Dont-run-with-scissors.patch
+++ b/patches/server/0128-Dont-run-with-scissors.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 65c9e83063c84ccff38d52049160bb093a7a50e7..90561a2fb7c353bedb62b200689d8c73b3534033 100644
+index b3cecec8a93bd0de1a74e693b7c103fdbc87eba2..cc3728902da9e10df2bb0e3edbb765bffd51d808 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1610,6 +1610,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                     this.player.resetFallDistance();
+@@ -1657,6 +1657,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                                     this.player.resetCurrentImpulseContext();
                                  }
  
 +                                // Purpur Start
@@ -22,14 +22,16 @@ index 65c9e83063c84ccff38d52049160bb093a7a50e7..90561a2fb7c353bedb62b200689d8c73
                                  this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
                                  this.lastGoodX = this.player.getX();
                                  this.lastGoodY = this.player.getY();
-@@ -1661,6 +1668,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1696,6 +1703,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          return false;
      }
      // Paper end - optimise out extra getCubes
 +
 +    // Purpur start
 +    public boolean isScissor(ItemStack stack) {
-+        return stack.is(Items.SHEARS) && (stack.getTag() == null || stack.getTag().getInt("CustomModelData") == 0);
++        if (!stack.is(Items.SHEARS)) return false;
++        net.minecraft.world.item.component.CustomModelData customModelData = stack.get(net.minecraft.core.component.DataComponents.CUSTOM_MODEL_DATA);
++        return customModelData == null || customModelData.value() == 0;
 +    }
 +    // Purpur end
 +
@@ -37,15 +39,15 @@ index 65c9e83063c84ccff38d52049160bb093a7a50e7..90561a2fb7c353bedb62b200689d8c73
          AABB axisalignedbb1 = this.player.getBoundingBox().move(newX - this.player.getX(), newY - this.player.getY(), newZ - this.player.getZ());
          Iterable<VoxelShape> iterable = world.getCollisions(this.player, axisalignedbb1.deflate(9.999999747378752E-6D));
 diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-index 9c99b2e365aacb8309f29acb9025faccd2c676b3..9e3608650c44ef5fa724c3aea86603d7bd02429c 100644
+index 99a7e9eb75231c15bd8bb24fbb4e296bc9fdedff..a375d40ec6365ba8704ba3ece22dd5b2de9857b5 100644
 --- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
 +++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-@@ -99,6 +99,11 @@ public class CombatTracker {
+@@ -98,6 +98,11 @@ public class CombatTracker {
                  Component component = ComponentUtils.wrapInSquareBrackets(Component.translatable(string + ".link")).withStyle(INTENTIONAL_GAME_DESIGN_STYLE);
                  return Component.translatable(string + ".message", this.mob.getDisplayName(), component);
              } else {
 +                // Purpur start
-+                if (damageSource.isScissors) {
++                if (damageSource.isScissors()) {
 +                    return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgRunWithScissors, this.mob);
 +                }
 +                // Purpur end
@@ -53,36 +55,76 @@ index 9c99b2e365aacb8309f29acb9025faccd2c676b3..9e3608650c44ef5fa724c3aea86603d7
              }
          }
 diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 14fcfd7c1d3a62833978e163f4e0d6f9b2203042..33210bc66dcc5fdf03fbf438ce8734b31c4e7975 100644
+index ff1df6360cb4d9da8717687344bdea2a44b6fc2a..894668c96ac36e737910a25cf89651236246200c 100644
 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
 +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -54,6 +54,8 @@ public class DamageSource {
-     // CraftBukkit end
-     public @Nullable org.bukkit.block.BlockState explodedBlockState; // Paper - add exploded state
+@@ -29,6 +29,7 @@ public class DamageSource {
+     private boolean withSweep = false;
+     private boolean melting = false;
+     private boolean poison = false;
++    private boolean scissors = false; // Purpur
+     @Nullable
+     private Entity customEventDamager = null; // This field is a helper for when causing entity damage is not set by vanilla // Paper - fix DamageSource API
  
-+    public boolean isScissors; // Purpur
-+
-     public String toString() {
-         return "DamageSource (" + this.type().msgId() + ")";
-     }
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-index 4604f8b38460e9113e966889a679d4547f24aff6..813916852774d6482791989252ecb67b945a8f84 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-@@ -267,4 +267,11 @@ public class DamageSources {
-     public DamageSource genericKill() {
-         return this.genericKill;
+@@ -59,6 +60,17 @@ public class DamageSource {
+         return this.poison;
      }
+ 
 +    // Purpur start
 +    public DamageSource scissors() {
-+        DamageSource source = new DamageSource(this.damageTypes.getHolderOrThrow(DamageTypes.MAGIC));
-+        source.isScissors = true;
-+        return source;
++        this.scissors = true;
++        return this;
++    }
++
++    public boolean isScissors() {
++        return this.scissors;
 +    }
 +    // Purpur end
- }
++
+     // Paper start - fix DamageSource API
+     public @Nullable Entity getCustomEventDamager() {
+         return (this.customEventDamager != null) ? this.customEventDamager : this.directEntity;
+@@ -101,6 +113,7 @@ public class DamageSource {
+         damageSource.withSweep = this.isSweep();
+         damageSource.poison = this.isPoison();
+         damageSource.melting = this.isMelting();
++        damageSource.scissors = this.isScissors(); // Purpur
+         return damageSource;
+     }
+     // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+index a1c53f04c2dd505e6af72e512e111d7994786035..13b596a1e06fa66396c43a6c72659d4342bf6549 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+@@ -44,11 +44,13 @@ public class DamageSources {
+     // CraftBukkit start
+     private final DamageSource melting;
+     private final DamageSource poison;
++    private final DamageSource scissors; // Purpur
+ 
+     public DamageSources(RegistryAccess registryManager) {
+         this.damageTypes = registryManager.registryOrThrow(Registries.DAMAGE_TYPE);
+         this.melting = this.source(DamageTypes.ON_FIRE).melting();
+         this.poison = this.source(DamageTypes.MAGIC).poison();
++        this.scissors = this.source(DamageTypes.MAGIC).scissors(); // Purpur
+         // CraftBukkit end
+         this.inFire = this.source(DamageTypes.IN_FIRE);
+         this.lightningBolt = this.source(DamageTypes.LIGHTNING_BOLT);
+@@ -97,6 +99,12 @@ public class DamageSources {
+     }
+     // CraftBukkit end
+ 
++    // Purpur start
++    public DamageSource scissors() {
++        return this.scissors;
++    }
++    // Purpur end
++
+     public DamageSource inFire() {
+         return this.inFire;
+     }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 61e3bce901bdbf111ffc06521b0e6d5369fce051..ea9d99990b718beaef4bee3ff75340656f3c76c5 100644
+index a4404782f0456a0bd05b385372ea920bd437eb35..0587b0c7f34ae90f0d06f29d58fafbcf5b80ff13 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -183,6 +183,7 @@ public class PurpurConfig {
@@ -107,7 +149,7 @@ index 61e3bce901bdbf111ffc06521b0e6d5369fce051..ea9d99990b718beaef4bee3ff7534065
  
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 55941d33fd619db4f25e29d51b1bc8a522bb29ba..651448bc3b84686b675349f0e72c699ce506ab82 100644
+index d56aa23ea97e6cd7e1b5824fc46d1b6c0ee23a2d..3f07fa6eec5efb308d6ec10ddb036c4774031a32 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -197,6 +197,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0133-One-Punch-Man.patch b/patches/server/0129-One-Punch-Man.patch
similarity index 63%
rename from patches/server/0133-One-Punch-Man.patch
rename to patches/server/0129-One-Punch-Man.patch
index 673ac8f5e..51461e170 100644
--- a/patches/server/0133-One-Punch-Man.patch
+++ b/patches/server/0129-One-Punch-Man.patch
@@ -5,32 +5,33 @@ Subject: [PATCH] One Punch Man!
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 82a8b3d6392fffae9ad3440045129c77119e3e84..b13757a20b04634c26d741e27df75be28089dc37 100644
+index dc1c7c55fd13cc1a8ade803bfb1b7c385cf29132..523052af43aa86982d2ded0cc0882d34bac24da7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2331,6 +2331,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2382,6 +2382,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  }
              }
  
-+           // Purpur start
-+           if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player player && damagesource.getEntity().level().purpurConfig.creativeOnePunch) {
-+               if (player.isCreative()) {
-+                   double attackDamage = 0;
-+                   for (AttributeModifier modifier : player.getMainHandItem().getAttributeModifiers(EquipmentSlot.MAINHAND).get(Attributes.ATTACK_DAMAGE)) {
-+                       attackDamage += modifier.getAmount();
-+                   }
-+                   if (attackDamage == 0) {
-+                       this.setHealth(0);
-+                   }
-+               }
-+           }
-+           // Purpur end
++            // Purpur start
++            if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player player && damagesource.getEntity().level().purpurConfig.creativeOnePunch) {
++                if (player.isCreative()) {
++                    double attackDamage;
++                    net.minecraft.world.item.component.ItemAttributeModifiers itemattributemodifiers = player.getMainHandItem().getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, net.minecraft.world.item.component.ItemAttributeModifiers.EMPTY);
++
++                    attackDamage = itemattributemodifiers.compute(player.getAttributeBaseValue(Attributes.ATTACK_DAMAGE), EquipmentSlot.MAINHAND);
++
++                    if (attackDamage == 1.0D) {
++                        this.setHealth(0);
++                    }
++                }
++            }
++            // Purpur end
 +
              if (f > 0 || !human) {
                  if (human) {
                      // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 651448bc3b84686b675349f0e72c699ce506ab82..50d10795981069b031170ef0de3a50603541f1c8 100644
+index 3f07fa6eec5efb308d6ec10ddb036c4774031a32..5f01c0d1277e1aa910208a3b9308c427b6e22cdb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -344,6 +344,7 @@ public class PurpurWorldConfig {
@@ -48,4 +49,4 @@ index 651448bc3b84686b675349f0e72c699ce506ab82..50d10795981069b031170ef0de3a5060
 +        creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0134-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0130-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 84%
rename from patches/server/0134-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/server/0130-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
index 0e0fbdefc..4248c4ebc 100644
--- a/patches/server/0134-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
+++ b/patches/server/0130-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Configurable Ender Pearl cooldown, damage, and Endermite RNG
 - Endermite spawn chance
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index e02d5dcbf69bd68b2f567c1a16a44ab59955f871..daf6701b20d03090ab4896e0c1897850300a2fea 100644
+index 1fb1e729d6879568d8b4943071fa940325b2e5b0..b61d659dc48f795c7f2d62044c245e342cd322e5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -67,7 +67,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -71,7 +71,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                      Bukkit.getPluginManager().callEvent(teleEvent);
  
                      if (!teleEvent.isCancelled() && entityplayer.connection.isAcceptingMessages()) {
@@ -20,17 +20,17 @@ index e02d5dcbf69bd68b2f567c1a16a44ab59955f871..daf6701b20d03090ab4896e0c1897850
                              Endermite entityendermite = (Endermite) EntityType.ENDERMITE.create(this.level());
  
                              if (entityendermite != null) {
-@@ -83,7 +83,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -86,7 +86,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+ 
                          entityplayer.connection.teleport(teleEvent.getTo());
                          entity.resetFallDistance();
-                         CraftEventFactory.entityDamage = this;
--                        entity.hurt(this.damageSources().fall(), 5.0F);
-+                        entity.hurt(this.damageSources().fall(), this.level().purpurConfig.enderPearlDamage); // Purpur
-                         CraftEventFactory.entityDamage = null;
+-                        entity.hurt(this.damageSources().fall().customEventDamager(this), 5.0F); // CraftBukkit // Paper - fix DamageSource API
++                        entity.hurt(this.damageSources().fall().customEventDamager(this), this.level().purpurConfig.enderPearlDamage); // CraftBukkit // Paper - fix DamageSource API // Purpur
                      }
                      // CraftBukkit end
+                     this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_TELEPORT, SoundSource.PLAYERS);
 diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f9461b088 100644
+index 20a91d798d31a71b3c05efa2cc5bda55494e26cc..fc62754f93bd11a10c28b8b7b116e9fff70a5c7b 100644
 --- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
 +++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
 @@ -36,7 +36,7 @@ public class EnderpearlItem extends Item {
@@ -40,10 +40,10 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f
 -                user.getCooldowns().addCooldown(this, 20);
 +                user.getCooldowns().addCooldown(this, user.getAbilities().instabuild ? world.purpurConfig.enderPearlCooldownCreative : world.purpurConfig.enderPearlCooldown); // Purpur
              } else {
-                 // Paper end
+                 // Paper end - PlayerLaunchProjectileEvent
                  if (user instanceof net.minecraft.server.level.ServerPlayer) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 50d10795981069b031170ef0de3a50603541f1c8..c09528388118f2386de3de14b8c1cb8896ebf556 100644
+index 5f01c0d1277e1aa910208a3b9308c427b6e22cdb..a71ce1e255bbb469d3c0a20853450130589af326 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -201,6 +201,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 86%
rename from patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch
index fad795247..29cc238c3 100644
--- a/patches/server/0135-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0131-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4c68d45f481d97d9fba7ac2eee44ca9c9261591e..b5de1fc5d352de4ba978cb718e57a913431a7c9a 100644
+index 146c2e46e0fb9a9358484a054f716d72b9750ed8..c9458551b1da419f484e9dce6b3fba8d79c2de79 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1425,7 +1425,7 @@ public class ServerPlayer extends Player {
+@@ -1505,7 +1505,7 @@ public class ServerPlayer extends Player {
                              return entitymonster.isPreventingPlayerRest(this);
                          });
  
@@ -18,7 +18,7 @@ index 4c68d45f481d97d9fba7ac2eee44ca9c9261591e..b5de1fc5d352de4ba978cb718e57a913
                          }
                      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c09528388118f2386de3de14b8c1cb8896ebf556..33db128ff2046a7a36eb5d70b35d10947f83a931 100644
+index a71ce1e255bbb469d3c0a20853450130589af326..afcde828b7f39affd26cf3a52b744e0b37140694 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -353,6 +353,7 @@ public class PurpurWorldConfig {
@@ -36,4 +36,4 @@ index c09528388118f2386de3de14b8c1cb8896ebf556..33db128ff2046a7a36eb5d70b35d1094
 +        playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0136-Add-back-player-spawned-endermite-API.patch b/patches/server/0132-Add-back-player-spawned-endermite-API.patch
similarity index 89%
rename from patches/server/0136-Add-back-player-spawned-endermite-API.patch
rename to patches/server/0132-Add-back-player-spawned-endermite-API.patch
index 4c423c0ca..33e1c6a57 100644
--- a/patches/server/0136-Add-back-player-spawned-endermite-API.patch
+++ b/patches/server/0132-Add-back-player-spawned-endermite-API.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add back player spawned endermite API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 936add0eb7204af7dc507c786cb82e0d7a76d5dc..c0c3ab5dbf5987e543e6cdd1a814d2ec3ec17939 100644
+index 514354bfcd0608554fd515248975fb107eddf427..c5fcefc6810c2127d6a0a48f95c50c2e15a4dd52 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-@@ -32,6 +32,7 @@ import org.joml.Vector3f;
- public class Endermite extends Monster {
+@@ -32,6 +32,7 @@ public class Endermite extends Monster {
+ 
      private static final int MAX_LIFE = 2400;
      public int life;
 +    private boolean isPlayerSpawned; // Purpur
@@ -31,7 +31,7 @@ index 936add0eb7204af7dc507c786cb82e0d7a76d5dc..c0c3ab5dbf5987e543e6cdd1a814d2ec
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
-@@ -117,12 +126,14 @@ public class Endermite extends Monster {
+@@ -112,12 +121,14 @@ public class Endermite extends Monster {
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
          this.life = nbt.getInt("Lifetime");
@@ -47,10 +47,10 @@ index 936add0eb7204af7dc507c786cb82e0d7a76d5dc..c0c3ab5dbf5987e543e6cdd1a814d2ec
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index daf6701b20d03090ab4896e0c1897850300a2fea..fb0f29b714344f0ac3e7f6bd809ac57a21061156 100644
+index b61d659dc48f795c7f2d62044c245e342cd322e5..d9761d8fe746e925a7a32dfc15eb8045c6150fe5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -71,6 +71,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
+@@ -75,6 +75,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
                              Endermite entityendermite = (Endermite) EntityType.ENDERMITE.create(this.level());
  
                              if (entityendermite != null) {
diff --git a/patches/server/0137-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0133-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 90%
rename from patches/server/0137-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/server/0133-Config-Enderman-aggressiveness-towards-Endermites.patch
index 52cc9b418..0ef7d7bfe 100644
--- a/patches/server/0137-Config-Enderman-aggressiveness-towards-Endermites.patch
+++ b/patches/server/0133-Config-Enderman-aggressiveness-towards-Endermites.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config Enderman aggressiveness towards Endermites
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 4fe5b9babd51a2123a76384c2fd9ec0147cac785..787d57f18568b8c2fd4694fc29492345dbe43564 100644
+index 17b044e58d2ed33ed16e60f4fd4f63b2ee3f854d..4821aec304399c64cbcff741334567a08b840c0a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -134,7 +134,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -129,7 +129,7 @@ public class EnderMan extends Monster implements NeutralMob {
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
          this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
@@ -18,10 +18,10 @@ index 4fe5b9babd51a2123a76384c2fd9ec0147cac785..787d57f18568b8c2fd4694fc29492345
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 33db128ff2046a7a36eb5d70b35d10947f83a931..fd7d88ed631d4b4675ce457f4e2de731223254aa 100644
+index afcde828b7f39affd26cf3a52b744e0b37140694..3736b6a5be1c4eea48416c48822675e394b821f1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -997,6 +997,8 @@ public class PurpurWorldConfig {
+@@ -998,6 +998,8 @@ public class PurpurWorldConfig {
      public boolean endermanDespawnEvenWithBlock = false;
      public boolean endermanBypassMobGriefing = false;
      public boolean endermanTakeDamageFromWater = true;
@@ -30,7 +30,7 @@ index 33db128ff2046a7a36eb5d70b35d10947f83a931..fd7d88ed631d4b4675ce457f4e2de731
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -1006,11 +1008,17 @@ public class PurpurWorldConfig {
+@@ -1007,11 +1009,17 @@ public class PurpurWorldConfig {
              set("mobs.enderman.attributes.max-health", null);
              set("mobs.enderman.attributes.max_health", oldValue);
          }
diff --git a/patches/server/0138-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0134-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 86%
rename from patches/server/0138-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/server/0134-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
index f252c2fbb..3fc172e84 100644
--- a/patches/server/0138-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
+++ b/patches/server/0134-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
@@ -7,11 +7,11 @@ Prevents Enderman from becoming aggresive towards players that are wearing a Dra
 Adds functionality to a useless item!
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 787d57f18568b8c2fd4694fc29492345dbe43564..db05006ca159a91165a7392cb57d0905e3732fe1 100644
+index 4821aec304399c64cbcff741334567a08b840c0a..b361c6b4ca17b9d466555037235a5660caa5c9bd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -271,7 +271,7 @@ public class EnderMan extends Monster implements NeutralMob {
-         // Paper end
+@@ -266,7 +266,7 @@ public class EnderMan extends Monster implements NeutralMob {
+         // Paper end - EndermanAttackPlayerEvent
          ItemStack itemstack = (ItemStack) player.getInventory().armor.get(3);
  
 -        if (itemstack.is(Blocks.CARVED_PUMPKIN.asItem())) {
@@ -20,10 +20,10 @@ index 787d57f18568b8c2fd4694fc29492345dbe43564..db05006ca159a91165a7392cb57d0905
          } else {
              Vec3 vec3d = player.getViewVector(1.0F).normalize();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fd7d88ed631d4b4675ce457f4e2de731223254aa..de246177d3fd248f0d926321b8696b1d13c507ed 100644
+index 3736b6a5be1c4eea48416c48822675e394b821f1..e3e0a5c0f241e7fe1fdd2be1bd1afe7752628b9e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -999,6 +999,8 @@ public class PurpurWorldConfig {
+@@ -1000,6 +1000,8 @@ public class PurpurWorldConfig {
      public boolean endermanTakeDamageFromWater = true;
      public boolean endermanAggroEndermites = true;
      public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
@@ -32,7 +32,7 @@ index fd7d88ed631d4b4675ce457f4e2de731223254aa..de246177d3fd248f0d926321b8696b1d
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -1019,6 +1021,8 @@ public class PurpurWorldConfig {
+@@ -1020,6 +1022,8 @@ public class PurpurWorldConfig {
          endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater);
          endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites);
          endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
diff --git a/patches/server/0139-Tick-fluids-config.patch b/patches/server/0135-Tick-fluids-config.patch
similarity index 75%
rename from patches/server/0139-Tick-fluids-config.patch
rename to patches/server/0135-Tick-fluids-config.patch
index 431b1e927..4a067efd0 100644
--- a/patches/server/0139-Tick-fluids-config.patch
+++ b/patches/server/0135-Tick-fluids-config.patch
@@ -5,38 +5,38 @@ Subject: [PATCH] Tick fluids config
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
-index 4a1830f85f47014da63e4584f411d13f0f0cd8b3..17b3dbb83fd9eb6ecdd58c1ac6446410b4bc3a51 100644
+index 84623c632d8c2f0fa7ec939c711316d757117d23..1851035b9fdcc076442d0699567a3b020e6425d6 100644
 --- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
-@@ -107,7 +107,7 @@ public class LiquidBlock extends Block implements BucketPickup {
+@@ -137,7 +137,7 @@ public class LiquidBlock extends Block implements BucketPickup {
  
      @Override
-     public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
+     protected void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
 -        if (this.shouldSpreadLiquid(world, pos, state)) {
 +        if (world.purpurConfig.tickFluids && this.shouldSpreadLiquid(world, pos, state)) { // Purpur
-             world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper
+             world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper - Configurable speed for water flowing over lava
          }
  
-@@ -135,7 +135,7 @@ public class LiquidBlock extends Block implements BucketPickup {
+@@ -165,7 +165,7 @@ public class LiquidBlock extends Block implements BucketPickup {
  
      @Override
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
+     protected BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
 -        if (state.getFluidState().isSource() || neighborState.getFluidState().isSource()) {
 +        if (world.getMinecraftWorld().purpurConfig.tickFluids && state.getFluidState().isSource() || neighborState.getFluidState().isSource()) { // Purpur
              world.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(world));
          }
  
-@@ -144,7 +144,7 @@ public class LiquidBlock extends Block implements BucketPickup {
+@@ -174,7 +174,7 @@ public class LiquidBlock extends Block implements BucketPickup {
  
      @Override
-     public void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
+     protected void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
 -        if (this.shouldSpreadLiquid(world, pos, state)) {
 +        if (world.purpurConfig.tickFluids && this.shouldSpreadLiquid(world, pos, state)) { // Purpur
-             world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper
+             world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper - Configurable speed for water flowing over lava
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index de246177d3fd248f0d926321b8696b1d13c507ed..1e3825e70f7e9baeb76d520d945d51369457377f 100644
+index e3e0a5c0f241e7fe1fdd2be1bd1afe7752628b9e..6756564f9b03bc822485b4199bf46c50069eea65 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -129,6 +129,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0140-Config-to-disable-Llama-caravans.patch b/patches/server/0136-Config-to-disable-Llama-caravans.patch
similarity index 85%
rename from patches/server/0140-Config-to-disable-Llama-caravans.patch
rename to patches/server/0136-Config-to-disable-Llama-caravans.patch
index 8b967f7ff..3600b1e45 100644
--- a/patches/server/0140-Config-to-disable-Llama-caravans.patch
+++ b/patches/server/0136-Config-to-disable-Llama-caravans.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Config to disable Llama caravans
 Disables the mechanic where llamas follow leashed llamas.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
-index 849f0c7c6d13df00d90211a48d8b56ab156812b8..3fc9528201fb96d6a0f905afe0b6a82ec88a7235 100644
+index eb0faf58fa1a408f294fc62120b140def97f998d..0f4f546cd0eda4bd82b47446ae23ac32da8a9556 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/LlamaFollowCaravanGoal.java
 @@ -22,7 +22,7 @@ public class LlamaFollowCaravanGoal extends Goal {
@@ -16,13 +16,13 @@ index 849f0c7c6d13df00d90211a48d8b56ab156812b8..3fc9528201fb96d6a0f905afe0b6a82e
 -        if (!this.llama.shouldJoinCaravan) return false; // Purpur
 +        if (!this.llama.level().purpurConfig.llamaJoinCaravans || !this.llama.shouldJoinCaravan) return false; // Purpur
          if (!this.llama.isLeashed() && !this.llama.inCaravan()) {
-             List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0D, 4.0D, 9.0D), (entity) -> {
+             List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity -> {
                  EntityType<?> entityType = entity.getType();
 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 d0717a81ae7b3c55fb47917508b456408484658b..fb6bca763fcbb249c86c1e360274d4458df19bfc 100644
+index 87ec5bd632353ce364de29c5d56460551b6a4139..12ff4091674f7efb3e324df0df2d798dcbc46027 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -519,7 +519,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -481,7 +481,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
  
      public void joinCaravan(Llama llama) {
@@ -32,10 +32,10 @@ index d0717a81ae7b3c55fb47917508b456408484658b..fb6bca763fcbb249c86c1e360274d445
          this.caravanHead.caravanTail = this;
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1e3825e70f7e9baeb76d520d945d51369457377f..e4cb4cb242eb6daa8bddea6c777cc6f578ff2610 100644
+index 6756564f9b03bc822485b4199bf46c50069eea65..3045fff19b9f9c35ed1b2e14894f6b5aa8442817 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1331,6 +1331,7 @@ public class PurpurWorldConfig {
+@@ -1332,6 +1332,7 @@ public class PurpurWorldConfig {
      public double llamaMovementSpeedMax = 0.175D;
      public int llamaBreedingTicks = 6000;
      public boolean llamaTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index 1e3825e70f7e9baeb76d520d945d51369457377f..e4cb4cb242eb6daa8bddea6c777cc6f5
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1350,6 +1351,7 @@ public class PurpurWorldConfig {
+@@ -1351,6 +1352,7 @@ public class PurpurWorldConfig {
          llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
          llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
          llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater);
diff --git a/patches/server/0141-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0137-Config-to-make-Creepers-explode-on-death.patch
similarity index 84%
rename from patches/server/0141-Config-to-make-Creepers-explode-on-death.patch
rename to patches/server/0137-Config-to-make-Creepers-explode-on-death.patch
index 1a5a9896f..f5bdb4084 100644
--- a/patches/server/0141-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0137-Config-to-make-Creepers-explode-on-death.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to make Creepers explode on death
 Creepers exploded after being killed in the alpha days. This brings that back.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index e8191f0df3420d5a531cf226547a177732ff65ea..fd3b1e92a626402112bbd371a0ac1264a2c19c32 100644
+index a9523b156eb88646ef82ee857d5f68360b12a753..af6f2fd2f2f48b8057cfb0462a0e72a86a1f83e3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -63,6 +63,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -65,6 +65,7 @@ public class Creeper extends Monster implements PowerableMob {
      private int spacebarCharge = 0;
      private int prevSpacebarCharge = 0;
      private int powerToggleDelay = 0;
@@ -17,7 +17,7 @@ index e8191f0df3420d5a531cf226547a177732ff65ea..fd3b1e92a626402112bbd371a0ac1264
      // Purpur end
  
      public Creeper(EntityType<? extends Creeper> type, Level world) {
-@@ -268,6 +269,14 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -270,6 +271,14 @@ public class Creeper extends Monster implements PowerableMob {
          return this.level().purpurConfig.creeperTakeDamageFromWater;
      }
  
@@ -32,7 +32,7 @@ index e8191f0df3420d5a531cf226547a177732ff65ea..fd3b1e92a626402112bbd371a0ac1264
      @Override
      protected SoundEvent getHurtSound(DamageSource source) {
          return SoundEvents.CREEPER_HURT;
-@@ -359,6 +368,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -358,6 +367,7 @@ public class Creeper extends Monster implements PowerableMob {
      }
  
      public void explodeCreeper() {
@@ -40,7 +40,7 @@ index e8191f0df3420d5a531cf226547a177732ff65ea..fd3b1e92a626402112bbd371a0ac1264
          if (!this.level().isClientSide) {
              float f = this.isPowered() ? 2.0F : 1.0F;
  
-@@ -377,7 +387,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -376,7 +386,7 @@ public class Creeper extends Monster implements PowerableMob {
              }
              // CraftBukkit end
          }
@@ -50,10 +50,10 @@ index e8191f0df3420d5a531cf226547a177732ff65ea..fd3b1e92a626402112bbd371a0ac1264
  
      private void spawnLingeringCloud() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e4cb4cb242eb6daa8bddea6c777cc6f578ff2610..4b01a7b2584871aa17c4cb08a0e2e630630b4e6c 100644
+index 3045fff19b9f9c35ed1b2e14894f6b5aa8442817..3a730b7d187ba043fc8f3f0ca7412ec44e352fba 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -851,6 +851,7 @@ public class PurpurWorldConfig {
+@@ -852,6 +852,7 @@ public class PurpurWorldConfig {
      public boolean creeperAllowGriefing = true;
      public boolean creeperBypassMobGriefing = false;
      public boolean creeperTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index e4cb4cb242eb6daa8bddea6c777cc6f578ff2610..4b01a7b2584871aa17c4cb08a0e2e630
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -865,6 +866,7 @@ public class PurpurWorldConfig {
+@@ -866,6 +867,7 @@ public class PurpurWorldConfig {
          creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
          creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
diff --git a/patches/server/0142-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0138-Configurable-ravager-griefable-blocks-list.patch
similarity index 85%
rename from patches/server/0142-Configurable-ravager-griefable-blocks-list.patch
rename to patches/server/0138-Configurable-ravager-griefable-blocks-list.patch
index fa72e49aa..e4e120f7a 100644
--- a/patches/server/0142-Configurable-ravager-griefable-blocks-list.patch
+++ b/patches/server/0138-Configurable-ravager-griefable-blocks-list.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable ravager griefable blocks list
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 0992e3729fdfa945660affb7eb7efcff63f37210..5e717433ef29d02669ee2e95454c69c36cbafc24 100644
+index e592b5ee3a0bfce987557defed8250682373fe65..ea9714b561d2cccad3ce012a118d200100ccd1e8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -191,7 +191,7 @@ public class Ravager extends Raider {
+@@ -183,7 +183,7 @@ public class Ravager extends Raider {
                      BlockState iblockdata = this.level().getBlockState(blockposition);
                      Block block = iblockdata.getBlock();
  
@@ -18,23 +18,23 @@ index 0992e3729fdfa945660affb7eb7efcff63f37210..5e717433ef29d02669ee2e95454c69c3
                          if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.getFluidState().createLegacyBlock())) { // Paper - fix wrong block state
                              continue;
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index c7ba8503b2722e5d9ce0699b959cd6be01128055..3f429f083f45d34effc273ccaa5db4da089f7355 100644
+index 2af4c365743b2956939335512f74e0a1d84298f7..a69e7e8da81bd13578d230cc1e3f0f900817cbfd 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-@@ -172,7 +172,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
+@@ -179,7 +179,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
      @Override
-     public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
-         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper
+     protected void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
+         if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
 -        if (entity instanceof Ravager && CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), (!world.purpurConfig.ravagerBypassMobGriefing && !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)))) { // CraftBukkit // Purpur
 +        if (entity instanceof Ravager && world.purpurConfig.ravagerGriefableBlocks.contains(world.getBlockState(pos).getBlock()) && CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState(), (!world.purpurConfig.ravagerBypassMobGriefing && !world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)))) { // CraftBukkit // Purpur
              world.destroyBlock(pos, true, entity);
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4b01a7b2584871aa17c4cb08a0e2e630630b4e6c..25972a20c4930d718e4f039d4d19c35d4adb0f03 100644
+index 3a730b7d187ba043fc8f3f0ca7412ec44e352fba..9ec5bae4a4caee44d84dd77b8be6b5c4b4b05b3e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1703,6 +1703,7 @@ public class PurpurWorldConfig {
+@@ -1704,6 +1704,7 @@ public class PurpurWorldConfig {
      public double ravagerMaxHealth = 100.0D;
      public boolean ravagerBypassMobGriefing = false;
      public boolean ravagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 4b01a7b2584871aa17c4cb08a0e2e630630b4e6c..25972a20c4930d718e4f039d4d19c35d
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -1715,6 +1716,23 @@ public class PurpurWorldConfig {
+@@ -1716,6 +1717,23 @@ public class PurpurWorldConfig {
          ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
          ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing);
          ravagerTakeDamageFromWater = getBoolean("mobs.ravager.takes-damage-from-water", ravagerTakeDamageFromWater);
diff --git a/patches/server/0143-Sneak-to-bulk-process-composter.patch b/patches/server/0139-Sneak-to-bulk-process-composter.patch
similarity index 59%
rename from patches/server/0143-Sneak-to-bulk-process-composter.patch
rename to patches/server/0139-Sneak-to-bulk-process-composter.patch
index 8a7577076..3260a1417 100644
--- a/patches/server/0143-Sneak-to-bulk-process-composter.patch
+++ b/patches/server/0139-Sneak-to-bulk-process-composter.patch
@@ -5,95 +5,92 @@ Subject: [PATCH] Sneak to bulk process composter
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index b2c2bd5ec0afd479973f7237a5c610f21231c505..f65eb045e518cdba91ace4483e385805b0e1171f 100644
+index 5cedce1f432f6b809b25269242a16477682c824f..61ff2f6c09251da8c34fd653020cd4d3b46a4371 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -578,7 +578,7 @@ public class ServerPlayerGameMode {
-             boolean flag1 = player.isSecondaryUseActive() && flag;
+@@ -573,7 +573,7 @@ public class ServerPlayerGameMode {
              ItemStack itemstack1 = stack.copy();
+             InteractionResult enuminteractionresult;
  
 -            if (!flag1) {
 +            if (!flag1 || (player.level().purpurConfig.composterBulkProcess && iblockdata.is(Blocks.COMPOSTER))) { // Purpur
-                 enuminteractionresult = iblockdata.use(world, player, hand, hitResult);
+                 ItemInteractionResult iteminteractionresult = iblockdata.useItemOn(player.getItemInHand(hand), world, player, hand, hitResult);
  
-                 if (enuminteractionresult.consumesAction()) {
+                 if (iteminteractionresult.consumesAction()) {
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 10d3912ef043eefdf89105332e29b0d2bf4a5539..596b77306f690a2298835f0f0fea1abee2a7c85d 100644
+index d3d12f9114173f4971f95d7ef895a4374705bd3f..f34159f8d6c51af2341bf49db0d6d6f0417919cf 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -229,20 +229,28 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
-         ItemStack itemstack = player.getItemInHand(hand);
+@@ -237,18 +237,27 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+         int i = (Integer) state.getValue(ComposterBlock.LEVEL);
  
-         if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(itemstack.getItem())) {
+         if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
 -            if (i < 7 && !world.isClientSide) {
--                BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack);
+-                BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
 -                // Paper start - handle cancelled events
 -                if (iblockdata1 == null) {
--                    return InteractionResult.PASS;
+-                    return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
 -                }
 -                // Paper end
-+            // Purpur start
-+            BlockState newState = process(i, state, world, itemstack, pos, player);
-+            if (newState == null) {
-+                return InteractionResult.PASS;
-+            }
- 
+-
 -                world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
--                player.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
--                if (!player.getAbilities().instabuild) {
--                    itemstack.shrink(1);
--                }
+-                player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
+-                stack.consume(1, player);
++            // Purpur start - sneak to bulk process composter
++            BlockState newState = process(i, player, state, world, pos, stack);
++            if (newState == null) {
++                return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
+             }
 +            if (world.purpurConfig.composterBulkProcess && player.isShiftKeyDown() && newState != state) {
 +                BlockState oldState;
 +                int oldCount, newCount, oldLevel, newLevel;
 +                do {
 +                    oldState = newState;
-+                    oldCount = itemstack.getCount();
++                    oldCount = stack.getCount();
 +                    oldLevel = oldState.getValue(ComposterBlock.LEVEL);
-+                    newState = process(oldLevel, oldState, world, itemstack, pos, player);
++                    newState = process(oldLevel, player, oldState, world, pos, stack);
 +                    if (newState == null) {
-+                        return InteractionResult.PASS;
++                        return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
 +                    }
-+                    newCount = itemstack.getCount();
++                    newCount = stack.getCount();
 +                    newLevel = newState.getValue(ComposterBlock.LEVEL);
 +                } while (newCount > 0 && (newCount != oldCount || newLevel != oldLevel || newState != oldState));
-             }
++            }
 +            // Purpur end
  
-             return InteractionResult.sidedSuccess(world.isClientSide);
-         } else if (i == 8) {
-@@ -253,6 +261,26 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+             return ItemInteractionResult.sidedSuccess(world.isClientSide);
+         } else {
+@@ -256,6 +265,25 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          }
      }
  
-+    private static BlockState process(int level, BlockState state, Level world, ItemStack itemstack, BlockPos pos, Player player) {
++    // Purpur start - sneak to bulk process composter
++    private static @Nullable BlockState process(int level, Player player, BlockState state, Level world, BlockPos pos, ItemStack stack) {
 +        if (level < 7 && !world.isClientSide) {
-+            BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, itemstack);
++            BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
 +            // Paper start - handle cancelled events
 +            if (iblockdata1 == null) {
-+                return iblockdata1;
++                return null;
 +            }
 +            // Paper end
 +
 +            world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
-+            player.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
-+            if (!player.getAbilities().instabuild) {
-+                itemstack.shrink(1);
-+            }
++            player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
++            stack.consume(1, player);
 +            return iblockdata1;
 +        }
 +        return state;
 +    }
 +    // Purpur end
 +
-     public static BlockState insertItem(Entity user, BlockState state, ServerLevel world, ItemStack stack, BlockPos pos) {
+     @Override
+     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
          int i = (Integer) state.getValue(ComposterBlock.LEVEL);
- 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 25972a20c4930d718e4f039d4d19c35d4adb0f03..f23be13aa229537dd6f9247a3008981e4ee098bc 100644
+index 9ec5bae4a4caee44d84dd77b8be6b5c4b4b05b3e..3b9973bbe7e752e906e152f9ddde5e7a1546988b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -479,6 +479,11 @@ public class PurpurWorldConfig {
+@@ -480,6 +480,11 @@ public class PurpurWorldConfig {
          chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
      }
  
diff --git a/patches/server/0144-Config-for-skipping-night.patch b/patches/server/0140-Config-for-skipping-night.patch
similarity index 87%
rename from patches/server/0144-Config-for-skipping-night.patch
rename to patches/server/0140-Config-for-skipping-night.patch
index 7e23cf748..a0874bf67 100644
--- a/patches/server/0144-Config-for-skipping-night.patch
+++ b/patches/server/0140-Config-for-skipping-night.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for skipping night
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0535faa8d95e75e3848ece4d756428a50b6c19f3..02bd86d25223e0c53d0515f91d0b7677011e9f24 100644
+index aef5157d183b69903fd215a5ce30c0705ba8fa3e..bcdef2c9bb116409445a4ef65c5e407c1003a55d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -833,7 +833,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -846,7 +846,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
          long j;
  
@@ -18,7 +18,7 @@ index 0535faa8d95e75e3848ece4d756428a50b6c19f3..02bd86d25223e0c53d0515f91d0b7677
              j = this.levelData.getDayTime() + 24000L;
              TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f23be13aa229537dd6f9247a3008981e4ee098bc..4cc6a3bdcb5eabfe2ee441ec41bd2cfdfacf0000 100644
+index 3b9973bbe7e752e906e152f9ddde5e7a1546988b..94f0eea598ee9908dd58efd7f4d5f6841bc9a003 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -356,6 +356,7 @@ public class PurpurWorldConfig {
@@ -36,4 +36,4 @@ index f23be13aa229537dd6f9247a3008981e4ee098bc..4cc6a3bdcb5eabfe2ee441ec41bd2cfd
 +        playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0145-Add-config-for-villager-trading.patch b/patches/server/0141-Add-config-for-villager-trading.patch
similarity index 86%
rename from patches/server/0145-Add-config-for-villager-trading.patch
rename to patches/server/0141-Add-config-for-villager-trading.patch
index 2edc663a1..2a72a25f9 100644
--- a/patches/server/0145-Add-config-for-villager-trading.patch
+++ b/patches/server/0141-Add-config-for-villager-trading.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for villager trading
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 2215bd386a617996095f24192f05825d0201b2ec..c7047bacce4851956e3732f0a73be423cc46ee54 100644
+index c9cfbc8817fe62e22cb165f856ed8569668c0a60..a7c85c9efd13145cc061a3a0076b44a7af9812b9 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -372,7 +372,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -371,7 +371,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                      return tryRide(player, hand, InteractionResult.sidedSuccess(this.level().isClientSide)); // Purpur
                  } else {
                      if (level().purpurConfig.villagerRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur
@@ -18,10 +18,10 @@ index 2215bd386a617996095f24192f05825d0201b2ec..c7047bacce4851956e3732f0a73be423
                      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 502ff11b909537f98339d3bef49f324e69d2f0fe..bb18a29281df797e05d828caed0a604329209cba 100644
+index c192f4cc5fd9cb0cf40083c4297f649ab909649d..0d11200ab580cc306602c29c61f7619565d8261d 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -153,7 +153,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -154,7 +154,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                  return tryRide(player, hand, InteractionResult.sidedSuccess(this.level().isClientSide)); // Purpur
              } else {
                  if (level().purpurConfig.wanderingTraderRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur
@@ -31,10 +31,10 @@ index 502ff11b909537f98339d3bef49f324e69d2f0fe..bb18a29281df797e05d828caed0a6043
                      this.openTradingScreen(player, this.getDisplayName(), 1);
                  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4cc6a3bdcb5eabfe2ee441ec41bd2cfdfacf0000..0eb757ba6523e23271a08ec8af66fd6fb581ce27 100644
+index 94f0eea598ee9908dd58efd7f4d5f6841bc9a003..9ad20a137f6cf35776e0e9cafe03c0dd475501b0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2123,6 +2123,7 @@ public class PurpurWorldConfig {
+@@ -2124,6 +2124,7 @@ public class PurpurWorldConfig {
      public boolean villagerClericFarmersThrowWarts = true;
      public boolean villagerBypassMobGriefing = false;
      public boolean villagerTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 4cc6a3bdcb5eabfe2ee441ec41bd2cfdfacf0000..0eb757ba6523e23271a08ec8af66fd6f
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2141,6 +2142,7 @@ public class PurpurWorldConfig {
+@@ -2142,6 +2143,7 @@ public class PurpurWorldConfig {
          villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
          villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
@@ -50,7 +50,7 @@ index 4cc6a3bdcb5eabfe2ee441ec41bd2cfdfacf0000..0eb757ba6523e23271a08ec8af66fd6f
      }
  
      public boolean vindicatorRidable = false;
-@@ -2170,6 +2172,7 @@ public class PurpurWorldConfig {
+@@ -2171,6 +2173,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderFollowEmeraldBlock = false;
      public boolean wanderingTraderCanBeLeashed = false;
      public boolean wanderingTraderTakeDamageFromWater = false;
@@ -58,7 +58,7 @@ index 4cc6a3bdcb5eabfe2ee441ec41bd2cfdfacf0000..0eb757ba6523e23271a08ec8af66fd6f
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -2183,6 +2186,7 @@ public class PurpurWorldConfig {
+@@ -2184,6 +2187,7 @@ public class PurpurWorldConfig {
          wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
          wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);
diff --git a/patches/server/0142-Allow-infinity-on-crossbows.patch b/patches/server/0142-Allow-infinity-on-crossbows.patch
new file mode 100644
index 000000000..5f50b3a98
--- /dev/null
+++ b/patches/server/0142-Allow-infinity-on-crossbows.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Kerllenevich <ben@omega24.dev>
+Date: Thu, 18 Mar 2021 12:25:29 -0400
+Subject: [PATCH] Allow infinity on crossbows
+
+
+diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
+index 1f52feb5684ee1bab710e1557cf69b43b4d4dfd4..d2bb5c84e1895f28afed03d1868a79338e4f3e58 100644
+--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
++++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
+@@ -107,7 +107,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
+         return CrossbowItem.tryLoadProjectiles(shooter, crossbow, true);
+     }
+     private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow, boolean consume) {
+-        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, consume);
++        List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, (org.purpurmc.purpur.PurpurConfig.allowCrossbowInfinity && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY, crossbow) > 0) || consume);
+         // Paper end - Add EntityLoadCrossbowEvent
+         if (!list.isEmpty()) {
+             crossbow.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index 0587b0c7f34ae90f0d06f29d58fafbcf5b80ff13..c60d0d1861fd24b74bfa93228357f27d524f4ce7 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -284,6 +284,7 @@ public class PurpurConfig {
+     }
+ 
+     public static boolean allowInfinityMending = false;
++    public static boolean allowCrossbowInfinity = true;
+     private static void enchantmentSettings() {
+         if (version < 5) {
+             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
+@@ -291,6 +292,7 @@ public class PurpurConfig {
+             set("settings.enchantment.allow-infinite-and-mending-together", null);
+         }
+         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
++        allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
+     }
+ 
+     public static boolean endermanShortHeight = false;
diff --git a/patches/server/0147-Drowning-Settings.patch b/patches/server/0143-Drowning-Settings.patch
similarity index 85%
rename from patches/server/0147-Drowning-Settings.patch
rename to patches/server/0143-Drowning-Settings.patch
index 97f2a4fb9..76bd7109d 100644
--- a/patches/server/0147-Drowning-Settings.patch
+++ b/patches/server/0143-Drowning-Settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c5b89e797f614bf388c7ec2ae3e6751180425ba2..9204b119a038868e63a345f2a8cd175cba96b090 100644
+index 1ec1f023d7eee5714c94dbb6c842444f70603f40..5f19cc285efac25b56a29242b41c2823020f170e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3333,7 +3333,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3452,7 +3452,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public int getMaxAirSupply() {
@@ -18,10 +18,10 @@ index c5b89e797f614bf388c7ec2ae3e6751180425ba2..9204b119a038868e63a345f2a8cd175c
  
      public int getAirSupply() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b13757a20b04634c26d741e27df75be28089dc37..6f6f6610c27c738db440d7be747f0be2296f2815 100644
+index 523052af43aa86982d2ded0cc0882d34bac24da7..aca2bd27da4d5bc754d7e98e45eb468170d17408 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -439,7 +439,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -452,7 +452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
                  if (flag1) {
                      this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
@@ -30,7 +30,7 @@ index b13757a20b04634c26d741e27df75be28089dc37..6f6f6610c27c738db440d7be747f0be2
                          this.setAirSupply(0);
                          Vec3 vec3d = this.getDeltaMovement();
  
-@@ -451,7 +451,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -464,7 +464,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                              this.level().addParticle(ParticleTypes.BUBBLE, this.getX() + d2, this.getY() + d3, this.getZ() + d4, vec3d.x, vec3d.y, vec3d.z);
                          }
  
@@ -40,7 +40,7 @@ index b13757a20b04634c26d741e27df75be28089dc37..6f6f6610c27c738db440d7be747f0be2
                  }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0eb757ba6523e23271a08ec8af66fd6fb581ce27..50dbb896e7bfcb009d0a1819f8b994cff668a06d 100644
+index 9ad20a137f6cf35776e0e9cafe03c0dd475501b0..76e26e67ba5bc56af28aae17ccd1da9b609e4947 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -164,6 +164,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0148-Break-individual-slabs-when-sneaking.patch b/patches/server/0144-Break-individual-slabs-when-sneaking.patch
similarity index 84%
rename from patches/server/0148-Break-individual-slabs-when-sneaking.patch
rename to patches/server/0144-Break-individual-slabs-when-sneaking.patch
index d7208c51b..c62491c48 100644
--- a/patches/server/0148-Break-individual-slabs-when-sneaking.patch
+++ b/patches/server/0144-Break-individual-slabs-when-sneaking.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Break individual slabs when sneaking
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index f65eb045e518cdba91ace4483e385805b0e1171f..2c9deba9da45feb81ed5801c33aa64e38f8d6a79 100644
+index 61ff2f6c09251da8c34fd653020cd4d3b46a4371..a810eaa7dc319f5ea69b239190ae91838bfad4ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -398,6 +398,7 @@ public class ServerPlayerGameMode {
-                 } else {capturedBlockEntity = true;} // Paper end
+@@ -400,6 +400,7 @@ public class ServerPlayerGameMode {
+                 } else {capturedBlockEntity = true;} // Paper - Send block entities after destroy prediction
                  return false;
              }
 +            if (this.player.level().purpurConfig.slabHalfBreak && this.player.isShiftKeyDown() && iblockdata.getBlock() instanceof net.minecraft.world.level.block.SlabBlock && ((net.minecraft.world.level.block.SlabBlock) iblockdata.getBlock()).halfBreak(iblockdata, pos, this.player)) return true; // Purpur
@@ -17,10 +17,10 @@ index f65eb045e518cdba91ace4483e385805b0e1171f..2c9deba9da45feb81ed5801c33aa64e3
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/world/level/block/SlabBlock.java b/src/main/java/net/minecraft/world/level/block/SlabBlock.java
-index ea8c78af35b0ddc0d08adfccfc78770b867e5df6..88cfa41f90d4ad395b96fd0b69ac0bdefe06ed2d 100644
+index fa29eb15934b3dad171d27c21d99b2451cfe553b..ba4aa69425d796d306791ea193f9c6b21a065f0b 100644
 --- a/src/main/java/net/minecraft/world/level/block/SlabBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SlabBlock.java
-@@ -131,4 +131,25 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
+@@ -138,4 +138,25 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
                  return false;
          }
      }
@@ -47,10 +47,10 @@ index ea8c78af35b0ddc0d08adfccfc78770b867e5df6..88cfa41f90d4ad395b96fd0b69ac0bde
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 50dbb896e7bfcb009d0a1819f8b994cff668a06d..1c9cba09dc987651f8533b0324578472ca2d5b02 100644
+index 76e26e67ba5bc56af28aae17ccd1da9b609e4947..c84cd3ebe3b95505a832e612c993e106d4cc1067 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -600,6 +600,11 @@ public class PurpurWorldConfig {
+@@ -601,6 +601,11 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0149-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0145-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 87%
rename from patches/server/0149-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/server/0145-Config-to-disable-hostile-mob-spawn-on-ice.patch
index 5ca467a70..16d1fd82b 100644
--- a/patches/server/0149-Config-to-disable-hostile-mob-spawn-on-ice.patch
+++ b/patches/server/0145-Config-to-disable-hostile-mob-spawn-on-ice.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to disable hostile mob spawn on ice
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
-index e4218acaaf7d3aef0fb31f5597fb1af32aa2c8b5..01977550309451cda795583ba4122143b140b9b7 100644
+index 759839e912c54598b257ad738481364940f88a18..e60e6b3e5ae5a468cfe649ed2222412f3bc8b268 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
-@@ -89,6 +89,14 @@ public abstract class Monster extends PathfinderMob implements Enemy {
+@@ -88,6 +88,14 @@ public abstract class Monster extends PathfinderMob implements Enemy {
      }
  
      public static boolean isDarkEnoughToSpawn(ServerLevelAccessor world, BlockPos pos, RandomSource random) {
@@ -24,10 +24,10 @@ index e4218acaaf7d3aef0fb31f5597fb1af32aa2c8b5..01977550309451cda795583ba4122143
              return false;
          } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1c9cba09dc987651f8533b0324578472ca2d5b02..cf044d358a2f1fe4bdb9240502ab889dd7156cb2 100644
+index c84cd3ebe3b95505a832e612c993e106d4cc1067..afac6d1da8604a2d6c6b015227db77617914867e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -565,6 +565,13 @@ public class PurpurWorldConfig {
+@@ -566,6 +566,13 @@ public class PurpurWorldConfig {
          furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
      }
  
diff --git a/patches/server/0146-Allow-infinity-on-crossbows.patch b/patches/server/0146-Allow-infinity-on-crossbows.patch
deleted file mode 100644
index d41d1c95a..000000000
--- a/patches/server/0146-Allow-infinity-on-crossbows.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Kerllenevich <ben@omega24.dev>
-Date: Thu, 18 Mar 2021 12:25:29 -0400
-Subject: [PATCH] Allow infinity on crossbows
-
-
-diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index eede02c3f125d230af537bb67bebed9b88f7d1b4..1ae5e17b95d994d69b060fc06c0a807c40a90f17 100644
---- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
-+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-@@ -114,7 +114,7 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
-         // Paper end
-         int i = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MULTISHOT, crossbow);
-         int j = i == 0 ? 1 : 3;
--        boolean flag = !consume || shooter instanceof Player && ((Player) shooter).getAbilities().instabuild; // Paper - add consume
-+        boolean flag = !consume || shooter instanceof Player && ((Player) shooter).getAbilities().instabuild || (org.purpurmc.purpur.PurpurConfig.allowCrossbowInfinity && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, crossbow) > 0); // Paper - add consume // Purpur
-         ItemStack itemstack1 = shooter.getProjectile(crossbow);
-         ItemStack itemstack2 = itemstack1.copy();
- 
-@@ -300,7 +300,7 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
- 
-         for (int i = 0; i < list.size(); ++i) {
-             ItemStack itemstack1 = (ItemStack) list.get(i);
--            boolean flag = entity instanceof Player && ((Player) entity).getAbilities().instabuild;
-+            boolean flag = entity instanceof Player && ((Player) entity).getAbilities().instabuild || (org.purpurmc.purpur.PurpurConfig.allowCrossbowInfinity && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.INFINITY_ARROWS, stack) > 0); // Purpur
- 
-             if (!itemstack1.isEmpty()) {
-                 if (i == 0) {
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java b/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-index 2c4ce164ab3011f372ff1719c8d4a3331d8db55f..27512787b37381a5236b1b473e9ce3f06df8e2d0 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/ArrowInfiniteEnchantment.java
-@@ -7,6 +7,14 @@ public class ArrowInfiniteEnchantment extends Enchantment {
-         super(weight, EnchantmentCategory.BOW, slotTypes);
-     }
- 
-+    // Purpur start
-+    @Override
-+    public boolean canEnchant(net.minecraft.world.item.ItemStack stack) {
-+        // we have to cheat the system because this class is loaded before purpur's config is loaded
-+        return (org.purpurmc.purpur.PurpurConfig.allowCrossbowInfinity ? EnchantmentCategory.BOW_AND_CROSSBOW : EnchantmentCategory.BOW).canEnchant(stack.getItem());
-+    }
-+    // Purpur end
-+
-     @Override
-     public int getMinCost(int level) {
-         return 20;
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
-index 246516e67db0b8b197b287c067d5a0163d8bde22..859435f747ceef860cb4e9e825a7353ea3b90798 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
-@@ -121,6 +121,14 @@ public enum EnchantmentCategory {
-         public boolean canEnchant(Item item) {
-             return item instanceof Vanishable || Block.byItem(item) instanceof Vanishable || BREAKABLE.canEnchant(item);
-         }
-+    // Purpur start
-+    },
-+    BOW_AND_CROSSBOW {
-+        @Override
-+        public boolean canEnchant(Item item) {
-+            return item instanceof BowItem || item instanceof CrossbowItem;
-+        }
-+    // Purpur end
-     };
- 
-     public abstract boolean canEnchant(Item item);
-diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-index 3d0ce0803e1da8a2681a3cb41096ac942ece54a1..bcd075a771c7f43c6d1549aeec2ccb20ee168b57 100644
---- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
-@@ -59,6 +59,7 @@ public class CraftEnchantment extends Enchantment {
-             return EnchantmentTarget.CROSSBOW;
-         case VANISHABLE:
-             return EnchantmentTarget.VANISHABLE;
-+        case BOW_AND_CROSSBOW: return EnchantmentTarget.BOW_AND_CROSSBOW; // Purpur
-         default:
-             return null;
-         }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ea9d99990b718beaef4bee3ff75340656f3c76c5..55963ed03a2e552636035b498cf7441bd4c3ee59 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -284,6 +284,7 @@ public class PurpurConfig {
-     }
- 
-     public static boolean allowInfinityMending = false;
-+    public static boolean allowCrossbowInfinity = false;
-     private static void enchantmentSettings() {
-         if (version < 5) {
-             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -291,6 +292,7 @@ public class PurpurConfig {
-             set("settings.enchantment.allow-infinite-and-mending-together", null);
-         }
-         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
-+        allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
-     }
- 
-     public static boolean endermanShortHeight = false;
diff --git a/patches/server/0150-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0146-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 87%
rename from patches/server/0150-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/server/0146-Config-to-show-Armor-Stand-arms-on-spawn.patch
index 2f0e537c3..6908249a2 100644
--- a/patches/server/0150-Config-to-show-Armor-Stand-arms-on-spawn.patch
+++ b/patches/server/0146-Config-to-show-Armor-Stand-arms-on-spawn.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index ba2fe129aaf25c54b624f282f8994c6a884abad8..2f64267d780fdbba1248398094bed39ed619740c 100644
+index 89f600edda9a1c5d1b132355fefb7eaed77c52f5..6697cd8a632becd72ee132007a61d1221e817abf 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -114,6 +114,7 @@ public class ArmorStand extends LivingEntity {
+@@ -117,6 +117,7 @@ public class ArmorStand extends LivingEntity {
+         this.rightArmPose = ArmorStand.DEFAULT_RIGHT_ARM_POSE;
          this.leftLegPose = ArmorStand.DEFAULT_LEFT_LEG_POSE;
          this.rightLegPose = ArmorStand.DEFAULT_RIGHT_LEG_POSE;
-         this.setMaxUpStep(0.0F);
 +        this.setShowArms(world != null && world.purpurConfig.armorstandPlaceWithArms); // Purpur
      }
  
      public ArmorStand(Level world, double x, double y, double z) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cf044d358a2f1fe4bdb9240502ab889dd7156cb2..be0d58ead54c70b5aa94732a90e15a49fe28f6a6 100644
+index afac6d1da8604a2d6c6b015227db77617914867e..4c9479029b659baa53377fde1dd7117d5e1bfc15 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -102,6 +102,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0151-Option-to-make-doors-require-redstone.patch b/patches/server/0147-Option-to-make-doors-require-redstone.patch
similarity index 88%
rename from patches/server/0151-Option-to-make-doors-require-redstone.patch
rename to patches/server/0147-Option-to-make-doors-require-redstone.patch
index e063760b9..739f0b0e7 100644
--- a/patches/server/0151-Option-to-make-doors-require-redstone.patch
+++ b/patches/server/0147-Option-to-make-doors-require-redstone.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to make doors require redstone
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
-index 42ae4d293a420f0b8eb476df6389b2e7a693895f..97c20c5b89e6d7e4ed844eff39ee55dfa8988d37 100644
+index 736f46d552d558bf0edd9a86601b5fbb6940815b..cf039181dfe0ddb3ccda44064a5d8a2f6c5c432c 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
 @@ -57,7 +57,7 @@ public class InteractWithDoor {
@@ -36,18 +36,18 @@ index 42ae4d293a420f0b8eb476df6389b2e7a693895f..97c20c5b89e6d7e4ed844eff39ee55df
                      } else {
                          DoorBlock blockdoor = (DoorBlock) iblockdata.getBlock();
 diff --git a/src/main/java/net/minecraft/world/level/block/DoorBlock.java b/src/main/java/net/minecraft/world/level/block/DoorBlock.java
-index c028a7158e41a0754abb8e24dcd647633fbf3fe8..cd65d32f4af016d4937e598c71386a3072f4c490 100644
+index 42d43b7a7e3b7c53cc80b8706c130e660f2c72da..96199441202ad929ad0274574704635c538a93c7 100644
 --- a/src/main/java/net/minecraft/world/level/block/DoorBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DoorBlock.java
-@@ -167,6 +167,7 @@ public class DoorBlock extends Block {
-     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
+@@ -198,6 +198,7 @@ public class DoorBlock extends Block {
+     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
          if (!this.type.canOpenByHand()) {
              return InteractionResult.PASS;
 +        } else if (requiresRedstone(world, state, pos)) { return InteractionResult.CONSUME; // Purpur
          } else {
              state = (BlockState) state.cycle(DoorBlock.OPEN);
              world.setBlock(pos, state, 10);
-@@ -270,4 +271,18 @@ public class DoorBlock extends Block {
+@@ -299,4 +300,18 @@ public class DoorBlock extends Block {
          flag = false;
          return flag;
      }
@@ -67,10 +67,10 @@ index c028a7158e41a0754abb8e24dcd647633fbf3fe8..cd65d32f4af016d4937e598c71386a30
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index be0d58ead54c70b5aa94732a90e15a49fe28f6a6..13d2d69181ceb9c211e675c58930649bd67005ed 100644
+index 4c9479029b659baa53377fde1dd7117d5e1bfc15..3464f0c8d019c4675c2df7c83e0a77cb3eec16e0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -504,6 +504,16 @@ public class PurpurWorldConfig {
+@@ -505,6 +505,16 @@ public class PurpurWorldConfig {
          dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
      }
  
diff --git a/patches/server/0152-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0148-Config-to-allow-for-unsafe-enchants.patch
similarity index 60%
rename from patches/server/0152-Config-to-allow-for-unsafe-enchants.patch
rename to patches/server/0148-Config-to-allow-for-unsafe-enchants.patch
index eccba460e..7e350835a 100644
--- a/patches/server/0152-Config-to-allow-for-unsafe-enchants.patch
+++ b/patches/server/0148-Config-to-allow-for-unsafe-enchants.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to allow for unsafe enchants
 
 
 diff --git a/src/main/java/net/minecraft/server/commands/EnchantCommand.java b/src/main/java/net/minecraft/server/commands/EnchantCommand.java
-index 664cbce2e06fcb95d3d3d6c5302fc9119f938925..bc9778c705d23acd84fa1cdeff6b403b4cda3686 100644
+index 84f1ba6275f04624f46ccd772924b5e075e7b205..bfb455fb74f0a9645212f90acb54f68d1c7d9772 100644
 --- a/src/main/java/net/minecraft/server/commands/EnchantCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/EnchantCommand.java
-@@ -48,7 +48,7 @@ public class EnchantCommand {
+@@ -70,7 +70,7 @@ public class EnchantCommand {
  
      private static int enchant(CommandSourceStack source, Collection<? extends Entity> targets, Holder<Enchantment> enchantment, int level) throws CommandSyntaxException {
          Enchantment enchantment2 = enchantment.value();
@@ -17,55 +17,55 @@ index 664cbce2e06fcb95d3d3d6c5302fc9119f938925..bc9778c705d23acd84fa1cdeff6b403b
              throw ERROR_LEVEL_TOO_HIGH.create(level, enchantment2.getMaxLevel());
          } else {
              int i = 0;
-@@ -58,7 +58,7 @@ public class EnchantCommand {
-                     LivingEntity livingEntity = (LivingEntity)entity;
+@@ -81,7 +81,7 @@ public class EnchantCommand {
                      ItemStack itemStack = livingEntity.getMainHandItem();
                      if (!itemStack.isEmpty()) {
--                        if (enchantment2.canEnchant(itemStack) && EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantments(itemStack).keySet(), enchantment2)) {
-+                        if ((enchantment2.canEnchant(itemStack) && EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantments(itemStack).keySet(), enchantment2)) || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchantCommand && !itemStack.hasEnchantment(enchantment2))) { // Purpur
+                         if (enchantment2.canEnchant(itemStack)
+-                            && EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantmentsForCrafting(itemStack).keySet(), enchantment2)) {
++                            && EnchantmentHelper.isEnchantmentCompatible(EnchantmentHelper.getEnchantmentsForCrafting(itemStack).keySet(), enchantment2) || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchantCommand && !itemStack.hasEnchantment(enchantment2))) { // Purpur
                              itemStack.enchant(enchantment2, level);
-                             ++i;
+                             i++;
                          } else if (targets.size() == 1) {
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index 8a7c30e316db4960b0b62ca0e366c19febead214..fdf2bf10a533c3d4ee145880e6949dadf6ce5410 100644
+index 5cadd69bcae33b1de58806fcf40533850d976154..17067510990f575bf638f6a95ed0d964f6e94dc5 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 @@ -228,7 +228,8 @@ public class AnvilMenu extends ItemCombinerMenu {
-                             int i2 = (Integer) map1.get(enchantment);
+                         int i2 = entry.getIntValue();
  
-                             i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
--                            boolean flag3 = canDoUnsafeEnchants || enchantment.canEnchant(itemstack); // Purpur
-+                            boolean flag3 = canDoUnsafeEnchants || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants && org.purpurmc.purpur.PurpurConfig.allowInapplicableEnchants) || enchantment.canEnchant(itemstack); // Purpur
-+                            boolean flag4 = true; // Purpur
+                         i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
+-                        boolean flag3 = enchantment.canEnchant(itemstack);
++                        boolean flag3 = canDoUnsafeEnchants || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants && org.purpurmc.purpur.PurpurConfig.allowInapplicableEnchants) || enchantment.canEnchant(itemstack); // Purpur
++                        boolean flag4 = true; // Purpur
  
-                             if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) {
-                                 flag3 = true;
+                         if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) {
+                             flag3 = true;
 @@ -240,16 +241,20 @@ public class AnvilMenu extends ItemCombinerMenu {
-                                 Enchantment enchantment1 = (Enchantment) iterator1.next();
+                             Holder<Enchantment> holder1 = (Holder) iterator1.next();
  
-                                 if (enchantment1 != enchantment && !enchantment.isCompatibleWith(enchantment1)) {
--                                    flag3 = canDoUnsafeEnchants; // Purpur
-+                                    flag4 = canDoUnsafeEnchants || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants && org.purpurmc.purpur.PurpurConfig.allowIncompatibleEnchants); // Purpur flag3 -> flag4
+                             if (!holder1.equals(holder) && !enchantment.isCompatibleWith((Enchantment) holder1.value())) {
+-                                flag3 = canDoUnsafeEnchants; // Purpur
++                                flag4 = canDoUnsafeEnchants || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants && org.purpurmc.purpur.PurpurConfig.allowIncompatibleEnchants); // Purpur flag3 -> flag4
 +                                    if (!flag4 && org.purpurmc.purpur.PurpurConfig.replaceIncompatibleEnchants) {
 +                                        iterator1.remove();
 +                                        flag4 = true;
 +                                    }
-                                     ++i;
-                                 }
+                                 ++i;
+                             }
+                         }
+ 
+-                        if (!flag3) {
++                        if (!flag3 || !flag4) { // Purpur
+                             flag2 = true;
+                         } else {
+                             flag1 = true;
+-                            if (i2 > enchantment.getMaxLevel()) {
++                            if ((!org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants || !org.purpurmc.purpur.PurpurConfig.allowHigherEnchantsLevels) && i2 > enchantment.getMaxLevel()) { // Purpur
+                                 i2 = enchantment.getMaxLevel();
                              }
  
--                            if (!flag3) {
-+                            if (!flag3 || !flag4) { // Purpur
-                                 flag2 = true;
-                             } else {
-                                 flag1 = true;
--                                if (i2 > enchantment.getMaxLevel()) {
-+                                if ((!org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants || !org.purpurmc.purpur.PurpurConfig.allowHigherEnchantsLevels) && i2 > enchantment.getMaxLevel()) { // Purpur
-                                     i2 = enchantment.getMaxLevel();
-                                 }
- 
-@@ -389,7 +394,7 @@ public class AnvilMenu extends ItemCombinerMenu {
-             sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
+@@ -374,7 +379,7 @@ public class AnvilMenu extends ItemCombinerMenu {
+             this.sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
              this.broadcastChanges();
              // Purpur start
 -            if (canDoUnsafeEnchants && itemstack1 != ItemStack.EMPTY) {
@@ -74,30 +74,34 @@ index 8a7c30e316db4960b0b62ca0e366c19febead214..fdf2bf10a533c3d4ee145880e6949dad
                  ((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get()));
              }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 6e6f60554b36117a833949ef2f9a4b68f6518a1d..048151dd863692b41721c063d9a287f11cb2a0df 100644
+index 4e5315c93e99dd3c1c27f48cdec9bd5a2cc70ec5..1b829ad61a25ef1e18adefe291d91fdb7401956d 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1213,6 +1213,12 @@ public final class ItemStack {
-         return this.tag != null && this.tag.contains("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false;
+@@ -1226,6 +1226,16 @@ public final class ItemStack implements DataComponentHolder {
+         return !((ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)).isEmpty();
      }
  
 +    // Purpur start
 +    public boolean hasEnchantment(Enchantment enchantment) {
-+        return isEnchanted() && EnchantmentHelper.deserializeEnchantments(getEnchantmentTags()).containsKey(enchantment);
++        if (isEnchanted()) {
++            ItemEnchantments enchantments = this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY);
++            return new net.minecraft.advancements.critereon.EnchantmentPredicate(enchantment, net.minecraft.advancements.critereon.MinMaxBounds.Ints.atLeast(1)).containedIn(enchantments);
++        }
++        return false;
 +    }
 +    // Purpur end
 +
-     public void addTagElement(String key, Tag element) {
-         this.getOrCreateTag().put(key, element);
+     public ItemEnchantments getEnchantments() {
+         return (ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY);
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 55963ed03a2e552636035b498cf7441bd4c3ee59..5697ce5ead8dc7e463206a56d489c99c861a9bb1 100644
+index c60d0d1861fd24b74bfa93228357f27d524f4ce7..25b0eeb09f20601e8517f3dc413a72a3b05ac983 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -285,14 +285,34 @@ public class PurpurConfig {
  
      public static boolean allowInfinityMending = false;
-     public static boolean allowCrossbowInfinity = false;
+     public static boolean allowCrossbowInfinity = true;
 +    public static boolean allowUnsafeEnchants = false;
 +    public static boolean allowInapplicableEnchants = true;
 +    public static boolean allowIncompatibleEnchants = true;
diff --git a/patches/server/0153-Configurable-sponge-absorption.patch b/patches/server/0149-Configurable-sponge-absorption.patch
similarity index 80%
rename from patches/server/0153-Configurable-sponge-absorption.patch
rename to patches/server/0149-Configurable-sponge-absorption.patch
index bffe9c97b..3c506fc31 100644
--- a/patches/server/0153-Configurable-sponge-absorption.patch
+++ b/patches/server/0149-Configurable-sponge-absorption.patch
@@ -8,10 +8,10 @@ Allows the total area and radius of water blocks the sponge can absorb to be cha
 Co-authored by: granny <granny@purpurmc.org>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-index d810f6bf9a8a354e5b8994e51ec3672428277dde..e7b19fa84d9dce28dd88a3b4adcb83576dcb98a8 100644
+index 902825ec9ea05f4418b45f56a008d73f217bd178..a676ccfa6b02e8986df6f6a2e04cbb06b3edd0ff 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-@@ -51,7 +51,7 @@ public class SpongeBlock extends Block {
+@@ -58,7 +58,7 @@ public class SpongeBlock extends Block {
  
      private boolean removeWaterBreadthFirstSearch(Level world, BlockPos pos) {
          BlockStateListPopulator blockList = new BlockStateListPopulator(world); // CraftBukkit - Use BlockStateListPopulator
@@ -21,10 +21,10 @@ index d810f6bf9a8a354e5b8994e51ec3672428277dde..e7b19fa84d9dce28dd88a3b4adcb8357
              int i = aenumdirection.length;
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 13d2d69181ceb9c211e675c58930649bd67005ed..2b6817d593f1f501055d57cb08be873917823b05 100644
+index 3464f0c8d019c4675c2df7c83e0a77cb3eec16e0..d7cfb2ab82953799d0ff13fcdcb115ca2fa20450 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -629,6 +629,13 @@ public class PurpurWorldConfig {
+@@ -630,6 +630,13 @@ public class PurpurWorldConfig {
          spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
      }
  
@@ -35,6 +35,6 @@ index 13d2d69181ceb9c211e675c58930649bd67005ed..2b6817d593f1f501055d57cb08be8739
 +        spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius);
 +    }
 +
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
diff --git a/patches/server/0154-Projectile-offset-config.patch b/patches/server/0150-Projectile-offset-config.patch
similarity index 67%
rename from patches/server/0154-Projectile-offset-config.patch
rename to patches/server/0150-Projectile-offset-config.patch
index f554306cf..36dfdb434 100644
--- a/patches/server/0154-Projectile-offset-config.patch
+++ b/patches/server/0150-Projectile-offset-config.patch
@@ -5,46 +5,46 @@ Subject: [PATCH] Projectile offset config
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
-index 33df0ca406dc8321b76b393f317bbd1c8ebe6366..220513d3fd5645322886522ea4f6b8c55d043b3c 100644
+index 4ae6b98b6a0d41e949b055f0678200a672a1df38..ff39d3614f360918d74b54b817bc227f89d34c9c 100644
 --- a/src/main/java/net/minecraft/world/item/BowItem.java
 +++ b/src/main/java/net/minecraft/world/item/BowItem.java
-@@ -44,7 +44,7 @@ public class BowItem extends ProjectileWeaponItem implements Vanishable {
-                         ArrowItem itemarrow = (ArrowItem) (itemstack1.getItem() instanceof ArrowItem ? itemstack1.getItem() : Items.ARROW);
-                         AbstractArrow entityarrow = itemarrow.createArrow(world, itemstack1, entityhuman);
+@@ -31,7 +31,7 @@ public class BowItem extends ProjectileWeaponItem {
+                 if (!((double)f < 0.1)) {
+                     List<ItemStack> list = draw(stack, itemStack, player, !((itemStack.is(Items.ARROW) && world.purpurConfig.infinityWorksWithNormalArrows) || (itemStack.is(Items.TIPPED_ARROW) && world.purpurConfig.infinityWorksWithTippedArrows) || (itemStack.is(Items.SPECTRAL_ARROW) && world.purpurConfig.infinityWorksWithSpectralArrows)));
+                     if (!world.isClientSide() && !list.isEmpty()) {
+-                        this.shoot(world, player, player.getUsedItemHand(), stack, list, f * 3.0F, 1.0F, f == 1.0F, null);
++                        this.shoot(world, player, player.getUsedItemHand(), stack, list, f * 3.0F, (float) world.purpurConfig.bowProjectileOffset, f == 1.0F, null); // Purpur
+                     }
  
--                        entityarrow.shootFromRotation(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, f * 3.0F, 1.0F);
-+                        entityarrow.shootFromRotation(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, f * 3.0F, (float) world.purpurConfig.bowProjectileOffset); // Purpur
-                         if (f == 1.0F) {
-                             entityarrow.setCritArrow(true);
-                         }
+                     world.playSound(
 diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 1ae5e17b95d994d69b060fc06c0a807c40a90f17..0a0f19f73a6a4e5aece7c17089dc4d31ed2a5299 100644
+index d2bb5c84e1895f28afed03d1868a79338e4f3e58..78f124f5204e4af9318ca3eeced6b1e3353b210f 100644
 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
 +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-@@ -64,7 +64,7 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
-         ItemStack itemstack = user.getItemInHand(hand);
- 
-         if (CrossbowItem.isCharged(itemstack)) {
--            CrossbowItem.performShooting(world, user, hand, itemstack, CrossbowItem.getShootingPower(itemstack), 1.0F);
-+            CrossbowItem.performShooting(world, user, hand, itemstack, CrossbowItem.getShootingPower(itemstack), (float) world.purpurConfig.crossbowProjectileOffset); // Purpur
-             CrossbowItem.setCharged(itemstack, false);
-             return InteractionResultHolder.consume(itemstack);
-         } else if (!user.getProjectile(itemstack).isEmpty()) {
+@@ -60,7 +60,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
+         ItemStack itemStack = user.getItemInHand(hand);
+         ChargedProjectiles chargedProjectiles = itemStack.get(DataComponents.CHARGED_PROJECTILES);
+         if (chargedProjectiles != null && !chargedProjectiles.isEmpty()) {
+-            this.performShooting(world, user, hand, itemStack, getShootingPower(chargedProjectiles), 1.0F, null);
++            this.performShooting(world, user, hand, itemStack, getShootingPower(chargedProjectiles), (float) world.purpurConfig.crossbowProjectileOffset, null); // Purpur
+             return InteractionResultHolder.consume(itemStack);
+         } else if (!user.getProjectile(itemStack).isEmpty()) {
+             this.startSoundPlayed = false;
 diff --git a/src/main/java/net/minecraft/world/item/EggItem.java b/src/main/java/net/minecraft/world/item/EggItem.java
-index 58cb992c5defec2f092755cbde661ff10f38bf9d..52f48681407d23f0925f4c9c072d5f0a2a6b1778 100644
+index 4ebd634cff286b10868e26eeb3ecf34abdcab22e..7dc811335caa46870d1d895899a1e6c21980382d 100644
 --- a/src/main/java/net/minecraft/world/item/EggItem.java
 +++ b/src/main/java/net/minecraft/world/item/EggItem.java
-@@ -24,7 +24,7 @@ public class EggItem extends Item {
+@@ -27,7 +27,7 @@ public class EggItem extends Item implements ProjectileItem {
              ThrownEgg entityegg = new ThrownEgg(world, user);
  
              entityegg.setItem(itemstack);
 -            entityegg.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
 +            entityegg.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, (float) world.purpurConfig.eggProjectileOffset); // Purpur
-             // Paper start
+             // Paper start - PlayerLaunchProjectileEvent
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityegg.getBukkitEntity());
              if (event.callEvent() && world.addFreshEntity(entityegg)) {
 diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-index 897c202c0905040072a06fdfa2032a7f9461b088..6b27d98d06b163243bb0e1bb979aad03f48d7770 100644
+index fc62754f93bd11a10c28b8b7b116e9fff70a5c7b..11b04455f09d8bfdf44499bb8359dc715c2daffd 100644
 --- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
 +++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
 @@ -24,7 +24,7 @@ public class EnderpearlItem extends Item {
@@ -53,53 +53,53 @@ index 897c202c0905040072a06fdfa2032a7f9461b088..6b27d98d06b163243bb0e1bb979aad03
              entityenderpearl.setItem(itemstack);
 -            entityenderpearl.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
 +            entityenderpearl.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, (float) world.purpurConfig.enderPearlProjectileOffset); // Purpur
-             // Paper start
-                 com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
+             // Paper start - PlayerLaunchProjectileEvent
+             com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
              if (event.callEvent() && world.addFreshEntity(entityenderpearl)) {
 diff --git a/src/main/java/net/minecraft/world/item/SnowballItem.java b/src/main/java/net/minecraft/world/item/SnowballItem.java
-index ef3f90a5bcdd7b9815a4053cff166f9d2552f55d..e7e5e1cc92f56e3daba8fa09c59188febec5e8f2 100644
+index 32b170551a2f5bdc88d29f4d03750bfe3974e71b..a41fb0dd26af367fc2470a7913a84d864bc505f7 100644
 --- a/src/main/java/net/minecraft/world/item/SnowballItem.java
 +++ b/src/main/java/net/minecraft/world/item/SnowballItem.java
-@@ -25,7 +25,7 @@ public class SnowballItem extends Item {
+@@ -28,7 +28,7 @@ public class SnowballItem extends Item implements ProjectileItem {
              Snowball entitysnowball = new Snowball(world, user);
  
              entitysnowball.setItem(itemstack);
 -            entitysnowball.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
 +            entitysnowball.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, (float) world.purpurConfig.snowballProjectileOffset); // Purpur
-             // Paper start
+             // Paper start - PlayerLaunchProjectileEvent
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitysnowball.getBukkitEntity());
              if (event.callEvent() && world.addFreshEntity(entitysnowball)) {
 diff --git a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-index de5bdceb4c8578fb972a2fd5ee0dfdae509e46dc..bcf63ccb6e679cb97d658780b2663aafa3568bcb 100644
+index 369955746f4b51f69fa01103e3771dd74fc6c8f0..e6edd3a0fa2578900cdbe8bd588219dc3fd3af5f 100644
 --- a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
 +++ b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-@@ -18,7 +18,7 @@ public class ThrowablePotionItem extends PotionItem {
+@@ -21,7 +21,7 @@ public class ThrowablePotionItem extends PotionItem implements ProjectileItem {
          if (!world.isClientSide) {
              ThrownPotion thrownPotion = new ThrownPotion(world, user);
              thrownPotion.setItem(itemStack);
 -            thrownPotion.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.5F, 1.0F);
 +            thrownPotion.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.5F, (float) world.purpurConfig.throwablePotionProjectileOffset); // Purpur
-             // Paper start
+             // Paper start - PlayerLaunchProjectileEvent
              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownPotion.getBukkitEntity());
              if (event.callEvent() && world.addFreshEntity(thrownPotion)) {
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 06c2f30b77a2c8aecc65e0c305f643d53798f364..6d1573161f0d8c7999f84925ba7bbf536ee9583a 100644
+index b094f4ec513194e10442156d8f7f2205da2384ac..85dc79b9b969fa0cbf6964cb26bac139fa55710a 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
-@@ -77,7 +77,7 @@ public class TridentItem extends Item implements Vanishable {
+@@ -76,7 +76,7 @@ public class TridentItem extends Item implements ProjectileItem {
                          if (k == 0) {
                              ThrownTrident entitythrowntrident = new ThrownTrident(world, entityhuman, stack);
  
 -                            entitythrowntrident.shootFromRotation(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, 2.5F + (float) k * 0.5F, 1.0F);
 +                            entitythrowntrident.shootFromRotation(entityhuman, entityhuman.getXRot(), entityhuman.getYRot(), 0.0F, 2.5F + (float) k * 0.5F, (float) world.purpurConfig.tridentProjectileOffset);  // Purpur
-                             if (entityhuman.getAbilities().instabuild) {
+                             if (entityhuman.hasInfiniteMaterials()) {
                                  entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
                              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2b6817d593f1f501055d57cb08be873917823b05..82dfee00977a201b14cd13a2b88a8d76e5955fca 100644
+index d7cfb2ab82953799d0ff13fcdcb115ca2fa20450..3550147e9c80964dc1bf4007e4280de4a3b39d78 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -422,6 +422,23 @@ public class PurpurWorldConfig {
+@@ -455,6 +455,23 @@ public class PurpurWorldConfig {
          //}
      }
  
diff --git a/patches/server/0155-Config-for-powered-rail-activation-distance.patch b/patches/server/0151-Config-for-powered-rail-activation-distance.patch
similarity index 83%
rename from patches/server/0155-Config-for-powered-rail-activation-distance.patch
rename to patches/server/0151-Config-for-powered-rail-activation-distance.patch
index 9f5118180..a92753919 100644
--- a/patches/server/0155-Config-for-powered-rail-activation-distance.patch
+++ b/patches/server/0151-Config-for-powered-rail-activation-distance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for powered rail activation distance
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java b/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
-index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623bd5accdcd 100644
+index 9603d8c84ff483030dc08e82d3579b89e5c1f6e9..8fc65c32a3c6e6842a76b36f45e1b1c23abbc480 100644
 --- a/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PoweredRailBlock.java
-@@ -23,7 +23,7 @@ public class PoweredRailBlock extends BaseRailBlock {
+@@ -30,7 +30,7 @@ public class PoweredRailBlock extends BaseRailBlock {
      }
  
      protected boolean findPoweredRailSignal(Level world, BlockPos pos, BlockState state, boolean flag, int distance) {
@@ -18,10 +18,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
          } else {
              int j = pos.getX();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 82dfee00977a201b14cd13a2b88a8d76e5955fca..4bd01834faafc8bbfb29818063c9acd42d44a8fa 100644
+index 3550147e9c80964dc1bf4007e4280de4a3b39d78..57ac8480bc6bb324366bbdd30718eb5df6a7d69b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -615,6 +615,11 @@ public class PurpurWorldConfig {
+@@ -616,6 +616,11 @@ public class PurpurWorldConfig {
          powderSnowBypassMobGriefing = getBoolean("blocks.powder_snow.bypass-mob-griefing", powderSnowBypassMobGriefing);
      }
  
diff --git a/patches/server/0156-Piglin-portal-spawn-modifier.patch b/patches/server/0152-Piglin-portal-spawn-modifier.patch
similarity index 85%
rename from patches/server/0156-Piglin-portal-spawn-modifier.patch
rename to patches/server/0152-Piglin-portal-spawn-modifier.patch
index 3d7246463..1ef7cd6e3 100644
--- a/patches/server/0156-Piglin-portal-spawn-modifier.patch
+++ b/patches/server/0152-Piglin-portal-spawn-modifier.patch
@@ -18,23 +18,23 @@ Difficulties:
 3 - hard
 
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 2c085c4a154cb0f8a1d38453f43474a764398784..589b437e7c97c846410f293e2f014bdcd7cb333e 100644
+index 67060b7446535fc352d221d9fe3928d1d6ffcf54..8d5e841d8cc69bf09a9f1b6248633a72ce5fe1d7 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-@@ -52,7 +52,7 @@ public class NetherPortalBlock extends Block {
+@@ -60,7 +60,7 @@ public class NetherPortalBlock extends Block {
  
      @Override
-     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
+     protected void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
 -        if (world.spigotConfig.enableZombiePigmenPortalSpawns && world.dimensionType().natural() && world.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && random.nextInt(2000) < world.getDifficulty().getId()) { // Spigot
 +        if (world.spigotConfig.enableZombiePigmenPortalSpawns && world.dimensionType().natural() && world.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && random.nextInt(world.purpurConfig.piglinPortalSpawnModifier) < world.getDifficulty().getId()) { // Spigot // Purpur
              while (world.getBlockState(pos).is((Block) this)) {
                  pos = pos.below();
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4bd01834faafc8bbfb29818063c9acd42d44a8fa..b71f78d71d88e051cb12bf1cf09abb909a4d0465 100644
+index 57ac8480bc6bb324366bbdd30718eb5df6a7d69b..518973f15f10d68039675dfcedfbeb5d2324a989 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1647,6 +1647,7 @@ public class PurpurWorldConfig {
+@@ -1648,6 +1648,7 @@ public class PurpurWorldConfig {
      public double piglinMaxHealth = 16.0D;
      public boolean piglinBypassMobGriefing = false;
      public boolean piglinTakeDamageFromWater = false;
@@ -42,7 +42,7 @@ index 4bd01834faafc8bbfb29818063c9acd42d44a8fa..b71f78d71d88e051cb12bf1cf09abb90
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -1659,6 +1660,7 @@ public class PurpurWorldConfig {
+@@ -1660,6 +1661,7 @@ public class PurpurWorldConfig {
          piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
          piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
          piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
diff --git a/patches/server/0157-Config-to-change-max-number-of-bees.patch b/patches/server/0153-Config-to-change-max-number-of-bees.patch
similarity index 90%
rename from patches/server/0157-Config-to-change-max-number-of-bees.patch
rename to patches/server/0153-Config-to-change-max-number-of-bees.patch
index fad4fde19..2a7554450 100644
--- a/patches/server/0157-Config-to-change-max-number-of-bees.patch
+++ b/patches/server/0153-Config-to-change-max-number-of-bees.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to change max number of bees
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 41c9f074203915c31c1ae7a160ce509c13383f84..a16a1df28258d605cf5908dbe19bda5d71ad4f45 100644
+index 7b263fab4f0014400b3b8e7e33db32f9a125f6ba..f52823146944d333f2d050e90261b570ba66f5dd 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -43,7 +43,7 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -59,7 +59,7 @@ public class BeehiveBlockEntity extends BlockEntity {
      private final List<BeehiveBlockEntity.BeeData> stored = Lists.newArrayList();
      @Nullable
      public BlockPos savedFlowerPos;
@@ -18,7 +18,7 @@ index 41c9f074203915c31c1ae7a160ce509c13383f84..a16a1df28258d605cf5908dbe19bda5d
      public BeehiveBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BEEHIVE, pos, state);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 5697ce5ead8dc7e463206a56d489c99c861a9bb1..85a41b50a1f0a89264585ecd621e7e5a1de67efc 100644
+index 25b0eeb09f20601e8517f3dc413a72a3b05ac983..80dfed685a84c15d8e667272e0ec91e0f1349296 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -250,6 +250,7 @@ public class PurpurConfig {
diff --git a/patches/server/0158-Config-for-wither-explosion-radius.patch b/patches/server/0154-Config-for-wither-explosion-radius.patch
similarity index 86%
rename from patches/server/0158-Config-for-wither-explosion-radius.patch
rename to patches/server/0154-Config-for-wither-explosion-radius.patch
index 623482c4d..6b368ede8 100644
--- a/patches/server/0158-Config-for-wither-explosion-radius.patch
+++ b/patches/server/0154-Config-for-wither-explosion-radius.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for wither explosion radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-index f40ab9d5b18c189ba9b572e49243640bd44362d1..b4687453256ead43cf5288994316c7bf946b86df 100644
+index c753f715710ec4bb8337e035ac5a4c11371a84a0..a60d7f7baab005afc532ecec7aa22c53db4f51e0 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java
-@@ -97,7 +97,7 @@ public class WitherSkull extends AbstractHurtingProjectile {
+@@ -99,7 +99,7 @@ public class WitherSkull extends AbstractHurtingProjectile {
          if (!this.level().isClientSide) {
              // CraftBukkit start
              // this.level().explode(this, this.getX(), this.getY(), this.getZ(), 1.0F, false, World.a.MOB);
@@ -18,10 +18,10 @@ index f40ab9d5b18c189ba9b572e49243640bd44362d1..b4687453256ead43cf5288994316c7bf
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b71f78d71d88e051cb12bf1cf09abb909a4d0465..714e605d56a35c69c057fa810e6a18649cb8cba0 100644
+index 518973f15f10d68039675dfcedfbeb5d2324a989..3a298515545972bb06a2f214aa35fb579bbac3de 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2290,6 +2290,7 @@ public class PurpurWorldConfig {
+@@ -2291,6 +2291,7 @@ public class PurpurWorldConfig {
      public boolean witherBypassMobGriefing = false;
      public boolean witherTakeDamageFromWater = false;
      public boolean witherCanRideVehicles = false;
@@ -29,7 +29,7 @@ index b71f78d71d88e051cb12bf1cf09abb909a4d0465..714e605d56a35c69c057fa810e6a1864
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2310,6 +2311,7 @@ public class PurpurWorldConfig {
+@@ -2311,6 +2312,7 @@ public class PurpurWorldConfig {
          witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
          witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
diff --git a/patches/server/0159-Gamemode-extra-permissions.patch b/patches/server/0155-Gamemode-extra-permissions.patch
similarity index 91%
rename from patches/server/0159-Gamemode-extra-permissions.patch
rename to patches/server/0155-Gamemode-extra-permissions.patch
index 8ae9938b5..8c95cf26c 100644
--- a/patches/server/0159-Gamemode-extra-permissions.patch
+++ b/patches/server/0155-Gamemode-extra-permissions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Gamemode extra permissions
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 756651db912068c837197a972e95bc66ab9d4a70..106b27d507b16297a0a88b3b5beaaf3d0ef7e2c6 100644
+index edb94e5601acc38994dac20a167b145de778d426..7475aaac2673729091eabc741c8ebb561aeec8f1 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -223,6 +223,19 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -230,6 +230,19 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
      }
      // CraftBukkit end
  
@@ -29,10 +29,10 @@ index 756651db912068c837197a972e95bc66ab9d4a70..106b27d507b16297a0a88b3b5beaaf3d
          return this.worldPosition;
      }
 diff --git a/src/main/java/net/minecraft/server/commands/GameModeCommand.java b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-index 5cb15e2209d7b315904a1fc6d650ce1e75584271..7e21db60f3ace2a19686d6ea04b994ec3a793ec8 100644
+index d1da3600dc07107309b20ebe6e7c0c4da0e8de76..244b4719c689f153fa36381a60acc280bb0bd9b3 100644
 --- a/src/main/java/net/minecraft/server/commands/GameModeCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/GameModeCommand.java
-@@ -45,6 +45,18 @@ public class GameModeCommand {
+@@ -57,6 +57,18 @@ public class GameModeCommand {
      }
  
      private static int setMode(CommandContext<CommandSourceStack> context, Collection<ServerPlayer> targets, GameType gameMode) {
@@ -50,9 +50,9 @@ index 5cb15e2209d7b315904a1fc6d650ce1e75584271..7e21db60f3ace2a19686d6ea04b994ec
 +        // Purpur end
          int i = 0;
  
-         for(ServerPlayer serverPlayer : targets) {
+         for (ServerPlayer serverPlayer : targets) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index 74ffea16027ba8eaa26716c3b6b78a8e83c9ed79..30567935db66eaa23614ad143cd8a45c596cae26 100644
+index 52649f82351ab4f675c3cc3cd6640956b0f76b91..eb51c88c7a0658190d3a8bfd5d18dca79d85fba0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 @@ -23,7 +23,15 @@ public final class CommandPermissions {
@@ -73,7 +73,7 @@ index 74ffea16027ba8eaa26716c3b6b78a8e83c9ed79..30567935db66eaa23614ad143cd8a45c
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "defaultgamemode", "Allows the user to change the default gamemode of the server", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "seed", "Allows the user to view the seed of the world", PermissionDefault.OP, commands);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 85a41b50a1f0a89264585ecd621e7e5a1de67efc..a66c35ce86437311b38d1787c766bbe179cc5dfa 100644
+index 80dfed685a84c15d8e667272e0ec91e0f1349296..8a28fc51baa9ff014d50acc91c05dcd1975b6081 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -233,6 +233,7 @@ public class PurpurConfig {
diff --git a/patches/server/0160-Configurable-piston-push-limit.patch b/patches/server/0156-Configurable-piston-push-limit.patch
similarity index 74%
rename from patches/server/0160-Configurable-piston-push-limit.patch
rename to patches/server/0156-Configurable-piston-push-limit.patch
index 1f4a926ae..4b3ade3fc 100644
--- a/patches/server/0160-Configurable-piston-push-limit.patch
+++ b/patches/server/0156-Configurable-piston-push-limit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable piston push limit
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java b/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java
-index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87dbb4cef178 100644
+index 205e223c356634bd6bc6bd58c6f0b7fda61a6f5f..bea05cb928d540a2f19b51bb7352d032b2dd69cd 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonStructureResolver.java
-@@ -86,7 +86,7 @@ public class PistonStructureResolver {
+@@ -81,7 +81,7 @@ public class PistonStructureResolver {
              return true;
          } else {
              int i = 1;
@@ -16,17 +16,17 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
 +            if (i + this.toPush.size() > this.level.purpurConfig.pistonBlockPushLimit) { // Purpur
                  return false;
              } else {
-                 while(isSticky(blockState)) {
-@@ -98,7 +98,7 @@ public class PistonStructureResolver {
+                 while (isSticky(blockState)) {
+@@ -95,7 +95,7 @@ public class PistonStructureResolver {
+                         break;
                      }
  
-                     ++i;
--                    if (i + this.toPush.size() > 12) {
-+                    if (i + this.toPush.size() > this.level.purpurConfig.pistonBlockPushLimit) { // Purpur
+-                    if (++i + this.toPush.size() > 12) {
++                    if (++i + this.toPush.size() > this.level.purpurConfig.pistonBlockPushLimit) { // Purpur
                          return false;
                      }
                  }
-@@ -142,7 +142,7 @@ public class PistonStructureResolver {
+@@ -140,7 +140,7 @@ public class PistonStructureResolver {
                          return true;
                      }
  
@@ -36,10 +36,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
                      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 714e605d56a35c69c057fa810e6a18649cb8cba0..99c7e2ff1dfdb7e9bb755c6081232c1c64c96396 100644
+index 3a298515545972bb06a2f214aa35fb579bbac3de..046c11b359125851d48f97505b0a823f01635cff 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -610,6 +610,11 @@ public class PurpurWorldConfig {
+@@ -611,6 +611,11 @@ public class PurpurWorldConfig {
          lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
      }
  
diff --git a/patches/server/0161-Configurable-broadcast-settings.patch b/patches/server/0157-Configurable-broadcast-settings.patch
similarity index 81%
rename from patches/server/0161-Configurable-broadcast-settings.patch
rename to patches/server/0157-Configurable-broadcast-settings.patch
index 3e505c718..84652faba 100644
--- a/patches/server/0161-Configurable-broadcast-settings.patch
+++ b/patches/server/0157-Configurable-broadcast-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable broadcast settings
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 0b3a06027f2c600960cd88159803be187c4d0317..533a348acb53c8e7590f3d81c19e53a655101713 100644
+index 94893039363b5fe2d7d0622d0592bce2c867b1c3..ef520d1dd00ae9473c1f34e2df4d8b064fe4d6ea 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -247,6 +247,7 @@ public class PlayerAdvancements {
+@@ -250,6 +250,7 @@ public class PlayerAdvancements {
                  advancement.value().display().ifPresent((advancementdisplay) -> {
                      // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
                      if (event.message() != null && this.player.level().getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
@@ -17,19 +17,19 @@ index 0b3a06027f2c600960cd88159803be187c4d0317..533a348acb53c8e7590f3d81c19e53a6
                          // Paper end
                      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b5de1fc5d352de4ba978cb718e57a913431a7c9a..04394c0b122d646ce35c259de41f97e93461955f 100644
+index c9458551b1da419f484e9dce6b3fba8d79c2de79..2b10087cf34be4c36d8596d0263d68476bb1a521 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1006,6 +1006,7 @@ public class ServerPlayer extends Player {
+@@ -1089,6 +1089,7 @@ public class ServerPlayer extends Player {
              }));
-             Team scoreboardteambase = this.getTeam();
+             PlayerTeam scoreboardteam = this.getTeam();
  
 +            if (org.purpurmc.purpur.PurpurConfig.deathMessageOnlyBroadcastToAffectedPlayer) this.sendSystemMessage(ichatbasecomponent); else // Purpur
-             if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != Team.Visibility.ALWAYS) {
-                 if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
+             if (scoreboardteam != null && scoreboardteam.getDeathMessageVisibility() != Team.Visibility.ALWAYS) {
+                 if (scoreboardteam.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                      this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a66c35ce86437311b38d1787c766bbe179cc5dfa..a0f45333ef049ac950295504bb7526f949dcbede 100644
+index 8a28fc51baa9ff014d50acc91c05dcd1975b6081..608acf6a75062fd6ac663a89b8a828fee7e6a773 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -203,6 +203,18 @@ public class PurpurConfig {
diff --git a/patches/server/0162-Configurable-mob-blindness.patch b/patches/server/0158-Configurable-mob-blindness.patch
similarity index 92%
rename from patches/server/0162-Configurable-mob-blindness.patch
rename to patches/server/0158-Configurable-mob-blindness.patch
index 3ad49a35b..b8a5ec65c 100644
--- a/patches/server/0162-Configurable-mob-blindness.patch
+++ b/patches/server/0158-Configurable-mob-blindness.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable mob blindness
 Ported from https://github.com/raltsmc/mobblindness
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6f6f6610c27c738db440d7be747f0be2296f2815..f7bd53e548ea2f57f697b143b58b6d2e21371366 100644
+index aca2bd27da4d5bc754d7e98e45eb468170d17408..ce0d043f8839bb6b7fa2f6e1e721a26ffe33f77c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1036,6 +1036,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1067,6 +1067,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
              if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.PIGLIN && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.PIGLIN_BRUTE && itemstack.is(Items.PIGLIN_HEAD) || entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) {
                  d0 *= 0.5D;
              }
@@ -28,7 +28,7 @@ index 6f6f6610c27c738db440d7be747f0be2296f2815..f7bd53e548ea2f57f697b143b58b6d2e
  
          return d0;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 99c7e2ff1dfdb7e9bb755c6081232c1c64c96396..01b3d8263d24f6b58da087c751c001a6bd5c723c 100644
+index 046c11b359125851d48f97505b0a823f01635cff..bc6d8925d1124a138af8918146764ed2bc7b9f27 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -132,6 +132,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0163-Hide-hidden-players-from-entity-selector.patch b/patches/server/0159-Hide-hidden-players-from-entity-selector.patch
similarity index 96%
rename from patches/server/0163-Hide-hidden-players-from-entity-selector.patch
rename to patches/server/0159-Hide-hidden-players-from-entity-selector.patch
index f70ac362e..a013b2ecc 100644
--- a/patches/server/0163-Hide-hidden-players-from-entity-selector.patch
+++ b/patches/server/0159-Hide-hidden-players-from-entity-selector.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Hide hidden players from entity selector
 
 
 diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
-index 73c15a0c56a103ba4e62f0a51af8d42566b07245..d630c5a1aed706265d1e077da540c0bf723b838d 100644
+index 676a1499747b071515479130875157263d3a8352..fc1bba350030c076405711716e9830f8ae7f3953 100644
 --- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
 +++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
 @@ -200,10 +200,10 @@ public class EntitySelector {
@@ -59,7 +59,7 @@ index 73c15a0c56a103ba4e62f0a51af8d42566b07245..d630c5a1aed706265d1e077da540c0bf
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a0f45333ef049ac950295504bb7526f949dcbede..8b2ec98b74f441b36acb94e0c6477ddaa2d333e8 100644
+index 608acf6a75062fd6ac663a89b8a828fee7e6a773..6b94bc901a6394434da3fd7c4737b87916c69908 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -246,6 +246,7 @@ public class PurpurConfig {
diff --git a/patches/server/0164-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0160-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 86%
rename from patches/server/0164-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/server/0160-Config-for-health-to-impact-Creeper-explosion-radius.patch
index 5f5bf13a6..48baffaa1 100644
--- a/patches/server/0164-Config-for-health-to-impact-Creeper-explosion-radius.patch
+++ b/patches/server/0160-Config-for-health-to-impact-Creeper-explosion-radius.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for health to impact Creeper explosion radius
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index fd3b1e92a626402112bbd371a0ac1264a2c19c32..a8bc27c858c6ddec2ff2f84b5c1dc51c3b1b04b0 100644
+index af6f2fd2f2f48b8057cfb0462a0e72a86a1f83e3..039ae2b694800e0bcd9844be85ad29a001ce52c0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -371,9 +371,10 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -370,9 +370,10 @@ public class Creeper extends Monster implements PowerableMob {
          this.exploding = true; // Purpur
          if (!this.level().isClientSide) {
              float f = this.isPowered() ? 2.0F : 1.0F;
@@ -21,10 +21,10 @@ index fd3b1e92a626402112bbd371a0ac1264a2c19c32..a8bc27c858c6ddec2ff2f84b5c1dc51c
              // CraftBukkit end
              this.dead = true;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 01b3d8263d24f6b58da087c751c001a6bd5c723c..ae367a21e60425f5720a3532e2a6d99cafa9e33f 100644
+index bc6d8925d1124a138af8918146764ed2bc7b9f27..77af32b0e98aaf49add6ca97ff00c6024bcc2cfd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -928,6 +928,7 @@ public class PurpurWorldConfig {
+@@ -929,6 +929,7 @@ public class PurpurWorldConfig {
      public boolean creeperBypassMobGriefing = false;
      public boolean creeperTakeDamageFromWater = false;
      public boolean creeperExplodeWhenKilled = false;
@@ -32,7 +32,7 @@ index 01b3d8263d24f6b58da087c751c001a6bd5c723c..ae367a21e60425f5720a3532e2a6d99c
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -943,6 +944,7 @@ public class PurpurWorldConfig {
+@@ -944,6 +945,7 @@ public class PurpurWorldConfig {
          creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
          creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
          creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
diff --git a/patches/server/0165-Iron-golem-calm-anger-options.patch b/patches/server/0161-Iron-golem-calm-anger-options.patch
similarity index 91%
rename from patches/server/0165-Iron-golem-calm-anger-options.patch
rename to patches/server/0161-Iron-golem-calm-anger-options.patch
index 7c2030848..3a31b700a 100644
--- a/patches/server/0165-Iron-golem-calm-anger-options.patch
+++ b/patches/server/0161-Iron-golem-calm-anger-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Iron golem calm anger options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 58539d29b8e2a8c0676cc574f64e7d61613e1451..1ffb8e1c386fc85796432281ac407a935169b186 100644
+index 9c86d86a6d89585cfbdace89e66866f496da86cb..fa81b12fc38a20b8ec39155259fb75c18ff9f0ae 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -96,6 +96,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -91,6 +91,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      @Override
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
@@ -16,19 +16,19 @@ index 58539d29b8e2a8c0676cc574f64e7d61613e1451..1ffb8e1c386fc85796432281ac407a93
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.0D, true));
          this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F));
-@@ -315,6 +316,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
-                     itemstack.shrink(1);
-                 }
+@@ -307,6 +308,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
  
+                 this.playSound(SoundEvents.IRON_GOLEM_REPAIR, 1.0F, f1);
+                 itemstack.consume(1, player);
 +                if (this.level().purpurConfig.ironGolemHealCalm && isAngry() && getHealth() == getMaxHealth()) stopBeingAngry(); // Purpur
                  return InteractionResult.sidedSuccess(this.level().isClientSide);
              }
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ae367a21e60425f5720a3532e2a6d99cafa9e33f..db9c2ac59a8a1a1659ab44420d9583d224be2c05 100644
+index 77af32b0e98aaf49add6ca97ff00c6024bcc2cfd..0e8829422bd7239523c80048be1aa8c3a17480b1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1386,6 +1386,8 @@ public class PurpurWorldConfig {
+@@ -1387,6 +1387,8 @@ public class PurpurWorldConfig {
      public boolean ironGolemCanSwim = false;
      public double ironGolemMaxHealth = 100.0D;
      public boolean ironGolemTakeDamageFromWater = false;
@@ -37,7 +37,7 @@ index ae367a21e60425f5720a3532e2a6d99cafa9e33f..db9c2ac59a8a1a1659ab44420d9583d2
      private void ironGolemSettings() {
          ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
          ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
-@@ -1398,6 +1400,8 @@ public class PurpurWorldConfig {
+@@ -1399,6 +1401,8 @@ public class PurpurWorldConfig {
          }
          ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
          ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater);
diff --git a/patches/server/0166-Breedable-parrots.patch b/patches/server/0162-Breedable-parrots.patch
similarity index 79%
rename from patches/server/0166-Breedable-parrots.patch
rename to patches/server/0162-Breedable-parrots.patch
index eb8ed2241..d017c922c 100644
--- a/patches/server/0166-Breedable-parrots.patch
+++ b/patches/server/0162-Breedable-parrots.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Breedable parrots
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 5c7400bab81b87e908010bab6684b072c51a8adc..364a2d9f7a77e10862c84398d5fade7e9a401dbb 100644
+index 490d7f8ac402f50a2f2f90ca032169784a402c0f..65be3dd9bc6994cac828ed45b74a577b65b7118a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -227,6 +227,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -221,6 +221,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
      protected void registerGoals() {
          //this.goalSelector.addGoal(0, new PanicGoal(this, 1.25D)); // Purpur - move down
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -16,24 +16,24 @@ index 5c7400bab81b87e908010bab6684b072c51a8adc..364a2d9f7a77e10862c84398d5fade7e
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new PanicGoal(this, 1.25D)); // Purpur
          this.goalSelector.addGoal(1, new LookAtPlayerGoal(this, Player.class, 8.0F));
-@@ -343,6 +344,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -329,6 +330,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
                  }
              }
  
 +            if (this.level().purpurConfig.parrotBreedable) return super.mobInteract(player, hand); // Purpur
              return InteractionResult.sidedSuccess(this.level().isClientSide);
-         } else if (itemstack.is(Parrot.POISONOUS_FOOD)) {
-             if (!player.getAbilities().instabuild) {
-@@ -368,7 +370,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+         } else if (!itemstack.is(ItemTags.PARROT_POISONOUS_FOOD)) {
+             if (!this.isFlying() && this.isTame() && this.isOwnedBy(player)) {
+@@ -353,7 +355,7 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      @Override
      public boolean isFood(ItemStack stack) {
 -        return false;
-+        return this.level().purpurConfig.parrotBreedable && Parrot.TAME_FOOD.contains(stack.getItem()); // Purpur
++        return this.level().purpurConfig.parrotBreedable && stack.is(ItemTags.PARROT_FOOD); // Purpur
      }
  
      public static boolean checkParrotSpawnRules(EntityType<Parrot> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-@@ -380,13 +382,13 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -365,13 +367,13 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
  
      @Override
      public boolean canMate(Animal other) {
@@ -50,10 +50,10 @@ index 5c7400bab81b87e908010bab6684b072c51a8adc..364a2d9f7a77e10862c84398d5fade7e
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index db9c2ac59a8a1a1659ab44420d9583d224be2c05..0e3f1a9a9518ba0942c8ef148d965dbcfc070258 100644
+index 0e8829422bd7239523c80048be1aa8c3a17480b1..77f8952da7ee8476b685e6aef1f8e2441bca068e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1556,6 +1556,7 @@ public class PurpurWorldConfig {
+@@ -1557,6 +1557,7 @@ public class PurpurWorldConfig {
      public double parrotMaxY = 320D;
      public double parrotMaxHealth = 6.0D;
      public boolean parrotTakeDamageFromWater = false;
@@ -61,7 +61,7 @@ index db9c2ac59a8a1a1659ab44420d9583d224be2c05..0e3f1a9a9518ba0942c8ef148d965dbc
      private void parrotSettings() {
          parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
          parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
-@@ -1568,6 +1569,7 @@ public class PurpurWorldConfig {
+@@ -1569,6 +1570,7 @@ public class PurpurWorldConfig {
          }
          parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
          parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);
diff --git a/patches/server/0167-Configurable-powered-rail-boost-modifier.patch b/patches/server/0163-Configurable-powered-rail-boost-modifier.patch
similarity index 88%
rename from patches/server/0167-Configurable-powered-rail-boost-modifier.patch
rename to patches/server/0163-Configurable-powered-rail-boost-modifier.patch
index 724db7713..7339c27fc 100644
--- a/patches/server/0167-Configurable-powered-rail-boost-modifier.patch
+++ b/patches/server/0163-Configurable-powered-rail-boost-modifier.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable powered rail boost modifier
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 9d9d9cf2366441b453b66f91c53e7a0fe0c01e8f..faf449dfb4f95a300796db46833f3b6a51cb961b 100644
+index 97172e9c53c381d451111227feb4d1fa19d38ad8..e7a1ce585c9e552e6f9ce9acd26fdfe5c43e0b5d 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -724,7 +724,7 @@ public abstract class AbstractMinecart extends Entity {
+@@ -673,7 +673,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
              if (d18 > 0.01D) {
                  double d20 = 0.06D;
  
@@ -18,7 +18,7 @@ index 9d9d9cf2366441b453b66f91c53e7a0fe0c01e8f..faf449dfb4f95a300796db46833f3b6a
                  Vec3 vec3d5 = this.getDeltaMovement();
                  double d21 = vec3d5.x;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0e3f1a9a9518ba0942c8ef148d965dbcfc070258..09ca13ad75c972cbf92a1dfc9b3835ccc1cd11d1 100644
+index 77f8952da7ee8476b685e6aef1f8e2441bca068e..c283a8aec6dfea3f9b84d47cf6abf568be2a73da 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -275,6 +275,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0168-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0164-Add-config-change-multiplier-critical-damage-value.patch
similarity index 70%
rename from patches/server/0168-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/server/0164-Add-config-change-multiplier-critical-damage-value.patch
index 4f5da2768..885fc1f18 100644
--- a/patches/server/0168-Add-config-change-multiplier-critical-damage-value.patch
+++ b/patches/server/0164-Add-config-change-multiplier-critical-damage-value.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Add config change multiplier critical damage value
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a21feaa31c6aa3c7f2198b3b4a84af101aa16988..65c92a2feffd878c12082239b0c41444a0f21d57 100644
+index 579a9c7d914015ef74c6147f2e17962a7aea2a78..bc994bbc4c7b66e6365739acb896aaa81fbcbd7e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1319,7 +1319,7 @@ public abstract class Player extends LivingEntity {
-                     flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper
-                     flag2 = flag2 && !this.isSprinting();
-                     if (flag2) {
--                        f *= 1.5F;
-+                        f *= this.level().purpurConfig.playerCriticalDamageMultiplier; // Purpur
-                     }
+@@ -1332,7 +1332,7 @@ public abstract class Player extends LivingEntity {
  
-                     f += f1;
+                         flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
+                         if (flag2) {
+-                            f *= 1.5F;
++                            f *= this.level().purpurConfig.playerCriticalDamageMultiplier; // Purpur
+                         }
+ 
+                         f += f1;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 09ca13ad75c972cbf92a1dfc9b3835ccc1cd11d1..3aedf02206c4581b201e4dd0cefe0b6524e6f38b 100644
+index c283a8aec6dfea3f9b84d47cf6abf568be2a73da..a7d95013005c895676dbe8cc10f12dbcf689b29c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -372,6 +372,7 @@ public class PurpurWorldConfig {
@@ -36,4 +36,4 @@ index 09ca13ad75c972cbf92a1dfc9b3835ccc1cd11d1..3aedf02206c4581b201e4dd0cefe0b65
 +        playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0169-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0165-Option-to-disable-dragon-egg-teleporting.patch
similarity index 83%
rename from patches/server/0169-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/server/0165-Option-to-disable-dragon-egg-teleporting.patch
index b187288a2..591f3c374 100644
--- a/patches/server/0169-Option-to-disable-dragon-egg-teleporting.patch
+++ b/patches/server/0165-Option-to-disable-dragon-egg-teleporting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable dragon egg teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java b/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java
-index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e711743c88 100644
+index fbe15cdd5b9bca2ab4b1e871abbbdbff49ade8a4..23d113842bf774bdc74e0dffcc97b642bc8684f1 100644
 --- a/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DragonEggBlock.java
-@@ -42,8 +42,8 @@ public class DragonEggBlock extends FallingBlock {
+@@ -48,8 +48,8 @@ public class DragonEggBlock extends FallingBlock {
      }
  
      private void teleport(BlockState state, Level world, BlockPos pos) {
@@ -19,10 +19,10 @@ index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e7
              BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16));
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3aedf02206c4581b201e4dd0cefe0b6524e6f38b..2abe6192ab9caac24aae3c8488cf0ee3cb3173d7 100644
+index a7d95013005c895676dbe8cc10f12dbcf689b29c..9c9fea719a90e49147b6c2ae342a1437ea8b9be3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -537,6 +537,11 @@ public class PurpurWorldConfig {
+@@ -538,6 +538,11 @@ public class PurpurWorldConfig {
          });
      }
  
diff --git a/patches/server/0170-Config-for-unverified-username-message.patch b/patches/server/0166-Config-for-unverified-username-message.patch
similarity index 92%
rename from patches/server/0170-Config-for-unverified-username-message.patch
rename to patches/server/0166-Config-for-unverified-username-message.patch
index fa7758c60..ae1572f3d 100644
--- a/patches/server/0170-Config-for-unverified-username-message.patch
+++ b/patches/server/0166-Config-for-unverified-username-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for unverified username message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ff2dd53e9e943aa929188fd9d4c35498b78c497a..e615e417627840d645db259bc9640a0471a52b05 100644
+index b656741eb68adeb04bf995f1045902cb6bd5f2e7..3b4fadb37eafb2f7b0ce4d6b276d2fdaa8287521 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -296,7 +296,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -315,7 +315,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
                          ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
                          ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(s1)); // Spigot
                      } else {
@@ -18,7 +18,7 @@ index ff2dd53e9e943aa929188fd9d4c35498b78c497a..e615e417627840d645db259bc9640a04
                      }
                  } catch (AuthenticationUnavailableException authenticationunavailableexception) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8b2ec98b74f441b36acb94e0c6477ddaa2d333e8..bda7ebcedcfc7086dcbd3a402e4c5ace3c508037 100644
+index 6b94bc901a6394434da3fd7c4737b87916c69908..1b2fdefed6b01719211b29119b6beb1baa77b497 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -184,6 +184,7 @@ public class PurpurConfig {
diff --git a/patches/server/0171-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0167-Make-anvil-cumulative-cost-configurable.patch
similarity index 83%
rename from patches/server/0171-Make-anvil-cumulative-cost-configurable.patch
rename to patches/server/0167-Make-anvil-cumulative-cost-configurable.patch
index e48a72e76..5f3b4e7da 100644
--- a/patches/server/0171-Make-anvil-cumulative-cost-configurable.patch
+++ b/patches/server/0167-Make-anvil-cumulative-cost-configurable.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Make anvil cumulative cost configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index fdf2bf10a533c3d4ee145880e6949dadf6ce5410..531b911c1bcdd3735529ee18f2bb0ccdf4ad6089 100644
+index 17067510990f575bf638f6a95ed0d964f6e94dc5..2747f04e657154362af55eef1dd50455e02af371 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -403,7 +403,7 @@ public class AnvilMenu extends ItemCombinerMenu {
+@@ -391,7 +391,7 @@ public class AnvilMenu extends ItemCombinerMenu {
      }
  
      public static int calculateIncreasedRepairCost(int cost) {
--        return cost * 2 + 1;
-+        return org.purpurmc.purpur.PurpurConfig.anvilCumulativeCost ? cost * 2 + 1 : 0;
+-        return (int) Math.min((long) cost * 2L + 1L, 2147483647L);
++        return org.purpurmc.purpur.PurpurConfig.anvilCumulativeCost ? (int) Math.min((long) cost * 2L + 1L, 2147483647L) : 0;
      }
  
      public boolean setItemName(String newItemName) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index bda7ebcedcfc7086dcbd3a402e4c5ace3c508037..cb0125f7aaa514578465d455b2b1fab98d7b13c1 100644
+index 1b2fdefed6b01719211b29119b6beb1baa77b497..b10e0de76f618c545294873038ce29ee0c486d24 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -269,6 +269,7 @@ public class PurpurConfig {
diff --git a/patches/server/0173-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0168-Bee-can-work-when-raining-or-at-night.patch
similarity index 81%
rename from patches/server/0173-Bee-can-work-when-raining-or-at-night.patch
rename to patches/server/0168-Bee-can-work-when-raining-or-at-night.patch
index 51a004388..e5f375fc3 100644
--- a/patches/server/0173-Bee-can-work-when-raining-or-at-night.patch
+++ b/patches/server/0168-Bee-can-work-when-raining-or-at-night.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bee can work when raining or at night
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index baeea251e8f6a23bbd41987fffeb60bac157c363..d969a4bb3522faa5f88cae92fcd0bad375b7b0f2 100644
+index 0978f519177ce2f0991402dafb9a22c5a8686168..91c013f7ab58f570d0ebe2773932fcdb49344b3c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -399,7 +399,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -395,7 +395,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
  
      boolean wantsToEnterHive() {
          if (this.stayOutOfHiveCountdown <= 0 && !this.beePollinateGoal.isPollinating() && !this.hasStung() && this.getTarget() == null) {
@@ -18,23 +18,23 @@ index baeea251e8f6a23bbd41987fffeb60bac157c363..d969a4bb3522faa5f88cae92fcd0bad3
              return flag && !this.isHiveNearFire();
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index a16a1df28258d605cf5908dbe19bda5d71ad4f45..7b82842b97ce795745cf6ee6399f618c55acbbf3 100644
+index f52823146944d333f2d050e90261b570ba66f5dd..d8efb00c325448d566c59418fe22268c6eb4cfce 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -203,7 +203,7 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -212,7 +212,7 @@ public class BeehiveBlockEntity extends BlockEntity {
      }
  
-     private static boolean releaseBee(Level world, BlockPos blockposition, BlockState iblockdata, BeehiveBlockEntity.BeeData tileentitybeehive_hivebee, @Nullable List<Entity> list, BeehiveBlockEntity.BeeReleaseStatus tileentitybeehive_releasestatus, @Nullable BlockPos blockposition1, boolean force) {
+     private static boolean releaseOccupant(Level world, BlockPos blockposition, BlockState iblockdata, BeehiveBlockEntity.Occupant tileentitybeehive_c, @Nullable List<Entity> list, BeehiveBlockEntity.BeeReleaseStatus tileentitybeehive_releasestatus, @Nullable BlockPos blockposition1, boolean force) {
 -        if (!force && (world.isNight() || world.isRaining()) && tileentitybeehive_releasestatus != BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY) {
 +        if (!force && ((world.isNight() && !world.purpurConfig.beeCanWorkAtNight) || (world.isRaining() && !world.purpurConfig.beeCanWorkInRain)) && tileentitybeehive_releasestatus != BeehiveBlockEntity.BeeReleaseStatus.EMERGENCY) { // Purpur
              // CraftBukkit end
              return false;
          } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bb01e0a0e92d9c6fad33129fe61a2a53779f44ff..f398039b41bc014c61dec0e932af4a93400bd252 100644
+index 9c9fea719a90e49147b6c2ae342a1437ea8b9be3..b3d24e076aef331f26ed5035f2015680f4a5c732 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -769,6 +769,8 @@ public class PurpurWorldConfig {
+@@ -765,6 +765,8 @@ public class PurpurWorldConfig {
      public double beeMaxHealth = 10.0D;
      public int beeBreedingTicks = 6000;
      public boolean beeTakeDamageFromWater = false;
@@ -43,7 +43,7 @@ index bb01e0a0e92d9c6fad33129fe61a2a53779f44ff..f398039b41bc014c61dec0e932af4a93
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -782,6 +784,8 @@ public class PurpurWorldConfig {
+@@ -778,6 +780,8 @@ public class PurpurWorldConfig {
          beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
          beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);
          beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater);
diff --git a/patches/server/0174-API-for-any-mob-to-burn-daylight.patch b/patches/server/0169-API-for-any-mob-to-burn-daylight.patch
similarity index 78%
rename from patches/server/0174-API-for-any-mob-to-burn-daylight.patch
rename to patches/server/0169-API-for-any-mob-to-burn-daylight.patch
index a37713e97..c3a524598 100644
--- a/patches/server/0174-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0169-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9204b119a038868e63a345f2a8cd175cba96b090..2570fb81e94f7169a54a8e0b2dce5a2c24fcd00e 100644
+index 5f19cc285efac25b56a29242b41c2823020f170e..2d1fc8734f440c284710c71abc6789e8185ec909 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -496,6 +496,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -562,6 +562,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return true;
      }
  
@@ -32,18 +32,18 @@ index 9204b119a038868e63a345f2a8cd175cba96b090..2570fb81e94f7169a54a8e0b2dce5a2c
          return this.hardCollides;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f7bd53e548ea2f57f697b143b58b6d2e21371366..b4c00ea434f73ff59d6171fd010d4e76d6dc08dd 100644
+index ce0d043f8839bb6b7fa2f6e1e721a26ffe33f77c..54a612dd2fcdf6972f7580fbd814f461df07b7f6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -274,6 +274,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
      public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
-     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
+     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
 +    protected boolean shouldBurnInDay = false;  public boolean shouldBurnInDay() { return this.shouldBurnInDay; } public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; } // Purpur
  
      @Override
      public float getBukkitYaw() {
-@@ -804,6 +805,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -842,6 +843,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> {
              nbt.put("Brain", nbtbase);
          });
@@ -51,7 +51,7 @@ index f7bd53e548ea2f57f697b143b58b6d2e21371366..b4c00ea434f73ff59d6171fd010d4e76
      }
  
      @Override
-@@ -888,6 +890,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -929,6 +931,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
          }
  
@@ -63,7 +63,7 @@ index f7bd53e548ea2f57f697b143b58b6d2e21371366..b4c00ea434f73ff59d6171fd010d4e76
      }
  
      // CraftBukkit start
-@@ -3577,6 +3584,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3573,6 +3580,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.hurt(this.damageSources().drown(), 1.0F);
          }
  
@@ -83,7 +83,7 @@ index f7bd53e548ea2f57f697b143b58b6d2e21371366..b4c00ea434f73ff59d6171fd010d4e76
 +                    flag = false;
 +                }
 +                if (flag) {
-+                    this.setSecondsOnFire(8);
++                    this.igniteForSeconds(8);
 +                }
 +            }
 +        }
@@ -92,10 +92,10 @@ index f7bd53e548ea2f57f697b143b58b6d2e21371366..b4c00ea434f73ff59d6171fd010d4e76
  
      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 4454241862598048abd4e8bf321f9a066be15067..547279a379190c2339d6335e00faf7730be6d0f0 100644
+index 77cf0d92212d11b9036f9f9cf23b23f71f1d590d..ee98efa69d67cd22eb5722cf68f3b7063e2595c8 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1755,17 +1755,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1881,17 +1881,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
      }
  
      public boolean isSunBurnTick() {
@@ -115,10 +115,10 @@ index 4454241862598048abd4e8bf321f9a066be15067..547279a379190c2339d6335e00faf773
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 2dbcfd847dd5b6db587b291a8a7a6e278949c3a9..f35637a105d5aa12fb57c2456f2b2a7db12a49f0 100644
+index 8f71739a4b23bc53994f1cbff8500b6bad288a42..919767affe2ede755cf83398436fbf1581ad508f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -66,6 +66,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -65,6 +65,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      protected AbstractSkeleton(EntityType<? extends AbstractSkeleton> type, Level world) {
          super(type, world);
          this.reassessWeaponGoal();
@@ -126,19 +126,19 @@ index 2dbcfd847dd5b6db587b291a8a7a6e278949c3a9..f35637a105d5aa12fb57c2456f2b2a7d
      }
  
      @Override
-@@ -101,35 +102,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-     }
+@@ -95,35 +96,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+     abstract SoundEvent getStepSound();
  
-     // Paper start
+     // Paper start - shouldBurnInDay API
 -    private boolean shouldBurnInDay = true;
 +    // private boolean shouldBurnInDay = true; // Purpur - moved to LivingEntity - keep methods for ABI compatibility
      public boolean shouldBurnInDay() { return shouldBurnInDay; }
      public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-     // Paper end
+     // Paper end - shouldBurnInDay API
  
      @Override
      public void aiStep() {
--        boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - Configurable Burning
+-        boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - shouldBurnInDay API
 -
 -        if (flag) {
 -            ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
@@ -156,7 +156,7 @@ index 2dbcfd847dd5b6db587b291a8a7a6e278949c3a9..f35637a105d5aa12fb57c2456f2b2a7d
 -            }
 -
 -            if (flag) {
--                this.setSecondsOnFire(8);
+-                this.igniteForSeconds(8);
 -            }
 -        }
 -
@@ -164,37 +164,29 @@ index 2dbcfd847dd5b6db587b291a8a7a6e278949c3a9..f35637a105d5aa12fb57c2456f2b2a7d
          super.aiStep();
      }
  
-@@ -194,7 +174,6 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
-             } else {
-                 this.goalSelector.addGoal(4, this.meleeGoal);
-             }
--
-         }
-     }
- 
-@@ -238,7 +217,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -238,7 +218,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          this.reassessWeaponGoal();
-         // Paper start
+         // Paper start - shouldBurnInDay API
          if (nbt.contains("Paper.ShouldBurnInDay")) {
 -            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
 +            // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity
          }
-         // Paper end
+         // Paper end - shouldBurnInDay API
      }
-@@ -247,7 +226,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -247,7 +227,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 -        nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay);
 +        // nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay); // Purpur - implemented in LivingEntity
      }
-     // Paper end
+     // Paper end - shouldBurnInDay API
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index b361078339f01881ee6806049ecc2490fd5cf6bf..481a6cf3dfc2948d80071920b905b488de8737e5 100644
+index cb96bd5769159e6c25968673ea07cd6d107cff46..440c90feeae3a55c98e2011ecb27c28d58f11e6e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -22,6 +22,7 @@ public class Husk extends Zombie {
+@@ -20,6 +20,7 @@ public class Husk extends Zombie {
  
      public Husk(EntityType<? extends Husk> type, Level world) {
          super(type, world);
@@ -202,7 +194,7 @@ index b361078339f01881ee6806049ecc2490fd5cf6bf..481a6cf3dfc2948d80071920b905b488
      }
  
      // Purpur start
-@@ -77,7 +78,7 @@ public class Husk extends Zombie {
+@@ -75,7 +76,7 @@ public class Husk extends Zombie {
  
      @Override
      public boolean isSunSensitive() {
@@ -212,36 +204,35 @@ index b361078339f01881ee6806049ecc2490fd5cf6bf..481a6cf3dfc2948d80071920b905b488
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 030b81dd8c52ddb300e73d792f9c4cea4e8a8d46..1d4a292a37069408420ca90b1c2784229781f93f 100644
+index c52d40eb33a16e428c016a902faeb62aea0fd727..bebc6f9f7e49e9dd34fa295d9ce3e8397feb280c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -61,6 +61,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -59,6 +59,7 @@ public class Phantom extends FlyingMob implements Enemy {
          this.xpReward = 5;
          this.moveControl = new Phantom.PhantomMoveControl(this);
-         this.lookControl = new Phantom.PhantomLookControl(this);
+         this.lookControl = new Phantom.PhantomLookControl(this, this);
 +        this.setShouldBurnInDay(true); // Purpur
      }
  
      // Purpur start
-@@ -254,16 +255,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -247,15 +248,7 @@ public class Phantom extends FlyingMob implements Enemy {
  
      @Override
      public void aiStep() {
 -        // Purpur start
--        boolean burnFromDaylight = this.shouldBurnInDay && this.level().purpurConfig.phantomBurnInDaylight;
+-        boolean burnFromDaylight = this.shouldBurnInDay && this.isSunBurnTick() && this.level().purpurConfig.phantomBurnInDaylight;
 -        boolean burnFromLightSource = this.level().purpurConfig.phantomBurnInLight > 0 && this.level().getMaxLocalRawBrightness(blockPosition()) >= this.level().purpurConfig.phantomBurnInLight;
--        if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - Configurable Burning
--            if (getRider() == null || !this.isControllable())
--            // Purpur end
+-        if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - shouldBurnInDay API
+-        // Purpur end
 -            if (getRider() == null || !this.isControllable()) // Purpur
--            this.setSecondsOnFire(8);
+-            this.igniteForSeconds(8);
 -        }
 -
 +        // Purpur - moved down to shouldBurnInDay()
          super.aiStep();
      }
  
-@@ -291,7 +283,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -283,7 +276,7 @@ public class Phantom extends FlyingMob implements Enemy {
          if (nbt.hasUUID("Paper.SpawningEntity")) {
              this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
          }
@@ -250,7 +241,7 @@ index 030b81dd8c52ddb300e73d792f9c4cea4e8a8d46..1d4a292a37069408420ca90b1c278422
              this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
          }
          // Paper end
-@@ -308,7 +300,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -300,7 +293,7 @@ public class Phantom extends FlyingMob implements Enemy {
          if (this.spawningEntity != null) {
              nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
          }
@@ -259,12 +250,13 @@ index 030b81dd8c52ddb300e73d792f9c4cea4e8a8d46..1d4a292a37069408420ca90b1c278422
          // Paper end
      }
  
-@@ -378,8 +370,14 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -356,8 +349,15 @@ public class Phantom extends FlyingMob implements Enemy {
+         return this.spawningEntity;
      }
      public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
- 
 -    private boolean shouldBurnInDay = true;
 -    public boolean shouldBurnInDay() { return shouldBurnInDay; }
++
 +    // private boolean shouldBurnInDay = true; // Purpur - moved to LivingEntity - keep methods for ABI compatibility
 +    // Purpur start
 +    public boolean shouldBurnInDay() {
@@ -275,26 +267,26 @@ index 030b81dd8c52ddb300e73d792f9c4cea4e8a8d46..1d4a292a37069408420ca90b1c278422
 +    // Purpur End
      public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
      // Paper end
-     private static enum AttackPhase {
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 63c0f86469182de482b04a27741e4b6fe29f0e79..15baaf9c358019b1ce2152086e8d16591eec7dbb 100644
+index de7a74f1e5181373da8dcc639245f35f77f4f09b..53f7659aed2378b36f1923a0208c7f86048eb85b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -96,11 +96,12 @@ public class Zombie extends Monster {
+@@ -93,11 +93,12 @@ public class Zombie extends Monster {
      private int inWaterTime;
      public int conversionTime;
      private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
--    private boolean shouldBurnInDay = true; // Paper
-+    // private boolean shouldBurnInDay = true; // Paper // Purpur - implemented in LivingEntity
+-    private boolean shouldBurnInDay = true; // Paper - Add more Zombie API
++    // private boolean shouldBurnInDay = true; // Paper - Add more Zombie API // Purpur - implemented in LivingEntity
  
      public Zombie(EntityType<? extends Zombie> type, Level world) {
          super(type, world);
-         this.breakDoorGoal = new BreakDoorGoal(this, com.google.common.base.Predicates.in(world.paperConfig().entities.behavior.doorBreakingDifficulty.getOrDefault(type, world.paperConfig().entities.behavior.doorBreakingDifficulty.get(EntityType.ZOMBIE)))); // Paper
+         this.breakDoorGoal = new BreakDoorGoal(this, com.google.common.base.Predicates.in(world.paperConfig().entities.behavior.doorBreakingDifficulty.getOrDefault(type, world.paperConfig().entities.behavior.doorBreakingDifficulty.get(EntityType.ZOMBIE)))); // Paper - Configurable door breaking difficulty
 +        this.setShouldBurnInDay(true); // Purpur
      }
  
      public Zombie(Level world) {
-@@ -296,30 +297,7 @@ public class Zombie extends Monster {
+@@ -293,30 +294,7 @@ public class Zombie extends Monster {
  
      @Override
      public void aiStep() {
@@ -317,7 +309,7 @@ index 63c0f86469182de482b04a27741e4b6fe29f0e79..15baaf9c358019b1ce2152086e8d1659
 -                }
 -
 -                if (flag) {
--                    this.setSecondsOnFire(8);
+-                    this.igniteForSeconds(8);
 -                }
 -            }
 -        }
@@ -326,37 +318,37 @@ index 63c0f86469182de482b04a27741e4b6fe29f0e79..15baaf9c358019b1ce2152086e8d1659
          super.aiStep();
      }
  
-@@ -357,6 +335,7 @@ public class Zombie extends Monster {
+@@ -354,6 +332,7 @@ public class Zombie extends Monster {
  
      }
  
 +    public boolean shouldBurnInDay() { return isSunSensitive(); } // Purpur - for ABI compatibility
      public boolean isSunSensitive() {
-         return this.shouldBurnInDay; // Paper - use api value instead
+         return this.shouldBurnInDay; // Paper - Add more Zombie API
      }
-@@ -486,7 +465,7 @@ public class Zombie extends Monster {
+@@ -477,7 +456,7 @@ public class Zombie extends Monster {
          nbt.putBoolean("CanBreakDoors", this.canBreakDoors());
          nbt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
          nbt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
--        nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay); // Paper
-+        // nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay); // Paper // Purpur - implemented in LivingEntity
+-        nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay); // Paper - Add more Zombie API
++        // nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay); // Paper - Add more Zombie API // Purpur - implemented in LivingEntity
      }
  
      @Override
-@@ -500,7 +479,7 @@ public class Zombie extends Monster {
+@@ -491,7 +470,7 @@ public class Zombie extends Monster {
          }
-         // Paper start
+         // Paper start - Add more Zombie API
          if (nbt.contains("Paper.ShouldBurnInDay")) {
 -            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
 +            // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity
          }
-         // Paper end
+         // Paper end - Add more Zombie API
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d1a550aa5905d26e5b0f534338b3f30f1f2db67c..eb409ecf5bf06692038e9fe84af986092a7d7837 100644
+index befe3372d5f1550b7bde3b63b5e7aef9035c5379..3c674ecd3b80501047b4593e8872034287defd2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -223,6 +223,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -84,6 +84,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
      }
  
@@ -365,14 +357,14 @@ index d1a550aa5905d26e5b0f534338b3f30f1f2db67c..eb409ecf5bf06692038e9fe84af98609
 +        return getHandle().isSunBurnTick();
 +    }
 +
-     public static CraftEntity getEntity(CraftServer server, Entity entity) {
-         /*
-          * Order is *EXTREMELY* important -- keep it right! =D
+     public static <T extends Entity> CraftEntity getEntity(CraftServer server, T entity) {
+         Preconditions.checkArgument(entity != null, "Unknown entity");
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 07cbcb7f5a77b75ba10ccb470502c73fab17784e..42b336a96e5c786b95356200da7d02bfd8b584dc 100644
+index 11bd76d79bbfff68734d8ee1095f21c5c50e7bde..1a8a76aa31bd1d1670be6e9cada162c540084cf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1116,5 +1116,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1180,5 +1180,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          if (slot == null) return;
          getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
      }
diff --git a/patches/server/0175-Config-MobEffect-by-world.patch b/patches/server/0170-Config-MobEffect-by-world.patch
similarity index 75%
rename from patches/server/0175-Config-MobEffect-by-world.patch
rename to patches/server/0170-Config-MobEffect-by-world.patch
index 78001e61e..5b850adcc 100644
--- a/patches/server/0175-Config-MobEffect-by-world.patch
+++ b/patches/server/0170-Config-MobEffect-by-world.patch
@@ -5,51 +5,51 @@ Subject: [PATCH] Config MobEffect by world
 
 
 diff --git a/src/main/java/net/minecraft/world/effect/HungerMobEffect.java b/src/main/java/net/minecraft/world/effect/HungerMobEffect.java
-index 3aad6bd0a1fb7bb3f9b7dab2c10c875864900750..31bd845130e363dd11c225dfd1e9dd896aea8aac 100644
+index a476b56ed98d0a1afc6a396ce29424df78f24ada..5119ff3414fbd9a1ae0a8db0fd15bd3c57c8e148 100644
 --- a/src/main/java/net/minecraft/world/effect/HungerMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/HungerMobEffect.java
-@@ -15,7 +15,7 @@ class HungerMobEffect extends MobEffect {
-         if (entity instanceof Player) {
-             Player entityhuman = (Player) entity;
- 
+@@ -12,7 +12,7 @@ class HungerMobEffect extends MobEffect {
+     @Override
+     public boolean applyEffectTick(LivingEntity entity, int amplifier) {
+         if (entity instanceof Player entityhuman) {
 -            entityhuman.causeFoodExhaustion(0.005F * (float) (amplifier + 1), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.HUNGER_EFFECT); // CraftBukkit - EntityExhaustionEvent
 +            entityhuman.causeFoodExhaustion(entity.level().purpurConfig.humanHungerExhaustionAmount * (float) (amplifier + 1), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.HUNGER_EFFECT); // CraftBukkit - EntityExhaustionEvent // Purpur
          }
  
-     }
+         return true;
 diff --git a/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java b/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
-index f8a8b825d21a7223a9839abda20825702985b7ad..41a853cd0f7d9aaa3d23df1c49a30fb29f19d14e 100644
+index 3e7a703632251e0a5234259e3702b58b332e5ef0..f2cc43fbccb5d2ba012b350268065c2cfe014faf 100644
 --- a/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/PoisonMobEffect.java
-@@ -11,8 +11,8 @@ class PoisonMobEffect extends MobEffect {
+@@ -10,8 +10,8 @@ class PoisonMobEffect extends MobEffect {
+ 
      @Override
-     public void applyEffectTick(LivingEntity entity, int amplifier) {
-         super.applyEffectTick(entity, amplifier);
+     public boolean applyEffectTick(LivingEntity entity, int amplifier) {
 -        if (entity.getHealth() > 1.0F) {
--            entity.hurt(entity.damageSources().poison, 1.0F);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON
+-            entity.hurt(entity.damageSources().poison(), 1.0F);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON
 +        if (entity.getHealth() > entity.level().purpurConfig.entityMinimalHealthPoison) { // Purpur
-+            entity.hurt(entity.damageSources().poison, entity.level().purpurConfig.entityPoisonDegenerationAmount);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON // Purpur
++            entity.hurt(entity.damageSources().poison(), entity.level().purpurConfig.entityPoisonDegenerationAmount);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON // Purpur
          }
  
-     }
+         return true;
 diff --git a/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java b/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java
-index 551b20f86347aeca4824b7a424ad7de7c0ff072e..06bb4ad98aa9ca38b8d423681b1ad4b821f5e47d 100644
+index 4dba3e813e054951cbfbe0b323c1f5d973469cc0..426f61d55b9692cf085368df4e4df6f6997aa420 100644
 --- a/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/RegenerationMobEffect.java
-@@ -12,7 +12,7 @@ class RegenerationMobEffect extends MobEffect {
-     public void applyEffectTick(LivingEntity entity, int amplifier) {
-         super.applyEffectTick(entity, amplifier);
+@@ -11,7 +11,7 @@ class RegenerationMobEffect extends MobEffect {
+     @Override
+     public boolean applyEffectTick(LivingEntity entity, int amplifier) {
          if (entity.getHealth() < entity.getMaxHealth()) {
 -            entity.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC_REGEN); // CraftBukkit
 +            entity.heal(entity.level().purpurConfig.entityHealthRegenAmount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC_REGEN); // CraftBukkit // Purpur
          }
  
-     }
+         return true;
 diff --git a/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java b/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
-index b994ae09621934df2cdd6a83a7d8ecb44649fb16..c2b812c992db1ac9cd391da902c8d819a6ec2e6d 100644
+index 7b415dca88f50dc472fe4be96e5ef0996f117913..2bb872f29350d15db46b32c686aef78fc1b6fa29 100644
 --- a/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/SaturationMobEffect.java
-@@ -23,7 +23,7 @@ class SaturationMobEffect extends InstantenousMobEffect {
+@@ -20,7 +20,7 @@ class SaturationMobEffect extends InstantenousMobEffect {
              int oldFoodLevel = entityhuman.getFoodData().foodLevel;
              org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(entityhuman, amplifier + 1 + oldFoodLevel);
              if (!event.isCancelled()) {
@@ -59,20 +59,20 @@ index b994ae09621934df2cdd6a83a7d8ecb44649fb16..c2b812c992db1ac9cd391da902c8d819
  
              ((CraftPlayer) entityhuman.getBukkitEntity()).sendHealthUpdate();
 diff --git a/src/main/java/net/minecraft/world/effect/WitherMobEffect.java b/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
-index 1f9e0c139988c4c44a26552881647d36965aa4fa..b8d612d22aca74a08b53393c0723a2ae3a0b9ddf 100644
+index f43bf280999ff3860cc702def50cc62b131eb1bd..66d9e99a351f5fc6cf58be3bee4397d92c932d64 100644
 --- a/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/WitherMobEffect.java
-@@ -10,7 +10,7 @@ class WitherMobEffect extends MobEffect {
-     @Override
-     public void applyEffectTick(LivingEntity entity, int amplifier) {
-         super.applyEffectTick(entity, amplifier);
--        entity.hurt(entity.damageSources().wither(), 1.0F);
-+        entity.hurt(entity.damageSources().wither(), entity.level().purpurConfig.entityWitherDegenerationAmount); // Purpur
-     }
+@@ -9,7 +9,7 @@ class WitherMobEffect extends MobEffect {
  
      @Override
+     public boolean applyEffectTick(LivingEntity entity, int amplifier) {
+-        entity.hurt(entity.damageSources().wither(), 1.0F);
++        entity.hurt(entity.damageSources().wither(), entity.level().purpurConfig.entityWitherDegenerationAmount); // Purpur
+         return true;
+     }
+ 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f398039b41bc014c61dec0e932af4a93400bd252..bef591a3392c4fe94bd91d38071381c09f8293a4 100644
+index b3d24e076aef331f26ed5035f2015680f4a5c732..e22dc10989d83642c4714aef97fbbd4a82d68c11 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -331,6 +331,21 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0176-Beacon-Activation-Range-Configurable.patch b/patches/server/0171-Beacon-Activation-Range-Configurable.patch
similarity index 88%
rename from patches/server/0176-Beacon-Activation-Range-Configurable.patch
rename to patches/server/0171-Beacon-Activation-Range-Configurable.patch
index ef0327b88..317654aee 100644
--- a/patches/server/0176-Beacon-Activation-Range-Configurable.patch
+++ b/patches/server/0171-Beacon-Activation-Range-Configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Beacon Activation Range Configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index f13943db6f2fb923c52dcf9e8bf7000041d0a362..a5f9747be5503dd24abd98f11cfa8229448ca3bf 100644
+index a6ffbbc1b5021564864e42c0756342352c2b8290..2b9cc89a2e71b523c90bbfa987b0f8352efff95a 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -88,6 +88,16 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -92,6 +92,16 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
  
      public double getEffectRange() {
          if (this.effectRange < 0) {
@@ -26,10 +26,10 @@ index f13943db6f2fb923c52dcf9e8bf7000041d0a362..a5f9747be5503dd24abd98f11cfa8229
          } else {
              return effectRange;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bef591a3392c4fe94bd91d38071381c09f8293a4..456a3cbadb5dbce0dfdafe4320c5006205a032bd 100644
+index e22dc10989d83642c4714aef97fbbd4a82d68c11..c27e8ad0e401499105ed3db2ef7b73a6fda8fb37 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -504,6 +504,17 @@ public class PurpurWorldConfig {
+@@ -505,6 +505,17 @@ public class PurpurWorldConfig {
          anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
      }
  
diff --git a/patches/server/0179-Make-lightning-rod-range-configurable.patch b/patches/server/0172-Make-lightning-rod-range-configurable.patch
similarity index 89%
rename from patches/server/0179-Make-lightning-rod-range-configurable.patch
rename to patches/server/0172-Make-lightning-rod-range-configurable.patch
index cf76027bf..1b3474b59 100644
--- a/patches/server/0179-Make-lightning-rod-range-configurable.patch
+++ b/patches/server/0172-Make-lightning-rod-range-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 02bd86d25223e0c53d0515f91d0b7677011e9f24..4edea5ea0964bc054b76b1c6635c5b719721e202 100644
+index bcdef2c9bb116409445a4ef65c5e407c1003a55d..1dc58b41d3963c2adc58e79cd6db7e146ac049ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1170,7 +1170,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1182,7 +1182,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return holder.is(PoiTypes.LIGHTNING_ROD);
          }, (blockposition1) -> {
              return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;
@@ -18,7 +18,7 @@ index 02bd86d25223e0c53d0515f91d0b7677011e9f24..4edea5ea0964bc054b76b1c6635c5b71
          return optional.map((blockposition1) -> {
              return blockposition1.above(1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index cb0125f7aaa514578465d455b2b1fab98d7b13c1..b1450f979efb13a31f96b0638d415f807c5c6a4f 100644
+index b10e0de76f618c545294873038ce29ee0c486d24..f3f8ca5f2b391860b2134e06784819aa0e78321e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -270,6 +270,7 @@ public class PurpurConfig {
diff --git a/patches/server/0172-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0172-ShulkerBox-allow-oversized-stacks.patch
deleted file mode 100644
index 704e05f48..000000000
--- a/patches/server/0172-ShulkerBox-allow-oversized-stacks.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 27 May 2021 04:04:23 -0500
-Subject: [PATCH] ShulkerBox allow oversized stacks
-
-This fixes PaperMC/Paper#4748 where breaking a shulkerbox in survival mode
-with oversized itemstacks would cause a "chunk ban". This fixes it by always
-creating an itemstack using the TileEntity's NBT data (how it handles it for
-creative players) instead of routing it through the LootableBuilder.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 2c9deba9da45feb81ed5801c33aa64e38f8d6a79..0838b3c612c832276afa1edc090ef7771e8bf2fc 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -429,7 +429,7 @@ public class ServerPlayerGameMode {
- 
-                 ItemStack mainHandStack = null; // Paper
-                 boolean isCorrectTool = false; // Paper
--                if (this.isCreative()) {
-+                if (this.isCreative() || (this.level.purpurConfig.shulkerBoxAllowOversizedStacks && block instanceof net.minecraft.world.level.block.ShulkerBoxBlock)) { // Purpur
-                     // return true; // CraftBukkit
-                 } else {
-                     ItemStack itemstack = this.player.getMainHandItem();
-diff --git a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index d5fe3b8e2f5a8899f6afeb0600764284a617f261..2b513fc2f6c33963e43093cb08594bff946d72fa 100644
---- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
-@@ -135,7 +135,7 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
-     public void playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
-         BlockEntity blockEntity = world.getBlockEntity(pos);
-         if (blockEntity instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity) {
--            if (!world.isClientSide && player.isCreative() && !shulkerBoxBlockEntity.isEmpty()) {
-+            if (world.purpurConfig.shulkerBoxAllowOversizedStacks || (!world.isClientSide && player.isCreative() && !shulkerBoxBlockEntity.isEmpty())) { // Purpur
-                 ItemStack itemStack = getColoredItemStack(this.getColor());
-                 blockEntity.saveToItem(itemStack);
-                 if (shulkerBoxBlockEntity.hasCustomName()) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2abe6192ab9caac24aae3c8488cf0ee3cb3173d7..bb01e0a0e92d9c6fad33129fe61a2a53779f44ff 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -657,6 +657,11 @@ public class PurpurWorldConfig {
-         }
-     }
- 
-+    public boolean shulkerBoxAllowOversizedStacks = false;
-+    private void shulkerBoxSettings() {
-+        shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
-+    }
-+
-     public boolean slabHalfBreak = false;
-     private void slabSettings() {
-         slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak);
diff --git a/patches/server/0180-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0173-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
similarity index 79%
rename from patches/server/0180-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
rename to patches/server/0173-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
index 6ecd8c1b8..969b2d855 100644
--- a/patches/server/0180-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
+++ b/patches/server/0173-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
@@ -6,18 +6,18 @@ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 65c92a2feffd878c12082239b0c41444a0f21d57..e46327725cbdae34b769c8d125594618099cb8b4 100644
+index bc994bbc4c7b66e6365739acb896aaa81fbcbd7e..ea3252a70c68f3c228417d8ed6d19d5669abb5fb 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -189,6 +189,7 @@ public abstract class Player extends LivingEntity {
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
-     // Paper end
+@@ -196,6 +196,7 @@ public abstract class Player extends LivingEntity {
+     public boolean affectsSpawning = true; // Paper - Affects Spawning API
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
      public int sixRowEnderchestSlotCount = -1; // Purpur
 +    public int burpDelay = 0; // Purpur
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -264,6 +265,12 @@ public abstract class Player extends LivingEntity {
+@@ -271,6 +272,12 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -30,9 +30,9 @@ index 65c92a2feffd878c12082239b0c41444a0f21d57..e46327725cbdae34b769c8d125594618
          this.noPhysics = this.isSpectator();
          if (this.isSpectator()) {
              this.setOnGround(false);
-@@ -2382,7 +2389,7 @@ public abstract class Player extends LivingEntity {
+@@ -2362,7 +2369,7 @@ public abstract class Player extends LivingEntity {
      public ItemStack eat(Level world, ItemStack stack) {
-         this.getFoodData().eat(stack.getItem(), stack);
+         this.getFoodData().eat(stack);
          this.awardStat(Stats.ITEM_USED.get(stack.getItem()));
 -        world.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_BURP, SoundSource.PLAYERS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F);
 +        // world.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_BURP, SoundSource.PLAYERS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F); // Purpur - moved to tick()
@@ -40,22 +40,21 @@ index 65c92a2feffd878c12082239b0c41444a0f21d57..e46327725cbdae34b769c8d125594618
              CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer) this, stack);
          }
 diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
-index 2038df72f8d7d33d4105de8129628daf21de6f0f..31ec6022b305df0ae02364c916ecf18425a0bc36 100644
+index b89860d451d92ddda64b7e4144542b7fc5fd86f0..08a6cca64ddd49826a0bbddd7711187c73bb4997 100644
 --- a/src/main/java/net/minecraft/world/food/FoodData.java
 +++ b/src/main/java/net/minecraft/world/food/FoodData.java
-@@ -33,8 +33,10 @@ public class FoodData {
-     // CraftBukkit end
+@@ -38,7 +38,9 @@ public class FoodData {
+     }
  
      public void eat(int food, float saturationModifier) {
 +        int oldValue = this.foodLevel; // Purpur
-         this.foodLevel = Math.min(food + this.foodLevel, 20);
-         this.saturationLevel = Math.min(this.saturationLevel + (float) food * saturationModifier * 2.0F, (float) this.foodLevel);
+         this.add(food, FoodConstants.saturationByModifier(food, saturationModifier));
 +        if (this.entityhuman.level().purpurConfig.playerBurpWhenFull && this.foodLevel == 20 && oldValue < 20) this.entityhuman.burpDelay = this.entityhuman.level().purpurConfig.playerBurpDelay; // Purpur
      }
  
-     public void eat(Item item, ItemStack stack) {
+     public void eat(ItemStack stack) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index db5156b0781cedc56929f73d3183b853b26ff4f7..01463f9279fd69b4afc42d9161a4da0473dc3ed8 100644
+index c27e8ad0e401499105ed3db2ef7b73a6fda8fb37..1c2aec3ddbe6d9dd0ae9ce4d074092ed0555d711 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -388,6 +388,8 @@ public class PurpurWorldConfig {
@@ -75,4 +74,4 @@ index db5156b0781cedc56929f73d3183b853b26ff4f7..01463f9279fd69b4afc42d9161a4da04
 +        playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0181-Allow-player-join-full-server-by-permission.patch b/patches/server/0174-Allow-player-join-full-server-by-permission.patch
similarity index 90%
rename from patches/server/0181-Allow-player-join-full-server-by-permission.patch
rename to patches/server/0174-Allow-player-join-full-server-by-permission.patch
index 551d1a790..6b634e729 100644
--- a/patches/server/0181-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0174-Allow-player-join-full-server-by-permission.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 265889514d2959731440ec180f6e47b19bb83cfb..cf721106b861a8c166244efc2114e22d038aa3a7 100644
+index f2a7eba2618ea9c1acaf93c0ef8f6f5f737de6fe..d20a7a79e27db1092ff78910df5d45982971cc3e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -736,7 +736,7 @@ public abstract class PlayerList {
+@@ -754,7 +754,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, io.papermc.paper.adventure.PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
          } else {
              // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;
diff --git a/patches/server/0175-Add-portal-permission-bypass.patch b/patches/server/0175-Add-portal-permission-bypass.patch
new file mode 100644
index 000000000..7d5cd2bd7
--- /dev/null
+++ b/patches/server/0175-Add-portal-permission-bypass.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Thu, 7 Dec 2023 14:53:48 -0800
+Subject: [PATCH] Add portal permission bypass
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index ea3252a70c68f3c228417d8ed6d19d5669abb5fb..458c14d4f298137ef1a333368644568a2c8a0b09 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity {
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
+     public int sixRowEnderchestSlotCount = -1; // Purpur
+     public int burpDelay = 0; // Purpur
++    public boolean canPortalInstant = false; // Purpur
+ 
+     // CraftBukkit start
+     public boolean fauxSleeping;
+@@ -488,7 +489,7 @@ public abstract class Player extends LivingEntity {
+ 
+     @Override
+     public int getPortalWaitTime() {
+-        return Math.max(1, this.level().getGameRules().getInt(this.abilities.invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY));
++        return Math.max(1, canPortalInstant ? 1 : this.level().getGameRules().getInt(this.abilities.invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY));
+     }
+ 
+     @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+index 41f3cdec7deabf34358b8087df77169f85a5b919..90265b6f2acd43713b61e277799dd31311b6b7e2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+@@ -265,6 +265,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+     @Override
+     public void recalculatePermissions() {
+         this.perm.recalculatePermissions();
++        getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur
+     }
+ 
+     @Override
diff --git a/patches/server/0183-Shulker-spawn-from-bullet-options.patch b/patches/server/0176-Shulker-spawn-from-bullet-options.patch
similarity index 90%
rename from patches/server/0183-Shulker-spawn-from-bullet-options.patch
rename to patches/server/0176-Shulker-spawn-from-bullet-options.patch
index 96f17fabf..7776673b5 100644
--- a/patches/server/0183-Shulker-spawn-from-bullet-options.patch
+++ b/patches/server/0176-Shulker-spawn-from-bullet-options.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Shulker spawn from bullet options
 (7 - 1) / 5.0 = 1.2    1.0 - 1.2 = -0.2     0% (6 other shulkers)
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 69e1f7d1737a8410ff36d4226c15090e72529658..786fe41cc743817f2ed613969c7eeec9fc001b4b 100644
+index 5b4ad4f64488ca5a21312caa3d13318f429401ea..73063abbd051f1d044a8b2c0530cc8d2a96a6331 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-@@ -503,12 +503,21 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
+@@ -504,12 +504,21 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
          Vec3 vec3d = this.position();
          AABB axisalignedbb = this.getBoundingBox();
  
@@ -43,7 +43,7 @@ index 69e1f7d1737a8410ff36d4226c15090e72529658..786fe41cc743817f2ed613969c7eeec9
  
                  if (entityshulker != null) {
                      entityshulker.setVariant(this.getVariant());
-@@ -620,7 +629,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
+@@ -621,7 +630,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
  
      @Override
      public Optional<DyeColor> getVariant() {
@@ -53,10 +53,10 @@ index 69e1f7d1737a8410ff36d4226c15090e72529658..786fe41cc743817f2ed613969c7eeec9
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/item/DyeColor.java b/src/main/java/net/minecraft/world/item/DyeColor.java
-index 88e1c2431d51d8cdc3d555b711e506648225d289..ac8735cc9d127fc1f867b40d4000c033ef73bb83 100644
+index 2202798612cad53aff28c499b8909a7292a37ad5..5ed2b7d15686fc9aa6dc7c03c337433cb3ee2cbd 100644
 --- a/src/main/java/net/minecraft/world/item/DyeColor.java
 +++ b/src/main/java/net/minecraft/world/item/DyeColor.java
-@@ -103,4 +103,10 @@ public enum DyeColor implements StringRepresentable {
+@@ -105,4 +105,10 @@ public enum DyeColor implements StringRepresentable {
      public String getSerializedName() {
          return this.name;
      }
@@ -68,10 +68,10 @@ index 88e1c2431d51d8cdc3d555b711e506648225d289..ac8735cc9d127fc1f867b40d4000c033
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3f39347665b1b88a3068b258ec7a6923890961f5..60f15c3cebdcfde4938d0088b7d5b053af7ecc8e 100644
+index 1c2aec3ddbe6d9dd0ae9ce4d074092ed0555d711..444ae36042e5d5bf2bd3ba7348882304825b5f06 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1926,6 +1926,11 @@ public class PurpurWorldConfig {
+@@ -1908,6 +1908,11 @@ public class PurpurWorldConfig {
      public boolean shulkerControllable = true;
      public double shulkerMaxHealth = 30.0D;
      public boolean shulkerTakeDamageFromWater = false;
@@ -83,7 +83,7 @@ index 3f39347665b1b88a3068b258ec7a6923890961f5..60f15c3cebdcfde4938d0088b7d5b053
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -1937,6 +1942,11 @@ public class PurpurWorldConfig {
+@@ -1919,6 +1924,11 @@ public class PurpurWorldConfig {
          }
          shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth);
          shulkerTakeDamageFromWater = getBoolean("mobs.shulker.takes-damage-from-water", shulkerTakeDamageFromWater);
diff --git a/patches/server/0177-Add-toggle-for-sand-duping-fix.patch b/patches/server/0177-Add-toggle-for-sand-duping-fix.patch
deleted file mode 100644
index 915276d71..000000000
--- a/patches/server/0177-Add-toggle-for-sand-duping-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 4 Jun 2021 09:13:54 -0500
-Subject: [PATCH] Add toggle for sand duping fix
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index e6f75a9cac46c8e3ddba664a9d5b27b665a94cb4..958e7684440fcc209fe33e882bf259d92a6814b1 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -133,7 +133,7 @@ public class FallingBlockEntity extends Entity {
-     @Override
-     public void tick() {
-         // Paper start - fix sand duping
--        if (this.isRemoved()) {
-+        if (this.level().purpurConfig.fixSandDuping && this.isRemoved()) { // Purpur
-             return;
-         }
-         // Paper end - fix sand duping
-@@ -150,7 +150,7 @@ public class FallingBlockEntity extends Entity {
-             this.move(MoverType.SELF, this.getDeltaMovement());
- 
-             // Paper start - fix sand duping
--            if (this.isRemoved()) {
-+            if (this.level().purpurConfig.fixSandDuping && this.isRemoved()) { // Purpur
-                 return;
-             }
-             // Paper end - fix sand duping
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 456a3cbadb5dbce0dfdafe4320c5006205a032bd..ce9a971ce1b9657823988395cb37b109a7b3410e 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -683,6 +683,11 @@ public class PurpurWorldConfig {
-         }
-     }
- 
-+    public boolean fixSandDuping = true;
-+    private void sandSettings() {
-+        fixSandDuping = getBoolean("blocks.sand.fix-duping", fixSandDuping);
-+    }
-+
-     public boolean shulkerBoxAllowOversizedStacks = false;
-     private void shulkerBoxSettings() {
-         shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
diff --git a/patches/server/0184-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0177-Eating-glow-berries-adds-glow-effect.patch
similarity index 74%
rename from patches/server/0184-Eating-glow-berries-adds-glow-effect.patch
rename to patches/server/0177-Eating-glow-berries-adds-glow-effect.patch
index 843e97c7d..c5288146e 100644
--- a/patches/server/0184-Eating-glow-berries-adds-glow-effect.patch
+++ b/patches/server/0177-Eating-glow-berries-adds-glow-effect.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Eating glow berries adds glow effect
 
 
 diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
-index e6f8cb165f7e3da5f0edfc952d14059516de8acf..31f5ed9dd1727eee24804a384817d2b76a45676b 100644
+index 6467358f5fdf4cd4f7c1e2cc65c834a9da39596a..42b322879629afb2d2fc64a215f010f5d5ce9e02 100644
 --- a/src/main/java/net/minecraft/world/item/Items.java
 +++ b/src/main/java/net/minecraft/world/item/Items.java
-@@ -1184,7 +1184,7 @@ public class Items {
-     public static final Item LANTERN = registerBlock(Blocks.LANTERN);
-     public static final Item SOUL_LANTERN = registerBlock(Blocks.SOUL_LANTERN);
-     public static final Item SWEET_BERRIES = registerItem("sweet_berries", new ItemNameBlockItem(Blocks.SWEET_BERRY_BUSH, (new Item.Properties()).food(Foods.SWEET_BERRIES)));
--    public static final Item GLOW_BERRIES = registerItem("glow_berries", new ItemNameBlockItem(Blocks.CAVE_VINES, (new Item.Properties()).food(Foods.GLOW_BERRIES)));
-+    public static final Item GLOW_BERRIES = registerItem("glow_berries", new org.purpurmc.purpur.item.GlowBerryItem(Blocks.CAVE_VINES, (new Item.Properties()).food(Foods.GLOW_BERRIES))); // Purpur
-     public static final Item CAMPFIRE = registerBlock(Blocks.CAMPFIRE);
-     public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE);
-     public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT);
+@@ -1909,7 +1909,7 @@ public class Items {
+         "sweet_berries", new ItemNameBlockItem(Blocks.SWEET_BERRY_BUSH, new Item.Properties().food(Foods.SWEET_BERRIES))
+     );
+     public static final Item GLOW_BERRIES = registerItem(
+-        "glow_berries", new ItemNameBlockItem(Blocks.CAVE_VINES, new Item.Properties().food(Foods.GLOW_BERRIES))
++        "glow_berries", new org.purpurmc.purpur.item.GlowBerryItem(Blocks.CAVE_VINES, new Item.Properties().food(Foods.GLOW_BERRIES)) // Purpur
+     );
+     public static final Item CAMPFIRE = registerBlock(Blocks.CAMPFIRE, settings -> settings.component(DataComponents.CONTAINER, ItemContainerContents.EMPTY));
+     public static final Item SOUL_CAMPFIRE = registerBlock(
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 60f15c3cebdcfde4938d0088b7d5b053af7ecc8e..2e810dafa23b92ba844a53d970c6e2206f8b3819 100644
+index 444ae36042e5d5bf2bd3ba7348882304825b5f06..75903da7236f6f57c4978d33cd8ac15a4f7d7a62 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -220,6 +220,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0178-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0178-Add-toggle-for-end-portal-safe-teleporting.patch
deleted file mode 100644
index b12418646..000000000
--- a/patches/server/0178-Add-toggle-for-end-portal-safe-teleporting.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Wed, 9 Jun 2021 11:03:40 -0500
-Subject: [PATCH] Add toggle for end portal safe teleporting
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2570fb81e94f7169a54a8e0b2dce5a2c24fcd00e..12f0da455f174c5a0652ac87f62c159808fbf7d3 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3158,7 +3158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-             }
- 
-             this.processPortalCooldown();
--            this.tickEndPortal(); // Paper - make end portalling safe
-+            if (this.level().purpurConfig.endPortalSafeTeleporting) this.tickEndPortal(); // Paper - make end portalling safe // Purpur
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index f80f6da484f4144e743079e5104bf503419074b2..2deddc746e43896584bd65ba8e7971a80acb4a4d 100644
---- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -61,6 +61,22 @@ public class EndPortalBlock extends BaseEntityBlock {
-                 // return; // CraftBukkit - always fire event in case plugins wish to change it
-             }
- 
-+            // Purpur start
-+            if (!world.purpurConfig.endPortalSafeTeleporting) {
-+                // CraftBukkit start - Entity in portal
-+                EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
-+                world.getCraftServer().getPluginManager().callEvent(event);
-+
-+                if (entity instanceof ServerPlayer) {
-+                    ((ServerPlayer) entity).changeDimension(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
-+                    return;
-+                }
-+                // CraftBukkit end
-+                entity.changeDimension(worldserver);
-+                return;
-+            }
-+            // Purpur end
-+
-             // Paper start - move all of this logic into portal tick
-             entity.portalWorld = ((ServerLevel)world);
-             entity.portalBlock = pos.immutable();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ce9a971ce1b9657823988395cb37b109a7b3410e..db5156b0781cedc56929f73d3183b853b26ff4f7 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -631,6 +631,11 @@ public class PurpurWorldConfig {
-         furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
-     }
- 
-+    public boolean endPortalSafeTeleporting = true;
-+    private void endPortalSettings() {
-+        endPortalSafeTeleporting = getBoolean("blocks.end_portal.safe-teleporting", endPortalSafeTeleporting);
-+    }
-+
-     public boolean mobsSpawnOnPackedIce = true;
-     public boolean mobsSpawnOnBlueIce = true;
-     private void iceSettings() {
diff --git a/patches/server/0185-Option-to-make-drowned-break-doors.patch b/patches/server/0178-Option-to-make-drowned-break-doors.patch
similarity index 88%
rename from patches/server/0185-Option-to-make-drowned-break-doors.patch
rename to patches/server/0178-Option-to-make-drowned-break-doors.patch
index f35fab407..48af70fc1 100644
--- a/patches/server/0185-Option-to-make-drowned-break-doors.patch
+++ b/patches/server/0178-Option-to-make-drowned-break-doors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option to make drowned break doors
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 902f831ea001145f73691b96f2fca8245a4fc05a..9346d634dd2b8cb3d89aa7ccf12fec6ff79bbe2f 100644
+index f037d50f26f7532f11a71790448de7a71644b6ca..2547ac49721e2840da2845076d5e62a1465a4ea3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -29,6 +29,7 @@ import net.minecraft.world.entity.ai.goal.MoveToBlockGoal;
@@ -16,7 +16,7 @@ index 902f831ea001145f73691b96f2fca8245a4fc05a..9346d634dd2b8cb3d89aa7ccf12fec6f
  import net.minecraft.world.entity.ai.goal.target.HurtByTargetGoal;
  import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
  import net.minecraft.world.entity.ai.navigation.GroundPathNavigation;
-@@ -122,6 +123,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -125,6 +126,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
          this.goalSelector.addGoal(2, new Drowned.DrownedAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(5, new Drowned.DrownedGoToBeachGoal(this, 1.0D));
          this.goalSelector.addGoal(6, new Drowned.DrownedSwimUpGoal(this, 1.0D, this.level().getSeaLevel()));
@@ -24,7 +24,7 @@ index 902f831ea001145f73691b96f2fca8245a4fc05a..9346d634dd2b8cb3d89aa7ccf12fec6f
          this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0D));
          this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Drowned.class})).setAlertOthers(ZombifiedPiglin.class));
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::okTarget));
-@@ -171,7 +173,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -174,7 +176,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
  
      @Override
      public boolean supportsBreakDoorGoal() {
@@ -34,10 +34,10 @@ index 902f831ea001145f73691b96f2fca8245a4fc05a..9346d634dd2b8cb3d89aa7ccf12fec6f
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2e810dafa23b92ba844a53d970c6e2206f8b3819..e49cd59e4fc687c9365d722f12948378e29b9327 100644
+index 75903da7236f6f57c4978d33cd8ac15a4f7d7a62..b3a999c8ecaaf9e0dae83d0fe10f9f927f592b58 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1072,6 +1072,7 @@ public class PurpurWorldConfig {
+@@ -1054,6 +1054,7 @@ public class PurpurWorldConfig {
      public double drownedJockeyChance = 0.05D;
      public boolean drownedJockeyTryExistingChickens = true;
      public boolean drownedTakeDamageFromWater = false;
@@ -45,7 +45,7 @@ index 2e810dafa23b92ba844a53d970c6e2206f8b3819..e49cd59e4fc687c9365d722f12948378
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -1087,6 +1088,7 @@ public class PurpurWorldConfig {
+@@ -1069,6 +1070,7 @@ public class PurpurWorldConfig {
          drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
          drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
          drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
diff --git a/patches/server/0186-Configurable-hunger-starvation-damage.patch b/patches/server/0179-Configurable-hunger-starvation-damage.patch
similarity index 85%
rename from patches/server/0186-Configurable-hunger-starvation-damage.patch
rename to patches/server/0179-Configurable-hunger-starvation-damage.patch
index 70fe518bd..0d9d7df22 100644
--- a/patches/server/0186-Configurable-hunger-starvation-damage.patch
+++ b/patches/server/0179-Configurable-hunger-starvation-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable hunger starvation damage
 
 
 diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
-index 31ec6022b305df0ae02364c916ecf18425a0bc36..e54af9ff2a786e919b8261aa27509be942e70261 100644
+index 08a6cca64ddd49826a0bbddd7711187c73bb4997..dd72d6a79139ff33f26a32b71283ce0b8d084ecc 100644
 --- a/src/main/java/net/minecraft/world/food/FoodData.java
 +++ b/src/main/java/net/minecraft/world/food/FoodData.java
-@@ -102,7 +102,7 @@ public class FoodData {
+@@ -107,7 +107,7 @@ public class FoodData {
              ++this.tickTimer;
              if (this.tickTimer >= this.starvationRate) { // CraftBukkit - add regen rate manipulation
                  if (player.getHealth() > 10.0F || enumdifficulty == Difficulty.HARD || player.getHealth() > 1.0F && enumdifficulty == Difficulty.NORMAL) {
@@ -18,10 +18,10 @@ index 31ec6022b305df0ae02364c916ecf18425a0bc36..e54af9ff2a786e919b8261aa27509be9
  
                  this.tickTimer = 0;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e49cd59e4fc687c9365d722f12948378e29b9327..9061a6819cbe7d9da35ff5f8fd8c49bb1128d346 100644
+index b3a999c8ecaaf9e0dae83d0fe10f9f927f592b58..a9a2b09b985e3e4eb69d4ae16dfd40f46be936d6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2583,4 +2583,9 @@ public class PurpurWorldConfig {
+@@ -2567,4 +2567,9 @@ public class PurpurWorldConfig {
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
          zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
      }
diff --git a/patches/server/0187-Enhance-SysoutCatcher.patch b/patches/server/0180-Enhance-SysoutCatcher.patch
similarity index 100%
rename from patches/server/0187-Enhance-SysoutCatcher.patch
rename to patches/server/0180-Enhance-SysoutCatcher.patch
diff --git a/patches/server/0188-Add-uptime-command.patch b/patches/server/0181-Add-uptime-command.patch
similarity index 94%
rename from patches/server/0188-Add-uptime-command.patch
rename to patches/server/0181-Add-uptime-command.patch
index 127da6da0..5f0236123 100644
--- a/patches/server/0188-Add-uptime-command.patch
+++ b/patches/server/0181-Add-uptime-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add uptime command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index e1887523b0b6a0479544385932f54ab1de0295ae..e254f7c498c5a1608afe130b2dd4d3d037069f25 100644
+index d0a81669ac20dc86e888aa34e246c251b8886ba2..26c9254cef922a78deac3053f93c60037f19d31f 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -233,6 +233,7 @@ public class Commands {
+@@ -255,6 +255,7 @@ public class Commands {
              org.purpurmc.purpur.command.CreditsCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
@@ -17,19 +17,19 @@ index e1887523b0b6a0479544385932f54ab1de0295ae..e254f7c498c5a1608afe130b2dd4d3d0
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a3675f1ef2317c1a0e9addd9280fe928a45b2736..615de0c4baf7797d03c43e5e164b198ebb70b341 100644
+index b68db217c8765fa029244bf2701757bd31a5db2b..6d84eb68e3160f772d6832513df2bc4db87b594e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -288,6 +288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -300,6 +300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
-     //public ConsoleReader reader; // Paper
-     public static int currentTick = 0; // Paper - Further improve tick loop
+     public static int currentTick; // Paper - improve tick loop
 +    public static final long startTimeMillis = System.currentTimeMillis();
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public Commands vanillaCommandDispatcher;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index b1450f979efb13a31f96b0638d415f807c5c6a4f..c33c31956de911ff03f4782ab811a84ba18241c9 100644
+index f3f8ca5f2b391860b2134e06784819aa0e78321e..16239aafded82b4f19f97ae5fd87c53b55a5ef53 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -184,6 +184,7 @@ public class PurpurConfig {
diff --git a/patches/server/0182-Add-portal-waiting-option-permission-bypass.patch b/patches/server/0182-Add-portal-waiting-option-permission-bypass.patch
deleted file mode 100644
index 969c8887d..000000000
--- a/patches/server/0182-Add-portal-waiting-option-permission-bypass.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 26 Jun 2021 23:05:12 -0500
-Subject: [PATCH] Add portal waiting option & permission bypass
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e46327725cbdae34b769c8d125594618099cb8b4..05c089d6e89cf017998bfab88aa9b2d124bf7f86 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -190,6 +190,7 @@ public abstract class Player extends LivingEntity {
-     // Paper end
-     public int sixRowEnderchestSlotCount = -1; // Purpur
-     public int burpDelay = 0; // Purpur
-+    public boolean canPortalInstant = false; // Purpur
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-@@ -474,7 +475,7 @@ public abstract class Player extends LivingEntity {
- 
-     @Override
-     public int getPortalWaitTime() {
--        return this.abilities.invulnerable ? 1 : 80;
-+        return canPortalInstant ? 1 : this.abilities.invulnerable ? this.level().purpurConfig.playerCreativePortalWaitTime : this.level().purpurConfig.playerPortalWaitTime; // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 017e97c1618b8ee4640b36a0ec1b07026047bfc3..cf124ad445fd5e8adb1114aca5113e274d950a4a 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -266,6 +266,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-     @Override
-     public void recalculatePermissions() {
-         this.perm.recalculatePermissions();
-+        getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 01463f9279fd69b4afc42d9161a4da0473dc3ed8..3f39347665b1b88a3068b258ec7a6923890961f5 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -390,6 +390,8 @@ public class PurpurWorldConfig {
-     public double playerCriticalDamageMultiplier = 1.5D;
-     public int playerBurpDelay = 10;
-     public boolean playerBurpWhenFull = false;
-+    public int playerPortalWaitTime = 80;
-+    public int playerCreativePortalWaitTime = 1;
-     private void playerSettings() {
-         if (PurpurConfig.version < 19) {
-             boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -412,6 +414,8 @@ public class PurpurWorldConfig {
-         playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
-         playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
-         playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
-+        playerPortalWaitTime = getInt("gameplay-mechanics.player.portal-wait-time", playerPortalWaitTime);
-+        playerCreativePortalWaitTime = getInt("gameplay-mechanics.player.creative-portal-wait-time", playerCreativePortalWaitTime);
-     }
- 
-     private static boolean projectileDespawnRateSettingsMigrated = false;
diff --git a/patches/server/0189-Tool-actionable-options.patch b/patches/server/0182-Tool-actionable-options.patch
similarity index 64%
rename from patches/server/0189-Tool-actionable-options.patch
rename to patches/server/0182-Tool-actionable-options.patch
index 8cacc981f..869604642 100644
--- a/patches/server/0189-Tool-actionable-options.patch
+++ b/patches/server/0182-Tool-actionable-options.patch
@@ -5,58 +5,33 @@ Subject: [PATCH] Tool actionable options
 
 
 diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java
-index 18898e16ec42f6b694b06e09d9174b60d62450d7..20f33b77b4a9494be227456bc742a029eb0af59b 100644
+index 9fd2d97ff0e05578a3e6a0b86dc1974691845c5d..58343722399404530d497648155dbc254d6a865a 100644
 --- a/src/main/java/net/minecraft/world/item/AxeItem.java
 +++ b/src/main/java/net/minecraft/world/item/AxeItem.java
-@@ -33,29 +33,32 @@ public class AxeItem extends DiggerItem {
+@@ -56,13 +56,15 @@ public class AxeItem extends DiggerItem {
+         Level level = context.getLevel();
          BlockPos blockPos = context.getClickedPos();
          Player player = context.getPlayer();
-         BlockState blockState = level.getBlockState(blockPos);
--        Optional<BlockState> optional = this.getStripped(blockState);
--        Optional<BlockState> optional2 = WeatheringCopper.getPrevious(blockState);
--        Optional<BlockState> optional3 = Optional.ofNullable(HoneycombItem.WAX_OFF_BY_BLOCK.get().get(blockState.getBlock())).map((block) -> {
--            return block.withPropertiesOf(blockState);
--        });
-+        // Purpur start
-+        Block clickedBlock = level.getBlockState(blockPos).getBlock();
-+        Optional<org.purpurmc.purpur.tool.Actionable> optional = Optional.ofNullable(level.purpurConfig.axeStrippables.get(blockState.getBlock()));
-+        Optional<org.purpurmc.purpur.tool.Actionable> optional2 = Optional.ofNullable(level.purpurConfig.axeWeatherables.get(blockState.getBlock()));
-+        Optional<org.purpurmc.purpur.tool.Actionable> optional3 = Optional.ofNullable(level.purpurConfig.axeWaxables.get(blockState.getBlock()));
-+        // Purpur end
-         ItemStack itemStack = context.getItemInHand();
--        Optional<BlockState> optional4 = Optional.empty();
-+        Optional<org.purpurmc.purpur.tool.Actionable> optional4 = Optional.empty(); // Purpur
-         if (optional.isPresent()) {
--            level.playSound(player, blockPos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F);
-+            if (!STRIPPABLES.containsKey(clickedBlock)) level.playSound(null, blockPos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - force sound
-             optional4 = optional;
-         } else if (optional2.isPresent()) {
--            level.playSound(player, blockPos, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F);
-+            if (!HoneycombItem.WAXABLES.get().containsKey(clickedBlock)) level.playSound(null, blockPos, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - force sound
-             level.levelEvent(player, 3005, blockPos, 0);
-             optional4 = optional2;
-         } else if (optional3.isPresent()) {
--            level.playSound(player, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F);
-+            if (!HoneycombItem.WAX_OFF_BY_BLOCK.get().containsKey(clickedBlock)) level.playSound(null, blockPos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - force sound
-             level.levelEvent(player, 3004, blockPos, 0);
-             optional4 = optional3;
-         }
- 
-         if (optional4.isPresent()) {
-+            org.purpurmc.purpur.tool.Actionable actionable = optional4.get(); // Purpur
-+            BlockState state = actionable.into().withPropertiesOf(blockState); // Purpur
+-        Optional<BlockState> optional = this.evaluateNewBlockState(level, blockPos, player, level.getBlockState(blockPos));
++        Optional<org.purpurmc.purpur.tool.Actionable> optional = this.evaluateActionable(level, blockPos, player, level.getBlockState(blockPos)); // Purpur
+         if (optional.isEmpty()) {
+             return InteractionResult.PASS;
+         } else {
++            org.purpurmc.purpur.tool.Actionable actionable = optional.get(); // Purpur
++            BlockState state = actionable.into().withPropertiesOf(level.getBlockState(blockPos)); // Purpur
+             ItemStack itemStack = context.getItemInHand();
              // Paper start - EntityChangeBlockEvent
--            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional4.get())) {
+-            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, optional.get())) {
 +            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, blockPos, state)) { // Purpur
                  return InteractionResult.PASS;
              }
              // Paper end
-@@ -63,15 +66,22 @@ public class AxeItem extends DiggerItem {
+@@ -70,32 +72,41 @@ public class AxeItem extends DiggerItem {
                  CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
              }
  
--            level.setBlock(blockPos, optional4.get(), 11);
--            level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, optional4.get()));
+-            level.setBlock(blockPos, optional.get(), 11);
+-            level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, optional.get()));
 +            // Purpur start
 +            level.setBlock(blockPos, state, 11);
 +            actionable.drops().forEach((drop, chance) -> {
@@ -67,21 +42,48 @@ index 18898e16ec42f6b694b06e09d9174b60d62450d7..20f33b77b4a9494be227456bc742a029
 +            level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(player, state));
 +            // Purpur end
              if (player != null) {
-                 itemStack.hurtAndBreak(1, player, (p) -> {
-                     p.broadcastBreakEvent(context.getHand());
-                 });
+                 itemStack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(context.getHand()));
              }
  
 -            return InteractionResult.sidedSuccess(level.isClientSide);
 +            return InteractionResult.SUCCESS; // Purpur - force arm swing
-         } else {
-             return InteractionResult.PASS;
          }
+     }
+ 
+-    private Optional<BlockState> evaluateNewBlockState(Level world, BlockPos pos, @Nullable Player player, BlockState state) {
+-        Optional<BlockState> optional = this.getStripped(state);
++    private Optional<org.purpurmc.purpur.tool.Actionable> evaluateActionable(Level world, BlockPos pos, @Nullable Player player, BlockState state) { // Purpur
++        Optional<org.purpurmc.purpur.tool.Actionable> optional = Optional.ofNullable(world.purpurConfig.axeStrippables.get(state.getBlock())); // Purpur
+         if (optional.isPresent()) {
+-            world.playSound(player, pos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F);
++            world.playSound(STRIPPABLES.containsKey(state.getBlock()) ? player : null, pos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - force sound
+             return optional;
+         } else {
+-            Optional<BlockState> optional2 = WeatheringCopper.getPrevious(state);
++            Optional<org.purpurmc.purpur.tool.Actionable> optional2 = Optional.ofNullable(world.purpurConfig.axeWeatherables.get(state.getBlock())); // Purpur
+             if (optional2.isPresent()) {
+-                world.playSound(player, pos, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F);
++                world.playSound(WeatheringCopper.getPrevious(state).isPresent() ? player : null, pos, SoundEvents.AXE_SCRAPE, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - force sound
+                 world.levelEvent(player, 3005, pos, 0);
+                 return optional2;
+             } else {
+-                Optional<BlockState> optional3 = Optional.ofNullable(HoneycombItem.WAX_OFF_BY_BLOCK.get().get(state.getBlock()))
+-                    .map(block -> block.withPropertiesOf(state));
++                // Purpur start
++                Optional<org.purpurmc.purpur.tool.Actionable> optional3 = Optional.ofNullable(world.purpurConfig.axeWaxables.get(state.getBlock()));
++                //    .map(block -> block.withPropertiesOf(state));
++                // Purpur end
+                 if (optional3.isPresent()) {
+-                    world.playSound(player, pos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F);
++                    world.playSound(HoneycombItem.WAX_OFF_BY_BLOCK.get().containsKey(state.getBlock()) ? player : null, pos, SoundEvents.AXE_WAX_OFF, SoundSource.BLOCKS, 1.0F, 1.0F); // Purpur - force sound
+                     world.levelEvent(player, 3004, pos, 0);
+                     return optional3;
+                 } else {
 diff --git a/src/main/java/net/minecraft/world/item/HoeItem.java b/src/main/java/net/minecraft/world/item/HoeItem.java
-index 180aec596110309aade13d2080f8824d152b07cb..552c31c0f3746dd35388395036e70a925bf00bd4 100644
+index 06497b5141e611cc7a1b6030a7b9c54b5c4eda06..28df1b3230762e52b5458ac93a85c9a5d41eb6a6 100644
 --- a/src/main/java/net/minecraft/world/item/HoeItem.java
 +++ b/src/main/java/net/minecraft/world/item/HoeItem.java
-@@ -34,15 +34,23 @@ public class HoeItem extends DiggerItem {
+@@ -46,15 +46,23 @@ public class HoeItem extends DiggerItem {
      public InteractionResult useOn(UseOnContext context) {
          Level level = context.getLevel();
          BlockPos blockPos = context.getClickedPos();
@@ -112,7 +114,7 @@ index 180aec596110309aade13d2080f8824d152b07cb..552c31c0f3746dd35388395036e70a92
                  if (!level.isClientSide) {
                      consumer.accept(context);
                      if (player != null) {
-@@ -52,7 +60,7 @@ public class HoeItem extends DiggerItem {
+@@ -62,7 +70,7 @@ public class HoeItem extends DiggerItem {
                      }
                  }
  
@@ -122,10 +124,10 @@ index 180aec596110309aade13d2080f8824d152b07cb..552c31c0f3746dd35388395036e70a92
                  return InteractionResult.PASS;
              }
 diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java
-index 21212462e6b415e96536a27b2c009d1562f18946..193bcb12152347f5f02ce18b01ba918e5e838f30 100644
+index 24f6a158e4759aac3be8da4cf5e0d40bd295355b..6b7dbb570f8a698c87c6bce992d84d87b55176e6 100644
 --- a/src/main/java/net/minecraft/world/item/ShovelItem.java
 +++ b/src/main/java/net/minecraft/world/item/ShovelItem.java
-@@ -37,9 +37,12 @@ public class ShovelItem extends DiggerItem {
+@@ -47,9 +47,12 @@ public class ShovelItem extends DiggerItem {
              BlockState blockState2 = FLATTENABLES.get(blockState.getBlock());
              BlockState blockState3 = null;
              Runnable afterAction = null; // Paper
@@ -141,7 +143,7 @@ index 21212462e6b415e96536a27b2c009d1562f18946..193bcb12152347f5f02ce18b01ba918e
              } else if (blockState.getBlock() instanceof CampfireBlock && blockState.getValue(CampfireBlock.LIT)) {
                  afterAction = () -> { // Paper
                  if (!level.isClientSide()) {
-@@ -68,7 +71,7 @@ public class ShovelItem extends DiggerItem {
+@@ -76,7 +79,7 @@ public class ShovelItem extends DiggerItem {
                      }
                  }
  
@@ -151,11 +153,11 @@ index 21212462e6b415e96536a27b2c009d1562f18946..193bcb12152347f5f02ce18b01ba918e
                  return InteractionResult.PASS;
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9061a6819cbe7d9da35ff5f8fd8c49bb1128d346..c2bc762175dfab4f64b00c56bbb28ff26b3cad73 100644
+index a9a2b09b985e3e4eb69d4ae16dfd40f46be936d6..e653a0cf4a4350d0faac21fab7681863fe2c75e0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -507,6 +507,206 @@ public class PurpurWorldConfig {
-         });
+@@ -504,6 +504,280 @@ public class PurpurWorldConfig {
+         snowballDamage = getInt("gameplay-mechanics.projectile-damage.snowball", snowballDamage);
      }
  
 +    public Map<Block, Strippable> axeStrippables = new HashMap<>();
@@ -203,6 +205,45 @@ index 9061a6819cbe7d9da35ff5f8fd8c49bb1128d346..c2bc762175dfab4f64b00c56bbb28ff2
 +            });
 +            set("gameplay-mechanics.shovel-turns-block-to-grass-path", null);
 +        }
++        if (PurpurConfig.version < 34) {
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_chiseled_copper", Map.of("into", "minecraft:chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_exposed_chiseled_copper", Map.of("into", "minecraft:exposed_chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_weathered_chiseled_copper", Map.of("into", "minecraft:weathered_chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_oxidized_chiseled_copper", Map.of("into", "minecraft:oxidized_chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_copper_door", Map.of("into", "minecraft:copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_exposed_copper_door", Map.of("into", "minecraft:exposed_copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_weathered_copper_door", Map.of("into", "minecraft:weathered_copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_oxidized_copper_door", Map.of("into", "minecraft:oxidized_copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_copper_trapdoor", Map.of("into", "minecraft:copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_exposed_copper_trapdoor", Map.of("into", "minecraft:exposed_copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_weathered_copper_trapdoor", Map.of("into", "minecraft:weathered_copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_oxidized_copper_trapdoor", Map.of("into", "minecraft:oxidized_copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_copper_grate", Map.of("into", "minecraft:copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_exposed_copper_grate", Map.of("into", "minecraft:exposed_copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_weathered_copper_grate", Map.of("into", "minecraft:weathered_copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_oxidized_copper_grate", Map.of("into", "minecraft:oxidized_copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_copper_bulb", Map.of("into", "minecraft:copper_bulb", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_exposed_copper_bulb", Map.of("into", "minecraft:exposed_copper_bulb", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_weathered_copper_bulb", Map.of("into", "minecraft:weathered_copper_bulb", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.waxables.minecraft:waxed_oxidized_copper_bulb", Map.of("into", "minecraft:oxidized_copper_bulb", "drops", new HashMap<String, Double>()));
++
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:exposed_chiseled_copper", Map.of("into", "minecraft:chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:weathered_chiseled_copper", Map.of("into", "minecraft:exposed_chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_chiseled_copper", Map.of("into", "minecraft:weathered_chiseled_copper", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_cut_copper_stairs", Map.of("into", "minecraft:weathered_cut_copper_stairs", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:exposed_copper_door", Map.of("into", "minecraft:copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:weathered_copper_door", Map.of("into", "minecraft:exposed_copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_copper_door", Map.of("into", "minecraft:weathered_copper_door", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:exposed_copper_trapdoor", Map.of("into", "minecraft:copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:weathered_copper_trapdoor", Map.of("into", "minecraft:exposed_copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_copper_trapdoor", Map.of("into", "minecraft:weathered_copper_trapdoor", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:exposed_copper_grate", Map.of("into", "minecraft:copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:weathered_copper_grate", Map.of("into", "minecraft:exposed_copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_copper_grate", Map.of("into", "minecraft:weathered_copper_grate", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:exposed_copper_bulb", Map.of("into", "minecraft:copper_bulb", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:weathered_copper_bulb", Map.of("into", "minecraft:exposed_copper_bulb", "drops", new HashMap<String, Double>()));
++            PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_copper_bulb", Map.of("into", "minecraft:weathered_copper_bulb", "drops", new HashMap<String, Double>()));
++        }
 +        getMap("tools.axe.strippables", Map.ofEntries(
 +                Map.entry("minecraft:oak_wood", Map.of("into", "minecraft:stripped_oak_wood", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:oak_log", Map.of("into", "minecraft:stripped_oak_log", "drops", new HashMap<String, Double>())),
@@ -258,7 +299,27 @@ index 9061a6819cbe7d9da35ff5f8fd8c49bb1128d346..c2bc762175dfab4f64b00c56bbb28ff2
 +                Map.entry("minecraft:waxed_cut_copper_stairs", Map.of("into", "minecraft:cut_copper_stairs", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:waxed_exposed_cut_copper_stairs", Map.of("into", "minecraft:exposed_cut_copper_stairs", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:waxed_weathered_cut_copper_stairs", Map.of("into", "minecraft:weathered_cut_copper_stairs", "drops", new HashMap<String, Double>())),
-+                Map.entry("minecraft:waxed_oxidized_cut_copper_stairs", Map.of("into", "minecraft:oxidized_cut_copper_stairs", "drops", new HashMap<String, Double>())))
++                Map.entry("minecraft:waxed_oxidized_cut_copper_stairs", Map.of("into", "minecraft:oxidized_cut_copper_stairs", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_chiseled_copper", Map.of("into", "minecraft:chiseled_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_exposed_chiseled_copper", Map.of("into", "minecraft:exposed_chiseled_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_weathered_chiseled_copper", Map.of("into", "minecraft:weathered_chiseled_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_oxidized_chiseled_copper", Map.of("into", "minecraft:oxidized_chiseled_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_copper_door", Map.of("into", "minecraft:copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_exposed_copper_door", Map.of("into", "minecraft:exposed_copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_weathered_copper_door", Map.of("into", "minecraft:weathered_copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_oxidized_copper_door", Map.of("into", "minecraft:oxidized_copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_copper_trapdoor", Map.of("into", "minecraft:copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_exposed_copper_trapdoor", Map.of("into", "minecraft:exposed_copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_weathered_copper_trapdoor", Map.of("into", "minecraft:weathered_copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_oxidized_copper_trapdoor", Map.of("into", "minecraft:oxidized_copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_copper_grate", Map.of("into", "minecraft:copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_exposed_copper_grate", Map.of("into", "minecraft:exposed_copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_weathered_copper_grate", Map.of("into", "minecraft:weathered_copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_oxidized_copper_grate", Map.of("into", "minecraft:oxidized_copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_copper_bulb", Map.of("into", "minecraft:copper_bulb", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_exposed_copper_bulb", Map.of("into", "minecraft:exposed_copper_bulb", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_weathered_copper_bulb", Map.of("into", "minecraft:weathered_copper_bulb", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:waxed_oxidized_copper_bulb", Map.of("into", "minecraft:oxidized_copper_bulb", "drops", new HashMap<String, Double>())))
 +        ).forEach((blockId, obj) -> {
 +            Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(blockId));
 +            if (block == Blocks.AIR) { PurpurConfig.log(Level.SEVERE, "Invalid block for `tools.axe.waxables`: " + blockId); return; }
@@ -283,12 +344,27 @@ index 9061a6819cbe7d9da35ff5f8fd8c49bb1128d346..c2bc762175dfab4f64b00c56bbb28ff2
 +                Map.entry("minecraft:exposed_cut_copper", Map.of("into", "minecraft:cut_copper", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:weathered_cut_copper", Map.of("into", "minecraft:exposed_cut_copper", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:oxidized_cut_copper", Map.of("into", "minecraft:weathered_cut_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:exposed_chiseled_copper", Map.of("into", "minecraft:chiseled_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:weathered_chiseled_copper", Map.of("into", "minecraft:exposed_chiseled_copper", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:oxidized_chiseled_copper", Map.of("into", "minecraft:weathered_chiseled_copper", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:exposed_cut_copper_slab", Map.of("into", "minecraft:cut_copper_slab", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:weathered_cut_copper_slab", Map.of("into", "minecraft:exposed_cut_copper_slab", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:oxidized_cut_copper_slab", Map.of("into", "minecraft:weathered_cut_copper_slab", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:exposed_cut_copper_stairs", Map.of("into", "minecraft:cut_copper_stairs", "drops", new HashMap<String, Double>())),
 +                Map.entry("minecraft:weathered_cut_copper_stairs", Map.of("into", "minecraft:exposed_cut_copper_stairs", "drops", new HashMap<String, Double>())),
-+                Map.entry("minecraft:oxidized_cut_copper_stairs", Map.of("into", "minecraft:weathered_cut_copper_stairs", "drops", new HashMap<String, Double>())))
++                Map.entry("minecraft:oxidized_cut_copper_stairs", Map.of("into", "minecraft:weathered_cut_copper_stairs", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:exposed_copper_door", Map.of("into", "minecraft:copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:weathered_copper_door", Map.of("into", "minecraft:exposed_copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:oxidized_copper_door", Map.of("into", "minecraft:weathered_copper_door", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:exposed_copper_trapdoor", Map.of("into", "minecraft:copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:weathered_copper_trapdoor", Map.of("into", "minecraft:exposed_copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:oxidized_copper_trapdoor", Map.of("into", "minecraft:weathered_copper_trapdoor", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:exposed_copper_grate", Map.of("into", "minecraft:copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:weathered_copper_grate", Map.of("into", "minecraft:exposed_copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:oxidized_copper_grate", Map.of("into", "minecraft:weathered_copper_grate", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:exposed_copper_bulb", Map.of("into", "minecraft:copper_bulb", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:weathered_copper_bulb", Map.of("into", "minecraft:exposed_copper_bulb", "drops", new HashMap<String, Double>())),
++                Map.entry("minecraft:oxidized_copper_bulb", Map.of("into", "minecraft:weathered_copper_bulb", "drops", new HashMap<String, Double>())))
 +        ).forEach((blockId, obj) -> {
 +            Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(blockId));
 +            if (block == Blocks.AIR) { PurpurConfig.log(Level.SEVERE, "Invalid block for `tools.axe.weatherables`: " + blockId); return; }
diff --git a/patches/server/0190-Store-placer-on-Block-when-placed.patch b/patches/server/0183-Store-placer-on-Block-when-placed.patch
similarity index 78%
rename from patches/server/0190-Store-placer-on-Block-when-placed.patch
rename to patches/server/0183-Store-placer-on-Block-when-placed.patch
index 7c35d7b30..eaf73e694 100644
--- a/patches/server/0190-Store-placer-on-Block-when-placed.patch
+++ b/patches/server/0183-Store-placer-on-Block-when-placed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Store placer on Block when placed
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 048151dd863692b41721c063d9a287f11cb2a0df..c0588e87f6f0ec3d642eacac41a3060abc08e33d 100644
+index 1b829ad61a25ef1e18adefe291d91fdb7401956d..f93cb39c2664b74066bd9ac352137c11e612e5f9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -432,6 +432,7 @@ public final class ItemStack {
+@@ -475,6 +475,7 @@ public final class ItemStack implements DataComponentHolder {
                      world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
@@ -16,20 +16,20 @@ index 048151dd863692b41721c063d9a287f11cb2a0df..c0588e87f6f0ec3d642eacac41a3060a
                      }
                      world.preventPoiUpdated = false;
  
-@@ -461,6 +462,7 @@ public final class ItemStack {
+@@ -506,6 +507,7 @@ public final class ItemStack implements DataComponentHolder {
                          if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
-                             block.getBlock().onPlace(block, world, newblockposition, oldBlock, true, context); // Paper - pass context
+                             block.onPlace(world, newblockposition, oldBlock, true, context); // Paper - pass context
                          }
 +                        block.getBlock().forgetPlacer(); // Purpur
  
                          world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
                      }
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index d4cbff18adb62073a1dceb189043789620af6877..f65b54919d19d2ddc7261cc36853babbaef3c822 100644
+index cf8b8c8efd1c9c81eb5f02d75bd75875eb66771f..6f7e90d406b088fee0eb254f8042bd404d8f36fa 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -430,7 +430,17 @@ public class Block extends BlockBehaviour implements ItemLike {
-         } // Paper
+@@ -438,7 +438,17 @@ public class Block extends BlockBehaviour implements ItemLike {
+         } // Paper - fix drops not preventing stats/food exhaustion
      }
  
 -    public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {}
diff --git a/patches/server/0191-Summoner-API.patch b/patches/server/0184-Summoner-API.patch
similarity index 85%
rename from patches/server/0191-Summoner-API.patch
rename to patches/server/0184-Summoner-API.patch
index 4e875fdf0..a269522e4 100644
--- a/patches/server/0191-Summoner-API.patch
+++ b/patches/server/0184-Summoner-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Summoner API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 1ffb8e1c386fc85796432281ac407a935169b186..c2817324ff57860ea2628dc4ac8e78b76cf67a5a 100644
+index fa81b12fc38a20b8ec39155259fb75c18ff9f0ae..8b08476457a6ead1a3c3e2ab35d08a8e0625c43e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -60,6 +60,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -56,6 +56,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      private int remainingPersistentAngerTime;
      @Nullable
      private UUID persistentAngerTarget;
@@ -16,7 +16,7 @@ index 1ffb8e1c386fc85796432281ac407a935169b186..c2817324ff57860ea2628dc4ac8e78b7
  
      public IronGolem(EntityType<? extends IronGolem> type, Level world) {
          super(type, world);
-@@ -93,6 +94,15 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -88,6 +89,15 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          return this.level().purpurConfig.ironGolemTakeDamageFromWater;
      }
  
@@ -32,7 +32,7 @@ index 1ffb8e1c386fc85796432281ac407a935169b186..c2817324ff57860ea2628dc4ac8e78b7
      @Override
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
-@@ -170,6 +180,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -165,6 +175,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
          nbt.putBoolean("PlayerCreated", this.isPlayerCreated());
@@ -40,7 +40,7 @@ index 1ffb8e1c386fc85796432281ac407a935169b186..c2817324ff57860ea2628dc4ac8e78b7
          this.addPersistentAngerSaveData(nbt);
      }
  
-@@ -177,6 +188,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -172,6 +183,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
          this.setPlayerCreated(nbt.getBoolean("PlayerCreated"));
@@ -49,18 +49,18 @@ index 1ffb8e1c386fc85796432281ac407a935169b186..c2817324ff57860ea2628dc4ac8e78b7
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d..20f2fd0edf290d448d06e4772b5947fc7865c20b 100644
+index 9f20eae7449c670b913cc3bbe1a89254a1d8cde2..8f2348a7fe830a85985ce2b19cb2a9159bca711f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -49,6 +49,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -47,6 +47,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+ 
      private static final EntityDataAccessor<Byte> DATA_PUMPKIN_ID = SynchedEntityData.defineId(SnowGolem.class, EntityDataSerializers.BYTE);
      private static final byte PUMPKIN_FLAG = 16;
-     private static final float EYE_HEIGHT = 1.7F;
 +    @Nullable private java.util.UUID summoner; // Purpur
  
      public SnowGolem(EntityType<? extends SnowGolem> type, Level world) {
          super(type, world);
-@@ -76,6 +77,15 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -74,6 +75,15 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.snowGolemMaxHealth);
      }
  
@@ -76,7 +76,7 @@ index a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d..20f2fd0edf290d448d06e4772b5947fc
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
-@@ -103,6 +113,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -101,6 +111,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
          nbt.putBoolean("Pumpkin", this.hasPumpkin());
@@ -84,7 +84,7 @@ index a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d..20f2fd0edf290d448d06e4772b5947fc
      }
  
      @Override
-@@ -111,6 +122,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -109,6 +120,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
          if (nbt.contains("Pumpkin")) {
              this.setPumpkin(nbt.getBoolean("Pumpkin"));
          }
@@ -93,18 +93,18 @@ index a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d..20f2fd0edf290d448d06e4772b5947fc
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 8d882e6ef4e199258866f30f5548a6feae4582da..ff5d08f0cf323606ca2eb8bef3f487c7a86029e2 100644
+index 6752a0039fac041e9bdd25327cdf20d3f1922bd6..01d193d2584b62897687bd088fb590de8a4ab279 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -84,6 +84,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-         return entityliving.getMobType() != MobType.UNDEAD && entityliving.attackable();
+@@ -88,6 +88,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+         return !entityliving.getType().is(EntityTypeTags.WITHER_FRIENDS) && entityliving.attackable();
      };
      private static final TargetingConditions TARGETING_CONDITIONS = TargetingConditions.forCombat().range(20.0D).selector(WitherBoss.LIVING_ENTITY_SELECTOR);
 +    @Nullable private java.util.UUID summoner; // Purpur
      private int shootCooldown = 0; // Purpur
      // Paper start
      private boolean canPortal = false;
-@@ -122,6 +123,15 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -126,6 +127,15 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          return this.level().purpurConfig.witherTakeDamageFromWater;
      }
  
@@ -120,7 +120,7 @@ index 8d882e6ef4e199258866f30f5548a6feae4582da..ff5d08f0cf323606ca2eb8bef3f487c7
      @Override
      protected PathNavigation createNavigation(Level world) {
          FlyingPathNavigation navigationflying = new FlyingPathNavigation(this, world);
-@@ -256,6 +266,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -260,6 +270,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
          nbt.putInt("Invul", this.getInvulnerableTicks());
@@ -128,7 +128,7 @@ index 8d882e6ef4e199258866f30f5548a6feae4582da..ff5d08f0cf323606ca2eb8bef3f487c7
      }
  
      @Override
-@@ -265,6 +276,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -269,6 +280,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          if (this.hasCustomName()) {
              this.bossEvent.setName(this.getDisplayName());
          }
@@ -137,10 +137,10 @@ index 8d882e6ef4e199258866f30f5548a6feae4582da..ff5d08f0cf323606ca2eb8bef3f487c7
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java b/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java
-index 23c487e295b3b736d8800f0c884324c9b18a5373..ebeb7caf7fd4f45714bab0856a48b847a544cce7 100644
+index 655f51902e5d24643d41c4ec981743543c0890a5..e6a299eeda5d18274fa3b1fb542b217a074c1d83 100644
 --- a/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CarvedPumpkinBlock.java
-@@ -64,7 +64,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
+@@ -71,7 +71,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
              SnowGolem entitysnowman = (SnowGolem) EntityType.SNOW_GOLEM.create(world);
  
              if (entitysnowman != null) {
@@ -149,7 +149,7 @@ index 23c487e295b3b736d8800f0c884324c9b18a5373..ebeb7caf7fd4f45714bab0856a48b847
              }
          } else {
              BlockPattern.BlockPatternMatch shapedetector_shapedetectorcollection1 = this.getOrCreateIronGolemFull().find(world, pos);
-@@ -74,7 +74,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
+@@ -81,7 +81,7 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
  
                  if (entityirongolem != null) {
                      entityirongolem.setPlayerCreated(true);
@@ -158,7 +158,7 @@ index 23c487e295b3b736d8800f0c884324c9b18a5373..ebeb7caf7fd4f45714bab0856a48b847
                  }
              }
          }
-@@ -82,6 +82,16 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
+@@ -89,6 +89,16 @@ public class CarvedPumpkinBlock extends HorizontalDirectionalBlock {
      }
  
      private static void spawnGolemInWorld(Level world, BlockPattern.BlockPatternMatch patternResult, Entity entity, BlockPos pos) {
@@ -176,10 +176,10 @@ index 23c487e295b3b736d8800f0c884324c9b18a5373..ebeb7caf7fd4f45714bab0856a48b847
          entity.moveTo((double) pos.getX() + 0.5D, (double) pos.getY() + 0.05D, (double) pos.getZ() + 0.5D, 0.0F, 0.0F);
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java b/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
-index 1aa0e921890d600c9274deb923da04e72b12bcc6..44bd7bee2665a05878fd2df935a700f02cd13a75 100644
+index bbf59b2577812e74ffd45f694b83a42e043273c0..5cb06959aeaceeb98cfee34b1df804e6642f305f 100644
 --- a/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/WitherSkullBlock.java
-@@ -69,6 +69,7 @@ public class WitherSkullBlock extends SkullBlock {
+@@ -79,6 +79,7 @@ public class WitherSkullBlock extends SkullBlock {
                          entitywither.moveTo((double) blockposition1.getX() + 0.5D, (double) blockposition1.getY() + 0.55D, (double) blockposition1.getZ() + 0.5D, shapedetector_shapedetectorcollection.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F, 0.0F);
                          entitywither.yBodyRot = shapedetector_shapedetectorcollection.getForwards().getAxis() == Direction.Axis.X ? 0.0F : 90.0F;
                          entitywither.makeInvulnerable();
@@ -188,7 +188,7 @@ index 1aa0e921890d600c9274deb923da04e72b12bcc6..44bd7bee2665a05878fd2df935a700f0
                          if (!world.addFreshEntity(entitywither, SpawnReason.BUILD_WITHER)) {
                              return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
-index 75d10b5322eb0a62bce2855c04a5151eb857d7de..208018981a2a5666c455eb34614b03f617354165 100644
+index 63cae1a2e95d8da17c45c4404a8dd0ca6a413c39..966587c2788b5c93be83259ddc962a89cde7cbaa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
 @@ -27,4 +27,17 @@ public class CraftIronGolem extends CraftGolem implements IronGolem {
@@ -210,7 +210,7 @@ index 75d10b5322eb0a62bce2855c04a5151eb857d7de..208018981a2a5666c455eb34614b03f6
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index e4a14cdfeb91a3d32e622d27d612605b1bca08e2..898d934aafd6066df45f02fe3406fa83f79b745c 100644
+index 4ce2373ff71c3c1b8951646e057587a3ab09e145..4f7f6cf6ca24406570d2d29dc63dc89401119961 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -28,4 +28,17 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok
@@ -232,7 +232,7 @@ index e4a14cdfeb91a3d32e622d27d612605b1bca08e2..898d934aafd6066df45f02fe3406fa83
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 5a97c92f9b044d8ab7bd3346ceb464455a09046e..e30d8b80734f04b1fa89e8a3cef666116fd7366c 100644
+index 7a8ce6956db56061af93ba9761f5d1057a90bc49..6d286b23806666f7b00ac88c5922144649f8a041 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -99,4 +99,17 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok
diff --git a/patches/server/0192-Customizable-sleeping-actionbar-messages.patch b/patches/server/0185-Customizable-sleeping-actionbar-messages.patch
similarity index 93%
rename from patches/server/0192-Customizable-sleeping-actionbar-messages.patch
rename to patches/server/0185-Customizable-sleeping-actionbar-messages.patch
index c5065add9..2834d4aee 100644
--- a/patches/server/0192-Customizable-sleeping-actionbar-messages.patch
+++ b/patches/server/0185-Customizable-sleeping-actionbar-messages.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4edea5ea0964bc054b76b1c6635c5b719721e202..f7d9398c9a73c8a02a2515b9d43b49433e5f883c 100644
+index 1dc58b41d3963c2adc58e79cd6db7e146ac049ad..83ec2e31d81d6209953252a3780552c3cf110c68 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1219,11 +1219,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1231,11 +1231,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (this.canSleepThroughNights()) {
              if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
                  int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -38,10 +38,10 @@ index 4edea5ea0964bc054b76b1c6635c5b719721e202..f7d9398c9a73c8a02a2515b9d43b4943
                  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 04394c0b122d646ce35c259de41f97e93461955f..4cc1604114ce283a70fb8faf89ac2b3979b06b52 100644
+index 2b10087cf34be4c36d8596d0263d68476bb1a521..7bb82c9b652a509c2bf1a43ed82a5da709fb2cb2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1466,7 +1466,19 @@ public class ServerPlayer extends Player {
+@@ -1546,7 +1546,19 @@ public class ServerPlayer extends Player {
                      });
  
                      if (!this.serverLevel().canSleepThroughNights()) {
@@ -63,7 +63,7 @@ index 04394c0b122d646ce35c259de41f97e93461955f..4cc1604114ce283a70fb8faf89ac2b39
  
                      ((ServerLevel) this.level()).updateSleepingPlayerList();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index c33c31956de911ff03f4782ab811a84ba18241c9..9a9c4826dab3de9e63ba984f8b2e1b3b7aa5a98b 100644
+index 16239aafded82b4f19f97ae5fd87c53b55a5ef53..e4188163e7a9dda878e72ae84a1b5cb28c23510d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -186,6 +186,9 @@ public class PurpurConfig {
diff --git a/patches/server/0193-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0186-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 73%
rename from patches/server/0193-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/server/0186-option-to-disable-shulker-box-items-from-dropping-co.patch
index 0a7e015a3..d14d88490 100644
--- a/patches/server/0193-option-to-disable-shulker-box-items-from-dropping-co.patch
+++ b/patches/server/0186-option-to-disable-shulker-box-items-from-dropping-co.patch
@@ -6,20 +6,19 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index e483186a5292b3b53bfb1af4d56f55fcc1a6106c..ec58193ebd73130f14dc5d8f51caa913b2036fc5 100644
+index 3253361d91e2a2e68d354eaf3dd3e3cd486e191d..2649188930653610b8aaaeb18797c80879cd572a 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -288,7 +288,7 @@ public class BlockItem extends Item {
+@@ -260,6 +260,7 @@ public class BlockItem extends Item {
+         ItemContainerContents itemcontainercontents = (ItemContainerContents) entity.getItem().set(DataComponents.CONTAINER, ItemContainerContents.EMPTY);
  
-     @Override
-     public void onDestroyed(ItemEntity entity) {
--        if (this.block instanceof ShulkerBoxBlock) {
-+        if (this.block instanceof ShulkerBoxBlock && entity.level().purpurConfig.shulkerBoxItemDropContentsWhenDestroyed) {
-             ItemStack itemstack = entity.getItem();
-             CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack);
+         if (itemcontainercontents != null) {
++            if (entity.level().purpurConfig.shulkerBoxItemDropContentsWhenDestroyed && entity.getItem().is(Items.SHULKER_BOX)) // Purpur
+             ItemUtils.onContainerDestroyed(entity, itemcontainercontents.nonEmptyItemsCopy());
+         }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c2bc762175dfab4f64b00c56bbb28ff26b3cad73..8a6b73793bab42e683e22a54d8b801d65baf5fe5 100644
+index e653a0cf4a4350d0faac21fab7681863fe2c75e0..2a05ee4d6d609fb0ab1837d2add45ffba68603fe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -221,6 +221,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0194-Big-dripleaf-tilt-delay.patch b/patches/server/0187-Big-dripleaf-tilt-delay.patch
similarity index 89%
rename from patches/server/0194-Big-dripleaf-tilt-delay.patch
rename to patches/server/0187-Big-dripleaf-tilt-delay.patch
index 78c6e8fa2..5161c5006 100644
--- a/patches/server/0194-Big-dripleaf-tilt-delay.patch
+++ b/patches/server/0187-Big-dripleaf-tilt-delay.patch
@@ -11,10 +11,10 @@ PARTIAL: big_dripleaf with PARTIAL tilt will change to FULL tilt after 10 ticks
 UNSTABLE: big_dripleaf with FULL tilt will change back to no tilt after 100 ticks
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-index 54cf35b0c48d96ecfb27ff13cd685c16a1cd616b..1822ea0c72cc1685aab86a44f75c791bc5c595fa 100644
+index 8240c32d676a88aa23dcd052ee0136767e54fb0d..372c4ab9d390d5afd98947f21c79aae06b15064d 100644
 --- a/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BigDripleafBlock.java
-@@ -236,7 +236,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
+@@ -244,7 +244,7 @@ public class BigDripleafBlock extends HorizontalDirectionalBlock implements Bone
              BigDripleafBlock.playTiltSound(world, blockposition, soundeffect);
          }
  
@@ -24,10 +24,10 @@ index 54cf35b0c48d96ecfb27ff13cd685c16a1cd616b..1822ea0c72cc1685aab86a44f75c791b
          if (i != -1) {
              world.scheduleTick(blockposition, (Block) this, i);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8a6b73793bab42e683e22a54d8b801d65baf5fe5..5909f27cf58efdfdb4a86909a86bf396ad9c740b 100644
+index 2a05ee4d6d609fb0ab1837d2add45ffba68603fe..220787aa0d3d144d2fa4296463af3c6b9ed0cf00 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -748,6 +748,22 @@ public class PurpurWorldConfig {
+@@ -819,6 +819,22 @@ public class PurpurWorldConfig {
          }
      }
  
diff --git a/patches/server/0195-Player-ridable-in-water-option.patch b/patches/server/0188-Player-ridable-in-water-option.patch
similarity index 66%
rename from patches/server/0195-Player-ridable-in-water-option.patch
rename to patches/server/0188-Player-ridable-in-water-option.patch
index 2120e4a3c..08cdecfce 100644
--- a/patches/server/0195-Player-ridable-in-water-option.patch
+++ b/patches/server/0188-Player-ridable-in-water-option.patch
@@ -5,38 +5,40 @@ Subject: [PATCH] Player ridable in water option
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 05c089d6e89cf017998bfab88aa9b2d124bf7f86..52b4ffc17ac913bf64cf6a6b7a37ae6e5af9bd87 100644
+index 458c14d4f298137ef1a333368644568a2c8a0b09..0460bdb52ce6b29cf57ef8f2d7f430e761c82d85 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2110,6 +2110,11 @@ public abstract class Player extends LivingEntity {
-         return this.inventory.armor;
+@@ -2073,6 +2073,13 @@ public abstract class Player extends LivingEntity {
+         return slot != EquipmentSlot.BODY;
      }
  
++    // Purpur start
 +    @Override
 +    public boolean dismountsUnderwater() {
 +        return !level().purpurConfig.playerRidableInWater;
 +    }
++    // Purpur end
 +
      public boolean setEntityOnShoulder(CompoundTag entityNbt) {
          if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
              if (this.getShoulderEntityLeft().isEmpty()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5909f27cf58efdfdb4a86909a86bf396ad9c740b..d0098fc7906ab1b6be5e720978540380e479a02f 100644
+index 220787aa0d3d144d2fa4296463af3c6b9ed0cf00..ee356e3174791f3c54abb8ddbf30694a3e9a87dc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -396,6 +396,7 @@ public class PurpurWorldConfig {
+@@ -394,6 +394,7 @@ public class PurpurWorldConfig {
+     public double playerCriticalDamageMultiplier = 1.5D;
+     public int playerBurpDelay = 10;
      public boolean playerBurpWhenFull = false;
-     public int playerPortalWaitTime = 80;
-     public int playerCreativePortalWaitTime = 1;
 +    public boolean playerRidableInWater = false;
      private void playerSettings() {
          if (PurpurConfig.version < 19) {
              boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -420,6 +421,7 @@ public class PurpurWorldConfig {
+@@ -416,6 +417,7 @@ public class PurpurWorldConfig {
+         playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
+         playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
          playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
-         playerPortalWaitTime = getInt("gameplay-mechanics.player.portal-wait-time", playerPortalWaitTime);
-         playerCreativePortalWaitTime = getInt("gameplay-mechanics.player.creative-portal-wait-time", playerCreativePortalWaitTime);
 +        playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0196-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0189-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 83%
rename from patches/server/0196-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/server/0189-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
index cc1023896..645ac77ce 100644
--- a/patches/server/0196-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
+++ b/patches/server/0189-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Config to disable Enderman teleport on projectile hit
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index db05006ca159a91165a7392cb57d0905e3732fe1..463a01305cc76ffd8018d2227f5f6dc1ecf24c5f 100644
+index b361c6b4ca17b9d466555037235a5660caa5c9bd..21a570d09ad3e19e6c709ff1152db7d204648122 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -455,6 +455,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -434,6 +434,7 @@ public class EnderMan extends Monster implements NeutralMob {
              } else {
                  flag1 = flag && this.hurtWithCleanWater(source, (ThrownPotion) source.getDirectEntity(), amount);
  
 +                if (!flag1 && this.level().purpurConfig.endermanIgnoreProjectiles) return super.hurt(source, amount); // Purpur
-                 if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
+                 if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper - EndermanEscapeEvent
                  for (int i = 0; i < 64; ++i) {
                      if (this.teleport()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d0098fc7906ab1b6be5e720978540380e479a02f..0319fa5cb86e40520228bbdbd41e51c38cb4ffd6 100644
+index ee356e3174791f3c54abb8ddbf30694a3e9a87dc..ae67aa6cf66e64d5e7506c0ca7193a9ba8a986ce 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1369,6 +1369,7 @@ public class PurpurWorldConfig {
+@@ -1425,6 +1425,7 @@ public class PurpurWorldConfig {
      public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
      public boolean endermanIgnorePlayerDragonHead = false;
      public boolean endermanDisableStareAggro = false;
@@ -28,7 +28,7 @@ index d0098fc7906ab1b6be5e720978540380e479a02f..0319fa5cb86e40520228bbdbd41e51c3
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -1391,6 +1392,7 @@ public class PurpurWorldConfig {
+@@ -1447,6 +1448,7 @@ public class PurpurWorldConfig {
          endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
          endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
          endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);
diff --git a/patches/server/0197-Add-compass-command.patch b/patches/server/0190-Add-compass-command.patch
similarity index 93%
rename from patches/server/0197-Add-compass-command.patch
rename to patches/server/0190-Add-compass-command.patch
index d2f0e84a5..a7c9fd136 100644
--- a/patches/server/0197-Add-compass-command.patch
+++ b/patches/server/0190-Add-compass-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add compass command
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index e254f7c498c5a1608afe130b2dd4d3d037069f25..af712f089e7919fa0bd3946866fd3486fab19f76 100644
+index 26c9254cef922a78deac3053f93c60037f19d31f..67ec90a2a05269a5912b3c8e64d6d4162a8c6ca2 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -235,6 +235,7 @@ public class Commands {
+@@ -257,6 +257,7 @@ public class Commands {
              org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
@@ -17,18 +17,18 @@ index e254f7c498c5a1608afe130b2dd4d3d037069f25..af712f089e7919fa0bd3946866fd3486
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4cc1604114ce283a70fb8faf89ac2b3979b06b52..f00c8b834db7ff9c92d878560d83db91b76c82fe 100644
+index 7bb82c9b652a509c2bf1a43ed82a5da709fb2cb2..e9d9cb47221075447aac66dd30ce6e8f08962cf5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
-     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
+@@ -300,6 +300,7 @@ public class ServerPlayer extends Player {
+     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
      public boolean purpurClient = false; // Purpur
      private boolean tpsBar = false; // Purpur
 +    private boolean compassBar = false; // Purpur
  
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
-@@ -564,6 +565,7 @@ public class ServerPlayer extends Player {
+@@ -611,6 +612,7 @@ public class ServerPlayer extends Player {
          }
  
          if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,15 +36,15 @@ index 4cc1604114ce283a70fb8faf89ac2b3979b06b52..f00c8b834db7ff9c92d878560d83db91
      }
  
      @Override
-@@ -631,6 +633,7 @@ public class ServerPlayer extends Player {
-         this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
+@@ -688,6 +690,7 @@ public class ServerPlayer extends Player {
+         }
  
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
 +        nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2799,5 +2802,13 @@ public class ServerPlayer extends Player {
+@@ -3011,5 +3014,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }
@@ -59,7 +59,7 @@ index 4cc1604114ce283a70fb8faf89ac2b3979b06b52..f00c8b834db7ff9c92d878560d83db91
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 9a9c4826dab3de9e63ba984f8b2e1b3b7aa5a98b..62fa79eccbb6f679c0460a6dfd457c405b3a8e67 100644
+index e4188163e7a9dda878e72ae84a1b5cb28c23510d..b56afa30c04350b5e9ca4ea2d33f9e7c58559380 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -255,6 +255,11 @@ public class PurpurConfig {
@@ -89,7 +89,7 @@ index 9a9c4826dab3de9e63ba984f8b2e1b3b7aa5a98b..62fa79eccbb6f679c0460a6dfd457c40
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
          uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0319fa5cb86e40520228bbdbd41e51c38cb4ffd6..3d5d4d444aa4e7e7226c6296677d3cc630af54e2 100644
+index ae67aa6cf66e64d5e7506c0ca7193a9ba8a986ce..963540e5c3eb6dfbb78b089bba013ef348c8487f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -222,6 +222,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0198-Toggle-for-kinetic-damage.patch b/patches/server/0191-Toggle-for-kinetic-damage.patch
similarity index 89%
rename from patches/server/0198-Toggle-for-kinetic-damage.patch
rename to patches/server/0191-Toggle-for-kinetic-damage.patch
index 68d9afc62..1addaa713 100644
--- a/patches/server/0198-Toggle-for-kinetic-damage.patch
+++ b/patches/server/0191-Toggle-for-kinetic-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b4c00ea434f73ff59d6171fd010d4e76d6dc08dd..cf997f8811aacd32946d81de87b1683910374e42 100644
+index 54a612dd2fcdf6972f7580fbd814f461df07b7f6..549579f2bc2e1fd23ece1ead543e3e5242f52ce0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2929,6 +2929,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2993,6 +2993,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
                      if (f3 > 0.0F) {
                          this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);
@@ -17,7 +17,7 @@ index b4c00ea434f73ff59d6171fd010d4e76d6dc08dd..cf997f8811aacd32946d81de87b16839
                      }
                  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3d5d4d444aa4e7e7226c6296677d3cc630af54e2..45b89ffe9b7a61d9c4d0508d533131d54e363549 100644
+index 963540e5c3eb6dfbb78b089bba013ef348c8487f..7a2a3243e6d1e22dcbd57674db06bf7cb42abfed 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -182,12 +182,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0199-Add-Option-for-disable-observer-clocks.patch b/patches/server/0192-Add-Option-for-disable-observer-clocks.patch
similarity index 81%
rename from patches/server/0199-Add-Option-for-disable-observer-clocks.patch
rename to patches/server/0192-Add-Option-for-disable-observer-clocks.patch
index 282f377d3..f71d1040c 100644
--- a/patches/server/0199-Add-Option-for-disable-observer-clocks.patch
+++ b/patches/server/0192-Add-Option-for-disable-observer-clocks.patch
@@ -6,19 +6,19 @@ Subject: [PATCH] Add Option for disable observer clocks
 Allow to disable observer clocks: https://www.spigotmc.org/attachments/observerclock-gif.365936/
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ObserverBlock.java b/src/main/java/net/minecraft/world/level/block/ObserverBlock.java
-index 7b45d6b9a005036ca5051d089a7be792eb87012f..8806c97ecc6bdd8a64c2d82bb2f58f46ac37c468 100644
+index b38fbe5121f293f425d7673a6ce49b11d0ced0d9..2a74f42672b92393b52a61c27c5b8af77c8c6070 100644
 --- a/src/main/java/net/minecraft/world/level/block/ObserverBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ObserverBlock.java
-@@ -64,6 +64,7 @@ public class ObserverBlock extends DirectionalBlock {
+@@ -71,6 +71,7 @@ public class ObserverBlock extends DirectionalBlock {
      @Override
-     public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
+     protected BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
          if (state.getValue(ObserverBlock.FACING) == direction && !(Boolean) state.getValue(ObserverBlock.POWERED)) {
 +            if (!world.getMinecraftWorld().purpurConfig.disableObserverClocks || !(neighborState.getBlock() instanceof ObserverBlock) || neighborState.getValue(ObserverBlock.FACING).getOpposite() != direction) // Purpur
              this.startSignal(world, pos);
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 45b89ffe9b7a61d9c4d0508d533131d54e363549..8cece9543a87ac86a8320fef4a23b39dbc76ab5c 100644
+index 7a2a3243e6d1e22dcbd57674db06bf7cb42abfed..4513d3e5441e1b68e890836e168c64e9b363f466 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -369,6 +369,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0200-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0193-Customizeable-Zombie-Villager-curing-times.patch
similarity index 84%
rename from patches/server/0200-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/server/0193-Customizeable-Zombie-Villager-curing-times.patch
index 3c025c5b7..af8658aac 100644
--- a/patches/server/0200-Customizeable-Zombie-Villager-curing-times.patch
+++ b/patches/server/0193-Customizeable-Zombie-Villager-curing-times.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Customizeable Zombie Villager curing times
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 5933bff2db353644705f5e1cfec3b0f2dedbad87..ecf41531855e1f60d9739ac6d2d82df7794f072f 100644
+index 2ec3a09135f85a5de68e77511f3f213adf08712c..d909138942212ee090ff513b1817414c93457425 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -221,7 +221,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
-                 }
- 
+@@ -222,7 +222,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+             if (this.hasEffect(MobEffects.WEAKNESS)) {
+                 itemstack.consume(1, player);
                  if (!this.level().isClientSide) {
 -                    this.startConverting(player.getUUID(), this.random.nextInt(2401) + 3600);
 +                    this.startConverting(player.getUUID(), this.random.nextInt(level().purpurConfig.zombieVillagerCuringTimeMax - level().purpurConfig.zombieVillagerCuringTimeMin + 1) + level().purpurConfig.zombieVillagerCuringTimeMin); // Purpur
@@ -18,10 +18,10 @@ index 5933bff2db353644705f5e1cfec3b0f2dedbad87..ecf41531855e1f60d9739ac6d2d82df7
  
                  return InteractionResult.SUCCESS;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8cece9543a87ac86a8320fef4a23b39dbc76ab5c..b2f365ab51b56a83ed7ea67c921c163c3511b834 100644
+index 4513d3e5441e1b68e890836e168c64e9b363f466..69753e7dc0fbc59a6e9d84479a5141a740e2fd15 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2770,6 +2770,8 @@ public class PurpurWorldConfig {
+@@ -2828,6 +2828,8 @@ public class PurpurWorldConfig {
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
      public boolean zombieVillagerTakeDamageFromWater = false;
@@ -30,7 +30,7 @@ index 8cece9543a87ac86a8320fef4a23b39dbc76ab5c..b2f365ab51b56a83ed7ea67c921c163c
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2785,6 +2787,8 @@ public class PurpurWorldConfig {
+@@ -2843,6 +2845,8 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
          zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
diff --git a/patches/server/0201-Option-for-sponges-to-work-on-lava-and-mud.patch b/patches/server/0194-Option-for-sponges-to-work-on-lava-and-mud.patch
similarity index 85%
rename from patches/server/0201-Option-for-sponges-to-work-on-lava-and-mud.patch
rename to patches/server/0194-Option-for-sponges-to-work-on-lava-and-mud.patch
index c7286491c..adcf1ca6b 100644
--- a/patches/server/0201-Option-for-sponges-to-work-on-lava-and-mud.patch
+++ b/patches/server/0194-Option-for-sponges-to-work-on-lava-and-mud.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Option for sponges to work on lava and mud
 Co-authored by: granny <granny@purpurmc.org>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-index e7b19fa84d9dce28dd88a3b4adcb83576dcb98a8..cc1ac862526377b2ac7b66bc20f428dc1aed6e78 100644
+index a676ccfa6b02e8986df6f6a2e04cbb06b3edd0ff..6fe44572e34ad3e3a1851e73138bd8b778eb7849 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-@@ -70,7 +70,7 @@ public class SpongeBlock extends Block {
+@@ -77,7 +77,7 @@ public class SpongeBlock extends Block {
                  FluidState fluid = blockList.getFluidState(blockposition1);
                  // CraftBukkit end
  
@@ -18,7 +18,7 @@ index e7b19fa84d9dce28dd88a3b4adcb83576dcb98a8..cc1ac862526377b2ac7b66bc20f428dc
                      return false;
                  } else {
                      Block block = iblockdata.getBlock();
-@@ -85,6 +85,10 @@ public class SpongeBlock extends Block {
+@@ -92,6 +92,10 @@ public class SpongeBlock extends Block {
  
                      if (iblockdata.getBlock() instanceof LiquidBlock) {
                          blockList.setBlock(blockposition1, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit
@@ -30,10 +30,10 @@ index e7b19fa84d9dce28dd88a3b4adcb83576dcb98a8..cc1ac862526377b2ac7b66bc20f428dc
                          if (!iblockdata.is(Blocks.KELP) && !iblockdata.is(Blocks.KELP_PLANT) && !iblockdata.is(Blocks.SEAGRASS) && !iblockdata.is(Blocks.TALL_SEAGRASS)) {
                              return false;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b2f365ab51b56a83ed7ea67c921c163c3511b834..13aa8ae8f33834793adf18c12541c2ecd2d0699f 100644
+index 69753e7dc0fbc59a6e9d84479a5141a740e2fd15..b69e224dc04758fec2bd0a2631848f4dc5a67b85 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -949,9 +949,13 @@ public class PurpurWorldConfig {
+@@ -1005,9 +1005,13 @@ public class PurpurWorldConfig {
  
      public int spongeAbsorptionArea = 65;
      public int spongeAbsorptionRadius = 6;
@@ -46,4 +46,4 @@ index b2f365ab51b56a83ed7ea67c921c163c3511b834..13aa8ae8f33834793adf18c12541c2ec
 +        spongeAbsorbsWaterFromMud = getBoolean("blocks.sponge.absorbs-water-from-mud", spongeAbsorbsWaterFromMud);
      }
  
-     public boolean turtleEggsBreakFromExpOrbs = true;
+     public boolean turtleEggsBreakFromExpOrbs = false;
diff --git a/patches/server/0202-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0195-Toggle-for-Wither-s-spawn-sound.patch
similarity index 88%
rename from patches/server/0202-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/server/0195-Toggle-for-Wither-s-spawn-sound.patch
index d771ca331..104d0fc9d 100644
--- a/patches/server/0202-Toggle-for-Wither-s-spawn-sound.patch
+++ b/patches/server/0195-Toggle-for-Wither-s-spawn-sound.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for Wither's spawn sound
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index ff5d08f0cf323606ca2eb8bef3f487c7a86029e2..5bf7a6ecd58612c8502ed747263b6c0edd445294 100644
+index 01d193d2584b62897687bd088fb590de8a4ab279..a030fe21a88a9486cc8367710a96af67c761635c 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -425,7 +425,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -18,10 +18,10 @@ index ff5d08f0cf323606ca2eb8bef3f487c7a86029e2..5bf7a6ecd58612c8502ed747263b6c0e
                      // this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
                      int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 13aa8ae8f33834793adf18c12541c2ecd2d0699f..7670e4e1291e8c48b960ee44977d4850b470a81e 100644
+index b69e224dc04758fec2bd0a2631848f4dc5a67b85..eb64ddde8162833ae522ea88befc2c837a3e6b53 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2617,6 +2617,7 @@ public class PurpurWorldConfig {
+@@ -2673,6 +2673,7 @@ public class PurpurWorldConfig {
      public boolean witherTakeDamageFromWater = false;
      public boolean witherCanRideVehicles = false;
      public float witherExplosionRadius = 1.0F;
@@ -29,7 +29,7 @@ index 13aa8ae8f33834793adf18c12541c2ecd2d0699f..7670e4e1291e8c48b960ee44977d4850
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2638,6 +2639,7 @@ public class PurpurWorldConfig {
+@@ -2694,6 +2695,7 @@ public class PurpurWorldConfig {
          witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
          witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
diff --git a/patches/server/0203-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0196-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 84%
rename from patches/server/0203-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/server/0196-Cactus-breaks-from-solid-neighbors-config.patch
index 9a219962e..5eef83775 100644
--- a/patches/server/0203-Cactus-breaks-from-solid-neighbors-config.patch
+++ b/patches/server/0196-Cactus-breaks-from-solid-neighbors-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cactus breaks from solid neighbors config
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index 0003fb51ae3a6575575e10b4c86719f3061e2577..c2ca3432a47124d02e1aaf8ffb621f9a2c7d7a62 100644
+index ff4dda48116a2969704b355ff96407ba869b466e..9200d75b05ce535f7b7f5c1572cd8f6261c6955b 100644
 --- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -107,7 +107,7 @@ public class CactusBlock extends Block {
+@@ -114,7 +114,7 @@ public class CactusBlock extends Block {
  
              enumdirection = (Direction) iterator.next();
              iblockdata1 = world.getBlockState(pos.relative(enumdirection));
@@ -18,10 +18,10 @@ index 0003fb51ae3a6575575e10b4c86719f3061e2577..c2ca3432a47124d02e1aaf8ffb621f9a
          return false;
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 7670e4e1291e8c48b960ee44977d4850b470a81e..2951c05d64f7c1667343dd781800816b7fae5cb9 100644
+index eb64ddde8162833ae522ea88befc2c837a3e6b53..27f34e56820351223707c305f67c5e50aadbbe4f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -775,6 +775,11 @@ public class PurpurWorldConfig {
+@@ -846,6 +846,11 @@ public class PurpurWorldConfig {
          });
      }
  
diff --git a/patches/server/0204-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0197-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 60%
rename from patches/server/0204-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/server/0197-Config-to-remove-curse-of-binding-with-weakness.patch
index a14b3f56c..154d60583 100644
--- a/patches/server/0204-Config-to-remove-curse-of-binding-with-weakness.patch
+++ b/patches/server/0197-Config-to-remove-curse-of-binding-with-weakness.patch
@@ -5,43 +5,35 @@ Subject: [PATCH] Config to remove curse of binding with weakness
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/InventoryMenu.java b/src/main/java/net/minecraft/world/inventory/InventoryMenu.java
-index b399903e8f11ec6c12fe7e724b7d9c8292acd573..a4afa946cd47238eb0fed297a27b24013d5ba77c 100644
+index 9992599dbe4f4a430e822a44b03c00505abfbfaf..3fea9339420aa38b303ccf6c154aec246e617b5b 100644
 --- a/src/main/java/net/minecraft/world/inventory/InventoryMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/InventoryMenu.java
-@@ -4,6 +4,7 @@ import com.mojang.datafixers.util.Pair;
- import net.minecraft.network.chat.Component;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.world.Container;
-+import net.minecraft.world.effect.MobEffects;
- import net.minecraft.world.entity.EquipmentSlot;
- import net.minecraft.world.entity.Mob;
- import net.minecraft.world.entity.player.Inventory;
-@@ -95,7 +96,7 @@ public class InventoryMenu extends RecipeBookMenu<CraftingContainer> {
+@@ -97,7 +97,7 @@ public class InventoryMenu extends RecipeBookMenu<CraftingContainer> {
                  public boolean mayPickup(Player playerEntity) {
                      ItemStack itemstack = this.getItem();
  
 -                    return !itemstack.isEmpty() && !playerEntity.isCreative() && EnchantmentHelper.hasBindingCurse(itemstack) ? false : super.mayPickup(playerEntity);
-+                    return !itemstack.isEmpty() && !playerEntity.isCreative() && EnchantmentHelper.hasBindingCurse(itemstack) ? playerEntity.level().purpurConfig.playerRemoveBindingWithWeakness && playerEntity.hasEffect(MobEffects.WEAKNESS) : super.mayPickup(playerEntity); // Purpur
++                    return !itemstack.isEmpty() && !playerEntity.isCreative() && EnchantmentHelper.hasBindingCurse(itemstack) ? playerEntity.level().purpurConfig.playerRemoveBindingWithWeakness && playerEntity.hasEffect(net.minecraft.world.effect.MobEffects.WEAKNESS) : super.mayPickup(playerEntity); // Purpur
                  }
  
                  @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2951c05d64f7c1667343dd781800816b7fae5cb9..f64c758f51134e8102ca4092bc313eefd346d211 100644
+index 27f34e56820351223707c305f67c5e50aadbbe4f..a673122f46d4e4ad48e8c42e2d50e5ea2870df24 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -406,6 +406,7 @@ public class PurpurWorldConfig {
-     public int playerPortalWaitTime = 80;
-     public int playerCreativePortalWaitTime = 1;
+@@ -404,6 +404,7 @@ public class PurpurWorldConfig {
+     public int playerBurpDelay = 10;
+     public boolean playerBurpWhenFull = false;
      public boolean playerRidableInWater = false;
 +    public boolean playerRemoveBindingWithWeakness = false;
      private void playerSettings() {
          if (PurpurConfig.version < 19) {
              boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -431,6 +432,7 @@ public class PurpurWorldConfig {
-         playerPortalWaitTime = getInt("gameplay-mechanics.player.portal-wait-time", playerPortalWaitTime);
-         playerCreativePortalWaitTime = getInt("gameplay-mechanics.player.creative-portal-wait-time", playerCreativePortalWaitTime);
+@@ -427,6 +428,7 @@ public class PurpurWorldConfig {
+         playerBurpDelay = getInt("gameplay-mechanics.player.burp-delay", playerBurpDelay);
+         playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
          playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
 +        playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0205-Conduit-behavior-configuration.patch b/patches/server/0198-Conduit-behavior-configuration.patch
similarity index 54%
rename from patches/server/0205-Conduit-behavior-configuration.patch
rename to patches/server/0198-Conduit-behavior-configuration.patch
index d9255aa2c..88f09f8d8 100644
--- a/patches/server/0205-Conduit-behavior-configuration.patch
+++ b/patches/server/0198-Conduit-behavior-configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Conduit behavior configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
-index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e1dcdcd4a 100644
+index 73e532dc998e5701c1a73da846da3d3a79871b81..ff6fea842ca80c2ba51693fe62e5b74f9affdc19 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
-@@ -171,7 +171,7 @@ public class ConduitBlockEntity extends BlockEntity {
+@@ -168,7 +168,7 @@ public class ConduitBlockEntity extends BlockEntity {
                      if ((l > 1 || i1 > 1 || j1 > 1) && (i == 0 && (i1 == 2 || j1 == 2) || j == 0 && (l == 2 || j1 == 2) || k == 0 && (l == 2 || i1 == 2))) {
                          BlockPos blockposition2 = pos.offset(i, j, k);
                          BlockState iblockdata = world.getBlockState(blockposition2);
@@ -17,44 +17,51 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
                          int k1 = ablock.length;
  
                          for (int l1 = 0; l1 < k1; ++l1) {
-@@ -191,7 +191,7 @@ public class ConduitBlockEntity extends BlockEntity {
+@@ -188,13 +188,13 @@ public class ConduitBlockEntity extends BlockEntity {
  
      private static void applyEffects(Level world, BlockPos pos, List<BlockPos> activatingBlocks) {
-         int i = activatingBlocks.size();
+         // CraftBukkit start
+-        ConduitBlockEntity.applyEffects(world, pos, ConduitBlockEntity.getRange(activatingBlocks));
++        ConduitBlockEntity.applyEffects(world, pos, ConduitBlockEntity.getRange(activatingBlocks, world)); // Purpur
+     }
+ 
+-    public static int getRange(List<BlockPos> list) {
++    public static int getRange(List<BlockPos> list, Level world) { // Purpur
+         // CraftBukkit end
+         int i = list.size();
 -        int j = i / 7 * 16;
 +        int j = i / 7 * world.purpurConfig.conduitDistance; // Purpur
-         int k = pos.getX();
-         int l = pos.getY();
-         int i1 = pos.getZ();
-@@ -222,21 +222,21 @@ public class ConduitBlockEntity extends BlockEntity {
-             blockEntity.destroyTarget = ConduitBlockEntity.findDestroyTarget(world, pos, blockEntity.destroyTargetUUID);
-             blockEntity.destroyTargetUUID = null;
-         } else if (blockEntity.destroyTarget == null) {
--            List<LivingEntity> list1 = world.getEntitiesOfClass(LivingEntity.class, ConduitBlockEntity.getDestroyRangeAABB(pos), (entityliving1) -> {
-+            List<LivingEntity> list1 = world.getEntitiesOfClass(LivingEntity.class, ConduitBlockEntity.getDestroyRangeAABB(pos, world), (entityliving1) -> { // Purpur
+         // CraftBukkit start
+         return j;
+     }
+@@ -237,20 +237,20 @@ public class ConduitBlockEntity extends BlockEntity {
+             tileentityconduit.destroyTarget = ConduitBlockEntity.findDestroyTarget(world, blockposition, tileentityconduit.destroyTargetUUID);
+             tileentityconduit.destroyTargetUUID = null;
+         } else if (tileentityconduit.destroyTarget == null) {
+-            List<LivingEntity> list1 = world.getEntitiesOfClass(LivingEntity.class, ConduitBlockEntity.getDestroyRangeAABB(blockposition), (entityliving1) -> {
++            List<LivingEntity> list1 = world.getEntitiesOfClass(LivingEntity.class, ConduitBlockEntity.getDestroyRangeAABB(blockposition, world), (entityliving1) -> { // Purpur
                  return entityliving1 instanceof Enemy && entityliving1.isInWaterOrRain();
              });
  
              if (!list1.isEmpty()) {
-                 blockEntity.destroyTarget = (LivingEntity) list1.get(world.random.nextInt(list1.size()));
+                 tileentityconduit.destroyTarget = (LivingEntity) list1.get(world.random.nextInt(list1.size()));
              }
--        } else if (!blockEntity.destroyTarget.isAlive() || !pos.closerThan(blockEntity.destroyTarget.blockPosition(), 8.0D)) {
-+        } else if (!blockEntity.destroyTarget.isAlive() || !pos.closerThan(blockEntity.destroyTarget.blockPosition(), world.purpurConfig.conduitDamageDistance)) { // Purpur
-             blockEntity.destroyTarget = null;
+-        } else if (!tileentityconduit.destroyTarget.isAlive() || !blockposition.closerThan(tileentityconduit.destroyTarget.blockPosition(), 8.0D)) {
++        } else if (!tileentityconduit.destroyTarget.isAlive() || !blockposition.closerThan(tileentityconduit.destroyTarget.blockPosition(), world.purpurConfig.conduitDamageDistance)) { // Purpur
+             tileentityconduit.destroyTarget = null;
          }
  
-         if (blockEntity.destroyTarget != null) {
-             // CraftBukkit start
-             CraftEventFactory.blockDamage = CraftBlock.at(world, pos);
--            if (blockEntity.destroyTarget.hurt(world.damageSources().magic(), 4.0F)) {
-+            if (blockEntity.destroyTarget.hurt(world.damageSources().magic(), world.purpurConfig.conduitDamageAmount)) { // Purpur
-                 world.playSound((Player) null, blockEntity.destroyTarget.getX(), blockEntity.destroyTarget.getY(), blockEntity.destroyTarget.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F);
+         // CraftBukkit start
+         if (damageTarget && tileentityconduit.destroyTarget != null) {
+-            if (tileentityconduit.destroyTarget.hurt(world.damageSources().magic().directBlock(world, blockposition), 4.0F)) {
++            if (tileentityconduit.destroyTarget.hurt(world.damageSources().magic().directBlock(world, blockposition), world.purpurConfig.conduitDamageAmount)) { // Purpur
+                 world.playSound(null, tileentityconduit.destroyTarget.getX(), tileentityconduit.destroyTarget.getY(), tileentityconduit.destroyTarget.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F);
              }
-             CraftEventFactory.blockDamage = null;
-@@ -262,16 +262,22 @@ public class ConduitBlockEntity extends BlockEntity {
+             // CraftBukkit end
+@@ -275,16 +275,22 @@ public class ConduitBlockEntity extends BlockEntity {
      }
  
-     private static AABB getDestroyRangeAABB(BlockPos pos) {
+     public static AABB getDestroyRangeAABB(BlockPos pos) {
 +        // Purpur start
 +        return getDestroyRangeAABB(pos, null);
 +    }
@@ -76,11 +83,24 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
              return entityliving.getUUID().equals(uuid);
          });
  
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
+index c1759aeb3e6ad0e4eb66cba3da1b120dd1dce812..1a91bc2e422db0eba65694ac046f1b362c6b0cd6 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java
+@@ -73,7 +73,7 @@ public class CraftConduit extends CraftBlockEntityState<ConduitBlockEntity> impl
+     public int getRange() {
+         this.ensureNoWorldGeneration();
+         ConduitBlockEntity conduit = (ConduitBlockEntity) this.getTileEntityFromWorld();
+-        return (conduit != null) ? ConduitBlockEntity.getRange(conduit.effectBlocks) : 0;
++        return (conduit != null) ? ConduitBlockEntity.getRange(conduit.effectBlocks, this.world.getHandle()) : 0; // Purpur
+     }
+ 
+     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f64c758f51134e8102ca4092bc313eefd346d211..5fd3e6bab03a2adcb776720b242c902b1330779e 100644
+index a673122f46d4e4ad48e8c42e2d50e5ea2870df24..25c361154866194de70c5d2365c25b4c0148e877 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2836,4 +2836,27 @@ public class PurpurWorldConfig {
+@@ -2894,4 +2894,27 @@ public class PurpurWorldConfig {
      private void hungerSettings() {
          hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
      }
diff --git a/patches/server/0206-Cauldron-fill-chances.patch b/patches/server/0199-Cauldron-fill-chances.patch
similarity index 87%
rename from patches/server/0206-Cauldron-fill-chances.patch
rename to patches/server/0199-Cauldron-fill-chances.patch
index dfe78e80d..d7f48bf81 100644
--- a/patches/server/0206-Cauldron-fill-chances.patch
+++ b/patches/server/0199-Cauldron-fill-chances.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cauldron fill chances
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
-index 2f85b893dd0abc39fcedec65acc89e1567faf6f0..3ee012a9ef8cada0b2203e53b2f731f60f697cb1 100644
+index c9968934f4ecaa8d81e545f279b3001c7b1ce545..03e4fce6f8226451365fc2831b5bf1e5e6091730 100644
 --- a/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CauldronBlock.java
-@@ -29,7 +29,7 @@ public class CauldronBlock extends AbstractCauldronBlock {
+@@ -37,7 +37,7 @@ public class CauldronBlock extends AbstractCauldronBlock {
      }
  
      protected static boolean shouldHandlePrecipitation(Level world, Biome.Precipitation precipitation) {
@@ -18,10 +18,10 @@ index 2f85b893dd0abc39fcedec65acc89e1567faf6f0..3ee012a9ef8cada0b2203e53b2f731f6
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-index cd943997f11f5ea5c600fdc6db96043fb0fa713c..4adeda49a2e422e11f885bffb311653d99159bf4 100644
+index a2bd54dae4b0460d200f6d5300194a7ef5a28830..bf189a171530abfc9bba5db5a305feb391f2cbee 100644
 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java
-@@ -186,7 +186,7 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
+@@ -190,7 +190,7 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
  
      @VisibleForTesting
      public static void maybeTransferFluid(BlockState state, ServerLevel world, BlockPos pos, float dripChance) {
@@ -30,7 +30,7 @@ index cd943997f11f5ea5c600fdc6db96043fb0fa713c..4adeda49a2e422e11f885bffb311653d
              if (PointedDripstoneBlock.isStalactiteStartPos(state, world, pos)) {
                  Optional<PointedDripstoneBlock.FluidInfo> optional = PointedDripstoneBlock.getFluidAboveStalactite(world, pos, state);
  
-@@ -195,13 +195,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
+@@ -199,13 +199,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate
                      float f1;
  
                      if (fluidtype == Fluids.WATER) {
@@ -47,10 +47,10 @@ index cd943997f11f5ea5c600fdc6db96043fb0fa713c..4adeda49a2e422e11f885bffb311653d
  
                      if (dripChance < f1) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5fd3e6bab03a2adcb776720b242c902b1330779e..909e6bb2781637e5f4c2525371de2ad0b5524afe 100644
+index 25c361154866194de70c5d2365c25b4c0148e877..0227caeb0efa2b9aa1d9e8cb1cb13997ebbb7a1c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2859,4 +2859,15 @@ public class PurpurWorldConfig {
+@@ -2917,4 +2917,15 @@ public class PurpurWorldConfig {
          });
          conduitBlocks = conduitBlockList.toArray(Block[]::new);
      }
diff --git a/patches/server/0207-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0200-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 56%
rename from patches/server/0207-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/server/0200-Config-to-allow-mobs-to-pathfind-over-rails.patch
index 40cf268ee..051804cbb 100644
--- a/patches/server/0207-Config-to-allow-mobs-to-pathfind-over-rails.patch
+++ b/patches/server/0200-Config-to-allow-mobs-to-pathfind-over-rails.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] Config to allow mobs to pathfind over rails
 
 
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-index 3583fcf5284bc5883308876dbd9886664b391e28..d976a6df54c1e817def2d588692abe25a03ee0fa 100644
+index d5004290e40a1ff5e0fcfe75f8da34ae15962359..31ae0f466ae522d767907ec5066b26695f327b96 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-@@ -241,7 +241,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-             }
- 
-             if (blockPathTypes != BlockPathTypes.WALKABLE && (!this.isAmphibious() || blockPathTypes != BlockPathTypes.WATER)) {
--                if ((node == null || node.costMalus < 0.0F) && maxYStep > 0 && (blockPathTypes != BlockPathTypes.FENCE || this.canWalkOverFences()) && blockPathTypes != BlockPathTypes.UNPASSABLE_RAIL && blockPathTypes != BlockPathTypes.TRAPDOOR && blockPathTypes != BlockPathTypes.POWDER_SNOW) {
-+                if ((node == null || node.costMalus < 0.0F) && maxYStep > 0 && (blockPathTypes != BlockPathTypes.FENCE || this.canWalkOverFences()) && (this.mob.level().purpurConfig.mobsIgnoreRails || blockPathTypes != BlockPathTypes.UNPASSABLE_RAIL) && blockPathTypes != BlockPathTypes.TRAPDOOR && blockPathTypes != BlockPathTypes.POWDER_SNOW) { // Purpur
-                     node = this.findAcceptedNode(x, y + 1, z, maxYStep - 1, prevFeetY, direction, nodeType);
-                     if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) {
-                         double g = (double)(x - direction.getStepX()) + 0.5D;
+@@ -240,7 +240,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
+                 if ((node == null || node.costMalus < 0.0F)
+                     && maxYStep > 0
+                     && (pathType != PathType.FENCE || this.canWalkOverFences())
+-                    && pathType != PathType.UNPASSABLE_RAIL
++                    && (this.mob.level().purpurConfig.mobsIgnoreRails || pathType != PathType.UNPASSABLE_RAIL) // Purpur
+                     && pathType != PathType.TRAPDOOR
+                     && pathType != PathType.POWDER_SNOW) {
+                     node = this.tryJumpOn(x, y, z, maxYStep, prevFeetY, direction, nodeType, mutableBlockPos);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 909e6bb2781637e5f4c2525371de2ad0b5524afe..8ae2e7f81d1d6a09d9b733ae27ad6c99a58aeb2e 100644
+index 0227caeb0efa2b9aa1d9e8cb1cb13997ebbb7a1c..c5e32e0e1865cdbd81b9077038717dab4db46f4d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -138,6 +138,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0208-Shulker-change-color-with-dye.patch b/patches/server/0201-Shulker-change-color-with-dye.patch
similarity index 87%
rename from patches/server/0208-Shulker-change-color-with-dye.patch
rename to patches/server/0201-Shulker-change-color-with-dye.patch
index edf3fe483..9bc5a11f2 100644
--- a/patches/server/0208-Shulker-change-color-with-dye.patch
+++ b/patches/server/0201-Shulker-change-color-with-dye.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Shulker change color with dye
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 786fe41cc743817f2ed613969c7eeec9fc001b4b..40f4a53cf244549e9cf392f4286bdec1a6852574 100644
+index 73063abbd051f1d044a8b2c0530cc8d2a96a6331..687fadf1ef64c5ae7e00c5da15b82245e07d3a39 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-@@ -22,6 +22,8 @@ import net.minecraft.tags.DamageTypeTags;
+@@ -23,6 +23,8 @@ import net.minecraft.tags.DamageTypeTags;
  import net.minecraft.util.Mth;
  import net.minecraft.world.Difficulty;
  import net.minecraft.world.DifficultyInstance;
@@ -16,8 +16,8 @@ index 786fe41cc743817f2ed613969c7eeec9fc001b4b..40f4a53cf244549e9cf392f4286bdec1
 +import net.minecraft.world.InteractionResult;
  import net.minecraft.world.damagesource.DamageSource;
  import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityDimensions;
-@@ -49,6 +51,8 @@ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.entity.EntitySelector;
+@@ -48,6 +50,8 @@ import net.minecraft.world.entity.player.Player;
  import net.minecraft.world.entity.projectile.AbstractArrow;
  import net.minecraft.world.entity.projectile.ShulkerBullet;
  import net.minecraft.world.item.DyeColor;
@@ -47,10 +47,10 @@ index 786fe41cc743817f2ed613969c7eeec9fc001b4b..40f4a53cf244549e9cf392f4286bdec1
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8ae2e7f81d1d6a09d9b733ae27ad6c99a58aeb2e..a8cddd10832e6be2704569b6c1fb995bd9caf0b9 100644
+index c5e32e0e1865cdbd81b9077038717dab4db46f4d..aa037b2fb2957be96db3d200294c41e43f6d820f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2179,6 +2179,7 @@ public class PurpurWorldConfig {
+@@ -2235,6 +2235,7 @@ public class PurpurWorldConfig {
      public double shulkerSpawnFromBulletNearbyRange = 8.0D;
      public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
      public boolean shulkerSpawnFromBulletRandomColor = false;
@@ -58,7 +58,7 @@ index 8ae2e7f81d1d6a09d9b733ae27ad6c99a58aeb2e..a8cddd10832e6be2704569b6c1fb995b
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -2195,6 +2196,7 @@ public class PurpurWorldConfig {
+@@ -2251,6 +2252,7 @@ public class PurpurWorldConfig {
          shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
          shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
          shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);
diff --git a/patches/server/0209-Extended-OfflinePlayer-API.patch b/patches/server/0202-Extended-OfflinePlayer-API.patch
similarity index 83%
rename from patches/server/0209-Extended-OfflinePlayer-API.patch
rename to patches/server/0202-Extended-OfflinePlayer-API.patch
index 04f2fece9..92790b03e 100644
--- a/patches/server/0209-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0202-Extended-OfflinePlayer-API.patch
@@ -5,10 +5,52 @@ Subject: [PATCH] Extended OfflinePlayer API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 03fc90a470c0f63d44161843cac88bea09166858..88640ac32d70ced6e8b1984663e1c492dd673cb5 100644
+index 9d93130f23addb18b97d7f5ec013faef17a74529..29d2fb87a65778926aea2cfc7a5b486cad596515 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -567,4 +567,213 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+@@ -335,14 +335,26 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+ 
+     @Override
+     public Location getLocation() {
++        // Purpur start
++        if (this.isOnline()) {
++            return this.getPlayer().getLocation();
++        }
++        // Purpur end
++
+         CompoundTag data = this.getData();
+         if (data == null) {
+             return null;
+         }
+ 
+-        if (data.contains("Pos") && data.contains("Rotation")) {
+-            ListTag position = (ListTag) data.get("Pos");
+-            ListTag rotation = (ListTag) data.get("Rotation");
++        // Purpur start - OfflinePlayer API
++        //if (data.contains("Pos") && data.contains("Rotation")) {
++            ListTag position = data.getList("Pos", net.minecraft.nbt.Tag.TAG_DOUBLE);
++            ListTag rotation = data.getList("Rotation", net.minecraft.nbt.Tag.TAG_FLOAT);
++
++            if (position.isEmpty() && rotation.isEmpty()) {
++                return null;
++            }
++        // Purpur end - OfflinePlayer API
+ 
+             UUID uuid = new UUID(data.getLong("WorldUUIDMost"), data.getLong("WorldUUIDLeast"));
+ 
+@@ -353,9 +365,9 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+                 rotation.getFloat(0),
+                 rotation.getFloat(1)
+             );
+-        }
++        //} // Purpur - OfflinePlayer API
+ 
+-        return null;
++        //return null; // Purpur - OfflinePlayer API
+     }
+ 
+     @Override
+@@ -598,4 +610,191 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
              manager.save();
          }
      }
@@ -129,28 +171,6 @@ index 03fc90a470c0f63d44161843cac88bea09166858..88640ac32d70ced6e8b1984663e1c492
 +    }
 +
 +    @Override
-+    public Location getLocation() {
-+        if (this.isOnline()) {
-+            return this.getPlayer().getLocation();
-+        } else {
-+            CompoundTag data = this.getData();
-+            if (data == null) return null;
-+            long worldUUIDMost = data.getLong("WorldUUIDMost");
-+            long worldUUIDLeast = data.getLong("WorldUUIDLeast");
-+            net.minecraft.nbt.ListTag position = data.getList("Pos", org.bukkit.craftbukkit.util.CraftMagicNumbers.NBT.TAG_DOUBLE);
-+            net.minecraft.nbt.ListTag rotation = data.getList("Rotation", org.bukkit.craftbukkit.util.CraftMagicNumbers.NBT.TAG_FLOAT);
-+            UUID worldUuid = new UUID(worldUUIDMost, worldUUIDLeast);
-+            org.bukkit.World world = server.getWorld(worldUuid);
-+            double x = position.getDouble(0);
-+            double y = position.getDouble(1);
-+            double z = position.getDouble(2);
-+            float yaw = rotation.getFloat(0);
-+            float pitch = rotation.getFloat(1);
-+            return new Location(world, x, y, z, yaw, pitch);
-+        }
-+    }
-+
-+    @Override
 +    public boolean teleportOffline(Location destination) {
 +        if (this.isOnline()) {
 +            return this.getPlayer().teleport(destination);
@@ -212,10 +232,10 @@ index 03fc90a470c0f63d44161843cac88bea09166858..88640ac32d70ced6e8b1984663e1c492
 +        File playerDir = server.console.playerDataStorage.getPlayerDir();
 +        try {
 +            File tempFile = File.createTempFile(this.getUniqueId()+"-", ".dat", playerDir);
-+            net.minecraft.nbt.NbtIo.writeCompressed(compoundTag, tempFile);
++            net.minecraft.nbt.NbtIo.writeCompressed(compoundTag, tempFile.toPath());
 +            File playerDataFile = new File(playerDir, this.getUniqueId()+".dat");
 +            File playerDataFileOld = new File(playerDir, this.getUniqueId()+".dat_old");
-+            net.minecraft.Util.safeReplaceFile(playerDataFile, tempFile, playerDataFileOld);
++            net.minecraft.Util.safeReplaceFile(playerDataFile.toPath(), tempFile.toPath(), playerDataFileOld.toPath());
 +        } catch (java.io.IOException e) {
 +            e.printStackTrace();
 +        }
@@ -223,10 +243,10 @@ index 03fc90a470c0f63d44161843cac88bea09166858..88640ac32d70ced6e8b1984663e1c492
 +    // 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 4895293d3dfd294d278c79932d354bf9fe780361..a03f60665059f96fc546e880c29d3bb7b04ca67c 100644
+index 925b8260bb2b1c94e544d6e082ea3b02e613d224..cf5897f8fed0c390ee75ca3b5b1037cfe1bdc43d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2521,6 +2521,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2745,6 +2745,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0210-Added-the-ability-to-add-combustible-items.patch b/patches/server/0203-Added-the-ability-to-add-combustible-items.patch
similarity index 87%
rename from patches/server/0210-Added-the-ability-to-add-combustible-items.patch
rename to patches/server/0203-Added-the-ability-to-add-combustible-items.patch
index 8bb5df6d0..702e67fa0 100644
--- a/patches/server/0210-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0203-Added-the-ability-to-add-combustible-items.patch
@@ -24,11 +24,11 @@ index 1af7e1548f0648890a1ef2fc0ff4e4c3a56c947c..decea1697c075e7549ccc7501c8e5935
                  } else if (this.isFuel(itemstack1)) {
                      if (!this.moveItemStackTo(itemstack1, 1, 2, false)) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index b0afc384907bb75dfa26e432a2328fe080660019..92e58d9503daf4cc9bc1f4c7785e159e0c1f4bf3 100644
+index ce2c424068001eec16032361baa206f6a5aa5332..c02d638b8f117156c815821207a91c55796f00b2 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -208,6 +208,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-         // Paper end
+@@ -214,6 +214,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+         }
      }
  
 +    // Purpur start
@@ -36,14 +36,14 @@ index b0afc384907bb75dfa26e432a2328fe080660019..92e58d9503daf4cc9bc1f4c7785e159e
 +        Map<Item, Integer> map = Maps.newLinkedHashMap();
 +        map.putAll(getFuel());
 +        map.put(itemStack.getItem(), burnTime);
-+        cachedBurnDurations = com.google.common.collect.ImmutableMap.copyOf(map);
++        AbstractFurnaceBlockEntity.fuelCache = com.google.common.collect.ImmutableMap.copyOf(map);
 +    }
 +
 +    public static void removeFuel(ItemStack itemStack) {
 +        Map<Item, Integer> map = Maps.newLinkedHashMap();
 +        map.putAll(getFuel());
 +        map.remove(itemStack.getItem());
-+        cachedBurnDurations = com.google.common.collect.ImmutableMap.copyOf(map);
++        AbstractFurnaceBlockEntity.fuelCache = com.google.common.collect.ImmutableMap.copyOf(map);
 +    }
 +    // Purpur End
 +
@@ -51,10 +51,10 @@ index b0afc384907bb75dfa26e432a2328fe080660019..92e58d9503daf4cc9bc1f4c7785e159e
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da114737b3515b3f39aaa36c23a0d76699eb4239..6e8cd10ec919e9c42c214a9a9c78a51794731fb6 100644
+index a52ddb9fe006c2cbaf34686fc53cfdbe5e70de01..f4b611754a0b4a14c31595bc2a5e8acf8bf849bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1537,6 +1537,19 @@ public final class CraftServer implements Server {
+@@ -1589,6 +1589,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0211-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0204-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 82%
rename from patches/server/0211-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/server/0204-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
index 5d2e91e3a..0d670738a 100644
--- a/patches/server/0211-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
+++ b/patches/server/0204-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
@@ -5,27 +5,27 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f7d9398c9a73c8a02a2515b9d43b49433e5f883c..492a50f3b619753f8a353c739a3f10c44dfa7861 100644
+index 83ec2e31d81d6209953252a3780552c3cf110c68..42db3e64b120b753e98a0fd7e3f56c7d28256fd2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1378,6 +1378,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-     private void resetWeatherCycle() {
+@@ -1391,6 +1391,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+     @VisibleForTesting
+     public void resetWeatherCycle() {
          // CraftBukkit start
 +        if (this.purpurConfig.rainStopsAfterSleep) // Purpur
-         this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - when passing the night
+         this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
          // Not that everyone ever manages to get the whole server to sleep at the same time....
-@@ -1385,6 +1386,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1398,6 +1399,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.serverLevelData.setRainTime(0);
          }
          // CraftBukkit end
 +        if (this.purpurConfig.thunderStopsAfterSleep) // Purpur
-         this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - when passing the night
+         this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
          // CraftBukkit start
          // If we stop due to everyone sleeping we should reset the weather duration to some other random value.
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a8cddd10832e6be2704569b6c1fb995bd9caf0b9..1da30e052c08c27370755cae3e1890a397a2f323 100644
+index aa037b2fb2957be96db3d200294c41e43f6d820f..ef65be19cc55c3c473338f02c9687e74b490b358 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -139,6 +139,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0205-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0205-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
new file mode 100644
index 000000000..5fca4b152
--- /dev/null
+++ b/patches/server/0205-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Mon, 23 Aug 2021 20:57:04 -0500
+Subject: [PATCH] Chance for azalea blocks to grow into trees naturally
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
+index fad69dfc20574ab23634b14252b50929cca75b21..7082486f6b760bed2a61938f493d5124722b58e2 100644
+--- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
+@@ -49,6 +49,20 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock {
+ 
+     @Override
+     public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
++        // Purpur start
++        growTree(world, random, pos, state);
++    }
++
++    @Override
++    public void randomTick(net.minecraft.world.level.block.state.BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
++        double chance = state.getBlock() == Blocks.FLOWERING_AZALEA ? world.purpurConfig.floweringAzaleaGrowthChance : world.purpurConfig.azaleaGrowthChance;
++        if (chance > 0.0D && world.getMaxLocalRawBrightness(pos.above()) > 9 && random.nextDouble() < chance) {
++            growTree(world, random, pos, state);
++        }
++    }
++
++    private void growTree(ServerLevel world, RandomSource random, BlockPos pos, net.minecraft.world.level.block.state.BlockState state) {
++        // Purpur end
+         TreeGrower.AZALEA.growTree(world, world.getChunkSource().getGenerator(), pos, state, random);
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
+index 260906f493416d98ab574a7262fce5e9b7e40c64..ce639e4a2d87202a10ef4fc73274c4b2c4e95720 100644
+--- a/src/main/java/net/minecraft/world/level/block/Blocks.java
++++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
+@@ -7389,6 +7389,7 @@ public class Blocks {
+             BlockBehaviour.Properties.of()
+                 .mapColor(MapColor.PLANT)
+                 .forceSolidOff()
++                .randomTicks() // Purpur
+                 .instabreak()
+                 .sound(SoundType.AZALEA)
+                 .noOcclusion()
+@@ -7401,6 +7402,7 @@ public class Blocks {
+             BlockBehaviour.Properties.of()
+                 .mapColor(MapColor.PLANT)
+                 .forceSolidOff()
++                .randomTicks() // Purpur
+                 .instabreak()
+                 .sound(SoundType.FLOWERING_AZALEA)
+                 .noOcclusion()
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+index ef65be19cc55c3c473338f02c9687e74b490b358..49837f5ebccfb0d6fbfefe379f52433b44c5aa79 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -806,6 +806,11 @@ public class PurpurWorldConfig {
+         anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
+     }
+ 
++    public double azaleaGrowthChance = 0.0D;
++    private void azaleaSettings() {
++        azaleaGrowthChance = getDouble("blocks.azalea.growth-chance", azaleaGrowthChance);
++    }
++
+     public int beaconLevelOne = 20;
+     public int beaconLevelTwo = 30;
+     public int beaconLevelThree = 40;
+@@ -943,6 +948,11 @@ public class PurpurWorldConfig {
+         farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
+     }
+ 
++    public double floweringAzaleaGrowthChance = 0.0D;
++    private void floweringAzaleaSettings() {
++        floweringAzaleaGrowthChance = getDouble("blocks.flowering_azalea.growth-chance", floweringAzaleaGrowthChance);
++    }
++
+     public boolean furnaceUseLavaFromUnderneath = false;
+     private void furnaceSettings() {
+         if (PurpurConfig.version < 17) {
diff --git a/patches/server/0213-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch
similarity index 81%
rename from patches/server/0213-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch
index 3e03aa2e6..07182adf0 100644
--- a/patches/server/0213-Shift-right-click-to-use-exp-for-mending.patch
+++ b/patches/server/0206-Shift-right-click-to-use-exp-for-mending.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Shift right click to use exp for mending
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0838b3c612c832276afa1edc090ef7771e8bf2fc..3250c21eded7872336d349a7a93c2c17160db723 100644
+index a810eaa7dc319f5ea69b239190ae91838bfad4ec..6d194797d8fe2cd6e5652d596f4bc66ffc3b6375 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -518,6 +518,7 @@ public class ServerPlayerGameMode {
+@@ -513,6 +513,7 @@ public class ServerPlayerGameMode {
      public InteractionHand interactHand;
      public ItemStack interactItemStack;
      public InteractionResult useItemOn(ServerPlayer player, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
 +        if (shiftClickMended(stack)) return InteractionResult.SUCCESS; // Purpur
          BlockPos blockposition = hitResult.getBlockPos();
          BlockState iblockdata = world.getBlockState(blockposition);
-         InteractionResult enuminteractionresult = InteractionResult.PASS;
-@@ -620,4 +621,18 @@ public class ServerPlayerGameMode {
+         boolean cancelledBlock = false;
+@@ -622,4 +623,18 @@ public class ServerPlayerGameMode {
      public void setLevel(ServerLevel world) {
          this.level = world;
      }
@@ -36,10 +36,10 @@ index 0838b3c612c832276afa1edc090ef7771e8bf2fc..3250c21eded7872336d349a7a93c2c17
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 90561a2fb7c353bedb62b200689d8c73b3534033..9e4100ed797cfbafbb9c0b658f2a19c1c9a57ffc 100644
+index cc3728902da9e10df2bb0e3edbb765bffd51d808..222436febf0b6ea93b57b8a4c0a98998a9430873 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2020,6 +2020,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2060,6 +2060,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
              boolean cancelled;
              if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
@@ -48,22 +48,22 @@ index 90561a2fb7c353bedb62b200689d8c73b3534033..9e4100ed797cfbafbb9c0b658f2a19c1
                  cancelled = event.useItemInHand() == Event.Result.DENY;
              } else {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a3a5decf6586569c347d36f4416cf3cb3b0bef78..8e658c5e81b85fa4fa36b9e18a02bd0634e42554 100644
+index 49837f5ebccfb0d6fbfefe379f52433b44c5aa79..fb785f51d7774d31ed50f71f8048301fc2561ed0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -413,6 +413,7 @@ public class PurpurWorldConfig {
-     public int playerCreativePortalWaitTime = 1;
+@@ -411,6 +411,7 @@ public class PurpurWorldConfig {
+     public boolean playerBurpWhenFull = false;
      public boolean playerRidableInWater = false;
      public boolean playerRemoveBindingWithWeakness = false;
 +    public int shiftRightClickRepairsMendingPoints = 0;
      private void playerSettings() {
          if (PurpurConfig.version < 19) {
              boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -439,6 +440,7 @@ public class PurpurWorldConfig {
-         playerCreativePortalWaitTime = getInt("gameplay-mechanics.player.creative-portal-wait-time", playerCreativePortalWaitTime);
+@@ -435,6 +436,7 @@ public class PurpurWorldConfig {
+         playerBurpWhenFull = getBoolean("gameplay-mechanics.player.burp-when-full", playerBurpWhenFull);
          playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
          playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
 +        shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0214-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0207-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 87%
rename from patches/server/0214-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/server/0207-Dolphins-naturally-aggressive-to-players-chance.patch
index ec76f54a5..e75951668 100644
--- a/patches/server/0214-Dolphins-naturally-aggressive-to-players-chance.patch
+++ b/patches/server/0207-Dolphins-naturally-aggressive-to-players-chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dolphins naturally aggressive to players chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 77746eeffdc612793a6c907f222753bce5cd0ed4..b6342637f1b42b6368dcda17eea4b39a22ec3b79 100644
+index 38112239035b0c66c429c0762199867e70e0a67a..e539eefb6e6d3172611d1f9185a1138001481885 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -82,6 +82,7 @@ public class Dolphin extends WaterAnimal {
+@@ -81,6 +81,7 @@ public class Dolphin extends WaterAnimal {
      public static final Predicate<ItemEntity> ALLOWED_ITEMS = (entityitem) -> {
          return !entityitem.hasPickUpDelay() && entityitem.isAlive() && entityitem.isInWater();
      };
@@ -16,15 +16,15 @@ index 77746eeffdc612793a6c907f222753bce5cd0ed4..b6342637f1b42b6368dcda17eea4b39a
      private int spitCooldown; // Purpur
  
      public Dolphin(EntityType<? extends Dolphin> type, Level world) {
-@@ -173,6 +174,7 @@ public class Dolphin extends WaterAnimal {
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+@@ -172,6 +173,7 @@ public class Dolphin extends WaterAnimal {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
          this.setAirSupply(this.getMaxAirSupply());
          this.setXRot(0.0F);
 +        this.isNaturallyAggressiveToPlayers = world.getLevel().purpurConfig.dolphinNaturallyAggressiveToPlayersChance > 0.0D && random.nextDouble() <= world.getLevel().purpurConfig.dolphinNaturallyAggressiveToPlayersChance; // Purpur
-         return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
+         return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
      }
  
-@@ -242,6 +244,7 @@ public class Dolphin extends WaterAnimal {
+@@ -236,6 +238,7 @@ public class Dolphin extends WaterAnimal {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new BreathAirGoal(this));
          this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
@@ -32,7 +32,7 @@ index 77746eeffdc612793a6c907f222753bce5cd0ed4..b6342637f1b42b6368dcda17eea4b39a
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.goalSelector.addGoal(1, new Dolphin.DolphinSwimToTreasureGoal(this));
          this.goalSelector.addGoal(2, new Dolphin.DolphinSwimWithPlayerGoal(this, 4.0D));
-@@ -249,12 +252,13 @@ public class Dolphin extends WaterAnimal {
+@@ -243,12 +246,13 @@ public class Dolphin extends WaterAnimal {
          this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
          this.goalSelector.addGoal(5, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(5, new DolphinJumpGoal(this, 10));
@@ -48,10 +48,10 @@ index 77746eeffdc612793a6c907f222753bce5cd0ed4..b6342637f1b42b6368dcda17eea4b39a
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8e658c5e81b85fa4fa36b9e18a02bd0634e42554..c146356aa04126f2cd74aabf50c1436fa111aa6a 100644
+index fb785f51d7774d31ed50f71f8048301fc2561ed0..b1a941d2747ca93354c9abb67df8419114f27ff7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1277,6 +1277,7 @@ public class PurpurWorldConfig {
+@@ -1333,6 +1333,7 @@ public class PurpurWorldConfig {
      public double dolphinMaxHealth = 10.0D;
      public boolean dolphinDisableTreasureSearching = false;
      public boolean dolphinTakeDamageFromWater = false;
@@ -59,7 +59,7 @@ index 8e658c5e81b85fa4fa36b9e18a02bd0634e42554..c146356aa04126f2cd74aabf50c1436f
      private void dolphinSettings() {
          dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
          dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
-@@ -1291,6 +1292,7 @@ public class PurpurWorldConfig {
+@@ -1347,6 +1348,7 @@ public class PurpurWorldConfig {
          dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
          dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
          dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);
diff --git a/patches/server/0215-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0208-Cows-naturally-aggressive-to-players-chance.patch
similarity index 82%
rename from patches/server/0215-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/server/0208-Cows-naturally-aggressive-to-players-chance.patch
index 054fdd923..dd14b76e4 100644
--- a/patches/server/0215-Cows-naturally-aggressive-to-players-chance.patch
+++ b/patches/server/0208-Cows-naturally-aggressive-to-players-chance.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Cows naturally aggressive to players chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f7173955629c 100644
+index 8c908891c6c683332d8877ab3fa084a0849b17a9..541cc6c70178a430ac8e3ab8f6a2250b8ea1d964 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -42,6 +42,7 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
+@@ -39,6 +39,7 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
  // CraftBukkit end
  
  public class Cow extends Animal {
 +    private boolean isNaturallyAggressiveToPlayers; // Purpur
  
-     public Cow(EntityType<? extends Cow> type, Level world) {
-         super(type, world);
-@@ -67,6 +68,7 @@ public class Cow extends Animal {
+     private static final EntityDimensions BABY_DIMENSIONS = EntityType.COW.getDimensions().scale(0.5F).withEyeHeight(0.665F);
+ 
+@@ -66,6 +67,7 @@ public class Cow extends Animal {
      @Override
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.cowMaxHealth);
@@ -24,14 +24,14 @@ index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f717
      }
  
      @Override
-@@ -79,11 +81,18 @@ public class Cow extends Animal {
+@@ -78,11 +80,18 @@ public class Cow extends Animal {
          return this.level().purpurConfig.cowTakeDamageFromWater;
      }
  
 +    @Override
-+    public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.MobSpawnType spawnReason, net.minecraft.world.entity.SpawnGroupData entityData, net.minecraft.nbt.CompoundTag entityNbt) {
++    public net.minecraft.world.entity.SpawnGroupData finalizeSpawn(net.minecraft.world.level.ServerLevelAccessor world, net.minecraft.world.DifficultyInstance difficulty, net.minecraft.world.entity.MobSpawnType spawnReason, net.minecraft.world.entity.SpawnGroupData entityData) {
 +        this.isNaturallyAggressiveToPlayers = world.getLevel().purpurConfig.cowNaturallyAggressiveToPlayersChance > 0.0D && random.nextDouble() <= world.getLevel().purpurConfig.cowNaturallyAggressiveToPlayersChance;
-+        return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
++        return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
 +    }
 +
      @Override
@@ -41,15 +41,19 @@ index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f717
          this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
 +        this.goalSelector.addGoal(1, new net.minecraft.world.entity.ai.goal.MeleeAttackGoal(this, 1.2000000476837158D, true)); // Purpur
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
-         if (level().purpurConfig.cowFeedMushrooms > 0) this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT, Blocks.RED_MUSHROOM.asItem(), Blocks.BROWN_MUSHROOM.asItem()), false)); else // Purpur
-         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT), false));
-@@ -91,10 +100,11 @@ public class Cow extends Animal {
+         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, (itemstack) -> {
+             return level().purpurConfig.cowFeedMushrooms > 0 && (itemstack.is(Blocks.RED_MUSHROOM.asItem()) || itemstack.is(Blocks.BROWN_MUSHROOM.asItem())) || itemstack.is(ItemTags.COW_FOOD); // Purpur
+@@ -91,6 +100,7 @@ public class Cow extends Animal {
          this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
 +        this.targetSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, target -> isNaturallyAggressiveToPlayers)); // Purpur
      }
  
+     @Override
+@@ -99,7 +109,7 @@ public class Cow extends Animal {
+     }
+ 
      public static AttributeSupplier.Builder createAttributes() {
 -        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
 +        return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 10.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D).add(Attributes.ATTACK_DAMAGE, 0.0D); // Purpur
@@ -57,10 +61,10 @@ index f76b0d92150fd985a8fc699f6f884527d589dfd3..3c12e179861b5514e081d0db1664f717
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c146356aa04126f2cd74aabf50c1436fa111aa6a..e752c2050b696a0f1db12c5301fbe940488d87d1 100644
+index b1a941d2747ca93354c9abb67df8419114f27ff7..0edff6f99dbea98f0d80f2a48d52d86874430ff5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1226,7 +1226,14 @@ public class PurpurWorldConfig {
+@@ -1282,7 +1282,14 @@ public class PurpurWorldConfig {
      public int cowFeedMushrooms = 0;
      public int cowBreedingTicks = 6000;
      public boolean cowTakeDamageFromWater = false;
@@ -75,7 +79,7 @@ index c146356aa04126f2cd74aabf50c1436fa111aa6a..e752c2050b696a0f1db12c5301fbe940
          cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
          cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
          cowControllable = getBoolean("mobs.cow.controllable", cowControllable);
-@@ -1239,6 +1246,8 @@ public class PurpurWorldConfig {
+@@ -1295,6 +1302,8 @@ public class PurpurWorldConfig {
          cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
          cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
          cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);
diff --git a/patches/server/0216-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0209-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 86%
rename from patches/server/0216-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/server/0209-Option-for-beds-to-explode-on-villager-sleep.patch
index 2a48fdd4f..8ee26831e 100644
--- a/patches/server/0216-Option-for-beds-to-explode-on-villager-sleep.patch
+++ b/patches/server/0209-Option-for-beds-to-explode-on-villager-sleep.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for beds to explode on villager sleep
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index c7047bacce4851956e3732f0a73be423cc46ee54..04ccb0562e01ea5b9fcc4a14346fb0767ae44639 100644
+index a7c85c9efd13145cc061a3a0076b44a7af9812b9..1bace0d549ea4a4b45ac4cd1409524989ecac4ca 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -1119,6 +1119,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -1101,6 +1101,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      public void startSleeping(BlockPos pos) {
@@ -22,10 +22,10 @@ index c7047bacce4851956e3732f0a73be423cc46ee54..04ccb0562e01ea5b9fcc4a14346fb076
          this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level().getGameTime()); // CraftBukkit - decompile error
          this.brain.eraseMemory(MemoryModuleType.WALK_TARGET);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e752c2050b696a0f1db12c5301fbe940488d87d1..dae834b637164fabea2b17d2d752a04df31ee88a 100644
+index 0edff6f99dbea98f0d80f2a48d52d86874430ff5..613dcb1b68169c724dbf63a6327dab5b50dd4a8d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -754,6 +754,7 @@ public class PurpurWorldConfig {
+@@ -825,6 +825,7 @@ public class PurpurWorldConfig {
      }
  
      public boolean bedExplode = true;
@@ -33,7 +33,7 @@ index e752c2050b696a0f1db12c5301fbe940488d87d1..dae834b637164fabea2b17d2d752a04d
      public double bedExplosionPower = 5.0D;
      public boolean bedExplosionFire = true;
      public net.minecraft.world.level.Level.ExplosionInteraction bedExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
-@@ -764,6 +765,7 @@ public class PurpurWorldConfig {
+@@ -835,6 +836,7 @@ public class PurpurWorldConfig {
              }
          }
          bedExplode = getBoolean("blocks.bed.explode", bedExplode);
diff --git a/patches/server/0217-Halloween-options-and-optimizations.patch b/patches/server/0210-Halloween-options-and-optimizations.patch
similarity index 81%
rename from patches/server/0217-Halloween-options-and-optimizations.patch
rename to patches/server/0210-Halloween-options-and-optimizations.patch
index 4df7eb178..95eff8c09 100644
--- a/patches/server/0217-Halloween-options-and-optimizations.patch
+++ b/patches/server/0210-Halloween-options-and-optimizations.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Halloween options and optimizations
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index c3d1d77a5703db4e1e3eb38fdd0b8903f691bf25..c103c3da165ec4a9717400fdf278de2a667edd2a 100644
+index a7847b6ca5b203fd693337928f31a9043be163d7..a50d58240c58a0fea4ae8fc24689870807103199 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -300,7 +300,7 @@ public class Bat extends AmbientCreature {
+@@ -301,7 +301,7 @@ public class Bat extends AmbientCreature {
              int i = world.getMaxLocalRawBrightness(pos);
              byte b0 = 4;
  
@@ -17,21 +17,21 @@ index c3d1d77a5703db4e1e3eb38fdd0b8903f691bf25..c103c3da165ec4a9717400fdf278de2a
                  b0 = 7;
              } else if (random.nextBoolean()) {
                  return false;
-@@ -314,6 +314,7 @@ public class Bat extends AmbientCreature {
-     private static boolean isSpookySeason = false;
-     private static final int ONE_HOUR = 20 * 60 * 60;
-     private static int lastSpookyCheck = -ONE_HOUR;
+@@ -311,6 +311,7 @@ public class Bat extends AmbientCreature {
+         }
+     }
+ 
 +    public static boolean isHalloweenSeason(Level level) { return level.purpurConfig.forceHalloweenSeason || isHalloween(); } // Purpur
      private static boolean isHalloween() {
-         if (net.minecraft.server.MinecraftServer.currentTick - lastSpookyCheck > ONE_HOUR) {
          LocalDate localdate = LocalDate.now();
+         int i = localdate.get(ChronoField.DAY_OF_MONTH);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index f35637a105d5aa12fb57c2456f2b2a7db12a49f0..f3e1fa62d9f067c0fe8aacb88bf30b01ee0562c1 100644
+index 919767affe2ede755cf83398436fbf1581ad508f..8515e6360c1630385884a60f652f65fdefeaf540 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -143,11 +143,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -135,11 +135,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          this.reassessWeaponGoal();
-         this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper
+         this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper - Add world settings for mobs picking up loot
          if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
 -            LocalDate localdate = LocalDate.now();
 -            int i = localdate.get(ChronoField.DAY_OF_MONTH);
@@ -43,10 +43,10 @@ index f35637a105d5aa12fb57c2456f2b2a7db12a49f0..f3e1fa62d9f067c0fe8aacb88bf30b01
                  this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 15baaf9c358019b1ce2152086e8d16591eec7dbb..79f791188a14a319a19b55674c891384fcb750c9 100644
+index 53f7659aed2378b36f1923a0208c7f86048eb85b..d5a5e51e23328deac09d6990539d8207b1567912 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -586,11 +586,7 @@ public class Zombie extends Monster {
+@@ -575,11 +575,7 @@ public class Zombie extends Monster {
          }
  
          if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
@@ -60,10 +60,10 @@ index 15baaf9c358019b1ce2152086e8d16591eec7dbb..79f791188a14a319a19b55674c891384
                  this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F;
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index dae834b637164fabea2b17d2d752a04df31ee88a..9f3fe0265904da5a4be55fd3bc0ed1d283d241a9 100644
+index 613dcb1b68169c724dbf63a6327dab5b50dd4a8d..1b7ebd3fe3cefd1ca26957835a93e103641ddb7a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1619,6 +1619,13 @@ public class PurpurWorldConfig {
+@@ -1675,6 +1675,13 @@ public class PurpurWorldConfig {
          guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
      }
  
diff --git a/patches/server/0211-Config-for-grindstones.patch b/patches/server/0211-Config-for-grindstones.patch
new file mode 100644
index 000000000..2dd7aa81b
--- /dev/null
+++ b/patches/server/0211-Config-for-grindstones.patch
@@ -0,0 +1,158 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Encode42 <me@encode42.dev>
+Date: Wed, 29 Sep 2021 13:37:57 -0400
+Subject: [PATCH] Config for grindstones
+
+
+diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+index db9444dda248260372d96ce239a590e88a4c1142..5824636332eb35ae6bee9cc0661ee95901bb8c4b 100644
+--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+@@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+                     Enchantment enchantment = (Enchantment) ((Holder) entry.getKey()).value();
+                     int k = entry.getIntValue();
+ 
+-                    if (!enchantment.isCurse()) {
++                    if (!org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(enchantment)) { // Purpur
+                         j += enchantment.getMinCost(k);
+                     }
+                 }
+@@ -229,7 +229,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+                 Entry<Holder<Enchantment>> entry = (Entry) iterator.next();
+                 Enchantment enchantment = (Enchantment) ((Holder) entry.getKey()).value();
+ 
+-                if (!enchantment.isCurse() || itemenchantments_a.getLevel(enchantment) == 0) {
++                if (!org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(enchantment) || itemenchantments_a.getLevel(enchantment) == 0) { // Purpur
+                     itemenchantments_a.upgrade(enchantment, entry.getIntValue());
+                 }
+             }
+@@ -237,10 +237,70 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+         });
+     }
+ 
++    // Purpur start
++    private java.util.List<net.minecraft.core.component.DataComponentType<?>> GRINDSTONE_REMOVE_ATTRIBUTES_REMOVAL_LIST = java.util.List.of(
++        // DataComponents.MAX_STACK_SIZE,
++        // DataComponents.DAMAGE,
++        // DataComponents.BLOCK_STATE,
++        DataComponents.CUSTOM_DATA,
++        // DataComponents.MAX_DAMAGE,
++        // DataComponents.UNBREAKABLE,
++        // DataComponents.CUSTOM_NAME,
++        // DataComponents.ITEM_NAME,
++        // DataComponents.LORE,
++        // DataComponents.RARITY,
++        // DataComponents.ENCHANTMENTS,
++        // DataComponents.CAN_PLACE_ON,
++        // DataComponents.CAN_BREAK,
++        DataComponents.ATTRIBUTE_MODIFIERS,
++        DataComponents.CUSTOM_MODEL_DATA,
++        // DataComponents.HIDE_ADDITIONAL_TOOLTIP,
++        // DataComponents.HIDE_TOOLTIP,
++        // DataComponents.REPAIR_COST,
++        // DataComponents.CREATIVE_SLOT_LOCK,
++        // DataComponents.ENCHANTMENT_GLINT_OVERRIDE,
++        // DataComponents.INTANGIBLE_PROJECTILE,
++        // DataComponents.FOOD,
++        // DataComponents.FIRE_RESISTANT,
++        // DataComponents.TOOL,
++        // DataComponents.STORED_ENCHANTMENTS,
++        DataComponents.DYED_COLOR,
++        // DataComponents.MAP_COLOR,
++        // DataComponents.MAP_ID,
++        // DataComponents.MAP_DECORATIONS,
++        // DataComponents.MAP_POST_PROCESSING,
++        // DataComponents.CHARGED_PROJECTILES,
++        // DataComponents.BUNDLE_CONTENTS,
++        // DataComponents.POTION_CONTENTS,
++        DataComponents.SUSPICIOUS_STEW_EFFECTS
++        // DataComponents.WRITABLE_BOOK_CONTENT,
++        // DataComponents.WRITTEN_BOOK_CONTENT,
++        // DataComponents.TRIM,
++        // DataComponents.DEBUG_STICK_STATE,
++        // DataComponents.ENTITY_DATA,
++        // DataComponents.BUCKET_ENTITY_DATA,
++        // DataComponents.BLOCK_ENTITY_DATA,
++        // DataComponents.INSTRUMENT,
++        // DataComponents.OMINOUS_BOTTLE_AMPLIFIER,
++        // DataComponents.RECIPES,
++        // DataComponents.LODESTONE_TRACKER,
++        // DataComponents.FIREWORK_EXPLOSION,
++        // DataComponents.FIREWORKS,
++        // DataComponents.PROFILE,
++        // DataComponents.NOTE_BLOCK_SOUND,
++        // DataComponents.BANNER_PATTERNS,
++        // DataComponents.BASE_COLOR,
++        // DataComponents.POT_DECORATIONS,
++        // DataComponents.CONTAINER,
++        // DataComponents.BEES,
++        // DataComponents.LOCK,
++        // DataComponents.CONTAINER_LOOT,
++    );
++    // Purpur end
+     private ItemStack removeNonCursesFrom(ItemStack item) {
+         ItemEnchantments itemenchantments = EnchantmentHelper.updateEnchantments(item, (itemenchantments_a) -> {
+             itemenchantments_a.removeIf((holder) -> {
+-                return !((Enchantment) holder.value()).isCurse();
++                return !org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(holder.value());
+             });
+         });
+ 
+@@ -255,6 +315,23 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+         }
+ 
+         item.set(DataComponents.REPAIR_COST, i);
++
++        // Purpur start
++        net.minecraft.core.component.DataComponentPatch.Builder builder = net.minecraft.core.component.DataComponentPatch.builder();
++        if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveAttributes) {
++            item.getComponents().forEach(typedDataComponent -> {
++                if (GRINDSTONE_REMOVE_ATTRIBUTES_REMOVAL_LIST.contains(typedDataComponent.type())) {
++                    builder.remove(typedDataComponent.type());
++                }
++            });
++        }
++        if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveDisplay) {
++            builder.remove(DataComponents.CUSTOM_NAME);
++            builder.remove(DataComponents.LORE);
++        }
++        item.applyComponents(builder.build());
++        // Purpur end
++
+         return item;
+     }
+ 
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index b56afa30c04350b5e9ca4ea2d33f9e7c58559380..7f0a9a239791cfb1d721d24f907b89ae2dd4c64a 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -309,6 +309,9 @@ public class PurpurConfig {
+     public static int beeInsideBeeHive = 3;
+     public static boolean anvilCumulativeCost = true;
+     public static int lightningRodRange = 128;
++    public static Set<Enchantment> grindstoneIgnoredEnchants = new HashSet<>();
++    public static boolean grindstoneRemoveAttributes = false;
++    public static boolean grindstoneRemoveDisplay = false;
+     private static void blockSettings() {
+         if (version < 3) {
+             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
+@@ -343,6 +346,19 @@ public class PurpurConfig {
+         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
+         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
+         lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
++        ArrayList<String> defaultCurses = new ArrayList<>(){{
++            add("minecraft:binding_curse");
++            add("minecraft:vanishing_curse");
++        }};
++        if (version < 24 && !getBoolean("settings.blocks.grindstone.ignore-curses", true)) {
++            defaultCurses.clear();
++        }
++        getList("settings.blocks.grindstone.ignored-enchants", defaultCurses).forEach(key -> {
++            Enchantment enchantment = BuiltInRegistries.ENCHANTMENT.get(new ResourceLocation(key.toString()));
++            grindstoneIgnoredEnchants.add(enchantment);
++        });
++        grindstoneRemoveAttributes = getBoolean("settings.blocks.grindstone.remove-attributes", grindstoneRemoveAttributes);
++        grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay);
+     }
+ 
+     public static boolean allowInfinityMending = false;
diff --git a/patches/server/0212-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0212-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
deleted file mode 100644
index abbd59590..000000000
--- a/patches/server/0212-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 23 Aug 2021 20:57:04 -0500
-Subject: [PATCH] Chance for azalea blocks to grow into trees naturally
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-index 087f3b3cc180e16195efdc0b402701fd9f5d78b4..aa4e13f1c77f10221128569483497668cd2eb7d3 100644
---- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java
-@@ -43,6 +43,20 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock {
- 
-     @Override
-     public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
-+        // Purpur start
-+        growTree(world, random, pos, state);
-+    }
-+
-+    @Override
-+    public void randomTick(net.minecraft.world.level.block.state.BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
-+        double chance = state.getBlock() == Blocks.FLOWERING_AZALEA ? world.purpurConfig.floweringAzaleaGrowthChance : world.purpurConfig.azaleaGrowthChance;
-+        if (chance > 0.0D && world.getMaxLocalRawBrightness(pos.above()) > 9 && random.nextDouble() < chance) {
-+            growTree(world, random, pos, state);
-+        }
-+    }
-+
-+    private void growTree(ServerLevel world, RandomSource random, BlockPos pos, net.minecraft.world.level.block.state.BlockState state) {
-+        // Purpur end
-         TREE_GROWER.growTree(world, world.getChunkSource().getGenerator(), pos, state, random);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
-index b49e02ac7b3db9a5b79ce3f106ead19af4e7cfa6..6425bc42bb8024aa7936b841d6c2ee2c892eb329 100644
---- a/src/main/java/net/minecraft/world/level/block/Blocks.java
-+++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
-@@ -1094,8 +1094,8 @@ public class Blocks {
-     public static final Block CAVE_VINES = register("cave_vines", new CaveVinesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).randomTicks().noCollission().lightLevel(CaveVines.emission(14)).instabreak().sound(SoundType.CAVE_VINES).pushReaction(PushReaction.DESTROY)));
-     public static final Block CAVE_VINES_PLANT = register("cave_vines_plant", new CaveVinesPlantBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().lightLevel(CaveVines.emission(14)).instabreak().sound(SoundType.CAVE_VINES).pushReaction(PushReaction.DESTROY)));
-     public static final Block SPORE_BLOSSOM = register("spore_blossom", new SporeBlossomBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instabreak().noCollission().sound(SoundType.SPORE_BLOSSOM).pushReaction(PushReaction.DESTROY)));
--    public static final Block AZALEA = register("azalea", new AzaleaBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).forceSolidOff().instabreak().sound(SoundType.AZALEA).noOcclusion().pushReaction(PushReaction.DESTROY)));
--    public static final Block FLOWERING_AZALEA = register("flowering_azalea", new AzaleaBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).forceSolidOff().instabreak().sound(SoundType.FLOWERING_AZALEA).noOcclusion().pushReaction(PushReaction.DESTROY)));
-+    public static final Block AZALEA = register("azalea", new AzaleaBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).forceSolidOff().randomTicks().instabreak().sound(SoundType.AZALEA).noOcclusion().pushReaction(PushReaction.DESTROY))); // Purpur
-+    public static final Block FLOWERING_AZALEA = register("flowering_azalea", new AzaleaBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).forceSolidOff().randomTicks().instabreak().sound(SoundType.FLOWERING_AZALEA).noOcclusion().pushReaction(PushReaction.DESTROY))); // Purpur
-     public static final Block MOSS_CARPET = register("moss_carpet", new CarpetBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS_CARPET).pushReaction(PushReaction.DESTROY)));
-     public static final Block PINK_PETALS = register("pink_petals", new PinkPetalsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.PINK_PETALS).pushReaction(PushReaction.DESTROY)));
-     public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS).pushReaction(PushReaction.DESTROY)));
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1da30e052c08c27370755cae3e1890a397a2f323..a3a5decf6586569c347d36f4416cf3cb3b0bef78 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -735,6 +735,11 @@ public class PurpurWorldConfig {
-         anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
-     }
- 
-+    public double azaleaGrowthChance = 0.0D;
-+    private void azaleaSettings() {
-+        azaleaGrowthChance = getDouble("blocks.azalea.growth-chance", azaleaGrowthChance);
-+    }
-+
-     public int beaconLevelOne = 20;
-     public int beaconLevelTwo = 30;
-     public int beaconLevelThree = 40;
-@@ -872,6 +877,11 @@ public class PurpurWorldConfig {
-         farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
-     }
- 
-+    public double floweringAzaleaGrowthChance = 0.0D;
-+    private void floweringAzaleaSettings() {
-+        floweringAzaleaGrowthChance = getDouble("blocks.flowering_azalea.growth-chance", floweringAzaleaGrowthChance);
-+    }
-+
-     public boolean furnaceUseLavaFromUnderneath = false;
-     private void furnaceSettings() {
-         if (PurpurConfig.version < 17) {
diff --git a/patches/server/0219-UPnP-Port-Forwarding.patch b/patches/server/0212-UPnP-Port-Forwarding.patch
similarity index 80%
rename from patches/server/0219-UPnP-Port-Forwarding.patch
rename to patches/server/0212-UPnP-Port-Forwarding.patch
index a6ed332a2..6865e4805 100644
--- a/patches/server/0219-UPnP-Port-Forwarding.patch
+++ b/patches/server/0212-UPnP-Port-Forwarding.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 615de0c4baf7797d03c43e5e164b198ebb70b341..ef25e6f4a36e98279061a8f066b37be956b92d49 100644
+index 6d84eb68e3160f772d6832513df2bc4db87b594e..0f4fde2097b9db59b6c29935462f305f34747b3b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -303,6 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-     public static long currentTickLong = 0L; // Paper
+@@ -317,6 +317,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public static long currentTickLong = 0L; // Paper - track current tick as a long
+     public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
      public boolean lagging = false; // Purpur
 +    protected boolean upnp = false; // Purpur
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -929,6 +930,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -979,6 +980,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftServer.LOGGER.info("Stopping server");
-         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
+         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
 +        // Purpur start
 +        if (upnp) {
@@ -32,11 +32,11 @@ index 615de0c4baf7797d03c43e5e164b198ebb70b341..ef25e6f4a36e98279061a8f066b37be9
          if (this.server != null) {
              this.server.disablePlugins();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3b0e5b4bb1b24cd2d1931af39ec4f421d5ac3511..21ea9ed1eaf767b7af3ccafbf5fdb88b4a9dc917 100644
+index 8a132fcdeb620d2e7f1c0c8b9e592ff233cd0568..29af03b8690e4d402d1e4e4516e4dc731b7b4323 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -278,6 +278,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
+@@ -290,6 +290,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+             if (true) throw new IllegalStateException("Failed to bind to port", ioexception); // Paper - Propagate failed to bind to port error
              return false;
          }
 +        // Purpur start
@@ -67,7 +67,7 @@ index 3b0e5b4bb1b24cd2d1931af39ec4f421d5ac3511..21ea9ed1eaf767b7af3ccafbf5fdb88b
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f3449eb7a1433a8420c0de6f4649f0fae70b2294..f6cd1c56dcc3f7d118edc6d7a63e42da166ebd5f 100644
+index 7f0a9a239791cfb1d721d24f907b89ae2dd4c64a..f79d0e3907dd89ff0abf8220392bb4e23cf9003e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -419,4 +419,9 @@ public class PurpurConfig {
diff --git a/patches/server/0220-Campfire-option-for-lit-when-placed.patch b/patches/server/0213-Campfire-option-for-lit-when-placed.patch
similarity index 87%
rename from patches/server/0220-Campfire-option-for-lit-when-placed.patch
rename to patches/server/0213-Campfire-option-for-lit-when-placed.patch
index dcaaa22e1..9fdd69c02 100644
--- a/patches/server/0220-Campfire-option-for-lit-when-placed.patch
+++ b/patches/server/0213-Campfire-option-for-lit-when-placed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Campfire option for lit when placed
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-index 7700461b8cd0bde1bf6c0d5e4b73184bed1adc4e..cfa02b274286374c7555919d0e8d66a2c8fb8b88 100644
+index d6fffb0953494e8667cc456137cac0f5deebfbb6..f7a2244b998aebe354d38eec7aa22fd94ce404c9 100644
 --- a/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CampfireBlock.java
-@@ -123,7 +123,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
+@@ -133,7 +133,7 @@ public class CampfireBlock extends BaseEntityBlock implements SimpleWaterloggedB
          BlockPos blockposition = ctx.getClickedPos();
          boolean flag = world.getFluidState(blockposition).getType() == Fluids.WATER;
  
@@ -18,10 +18,10 @@ index 7700461b8cd0bde1bf6c0d5e4b73184bed1adc4e..cfa02b274286374c7555919d0e8d66a2
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9f3fe0265904da5a4be55fd3bc0ed1d283d241a9..19684e9d59f57d587818dcf5debd4873944298bf 100644
+index 1b7ebd3fe3cefd1ca26957835a93e103641ddb7a..88d300ebbfa907712ddd77c2ca7dd91e04d22f21 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -797,6 +797,11 @@ public class PurpurWorldConfig {
+@@ -868,6 +868,11 @@ public class PurpurWorldConfig {
          cactusBreaksFromSolidNeighbors = getBoolean("blocks.cactus.breaks-from-solid-neighbors", cactusBreaksFromSolidNeighbors);
      }
  
diff --git a/patches/server/0221-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0214-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 94%
rename from patches/server/0221-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/server/0214-options-to-extinguish-fire-blocks-with-snowballs.patch
index eec71c225..d3e4d711e 100644
--- a/patches/server/0221-options-to-extinguish-fire-blocks-with-snowballs.patch
+++ b/patches/server/0214-options-to-extinguish-fire-blocks-with-snowballs.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] options to extinguish fire blocks with snowballs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-index b90cedad282e95a067aca176fafa9f72a726f520..440d3d72d8b2dac14f83a83caa5ae9dbf3e979b6 100644
+index f59a2903bfb8ae591a638ea5bb387caaa93ce664..1b9d0e28e518c501b4b93ae385ddd64aeade97d5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-@@ -57,6 +57,36 @@ public class Snowball extends ThrowableItemProjectile {
-         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i);
+@@ -63,6 +63,36 @@ public class Snowball extends ThrowableItemProjectile {
+         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
      }
  
 +    // Purpur start - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire
@@ -46,7 +46,7 @@ index b90cedad282e95a067aca176fafa9f72a726f520..440d3d72d8b2dac14f83a83caa5ae9db
      protected void onHit(HitResult hitResult) {
          super.onHit(hitResult);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 19684e9d59f57d587818dcf5debd4873944298bf..51350d67992bba19be24bfbc75968cae29ca5d98 100644
+index 88d300ebbfa907712ddd77c2ca7dd91e04d22f21..d005e045f5fc2a9442fb070ebf984f34785ecc9e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -231,6 +231,9 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0222-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0215-Add-option-to-disable-zombie-villagers-cure.patch
similarity index 75%
rename from patches/server/0222-Add-option-to-disable-zombie-villagers-cure.patch
rename to patches/server/0215-Add-option-to-disable-zombie-villagers-cure.patch
index 46f05ff4b..7fb8dcede 100644
--- a/patches/server/0222-Add-option-to-disable-zombie-villagers-cure.patch
+++ b/patches/server/0215-Add-option-to-disable-zombie-villagers-cure.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Add option to disable zombie villagers cure
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index ecf41531855e1f60d9739ac6d2d82df7794f072f..4bac02d30ec28ea0bce069f0f915b660b99b122d 100644
+index d909138942212ee090ff513b1817414c93457425..fe43c744cccdc07d5e449ce3ede85f4c7d898018 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -215,7 +215,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+@@ -219,7 +219,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          ItemStack itemstack = player.getItemInHand(hand);
  
          if (itemstack.is(Items.GOLDEN_APPLE)) {
 -            if (this.hasEffect(MobEffects.WEAKNESS)) {
 +            if (this.hasEffect(MobEffects.WEAKNESS) && level().purpurConfig.zombieVillagerCureEnabled) { // Purpur
-                 if (!player.getAbilities().instabuild) {
-                     itemstack.shrink(1);
-                 }
+                 itemstack.consume(1, player);
+                 if (!this.level().isClientSide) {
+                     this.startConverting(player.getUUID(), this.random.nextInt(level().purpurConfig.zombieVillagerCuringTimeMax - level().purpurConfig.zombieVillagerCuringTimeMin + 1) + level().purpurConfig.zombieVillagerCuringTimeMin); // Purpur
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 51350d67992bba19be24bfbc75968cae29ca5d98..cbf30293766899b7aa66dc922ba76395feca1094 100644
+index d005e045f5fc2a9442fb070ebf984f34785ecc9e..8d4c3c4a06d40841e8446485364393e36e686fdd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2836,6 +2836,7 @@ public class PurpurWorldConfig {
+@@ -2894,6 +2894,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerTakeDamageFromWater = false;
      public int zombieVillagerCuringTimeMin = 3600;
      public int zombieVillagerCuringTimeMax = 6000;
@@ -29,7 +29,7 @@ index 51350d67992bba19be24bfbc75968cae29ca5d98..cbf30293766899b7aa66dc922ba76395
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2853,6 +2854,7 @@ public class PurpurWorldConfig {
+@@ -2911,6 +2912,7 @@ public class PurpurWorldConfig {
          zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
          zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
          zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
diff --git a/patches/server/0216-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0216-Persistent-BlockEntity-Lore-and-DisplayName.patch
new file mode 100644
index 000000000..f76de1cf7
--- /dev/null
+++ b/patches/server/0216-Persistent-BlockEntity-Lore-and-DisplayName.patch
@@ -0,0 +1,164 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
+Date: Wed, 30 Sep 2020 14:32:46 -0700
+Subject: [PATCH] Persistent BlockEntity Lore and DisplayName
+
+Makes it so that when a BlockEntity is placed in the world and then broken,
+the dropped ItemStack retains any original custom display name/lore.
+
+diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
+index 2649188930653610b8aaaeb18797c80879cd572a..7572c289758001c7417a192f0e6e994ffa8408b3 100644
+--- a/src/main/java/net/minecraft/world/item/BlockItem.java
++++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+@@ -157,7 +157,16 @@ public class BlockItem extends Item {
+     }
+ 
+     protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) {
+-        return BlockItem.updateCustomBlockEntityTag(world, player, pos, stack);
++        // Purpur start
++        boolean handled = updateCustomBlockEntityTag(world, player, pos, stack);
++        if (world.purpurConfig.persistentTileEntityLore) {
++            BlockEntity blockEntity1 = world.getBlockEntity(pos);
++            if (blockEntity1 != null) {
++                blockEntity1.setPersistentLore(stack.getOrDefault(DataComponents.LORE, net.minecraft.world.item.component.ItemLore.EMPTY));
++            }
++        }
++        return handled;
++        // Purpur end
+     }
+ 
+     @Nullable
+diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
+index 6f7e90d406b088fee0eb254f8042bd404d8f36fa..7ffe51eedc9d086424cf450026bdc260249864c4 100644
+--- a/src/main/java/net/minecraft/world/level/block/Block.java
++++ b/src/main/java/net/minecraft/world/level/block/Block.java
+@@ -312,7 +312,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+     public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
+         if (world instanceof ServerLevel) {
+             Block.getDrops(state, (ServerLevel) world, pos, blockEntity).forEach((itemstack) -> {
+-                Block.popResource((ServerLevel) world, pos, itemstack);
++                Block.popResource((ServerLevel) world, pos, applyLoreFromTile(itemstack, blockEntity)); // Purpur
+             });
+             state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
+         }
+@@ -331,7 +331,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+             event.setExpToDrop(block.getExpDrop(state, serverLevel, pos, net.minecraft.world.item.ItemStack.EMPTY, true)); // Paper - Properly handle xp dropping
+             event.callEvent();
+             for (org.bukkit.inventory.ItemStack drop : event.getDrops()) {
+-                popResource(serverLevel, pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop));
++                popResource(serverLevel, pos, applyLoreFromTile(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop), blockEntity)); // Purpur
+             }
+             state.spawnAfterBreak(serverLevel, pos, ItemStack.EMPTY, false); // Paper - Properly handle xp dropping
+             block.popExperience(serverLevel, pos, event.getExpToDrop()); // Paper - Properly handle xp dropping
+@@ -348,13 +348,32 @@ public class Block extends BlockBehaviour implements ItemLike {
+     // Paper end - Properly handle xp dropping
+         if (world instanceof ServerLevel) {
+             Block.getDrops(state, (ServerLevel) world, pos, blockEntity, entity, tool).forEach((itemstack1) -> {
+-                Block.popResource(world, pos, itemstack1);
++                Block.popResource(world, pos, applyLoreFromTile(itemstack1, blockEntity)); // Purpur
+             });
+             state.spawnAfterBreak((ServerLevel) world, pos, tool, dropExperience); // Paper - Properly handle xp dropping
+         }
+ 
+     }
+ 
++    // Purpur start
++    private static ItemStack applyLoreFromTile(ItemStack stack, @Nullable BlockEntity blockEntity) {
++        if (stack.getItem() instanceof BlockItem) {
++            if (blockEntity != null && blockEntity.getLevel() instanceof ServerLevel) {
++                net.minecraft.world.item.component.ItemLore lore = blockEntity.getPersistentLore();
++                net.minecraft.core.component.DataComponentPatch.Builder builder = net.minecraft.core.component.DataComponentPatch.builder();
++                if (blockEntity.getLevel().purpurConfig.persistentTileEntityLore && lore != null) {
++                    builder.set(net.minecraft.core.component.DataComponents.LORE, lore);
++                }
++                if (!blockEntity.getLevel().purpurConfig.persistentTileEntityDisplayName) {
++                    builder.remove(net.minecraft.core.component.DataComponents.CUSTOM_NAME);
++                }
++                stack.applyComponents(builder.build());
++            }
++        }
++        return stack;
++    }
++    // Purpur end
++
+     public static void popResource(Level world, BlockPos pos, ItemStack stack) {
+         double d0 = (double) EntityType.ITEM.getHeight() / 2.0D;
+         double d1 = (double) pos.getX() + 0.5D + Mth.nextDouble(world.random, -0.25D, 0.25D);
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+index 6349f2e0a5ba30d250f5ffe43771f325c0999a76..8dc1436fe78759cee5247cc28e8a18999e738a1b 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+@@ -87,6 +87,12 @@ public abstract class BlockEntity {
+         if (persistentDataTag instanceof CompoundTag) {
+             this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
+         }
++        // Purpur start
++        if (nbt.contains("Purpur.persistentLore")) {
++            net.minecraft.world.item.component.ItemLore.CODEC.decode(net.minecraft.nbt.NbtOps.INSTANCE, nbt.getCompound("Purpur.persistentLore")).result()
++                .ifPresent(tag -> this.persistentLore = tag.getFirst());
++        }
++        // Purpur end
+     }
+     // CraftBukkit end
+ 
+@@ -103,6 +109,15 @@ public abstract class BlockEntity {
+         this.loadAdditional(nbt, registryLookup);
+     }
+ 
++    // Purpur start
++    protected void saveAdditional(CompoundTag nbt) {
++        if (this.persistentLore != null) {
++            net.minecraft.world.item.component.ItemLore.CODEC.encodeStart(net.minecraft.nbt.NbtOps.INSTANCE, this.persistentLore).result()
++                .ifPresent(tag -> nbt.put("Purpur.persistentLore", tag));
++        }
++    }
++    // Purpur end
++
+     protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider registryLookup) {}
+ 
+     public final CompoundTag saveWithFullMetadata(HolderLookup.Provider registryLookup) {
+@@ -407,4 +422,16 @@ public abstract class BlockEntity {
+ 
+         <T> T getOrDefault(DataComponentType<? extends T> type, T fallback);
+     }
++    // Purpur start
++    @Nullable
++    private net.minecraft.world.item.component.ItemLore persistentLore = null;
++
++    public void setPersistentLore(net.minecraft.world.item.component.ItemLore lore) {
++        this.persistentLore = lore;
++    }
++
++    public @org.jetbrains.annotations.Nullable net.minecraft.world.item.component.ItemLore getPersistentLore() {
++        return this.persistentLore;
++    }
++    // Purpur end
+ }
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+index 8d4c3c4a06d40841e8446485364393e36e686fdd..abe3614f2286db8945bc6c4eadd01ec8a7f93555 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -130,6 +130,8 @@ public class PurpurWorldConfig {
+     public boolean milkCuresBadOmen = true;
+     public boolean noteBlockIgnoreAbove = false;
+     public boolean persistentDroppableEntityDisplayNames = true;
++    public boolean persistentTileEntityLore = false;
++    public boolean persistentTileEntityDisplayName = true;
+     public boolean projectilesBypassMobGriefing = false;
+     public boolean tickFluids = true;
+     public double mobsBlindnessMultiplier = 1;
+@@ -153,6 +155,14 @@ public class PurpurWorldConfig {
+         imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
+         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
+         noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
++        if (PurpurConfig.version < 35) {
++            boolean oldVal = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityLore);
++            set("gameplay-mechanics.persistent-tileentity-display-names-and-lore", null);
++            set("gameplay-mechanics.persistent-tileentity-lore", oldVal);
++            set("gameplay-mechanics.persistent-tileentity-display-name", !oldVal);
++        }
++        persistentTileEntityLore = getBoolean("gameplay-mechanics.persistent-tileentity-lore", persistentTileEntityLore);
++        persistentTileEntityDisplayName = getBoolean("gameplay-mechanics.persistent-tileentity-display-name", persistentTileEntityDisplayName);
+         persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
+         projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);
+         tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids);
diff --git a/patches/server/0224-Signs-allow-color-codes.patch b/patches/server/0217-Signs-allow-color-codes.patch
similarity index 78%
rename from patches/server/0224-Signs-allow-color-codes.patch
rename to patches/server/0217-Signs-allow-color-codes.patch
index 72f9f8709..f547212e5 100644
--- a/patches/server/0224-Signs-allow-color-codes.patch
+++ b/patches/server/0217-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f00c8b834db7ff9c92d878560d83db91b76c82fe..6a97eca066c6957eefb15e8f23eb29b1781cf1a9 100644
+index e9d9cb47221075447aac66dd30ce6e8f08962cf5..635e6b46081ec0078b687818310e623cbbf1cc1f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1578,6 +1578,7 @@ public class ServerPlayer extends Player {
+@@ -1683,6 +1683,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void openTextEdit(SignBlockEntity sign, boolean front) {
@@ -17,10 +17,10 @@ index f00c8b834db7ff9c92d878560d83db91b76c82fe..6a97eca066c6957eefb15e8f23eb29b1
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos(), front));
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 38cde466714e5663cd416b6afd5d2558e139ec09..2d625f18f2ba42ee5a1ebeea78ca395ad6f88b37 100644
+index a28be7a332659be655f419d969e0c64e659b6c21..8cd812a25b1cc05ea14675658bf9c1503ebebd51 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -202,16 +202,31 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+@@ -201,16 +201,31 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
          return this.setText((SignText) textChanger.apply(signtext), front);
      }
  
@@ -46,22 +46,22 @@ index 38cde466714e5663cd416b6afd5d2558e139ec09..2d625f18f2ba42ee5a1ebeea78ca395a
  
 +            org.bukkit.entity.Player player =  (org.bukkit.craftbukkit.entity.CraftPlayer) entityhuman.getBukkitEntity(); // Purpur
              if (entityhuman.isTextFilteringEnabled()) {
--                signtext = signtext.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only
-+                signtext = signtext.setMessage(i, translateColors(player, net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty()), chatmodifier)); // Paper - filter sign text to chat only // Purpur
+-                signtext = signtext.setMessage(i, Component.literal(net.minecraft.util.StringUtil.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only
++                signtext = signtext.setMessage(i, translateColors(player, net.minecraft.util.StringUtil.filterText(filteredtext.filteredOrEmpty()), chatmodifier)); // Paper - filter sign text to chat only // Purpur
              } else {
--                signtext = signtext.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.raw())).setStyle(chatmodifier), Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only
-+                signtext = signtext.setMessage(i, translateColors(player, net.minecraft.SharedConstants.filterText(filteredtext.raw()), chatmodifier), translateColors(player, net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty()), chatmodifier)); // Paper - filter sign text to chat only // Purpur
+-                signtext = signtext.setMessage(i, Component.literal(net.minecraft.util.StringUtil.filterText(filteredtext.raw())).setStyle(chatmodifier), Component.literal(net.minecraft.util.StringUtil.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only
++                signtext = signtext.setMessage(i, translateColors(player, net.minecraft.util.StringUtil.filterText(filteredtext.raw()), chatmodifier), translateColors(player, net.minecraft.util.StringUtil.filterText(filteredtext.filteredOrEmpty()), chatmodifier)); // Paper - filter sign text to chat only // Purpur
              }
          }
  
-@@ -351,6 +366,28 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
-         return ClientboundBlockEntityDataPacket.create(this);
+@@ -345,6 +360,28 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+         return new CommandSourceStack(commandSource, Vec3.atCenterOf(pos), Vec2.ZERO, (ServerLevel) world, 2, s, (Component) object, world.getServer(), player); // Paper - Fix commands from signs not firing command events
      }
  
 +    // Purpur start
 +    public ClientboundBlockEntityDataPacket getTranslatedUpdatePacket(boolean filtered, boolean front) {
 +        final CompoundTag nbt = new CompoundTag();
-+        this.saveAdditional(nbt);
++        this.saveAdditional(nbt, this.getLevel().registryAccess());
 +        final Component[] lines = front ? frontText.getMessages(filtered) : backText.getMessages(filtered);
 +        final String side = front ? "front_text" : "back_text";
 +        for (int i = 0; i < 4; i++) {
@@ -76,19 +76,19 @@ index 38cde466714e5663cd416b6afd5d2558e139ec09..2d625f18f2ba42ee5a1ebeea78ca395a
 +            messagesNbt.set(i, net.minecraft.nbt.StringTag.valueOf(json));
 +        }
 +        nbt.putString("PurpurEditor", "true");
-+        return ClientboundBlockEntityDataPacket.create(this, entity -> nbt);
++        return ClientboundBlockEntityDataPacket.create(this, (blockEntity, registryAccess) -> nbt);
 +    }
 +    // Purpur end
 +
      @Override
-     public CompoundTag getUpdateTag() {
-         return this.saveWithoutMetadata();
+     public ClientboundBlockEntityDataPacket getUpdatePacket() {
+         return ClientboundBlockEntityDataPacket.create(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0f8384ba3bb9b6f36bb36bf833c260076b49014e..3d07df1fbe7116df6f97a2fb3931e739c38b671e 100644
+index abe3614f2286db8945bc6c4eadd01ec8a7f93555..6fce1773a4b5008f3234e06b556bf12e140eb1c1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -977,6 +977,11 @@ public class PurpurWorldConfig {
-         shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
+@@ -1041,6 +1041,11 @@ public class PurpurWorldConfig {
+         }
      }
  
 +    public boolean signAllowColors = false;
diff --git a/patches/server/0218-Config-for-grindstones.patch b/patches/server/0218-Config-for-grindstones.patch
deleted file mode 100644
index 65da4266d..000000000
--- a/patches/server/0218-Config-for-grindstones.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Encode42 <me@encode42.dev>
-Date: Wed, 29 Sep 2021 13:37:57 -0400
-Subject: [PATCH] Config for grindstones
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index a21eadcdfbdc4be803c5793bc97996db3e706071..132a07e226ae3ac6b5abc6f53c62345e2ab2f31f 100644
---- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-@@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-                     Enchantment enchantment = (Enchantment) entry.getKey();
-                     Integer integer = (Integer) entry.getValue();
- 
--                    if (!enchantment.isCurse()) {
-+                    if (!org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(enchantment)) { // Purpur
-                         j += enchantment.getMinCost(integer);
-                     }
-                 }
-@@ -230,7 +230,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-             Entry<Enchantment, Integer> entry = (Entry) iterator.next();
-             Enchantment enchantment = (Enchantment) entry.getKey();
- 
--            if (!enchantment.isCurse() || EnchantmentHelper.getItemEnchantmentLevel(enchantment, itemstack2) == 0) {
-+            if (!org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(enchantment) || EnchantmentHelper.getItemEnchantmentLevel(enchantment, itemstack2) == 0) { // Purpur
-                 itemstack2.enchant(enchantment, (Integer) entry.getValue());
-             }
-         }
-@@ -250,7 +250,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-         }
- 
-         Map<Enchantment, Integer> map = (Map) EnchantmentHelper.getEnchantments(item).entrySet().stream().filter((entry) -> {
--            return ((Enchantment) entry.getKey()).isCurse();
-+            return org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains((Enchantment) entry.getKey()); // Purpur
-         }).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
- 
-         EnchantmentHelper.setEnchantments(map, itemstack1);
-@@ -266,6 +266,20 @@ public class GrindstoneMenu extends AbstractContainerMenu {
-             itemstack1.setRepairCost(AnvilMenu.calculateIncreasedRepairCost(itemstack1.getBaseRepairCost()));
-         }
- 
-+        // Purpur start
-+        if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveAttributes && itemstack1.getTag() != null) {
-+            for (String key : itemstack1.getTag().getAllKeys()) {
-+                if (!key.equals("display")) {
-+                    itemstack1.getTag().remove(key);
-+                }
-+            }
-+        }
-+
-+        if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveDisplay && itemstack1.getTag() != null) {
-+            itemstack1.getTag().remove("display");
-+        }
-+        // Purpur end
-+
-         return itemstack1;
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 62fa79eccbb6f679c0460a6dfd457c405b3a8e67..f3449eb7a1433a8420c0de6f4649f0fae70b2294 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -309,6 +309,9 @@ public class PurpurConfig {
-     public static int beeInsideBeeHive = 3;
-     public static boolean anvilCumulativeCost = true;
-     public static int lightningRodRange = 128;
-+    public static Set<Enchantment> grindstoneIgnoredEnchants = new HashSet<>();
-+    public static boolean grindstoneRemoveAttributes = false;
-+    public static boolean grindstoneRemoveDisplay = false;
-     private static void blockSettings() {
-         if (version < 3) {
-             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -343,6 +346,19 @@ public class PurpurConfig {
-         beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
-         anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
-         lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
-+        ArrayList<String> defaultCurses = new ArrayList<>(){{
-+            add("minecraft:binding_curse");
-+            add("minecraft:vanishing_curse");
-+        }};
-+        if (version < 24 && !getBoolean("settings.blocks.grindstone.ignore-curses", true)) {
-+            defaultCurses.clear();
-+        }
-+        getList("settings.blocks.grindstone.ignored-enchants", defaultCurses).forEach(key -> {
-+            Enchantment enchantment = BuiltInRegistries.ENCHANTMENT.get(new ResourceLocation(key.toString()));
-+            grindstoneIgnoredEnchants.add(enchantment);
-+        });
-+        grindstoneRemoveAttributes = getBoolean("settings.blocks.grindstone.remove-attributes", grindstoneRemoveAttributes);
-+        grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay);
-     }
- 
-     public static boolean allowInfinityMending = false;
diff --git a/patches/server/0225-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/server/0218-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
similarity index 87%
rename from patches/server/0225-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
rename to patches/server/0218-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
index 4873329c8..68ed8eff9 100644
--- a/patches/server/0225-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
+++ b/patches/server/0218-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Kelp, cave, weeping, and twisting vines configurable max
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
-index ead7b37122c76d43af2cdd17af7f0da8014efb26..1acc2dcda68ec8e462d51927f2ea985e7952a830 100644
+index 635fc086d832c641f840cf36d18cdc0fcc3beef3..e3ff7b8059da499cfde1106f6d51156931b292dc 100644
 --- a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
-@@ -88,4 +88,11 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements Bonemealabl
+@@ -94,4 +94,11 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements Bonemealabl
      public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
          world.setBlock(pos, state.setValue(BERRIES, Boolean.valueOf(true)), 2);
      }
@@ -22,10 +22,10 @@ index ead7b37122c76d43af2cdd17af7f0da8014efb26..1acc2dcda68ec8e462d51927f2ea985e
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-index b325fdec8eb99ce57152a5c0fefa5059685276e4..c93e60b01dd46e7de6a6b5a5149a522304f28178 100644
+index cf05da1c86e3018db11dc079bf50317b6639e5cc..8e9903899ac91e9431f00675c1f5ac4a18e61593 100644
 --- a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-@@ -30,12 +30,12 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
+@@ -34,12 +34,12 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
  
      @Override
      public BlockState getStateForPlacement(LevelAccessor world) {
@@ -34,13 +34,13 @@ index b325fdec8eb99ce57152a5c0fefa5059685276e4..c93e60b01dd46e7de6a6b5a5149a5223
      }
  
      @Override
-     public boolean isRandomlyTicking(BlockState state) {
+     protected boolean isRandomlyTicking(BlockState state) {
 -        return (Integer) state.getValue(GrowingPlantHeadBlock.AGE) < 25;
 +        return (Integer) state.getValue(GrowingPlantHeadBlock.AGE) < getMaxGrowthAge(); // Purpur
      }
  
      @Override
-@@ -51,7 +51,7 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
+@@ -55,7 +55,7 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
          } else {
              modifier = world.spigotConfig.caveVinesModifier;
          }
@@ -49,7 +49,7 @@ index b325fdec8eb99ce57152a5c0fefa5059685276e4..c93e60b01dd46e7de6a6b5a5149a5223
              // Spigot end
              BlockPos blockposition1 = pos.relative(this.growthDirection);
  
-@@ -73,11 +73,11 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
+@@ -77,11 +77,11 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
      }
  
      public BlockState getMaxAgeState(BlockState state) {
@@ -63,7 +63,7 @@ index b325fdec8eb99ce57152a5c0fefa5059685276e4..c93e60b01dd46e7de6a6b5a5149a5223
      }
  
      protected BlockState updateBodyAfterConvertedFromHead(BlockState from, BlockState to) {
-@@ -119,13 +119,13 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
+@@ -123,13 +123,13 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
      @Override
      public void performBonemeal(ServerLevel world, RandomSource random, BlockPos pos, BlockState state) {
          BlockPos blockposition1 = pos.relative(this.growthDirection);
@@ -79,7 +79,7 @@ index b325fdec8eb99ce57152a5c0fefa5059685276e4..c93e60b01dd46e7de6a6b5a5149a5223
          }
  
      }
-@@ -138,4 +138,6 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
+@@ -142,4 +142,6 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
      protected GrowingPlantHeadBlock getHeadBlock() {
          return this;
      }
@@ -87,11 +87,11 @@ index b325fdec8eb99ce57152a5c0fefa5059685276e4..c93e60b01dd46e7de6a6b5a5149a5223
 +    public abstract int getMaxGrowthAge(); // Purpur
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/KelpBlock.java b/src/main/java/net/minecraft/world/level/block/KelpBlock.java
-index ff30a93f4160e8e22b40c7a7033c14fa15839160..bf043e1b9f0ec5876a2fa2d0597ec3c60b32b2c0 100644
+index 784b19bc78c8ad9476b6dac37b6778a409a7c675..d49dd8b20d3785cc9482ed2a34fbd7aed4c9e537 100644
 --- a/src/main/java/net/minecraft/world/level/block/KelpBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/KelpBlock.java
-@@ -65,4 +65,11 @@ public class KelpBlock extends GrowingPlantHeadBlock implements LiquidBlockConta
-     public FluidState getFluidState(BlockState state) {
+@@ -72,4 +72,11 @@ public class KelpBlock extends GrowingPlantHeadBlock implements LiquidBlockConta
+     protected FluidState getFluidState(BlockState state) {
          return Fluids.WATER.getSource(false);
      }
 +
@@ -103,10 +103,10 @@ index ff30a93f4160e8e22b40c7a7033c14fa15839160..bf043e1b9f0ec5876a2fa2d0597ec3c6
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java b/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java
-index 6866605c7ef5361b21130a19a59c3fa3660dfb19..dee5d76d29da13f8639ab5d392cd0143201e71ba 100644
+index 6342bb11a162b9e6d9475c5989b1670d77e8f0fb..f8be92512446d3f0e5f0f21222bbefd04ab2838a 100644
 --- a/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TwistingVinesBlock.java
-@@ -27,4 +27,11 @@ public class TwistingVinesBlock extends GrowingPlantHeadBlock {
+@@ -34,4 +34,11 @@ public class TwistingVinesBlock extends GrowingPlantHeadBlock {
      protected boolean canGrowInto(BlockState state) {
          return NetherVines.isValidGrowthState(state);
      }
@@ -119,10 +119,10 @@ index 6866605c7ef5361b21130a19a59c3fa3660dfb19..dee5d76d29da13f8639ab5d392cd0143
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java b/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java
-index e5c135ec059746b75fe58516809584221285cdbe..713c7e6e31a3e1097b612c77a4fce147c9252e0b 100644
+index 3dec5a082606ee35a8c8d7f746480262d6a189c5..b2f6ccae9576c176263e51a232e17a08d54543b3 100644
 --- a/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/WeepingVinesBlock.java
-@@ -27,4 +27,11 @@ public class WeepingVinesBlock extends GrowingPlantHeadBlock {
+@@ -34,4 +34,11 @@ public class WeepingVinesBlock extends GrowingPlantHeadBlock {
      protected boolean canGrowInto(BlockState state) {
          return NetherVines.isValidGrowthState(state);
      }
@@ -135,7 +135,7 @@ index e5c135ec059746b75fe58516809584221285cdbe..713c7e6e31a3e1097b612c77a4fce147
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f6cd1c56dcc3f7d118edc6d7a63e42da166ebd5f..f562729f543ef2b5998c6c38c0a08b3ae4dab1bf 100644
+index f79d0e3907dd89ff0abf8220392bb4e23cf9003e..9ded52a0022e33a6b69191b5fa758d6cc7eb076f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -312,6 +312,10 @@ public class PurpurConfig {
diff --git a/patches/server/0226-Mobs-always-drop-experience.patch b/patches/server/0219-Mobs-always-drop-experience.patch
similarity index 84%
rename from patches/server/0226-Mobs-always-drop-experience.patch
rename to patches/server/0219-Mobs-always-drop-experience.patch
index dddf1ca3b..9aaf8f194 100644
--- a/patches/server/0226-Mobs-always-drop-experience.patch
+++ b/patches/server/0219-Mobs-always-drop-experience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mobs always drop experience
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index d04e48d6a0a6dc7825a3e3d4cf854e294a75d19c..b18cbe85330e26de6f6cbfcc3d51a7418bd93877 100644
+index 70e3d583f7a039a5c67428ce9e8beb1922574c7b..3e2ea26c23e88c395856b65001f2895db6a52bd4 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -51,6 +51,11 @@ public class GlowSquid extends Squid {
@@ -21,10 +21,10 @@ index d04e48d6a0a6dc7825a3e3d4cf854e294a75d19c..b18cbe85330e26de6f6cbfcc3d51a741
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index c103c3da165ec4a9717400fdf278de2a667edd2a..1eab1393a2636c4a247f25dae317cea60cc7021c 100644
+index a50d58240c58a0fea4ae8fc24689870807103199..47a7c7f9527e1c4ea457eeafe0e11145653a871f 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -281,6 +281,11 @@ public class Bat extends AmbientCreature {
+@@ -282,6 +282,11 @@ public class Bat extends AmbientCreature {
          return this.level().purpurConfig.batTakeDamageFromWater;
      }
  
@@ -37,10 +37,10 @@ index c103c3da165ec4a9717400fdf278de2a667edd2a..1eab1393a2636c4a247f25dae317cea6
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index d969a4bb3522faa5f88cae92fcd0bad375b7b0f2..1ddd4ad531e1c536bc3769dc84007d3a3c0350df 100644
+index 91c013f7ab58f570d0ebe2773932fcdb49344b3c..926c30db9b28a30fe5d6c8d20f3972dec0d7b4d0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -486,6 +486,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -482,6 +482,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
          return this.level().purpurConfig.beeTakeDamageFromWater;
      }
  
@@ -53,26 +53,26 @@ index d969a4bb3522faa5f88cae92fcd0bad375b7b0f2..1ddd4ad531e1c536bc3769dc84007d3a
      public int getRemainingPersistentAngerTime() {
          return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 9a40cd8d7d4789a8b43f5194bdc67dc6753eed21..6e5b4a50b8d2dddbd7f099426b4866b35bcb798a 100644
+index 17aaeb734a5c1b16bd7771c909958f3acc956b7a..3e1345f1c534320e07820d573f5c8dba49746425 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -138,6 +138,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
+@@ -144,6 +144,11 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+     public boolean isSensitiveToWater() {
          return this.level().purpurConfig.catTakeDamageFromWater;
      }
- 
++
 +    @Override
 +    protected boolean isAlwaysExperienceDropper() {
 +        return this.level().purpurConfig.catAlwaysDropExp;
 +    }
-+
-     public ResourceLocation getResourceLocation() {
-         return this.getVariant().texture();
-     }
+     // Purpur end
+ 
+     public ResourceLocation getTextureId() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 2dc2486e2b5e046ab8f23976b7bf0202f61756ec..0388ff9ce0ffe1029d977a65a528a0d9f228a3ee 100644
+index 2c0fbc86a49213eedd92a62197c79633ff1c6cb2..d8fe8f86ccc9b26b2208b090bb6572b483d14bae 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -90,6 +90,11 @@ public class Chicken extends Animal {
+@@ -89,6 +89,11 @@ public class Chicken extends Animal {
          return this.level().purpurConfig.chickenTakeDamageFromWater;
      }
  
@@ -101,11 +101,11 @@ index 2343325fa9a771de7b9445cda24a2bcd7a7c1761..f0b6118a9995bb41836685bbf94d2e7f
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 3c12e179861b5514e081d0db1664f7173955629c..6d00b3cd4a9cb0fc8a9e9c27f37429a25fcf6e9d 100644
+index 541cc6c70178a430ac8e3ab8f6a2250b8ea1d964..1691a98caabf27ea092a9b422649ac84bc0a7235 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -87,6 +87,11 @@ public class Cow extends Animal {
-         return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
+@@ -86,6 +86,11 @@ public class Cow extends Animal {
+         return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
      }
  
 +    @Override
@@ -117,10 +117,10 @@ index 3c12e179861b5514e081d0db1664f7173955629c..6d00b3cd4a9cb0fc8a9e9c27f37429a2
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index b6342637f1b42b6368dcda17eea4b39a22ec3b79..4c9c07d470357c35bd5ba3c21437a2c44c52811e 100644
+index e539eefb6e6d3172611d1f9185a1138001481885..c1a9a87ef0fefc499c0e1edbe1031f47cc432b31 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -169,6 +169,11 @@ public class Dolphin extends WaterAnimal {
+@@ -168,6 +168,11 @@ public class Dolphin extends WaterAnimal {
          return this.level().purpurConfig.dolphinTakeDamageFromWater;
      }
  
@@ -131,12 +131,12 @@ index b6342637f1b42b6368dcda17eea4b39a22ec3b79..4c9c07d470357c35bd5ba3c21437a2c4
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 7bd1177b58bd5ecc5659266eece39a49ec08ffa9..39c982f83a8b5b0787fc8dd48a0c11e5ad452bb0 100644
+index ee691437da9571900039f90c1700cd33e31c03bc..124839f22ed0499ca395a648e858469d81d31f93 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -198,6 +198,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -199,6 +199,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
          return this.level().purpurConfig.foxTakeDamageFromWater;
      }
  
@@ -146,13 +146,13 @@ index 7bd1177b58bd5ecc5659266eece39a49ec08ffa9..39c982f83a8b5b0787fc8dd48a0c11e5
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index c2817324ff57860ea2628dc4ac8e78b76cf67a5a..64aba511e615983988cdb6a0fd45b7d9d4f2f16d 100644
+index 8b08476457a6ead1a3c3e2ab35d08a8e0625c43e..12bc57d36d76f49596df0004fda31a6a678be60c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-@@ -103,6 +103,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
+@@ -98,6 +98,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
          this.summoner = summoner;
      }
  
@@ -165,10 +165,10 @@ index c2817324ff57860ea2628dc4ac8e78b76cf67a5a..64aba511e615983988cdb6a0fd45b7d9
      protected void registerGoals() {
          if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 6b635c997a8052f6ea9b6dc39bef70000edbd782..ab5b150b379598861666ad32906e1fe454437063 100644
+index 6cb8d85986f4d891dfbb66b83163ed23bac694f6..06fac8dae42451f912c2db14d792461cee3dba83 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -95,6 +95,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -96,6 +96,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
          return this.level().purpurConfig.mooshroomTakeDamageFromWater;
      }
  
@@ -181,10 +181,10 @@ index 6b635c997a8052f6ea9b6dc39bef70000edbd782..ab5b150b379598861666ad32906e1fe4
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index c91ade7f4b1f04f12e38cf2c5fda1a92b129bec8..af275fc579d66bb098c08e88e4186846a1174c02 100644
+index a1b7661ae0676007d59d202493efc5a0c795045f..5668aca08732e317c7bccacf1cfaae7d8666bce6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -102,6 +102,11 @@ public class Ocelot extends Animal {
+@@ -98,6 +98,11 @@ public class Ocelot extends Animal {
          return this.level().purpurConfig.ocelotTakeDamageFromWater;
      }
  
@@ -197,10 +197,10 @@ index c91ade7f4b1f04f12e38cf2c5fda1a92b129bec8..af275fc579d66bb098c08e88e4186846
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 632041e2804f98a1954cf1268c6fd0427696d4a3..505469cf6b7fa66c6cbac73a49e4eec850d5bfec 100644
+index 4895bd2566605ab3986f35d43345f29ce78e81e0..7bd81d073ce4a8d5981f256415d3e99e13da79ba 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -156,6 +156,11 @@ public class Panda extends Animal {
+@@ -162,6 +162,11 @@ public class Panda extends Animal {
          return this.level().purpurConfig.pandaTakeDamageFromWater;
      }
  
@@ -213,10 +213,10 @@ index 632041e2804f98a1954cf1268c6fd0427696d4a3..505469cf6b7fa66c6cbac73a49e4eec8
      public boolean canTakeItem(ItemStack stack) {
          EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 364a2d9f7a77e10862c84398d5fade7e9a401dbb..d97ca9d567df224c34eba306b4c9b7df65f31824 100644
+index 65be3dd9bc6994cac828ed45b74a577b65b7118a..b8c69414b734eecb7412fab8ae6996712307da70 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -207,6 +207,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
+@@ -201,6 +201,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
          return this.level().purpurConfig.parrotTakeDamageFromWater;
      }
  
@@ -227,12 +227,12 @@ index 364a2d9f7a77e10862c84398d5fade7e9a401dbb..d97ca9d567df224c34eba306b4c9b7df
 +
      @Nullable
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 60562089daf363f5af24fbf30a3ccd74311be289..b8de9c4630fbdaad2d3a4ca6d27a61873ddbda2e 100644
+index badee6aed2c07dbfc05fa31d74d53c4630295761..748ab1a1f578a1ba4c46834607235d9d5856f185 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -99,6 +99,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -96,6 +96,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
          return this.level().purpurConfig.pigTakeDamageFromWater;
      }
  
@@ -245,10 +245,10 @@ index 60562089daf363f5af24fbf30a3ccd74311be289..b8de9c4630fbdaad2d3a4ca6d27a6187
      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 e03c84575360a65425d7ec375ea9bc17e33bdddb..54b6d780d14c27f24d3d4dc9171818f6256afd5c 100644
+index 3abab3b4d5409cf2f0374c038fa6c0241b89b8e5..9b6e07b0de7328b18c5e526b89cfd48fdbc79753 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -130,6 +130,11 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -129,6 +129,11 @@ public class PolarBear extends Animal implements NeutralMob {
          return this.level().purpurConfig.polarBearTakeDamageFromWater;
      }
  
@@ -261,10 +261,10 @@ index e03c84575360a65425d7ec375ea9bc17e33bdddb..54b6d780d14c27f24d3d4dc9171818f6
      @Override
      public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index ef3d0bbbeb6aa736f35c26066a1473c70ef028a2..54f5206b686c3cf4d2e5b470c07047a518f5dd00 100644
+index 91fd38aeafb4354e845b579988c7c9a6b3f6f551..c758f759ccae81b7651bfcba254f54335f2c7cc8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-@@ -67,6 +67,11 @@ public class Pufferfish extends AbstractFish {
+@@ -73,6 +73,11 @@ public class Pufferfish extends AbstractFish {
          return this.level().purpurConfig.pufferfishTakeDamageFromWater;
      }
  
@@ -274,13 +274,13 @@ index ef3d0bbbeb6aa736f35c26066a1473c70ef028a2..54f5206b686c3cf4d2e5b470c07047a5
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index b58d9fadccbf4cd74abfc2449a9399277c876f59..eae2488f2a46e543b496b7a2919aabbb55dcb825 100644
+index c2510200507edd205bc3283bec98a0d6951f497f..02702390c0b336762ce8c0d38d804e6f24ebbfd4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -153,6 +153,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -152,6 +152,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
      public boolean isSensitiveToWater() {
          return this.level().purpurConfig.rabbitTakeDamageFromWater;
      }
@@ -309,10 +309,10 @@ index e101c3bf425902908c43ffa18867fb83a5e1f16e..382e47f26ee94506cb76463a677351b9
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 6e951928482fb6d662f2b7aa37ebe7a0885b47de..f2d0c67709e38209a8a02e98f4392b9e0a53c211 100644
+index afec39ba3b51b121fd7ae937e7bac060ef430dfd..9e617b3f1ec4eac5f83bdf19a3563cdc81b008d8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -151,6 +151,11 @@ public class Sheep extends Animal implements Shearable {
+@@ -149,6 +149,11 @@ public class Sheep extends Animal implements Shearable {
          return this.level().purpurConfig.sheepTakeDamageFromWater;
      }
  
@@ -325,10 +325,10 @@ index 6e951928482fb6d662f2b7aa37ebe7a0885b47de..f2d0c67709e38209a8a02e98f4392b9e
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 20f2fd0edf290d448d06e4772b5947fc7865c20b..fc8526af7e1df15794b4560b58e7f6a47508aa08 100644
+index 8f2348a7fe830a85985ce2b19cb2a9159bca711f..69cdccca01fe7d10e6d958e16d91efe08f699505 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -86,6 +86,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -84,6 +84,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
          this.summoner = summoner;
      }
  
@@ -341,10 +341,10 @@ index 20f2fd0edf290d448d06e4772b5947fc7865c20b..fc8526af7e1df15794b4560b58e7f6a4
      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 57b37ac40b4ffe6c5e27548755aaa15da89a0f0b..88c238e492b1081d1a64a3b6f05d7baa17e5d8c9 100644
+index 0d05879eadeff8731028d78d89d5d32142818ea2..b86676ebcd6c301e5dd857d8e84e1db2c1da416b 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 {
+@@ -93,6 +93,11 @@ public class Squid extends WaterAnimal {
          return this.level().purpurConfig.squidTakeDamageFromWater;
      }
  
@@ -357,10 +357,10 @@ index 57b37ac40b4ffe6c5e27548755aaa15da89a0f0b..88c238e492b1081d1a64a3b6f05d7baa
      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 b16d075581a352714f86f1b87805f24c9e336aa3..87b6f6b10ba6e3d9c6a42298a2019a526a183d90 100644
+index 4ac998e9d96aed3b0ea0ec3f9dcd5fdd74c45d24..2d04addd17d2c358fff598012b323cd7d8bf007e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-@@ -64,6 +64,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
+@@ -89,6 +89,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
          return this.level().purpurConfig.tropicalFishTakeDamageFromWater;
      }
  
@@ -373,10 +373,10 @@ index b16d075581a352714f86f1b87805f24c9e336aa3..87b6f6b10ba6e3d9c6a42298a2019a52
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 01375aede431c5023dd4a2d6667948c7bd056efe..c8f3be5fd869f62472d5a248f9c02700dac0ac69 100644
+index b146ac72584d998cee4279133b3b19051fbf14c9..01dc59695f295657b1cd7bb015558bfc2ce73b47 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -118,6 +118,11 @@ public class Turtle extends Animal {
+@@ -119,6 +119,11 @@ public class Turtle extends Animal {
          return this.level().purpurConfig.turtleTakeDamageFromWater;
      }
  
@@ -389,10 +389,10 @@ index 01375aede431c5023dd4a2d6667948c7bd056efe..c8f3be5fd869f62472d5a248f9c02700
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 6b51886e383992f35e0313bd9cc012354190a87d..5d49ed7ddf44a3d549b178ae548664194967776b 100644
+index 31b5d874fdc6f7d2eaabe877b32b64d360cb48e3..e1f6202df983be2510436538904a45beedbdc9c2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -217,6 +217,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
+@@ -224,6 +224,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
          return this.level().purpurConfig.wolfTakeDamageFromWater;
      }
  
@@ -405,10 +405,10 @@ index 6b51886e383992f35e0313bd9cc012354190a87d..5d49ed7ddf44a3d549b178ae54866419
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 8aae4bda1c39853c972bf17cd2ed5b940ef7ba27..7223528b4fb2885e0f6c0df2238cada16dbed35e 100644
+index ab3727c336cc7e268a2f7b2c04dac3e5d259b454..ea1515f189bf3bc4cfef4524fb40f0d826f68cc0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -130,6 +130,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -128,6 +128,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
          return this.level().purpurConfig.axolotlTakeDamageFromWater;
      }
  
@@ -421,10 +421,10 @@ index 8aae4bda1c39853c972bf17cd2ed5b940ef7ba27..7223528b4fb2885e0f6c0df2238cada1
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 26062173d137e26abdc452f7b2e0be0ee6dddfa3..fba00cab2c4b234dd2e85b5f4dcd0db34183c1a2 100644
+index 412b44ea2d33ef68721b91da9f550738c6c780ba..79c27b5717fec000ea94138ebc76dbabf5b2eeaf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -119,6 +119,11 @@ public class Goat extends Animal {
+@@ -118,6 +118,11 @@ public class Goat extends Animal {
          return this.level().purpurConfig.goatTakeDamageFromWater;
      }
  
@@ -437,7 +437,7 @@ index 26062173d137e26abdc452f7b2e0be0ee6dddfa3..fba00cab2c4b234dd2e85b5f4dcd0db3
      protected Brain.Provider<Goat> brainProvider() {
          return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index af4bac165cbc39fb6959983a1116a6fb65af0ecb..72ad12175325091397459e06743875cce6df8d94 100644
+index 891ea1cca8495c08a1817096c8c4277f5311d6c7..94021abe521aea4a70f5eaa78fb05f9f71b7c38c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -47,6 +47,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -453,10 +453,10 @@ index af4bac165cbc39fb6959983a1116a6fb65af0ecb..72ad12175325091397459e06743875cc
      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 f8dbea402f723bf38d7ab3f2468d1b02b7124560..3b1faa63e46a48e83ea672cf6da444a1d7e13270 100644
+index e623284b353831d1a540af40e139ac16091dcbf6..fdf9ec418b0fc567e286ac79dbdbeddac568ad67 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> {
+@@ -76,6 +76,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
          return this.level().purpurConfig.horseTakeDamageFromWater;
      }
  
@@ -469,7 +469,7 @@ index f8dbea402f723bf38d7ab3f2468d1b02b7124560..3b1faa63e46a48e83ea672cf6da444a1
      protected void randomizeAttributes(RandomSource random) {
          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 fb6bca763fcbb249c86c1e360274d4458df19bfc..9288327a365bc67c5bb8ed6aa23b78c725d5ba40 100644
+index 12ff4091674f7efb3e324df0df2d798dcbc46027..7d2a5c806fd0f1228c45b8a8b56d7ba13b899a2d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -150,6 +150,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -485,7 +485,7 @@ index fb6bca763fcbb249c86c1e360274d4458df19bfc..9288327a365bc67c5bb8ed6aa23b78c7
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index 53546e904948d03882e5f5b0a8d4256c72698afb..42dcdbec69b052679e590a1ff932c6192c68b20d 100644
+index f2b909029672c17362b2acf0ea54aa19385cff8f..b260e8dececaa58376c7d8ada30d0b23c0909d81 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -46,6 +46,11 @@ public class Mule extends AbstractChestedHorse {
@@ -501,10 +501,10 @@ index 53546e904948d03882e5f5b0a8d4256c72698afb..42dcdbec69b052679e590a1ff932c619
      protected SoundEvent getAmbientSound() {
          return SoundEvents.MULE_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index 32ef5b8dc8bf1dd37f49b9d67fdde9feda37e6b5..98e28ed72f18c88ff00dec9156b1ffda89da1269 100644
+index 7702af3c80ecc09318a25bb6c1acc5099fa10af4..46cb38c56073fe6c259a9ce3b5d8379e0d9a05c8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -63,6 +63,11 @@ public class SkeletonHorse extends AbstractHorse {
+@@ -74,6 +74,11 @@ public class SkeletonHorse extends AbstractHorse {
          return this.level().purpurConfig.skeletonHorseTakeDamageFromWater;
      }
  
@@ -514,13 +514,13 @@ index 32ef5b8dc8bf1dd37f49b9d67fdde9feda37e6b5..98e28ed72f18c88ff00dec9156b1ffda
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, 0.20000000298023224D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index 17648925f97110f2439890388f4bfbbff0917c61..02e3adc9a55fa9cd2a418094eb206970faaf471b 100644
+index a7261719c4608bdfbc43072ea5948b950f1bea0d..2cdbf8dfb4b78027031e41445d4535f6d28e876a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -74,6 +74,11 @@ public class TraderLlama extends Llama {
+@@ -77,6 +77,11 @@ public class TraderLlama extends Llama {
          return this.level().purpurConfig.traderLlamaTakeDamageFromWater;
      }
  
@@ -533,10 +533,10 @@ index 17648925f97110f2439890388f4bfbbff0917c61..02e3adc9a55fa9cd2a418094eb206970
      public boolean isTraderLlama() {
          return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index 4a7c1ba529261e57acd01f83796ee8faa17d3a2f..9e13a0c5ba2e31182c76df06380055a04c18a6a6 100644
+index 343632a030eb423367387750fabbdae53c4bb20b..201471473b7ecc7489c4303a0d37b99fb4a8740f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-@@ -59,6 +59,11 @@ public class ZombieHorse extends AbstractHorse {
+@@ -70,6 +70,11 @@ public class ZombieHorse extends AbstractHorse {
          return this.level().purpurConfig.zombieHorseTakeDamageFromWater;
      }
  
@@ -546,13 +546,13 @@ index 4a7c1ba529261e57acd01f83796ee8faa17d3a2f..9e13a0c5ba2e31182c76df06380055a0
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 5bf7a6ecd58612c8502ed747263b6c0edd445294..c94a1b75593ad01e7f79fdc84818ea8ec269e124 100644
+index a030fe21a88a9486cc8367710a96af67c761635c..4a98027a12c2535d1df3a9f6390eb85146398403 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -132,6 +132,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -136,6 +136,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          this.summoner = summoner;
      }
  
@@ -565,7 +565,7 @@ index 5bf7a6ecd58612c8502ed747263b6c0edd445294..c94a1b75593ad01e7f79fdc84818ea8e
      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 eae0511698f383e11a0083c2b845479755f114f7..a8b58469fd8a1ed4ec0ce443cf05557903527bd7 100644
+index 1d7e37677d78695f94e8c9e0cae4d64498ffd7ee..27db17e19dd95e99f7bd67747eba3c3072b48ed5 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 {
@@ -581,10 +581,10 @@ index eae0511698f383e11a0083c2b845479755f114f7..a8b58469fd8a1ed4ec0ce443cf055579
      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/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-index 5dc0b3d04bfc01cd2cb004c18279840861dc4a57..c9bd400473166999479f5eef1edad529d3aafe01 100644
+index 0604b7c68373ed071ac22cabd7a961161ad228f8..43b5a0e7993ae9daef1c1ea67722347f9851d3a9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-@@ -56,6 +56,11 @@ public class CaveSpider extends Spider {
+@@ -53,6 +53,11 @@ public class CaveSpider extends Spider {
          return this.level().purpurConfig.caveSpiderTakeDamageFromWater;
      }
  
@@ -597,10 +597,10 @@ index 5dc0b3d04bfc01cd2cb004c18279840861dc4a57..c9bd400473166999479f5eef1edad529
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index a8bc27c858c6ddec2ff2f84b5c1dc51c3b1b04b0..304ea7fdcd410a7c88ec61143364e14de8db0b0c 100644
+index 039ae2b694800e0bcd9844be85ad29a001ce52c0..1829bedfa8084c4932a0e67c36f48f19993e22b6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -277,6 +277,11 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -279,6 +279,11 @@ public class Creeper extends Monster implements PowerableMob {
          return super.dropAllDeathLoot(damagesource);
      }
  
@@ -613,10 +613,10 @@ index a8bc27c858c6ddec2ff2f84b5c1dc51c3b1b04b0..304ea7fdcd410a7c88ec61143364e14d
      protected SoundEvent getHurtSound(DamageSource source) {
          return SoundEvents.CREEPER_HURT;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 9346d634dd2b8cb3d89aa7ccf12fec6ff79bbe2f..63a1cf5604c14025171d7be7434e2d6b64c98107 100644
+index 2547ac49721e2840da2845076d5e62a1465a4ea3..15afee3c4f6307557321424560d2340e23cd472b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -116,6 +116,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -119,6 +119,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
          return level().purpurConfig.drownedJockeyTryExistingChickens;
      }
  
@@ -629,10 +629,10 @@ index 9346d634dd2b8cb3d89aa7ccf12fec6ff79bbe2f..63a1cf5604c14025171d7be7434e2d6b
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index cd1f830bf28b1c68e2b9cc7daa77f696234a22c9..df8d1b34078031001c50325b8cf5bfa9a5c361fd 100644
+index 3651a720e4ae20686a91b4420fe4879f765935e4..7e8603ef5df722f19e85b9c5cdd4ebfdd6481e42 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-@@ -58,6 +58,11 @@ public class ElderGuardian extends Guardian {
+@@ -55,6 +55,11 @@ public class ElderGuardian extends Guardian {
          return this.level().purpurConfig.elderGuardianTakeDamageFromWater;
      }
  
@@ -645,10 +645,10 @@ index cd1f830bf28b1c68e2b9cc7daa77f696234a22c9..df8d1b34078031001c50325b8cf5bfa9
          return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 463a01305cc76ffd8018d2227f5f6dc1ecf24c5f..0be47e96b2bb6bb66e7905e255e5f6009d6e0a97 100644
+index 21a570d09ad3e19e6c709ff1152db7d204648122..5b49a6b1884c33bedafca5cff0214cdfccd87302 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -120,6 +120,11 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -115,6 +115,11 @@ public class EnderMan extends Monster implements NeutralMob {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.endermanMaxHealth);
      }
  
@@ -661,7 +661,7 @@ index 463a01305cc76ffd8018d2227f5f6dc1ecf24c5f..0be47e96b2bb6bb66e7905e255e5f600
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index c0c3ab5dbf5987e543e6cdd1a814d2ec3ec17939..20ca96baf8f73fd5835422c6551f515a394cb168 100644
+index c5fcefc6810c2127d6a0a48f95c50c2e15a4dd52..14d6796a124a85b8cbf5f3b719d89d99e0cf8db5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -74,6 +74,11 @@ public class Endermite extends Monster {
@@ -677,10 +677,10 @@ index c0c3ab5dbf5987e543e6cdd1a814d2ec3ec17939..20ca96baf8f73fd5835422c6551f515a
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 1ef547285cfb8e74404e4108a1403c8fda43cb1f..4095f03ccd1712335baffe858603618100aed99c 100644
+index a3e88c252b39a78a0759623f188dbdc8aa2fcc0b..f92f93c780f4c176d6c02c4b98ffe3a4ef3993f6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-@@ -77,6 +77,11 @@ public class Evoker extends SpellcasterIllager {
+@@ -79,6 +79,11 @@ public class Evoker extends SpellcasterIllager {
          return this.level().purpurConfig.evokerTakeDamageFromWater;
      }
  
@@ -693,10 +693,10 @@ index 1ef547285cfb8e74404e4108a1403c8fda43cb1f..4095f03ccd1712335baffe8586036181
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index fa74eb7ee34f3f9b0026778bc0d37e977fc41d70..640f0c378a18cf0a820ad544bb3b172b698c6bfc 100644
+index 96f7c8fb4e49e7640aaa1adb466d67fc887a2dc5..a25c82be45e3db5143f6bf617fedc2fa85bd89ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-@@ -143,6 +143,11 @@ public class Ghast extends FlyingMob implements Enemy {
+@@ -141,6 +141,11 @@ public class Ghast extends FlyingMob implements Enemy {
          return this.level().purpurConfig.ghastTakeDamageFromWater;
      }
  
@@ -706,29 +706,29 @@ index fa74eb7ee34f3f9b0026778bc0d37e977fc41d70..640f0c378a18cf0a820ad544bb3b172b
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index ecaccb4697bf2acaa6dc9034486fcf97c184aa71..d13eed85d5399cd6991b3ad90f05a5805a3a2678 100644
+index 47e403a5986f77dbb3833acb9a3ea59e5c3740c6..5c2881d0be519c52cbba74d7b7ca3ea9b4536463 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -80,6 +80,11 @@ public class Giant extends Monster {
-     public boolean isSensitiveToWater() {
+@@ -77,6 +77,11 @@ public class Giant extends Monster {
          return this.level().purpurConfig.giantTakeDamageFromWater;
      }
-+
+ 
 +    @Override
 +    protected boolean isAlwaysExperienceDropper() {
 +        return this.level().purpurConfig.giantAlwaysDropExp;
 +    }
-     // Purpur end
- 
++
      @Override
+     protected void initAttributes() {
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.giantMaxHealth);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-index 93cd1129003b360ca40ad50fe849bd834a5f2a9b..54113957c9cfab2ad3be25dbc05b8c29d1a064d5 100644
+index 6b0ff4ded5e8b62572d5889f0be5e3148243ed7d..f9496126f75b4c1b89ec33617e577d83042e0290 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-@@ -104,6 +104,11 @@ public class Guardian extends Monster {
+@@ -100,6 +100,11 @@ public class Guardian extends Monster {
          return this.level().purpurConfig.guardianTakeDamageFromWater;
      }
  
@@ -741,10 +741,10 @@ index 93cd1129003b360ca40ad50fe849bd834a5f2a9b..54113957c9cfab2ad3be25dbc05b8c29
      protected void registerGoals() {
          MoveTowardsRestrictionGoal pathfindergoalmovetowardsrestriction = new MoveTowardsRestrictionGoal(this, 1.0D);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 481a6cf3dfc2948d80071920b905b488de8737e5..473f28e86a0e5157264b83d9c3c4a18c72216da3 100644
+index 440c90feeae3a55c98e2011ecb27c28d58f11e6e..95d3edc6c88d6ed0556c21c2623cdd5cfda35911 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -72,6 +72,11 @@ public class Husk extends Zombie {
+@@ -70,6 +70,11 @@ public class Husk extends Zombie {
          return this.level().purpurConfig.huskTakeDamageFromWater;
      }
  
@@ -754,13 +754,13 @@ index 481a6cf3dfc2948d80071920b905b488de8737e5..473f28e86a0e5157264b83d9c3c4a18c
 +    }
 +
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
-         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
+         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (MobSpawnType.isSpawner(spawnReason) || world.canSeeSky(pos));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index 91294d87521c884c402485b923691f9fd8985353..f9cddf46d1dbcabc738842ba039daa76bb6f3eb5 100644
+index e2393be574475377fd401d55ab0be9b483e705e6..ae036a16e3677dfba451f4eb4505036d45e50cf3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-@@ -88,6 +88,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
+@@ -85,6 +85,11 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
          return this.level().purpurConfig.illusionerTakeDamageFromWater;
      }
  
@@ -773,10 +773,10 @@ index 91294d87521c884c402485b923691f9fd8985353..f9cddf46d1dbcabc738842ba039daa76
      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 e0ebc4c2d8dd718ce78d981a1d099e7482221f1f..1ad97267394d3717b1871336193cdc91f3ffb276 100644
+index adacdbf9fac7d1504be73e2e5a7526e8258a126d..e7c79e8c72226285eb5a4763dcf8ddd27078539c 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 {
+@@ -71,6 +71,11 @@ public class MagmaCube extends Slime {
          return this.level().purpurConfig.magmaCubeTakeDamageFromWater;
      }
  
@@ -786,13 +786,13 @@ index e0ebc4c2d8dd718ce78d981a1d099e7482221f1f..1ad97267394d3717b1871336193cdc91
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, (double)0.2F);
+         return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 1d4a292a37069408420ca90b1c2784229781f93f..ab9ed9acc394dedf2151b83ff5cf998e0e0be21e 100644
+index bebc6f9f7e49e9dd34fa295d9ce3e8397feb280c..0d81540d048cd4a08962bd24d3bdd49db708f83f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -144,6 +144,11 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -142,6 +142,11 @@ public class Phantom extends FlyingMob implements Enemy {
          return this.level().purpurConfig.phantomTakeDamageFromWater;
      }
  
@@ -805,10 +805,10 @@ index 1d4a292a37069408420ca90b1c2784229781f93f..ab9ed9acc394dedf2151b83ff5cf998e
      public boolean isFlapping() {
          return (this.getUniqueFlapTickOffset() + this.tickCount) % Phantom.TICKS_PER_FLAP == 0;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index 1f64dc8442de75447c17ae4fd5483345d4b7fd3e..06d52d8b61abc4dbbdc953bfed2e688be377b3cc 100644
+index a405764724d7f4b586d8510450a6258417495942..ae3eb87af8d3853be82c2002507141e43ab644de 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-@@ -89,6 +89,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
+@@ -85,6 +85,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
          return this.level().purpurConfig.pillagerTakeDamageFromWater;
      }
  
@@ -821,10 +821,10 @@ index 1f64dc8442de75447c17ae4fd5483345d4b7fd3e..06d52d8b61abc4dbbdc953bfed2e688b
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 5e717433ef29d02669ee2e95454c69c36cbafc24..c9c21c87e3bd1c404fbef6768761bcb5d97d98b9 100644
+index ea9714b561d2cccad3ce012a118d200100ccd1e8..9551bd7c9bed37cf17910e7f71b82ed20fb2d759 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-@@ -104,6 +104,11 @@ public class Ravager extends Raider {
+@@ -101,6 +101,11 @@ public class Ravager extends Raider {
          return this.level().purpurConfig.ravagerTakeDamageFromWater;
      }
  
@@ -837,7 +837,7 @@ index 5e717433ef29d02669ee2e95454c69c36cbafc24..c9c21c87e3bd1c404fbef6768761bcb5
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 40f4a53cf244549e9cf392f4286bdec1a6852574..81caa18fca658f70846ba437ac02906f5e9653b9 100644
+index 687fadf1ef64c5ae7e00c5da15b82245e07d3a39..1afa6dc4f2a6437cd4cc3e49694e79641fcc13ad 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -141,6 +141,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -853,10 +853,10 @@ index 40f4a53cf244549e9cf392f4286bdec1a6852574..81caa18fca658f70846ba437ac02906f
      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/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 65203a502a970ffec622d91d25716f02e2a2fda2..dbc27afbccb027963ae3f035c268835adedbb933 100644
+index 18172d30a7a03d0bdef02878261639c0655f9475..c713e0b9b90784ad5f043f3a06ef50b5a1769ed1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -74,6 +74,11 @@ public class Silverfish extends Monster {
+@@ -70,6 +70,11 @@ public class Silverfish extends Monster {
          return this.level().purpurConfig.silverfishTakeDamageFromWater;
      }
  
@@ -869,12 +869,12 @@ index 65203a502a970ffec622d91d25716f02e2a2fda2..dbc27afbccb027963ae3f035c268835a
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 1c7cd82540aa9566b04142c741d26b4f346073d4..9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86 100644
+index a44896c87bb9f6f48cd9edeb31240692785b3a92..1aae461eed332fe31c1449c47d0928f655c740da 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-@@ -53,6 +53,11 @@ public class Skeleton extends AbstractSkeleton {
-         return this.level().purpurConfig.skeletonTakeDamageFromWater;
+@@ -55,6 +55,11 @@ public class Skeleton extends AbstractSkeleton {
      }
+     // Purpur end
  
 +    @Override
 +    protected boolean isAlwaysExperienceDropper() {
@@ -882,10 +882,10 @@ index 1c7cd82540aa9566b04142c741d26b4f346073d4..9b43150a00d7fac85aa69f5a2dbffd0d
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 38fc8668f3c9da15d97f2dd15bc3fad07299dcb1..e2eb27a60fde8a937ad1101bbda54c89ef358826 100644
+index 0f79a99408e2d4c48c8a541f183b9201259f0b1f..ccf7fea215d3096e76db294daa5874fec00147ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -80,6 +80,11 @@ public class Slime extends Mob implements Enemy {
@@ -901,10 +901,10 @@ index 38fc8668f3c9da15d97f2dd15bc3fad07299dcb1..e2eb27a60fde8a937ad1101bbda54c89
      public boolean dismountsUnderwater() {
          return level().purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level().purpurConfig.slimeRidableInWater;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index c3caf3afa377474fe0a7d1f37ebee94ee5bb0e84..42252e86ca02955ba8cae913081795b57e04c934 100644
+index f2ec092b1b26ccc5a2a7868bb8add64b8280dd70..159740069aba59bffff444d933af32aaf752ba48 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -80,6 +80,11 @@ public class Spider extends Monster {
+@@ -78,6 +78,11 @@ public class Spider extends Monster {
          return this.level().purpurConfig.spiderTakeDamageFromWater;
      }
  
@@ -917,7 +917,7 @@ index c3caf3afa377474fe0a7d1f37ebee94ee5bb0e84..42252e86ca02955ba8cae913081795b5
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
-index 2e01eb4a1a1c415dd5bd195086072b536c019eae..a95e983032b3d3d125a39a46700b7db9dc69f307 100644
+index 509c7d79340673e213910ea74a5237332792a3b4..18c0cf991c2e8418d7fdd4c8dbd7487a301e890d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -48,6 +48,11 @@ public class Stray extends AbstractSkeleton {
@@ -933,10 +933,10 @@ index 2e01eb4a1a1c415dd5bd195086072b536c019eae..a95e983032b3d3d125a39a46700b7db9
          BlockPos blockPos = pos;
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index f0d7174eae482cef9311fb646f340af59fa1c743..2f49b528601a1feb7246fe7a9b83ce828c2d78fc 100644
+index 585614f7825700da28c7c832bdfc6a9eb0b78b5f..5ea5bf9c0e11b0e1f9fe50093899c6e35ee6cf4f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -127,6 +127,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
+@@ -124,6 +124,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
          return this.level().purpurConfig.striderBreedingTicks;
      }
  
@@ -949,26 +949,26 @@ index f0d7174eae482cef9311fb646f340af59fa1c743..2f49b528601a1feb7246fe7a9b83ce82
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index abf2f0fdc6895e4ddcc2c2c76db9388c5287fa9d..be1c9a7e2bafb33dcb954ba9fd427c033bb7542f 100644
+index d85e4baa892ebd987993bd39c895e5f1d310e30e..691f319719280f873140df7d93c821417e32e8f7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-@@ -117,6 +117,11 @@ public class Vex extends Monster implements TraceableEntity {
+@@ -112,6 +112,11 @@ public class Vex extends Monster implements TraceableEntity {
+     public boolean isSensitiveToWater() {
          return this.level().purpurConfig.vexTakeDamageFromWater;
      }
- 
++
 +    @Override
 +    protected boolean isAlwaysExperienceDropper() {
 +        return this.level().purpurConfig.vexAlwaysDropExp;
 +    }
-+
+     // Purpur end
+ 
      @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return dimensions.height - 0.28125F;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index c7e995c5e639a1fb42a77edea3491682b72d32f4..ffe956f200dd0b4148043d0d7f2eac007a9f22b1 100644
+index ded53c16dfd850c9c520878bc75414ebc188ea8a..e7703aa5467e7551bff06fab4c11d76237bda2e0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -85,6 +85,11 @@ public class Vindicator extends AbstractIllager {
+@@ -77,6 +77,11 @@ public class Vindicator extends AbstractIllager {
          return this.level().purpurConfig.vindicatorTakeDamageFromWater;
      }
  
@@ -981,10 +981,10 @@ index c7e995c5e639a1fb42a77edea3491682b72d32f4..ffe956f200dd0b4148043d0d7f2eac00
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 4b722c7b6c000c4f8156724b127c9df33f15f6db..1f19be94995d02596306fa49e19582b3deb1924a 100644
+index 51d35e7f510c76d1fc18c67dbb56707207b39e4e..b4aab57b9aaab2ed1322ca41d4bf3c60f155902c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -86,6 +86,11 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -82,6 +82,11 @@ public class Witch extends Raider implements RangedAttackMob {
          return this.level().purpurConfig.witchTakeDamageFromWater;
      }
  
@@ -997,10 +997,10 @@ index 4b722c7b6c000c4f8156724b127c9df33f15f6db..1f19be94995d02596306fa49e19582b3
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 87b42dff7d770cf04415301346674aad5e45081b..b5462ca1e67c87eeb447b8c4536c4bba897be186 100644
+index 9865cc694e6ef02543a4b04cde37be3dc285475b..8c62d39c54acf274200667ae30c517cd4416b22f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-@@ -62,6 +62,11 @@ public class WitherSkeleton extends AbstractSkeleton {
+@@ -59,6 +59,11 @@ public class WitherSkeleton extends AbstractSkeleton {
          return this.level().purpurConfig.witherSkeletonTakeDamageFromWater;
      }
  
@@ -1013,10 +1013,10 @@ index 87b42dff7d770cf04415301346674aad5e45081b..b5462ca1e67c87eeb447b8c4536c4bba
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 8cd6012b00dd5b307fd76ef0fd9c2cd92342a92a..15fd1af0773ba1254a429240444f48e68e29ee74 100644
+index 76d47ba17dd140572a0be40dfda18c24851198bb..451762b3cd023b8c5828f68e2778aada9c50ab85 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-@@ -96,6 +96,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+@@ -107,6 +107,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
          return this.level().purpurConfig.zoglinTakeDamageFromWater;
      }
  
@@ -1029,10 +1029,10 @@ index 8cd6012b00dd5b307fd76ef0fd9c2cd92342a92a..15fd1af0773ba1254a429240444f48e6
      protected Brain.Provider<Zoglin> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 79f791188a14a319a19b55674c891384fcb750c9..3f00634dd8d426f4578a3d6362f7a52f57e09d3b 100644
+index d5a5e51e23328deac09d6990539d8207b1567912..d48d22157a89f98c1bbabc70b0bb31187038176d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -147,6 +147,11 @@ public class Zombie extends Monster {
+@@ -144,6 +144,11 @@ public class Zombie extends Monster {
          return this.level().purpurConfig.zombieTakeDamageFromWater;
      }
  
@@ -1045,10 +1045,10 @@ index 79f791188a14a319a19b55674c891384fcb750c9..3f00634dd8d426f4578a3d6362f7a52f
      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/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 4bac02d30ec28ea0bce069f0f915b660b99b122d..858bf64d951ae48421ceb2f9b62de9397ffb4dc3 100644
+index fe43c744cccdc07d5e449ce3ede85f4c7d898018..091095d1690bdd4d0870910b19e5e4ee3a3f9e7c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -129,6 +129,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
+@@ -127,6 +127,11 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
          return level().purpurConfig.zombieVillagerJockeyTryExistingChickens;
      }
  
@@ -1058,13 +1058,13 @@ index 4bac02d30ec28ea0bce069f0f915b660b99b122d..858bf64d951ae48421ceb2f9b62de939
 +    }
 +
      @Override
-     protected void defineSynchedData() {
-         super.defineSynchedData();
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 3574a1e641d8af34a0ff7ea8dcfb08641cf6ace0..df8c7a45eb49a8c667030eb67d6d49dcbaef4fcf 100644
+index bd2953448e568b1a20bcc6a889cef83b88418548..5bae3215ee0bf222c3bd77b3131f3d01ac6c9c41 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -106,6 +106,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
+@@ -104,6 +104,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
          return level().purpurConfig.zombifiedPiglinJockeyTryExistingChickens;
      }
  
@@ -1077,10 +1077,10 @@ index 3574a1e641d8af34a0ff7ea8dcfb08641cf6ace0..df8c7a45eb49a8c667030eb67d6d49dc
      public void setPersistentAngerTarget(@Nullable UUID angryAt) {
          this.persistentAngerTarget = angryAt;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index d0144c99cf5c755c81fc0f9457b462c98ff3e804..e326e753cc6bca1bd00287d16c9796b9f3dd4d14 100644
+index 9ca294d5177ec7d541433d644d2fb90d937b011c..a69a4d860cf537322cdf96bfd42e55d3fc684dd1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -101,6 +101,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+@@ -122,6 +122,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
          return this.level().purpurConfig.hoglinTakeDamageFromWater;
      }
  
@@ -1093,10 +1093,10 @@ index d0144c99cf5c755c81fc0f9457b462c98ff3e804..e326e753cc6bca1bd00287d16c9796b9
      public boolean canBeLeashed(Player player) {
          return !this.isLeashed();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index e506dcf390ecb5cce8ae6993df7ec91b3ebc125e..9ca1618ab945ad834c5fc221ada49058f806e79c 100644
+index e5b24bd8e31ca5748185181bb6741760c86a92a1..811b622945ecf67cff1992c3cdd4fcd84f33fb68 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -123,6 +123,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -121,6 +121,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          return this.level().purpurConfig.piglinTakeDamageFromWater;
      }
  
@@ -1109,10 +1109,10 @@ index e506dcf390ecb5cce8ae6993df7ec91b3ebc125e..9ca1618ab945ad834c5fc221ada49058
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index b63d87df0f48dd63c89118f91b31dc4e3622e3b8..61e8f2d030fc50840c3f80dfb6fc810797ec440f 100644
+index 6c7e0f177382cb6329002dcde270f6ce51f08f9f..71d2501e88a99819ef305fa8715418aad65ec81d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -68,6 +68,11 @@ public class PiglinBrute extends AbstractPiglin {
+@@ -89,6 +89,11 @@ public class PiglinBrute extends AbstractPiglin {
          return this.level().purpurConfig.piglinBruteTakeDamageFromWater;
      }
  
@@ -1122,13 +1122,13 @@ index b63d87df0f48dd63c89118f91b31dc4e3622e3b8..61e8f2d030fc50840c3f80dfb6fc8107
 +    }
 +
      public static AttributeSupplier.Builder createAttributes() {
-         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D);
+         return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0).add(Attributes.MOVEMENT_SPEED, 0.35F).add(Attributes.ATTACK_DAMAGE, 7.0);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 04ccb0562e01ea5b9fcc4a14346fb0767ae44639..1ad37f05e37551c72f780c56ff0c01ccc4907ed4 100644
+index 1bace0d549ea4a4b45ac4cd1409524989ecac4ca..17a247455dd853ae98e2f82f64a99bccc4d27438 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -195,6 +195,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -194,6 +194,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return this.level().purpurConfig.villagerTakeDamageFromWater;
      }
  
@@ -1141,10 +1141,10 @@ index 04ccb0562e01ea5b9fcc4a14346fb0767ae44639..1ad37f05e37551c72f780c56ff0c01cc
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index bb18a29281df797e05d828caed0a604329209cba..6986fcbe67e55c4942d13b2af39bd6293bf993a9 100644
+index 0d11200ab580cc306602c29c61f7619565d8261d..62f5e5cfe5745deced2811d14d0c7ebb2c2c6948 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -102,6 +102,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -103,6 +103,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          return this.level().purpurConfig.wanderingTraderTakeDamageFromWater;
      }
  
@@ -1157,10 +1157,10 @@ index bb18a29281df797e05d828caed0a604329209cba..6986fcbe67e55c4942d13b2af39bd629
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e465c3143e 100644
+index 6fce1773a4b5008f3234e06b556bf12e140eb1c1..fd8c8c6e563662926002fb1c72aaea0ba2999cdb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1044,12 +1044,14 @@ public class PurpurWorldConfig {
+@@ -1108,12 +1108,14 @@ public class PurpurWorldConfig {
      public double axolotlMaxHealth = 14.0D;
      public int axolotlBreedingTicks = 6000;
      public boolean axolotlTakeDamageFromWater = false;
@@ -1175,7 +1175,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean batRidable = false;
-@@ -1065,6 +1067,7 @@ public class PurpurWorldConfig {
+@@ -1129,6 +1131,7 @@ public class PurpurWorldConfig {
      public double batArmorToughness = 0.0D;
      public double batAttackKnockback = 0.0D;
      public boolean batTakeDamageFromWater = false;
@@ -1183,7 +1183,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void batSettings() {
          batRidable = getBoolean("mobs.bat.ridable", batRidable);
          batRidableInWater = getBoolean("mobs.bat.ridable-in-water", batRidableInWater);
-@@ -1084,6 +1087,7 @@ public class PurpurWorldConfig {
+@@ -1148,6 +1151,7 @@ public class PurpurWorldConfig {
          batArmorToughness = getDouble("mobs.bat.attributes.armor_toughness", batArmorToughness);
          batAttackKnockback = getDouble("mobs.bat.attributes.attack_knockback", batAttackKnockback);
          batTakeDamageFromWater = getBoolean("mobs.bat.takes-damage-from-water", batTakeDamageFromWater);
@@ -1191,7 +1191,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean beeRidable = false;
-@@ -1095,6 +1099,7 @@ public class PurpurWorldConfig {
+@@ -1159,6 +1163,7 @@ public class PurpurWorldConfig {
      public boolean beeTakeDamageFromWater = false;
      public boolean beeCanWorkAtNight = false;
      public boolean beeCanWorkInRain = false;
@@ -1199,7 +1199,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -1110,6 +1115,7 @@ public class PurpurWorldConfig {
+@@ -1174,6 +1179,7 @@ public class PurpurWorldConfig {
          beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater);
          beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
          beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
@@ -1207,7 +1207,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean blazeRidable = false;
-@@ -1118,6 +1124,7 @@ public class PurpurWorldConfig {
+@@ -1182,6 +1188,7 @@ public class PurpurWorldConfig {
      public double blazeMaxY = 320D;
      public double blazeMaxHealth = 20.0D;
      public boolean blazeTakeDamageFromWater = true;
@@ -1215,7 +1215,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void blazeSettings() {
          blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
          blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
-@@ -1130,6 +1137,7 @@ public class PurpurWorldConfig {
+@@ -1194,6 +1201,7 @@ public class PurpurWorldConfig {
          }
          blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
          blazeTakeDamageFromWater = getBoolean("mobs.blaze.takes-damage-from-water", blazeTakeDamageFromWater);
@@ -1223,7 +1223,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean camelRidableInWater = false;
-@@ -1161,6 +1169,7 @@ public class PurpurWorldConfig {
+@@ -1225,6 +1233,7 @@ public class PurpurWorldConfig {
      public int catBreedingTicks = 6000;
      public DyeColor catDefaultCollarColor = DyeColor.RED;
      public boolean catTakeDamageFromWater = false;
@@ -1231,7 +1231,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void catSettings() {
          catRidable = getBoolean("mobs.cat.ridable", catRidable);
          catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
-@@ -1181,6 +1190,7 @@ public class PurpurWorldConfig {
+@@ -1245,6 +1254,7 @@ public class PurpurWorldConfig {
              catDefaultCollarColor = DyeColor.RED;
          }
          catTakeDamageFromWater = getBoolean("mobs.cat.takes-damage-from-water", catTakeDamageFromWater);
@@ -1239,7 +1239,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean caveSpiderRidable = false;
-@@ -1188,6 +1198,7 @@ public class PurpurWorldConfig {
+@@ -1252,6 +1262,7 @@ public class PurpurWorldConfig {
      public boolean caveSpiderControllable = true;
      public double caveSpiderMaxHealth = 12.0D;
      public boolean caveSpiderTakeDamageFromWater = false;
@@ -1247,7 +1247,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void caveSpiderSettings() {
          caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable);
          caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater);
-@@ -1199,6 +1210,7 @@ public class PurpurWorldConfig {
+@@ -1263,6 +1274,7 @@ public class PurpurWorldConfig {
          }
          caveSpiderMaxHealth = getDouble("mobs.cave_spider.attributes.max_health", caveSpiderMaxHealth);
          caveSpiderTakeDamageFromWater = getBoolean("mobs.cave_spider.takes-damage-from-water", caveSpiderTakeDamageFromWater);
@@ -1255,7 +1255,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean chickenRidable = false;
-@@ -1208,6 +1220,7 @@ public class PurpurWorldConfig {
+@@ -1272,6 +1284,7 @@ public class PurpurWorldConfig {
      public boolean chickenRetaliate = false;
      public int chickenBreedingTicks = 6000;
      public boolean chickenTakeDamageFromWater = false;
@@ -1263,7 +1263,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void chickenSettings() {
          chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
          chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
-@@ -1221,12 +1234,14 @@ public class PurpurWorldConfig {
+@@ -1285,12 +1298,14 @@ public class PurpurWorldConfig {
          chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
          chickenBreedingTicks = getInt("mobs.chicken.breeding-delay-ticks", chickenBreedingTicks);
          chickenTakeDamageFromWater = getBoolean("mobs.chicken.takes-damage-from-water", chickenTakeDamageFromWater);
@@ -1278,7 +1278,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void codSettings() {
          codRidable = getBoolean("mobs.cod.ridable", codRidable);
          codControllable = getBoolean("mobs.cod.controllable", codControllable);
-@@ -1237,6 +1252,7 @@ public class PurpurWorldConfig {
+@@ -1301,6 +1316,7 @@ public class PurpurWorldConfig {
          }
          codMaxHealth = getDouble("mobs.cod.attributes.max_health", codMaxHealth);
          codTakeDamageFromWater = getBoolean("mobs.cod.takes-damage-from-water", codTakeDamageFromWater);
@@ -1286,7 +1286,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean cowRidable = false;
-@@ -1248,6 +1264,7 @@ public class PurpurWorldConfig {
+@@ -1312,6 +1328,7 @@ public class PurpurWorldConfig {
      public boolean cowTakeDamageFromWater = false;
      public double cowNaturallyAggressiveToPlayersChance = 0.0D;
      public double cowNaturallyAggressiveToPlayersDamage = 2.0D;
@@ -1294,7 +1294,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void cowSettings() {
          if (PurpurConfig.version < 22) {
              double oldValue = getDouble("mobs.cow.naturally-aggressive-to-players-chance", cowNaturallyAggressiveToPlayersChance);
-@@ -1268,6 +1285,7 @@ public class PurpurWorldConfig {
+@@ -1332,6 +1349,7 @@ public class PurpurWorldConfig {
          cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);
          cowNaturallyAggressiveToPlayersChance = getDouble("mobs.cow.naturally-aggressive-to-players.chance", cowNaturallyAggressiveToPlayersChance);
          cowNaturallyAggressiveToPlayersDamage = getDouble("mobs.cow.naturally-aggressive-to-players.damage", cowNaturallyAggressiveToPlayersDamage);
@@ -1302,7 +1302,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean creeperRidable = false;
-@@ -1280,6 +1298,7 @@ public class PurpurWorldConfig {
+@@ -1344,6 +1362,7 @@ public class PurpurWorldConfig {
      public boolean creeperTakeDamageFromWater = false;
      public boolean creeperExplodeWhenKilled = false;
      public boolean creeperHealthRadius = false;
@@ -1310,7 +1310,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -1296,6 +1315,7 @@ public class PurpurWorldConfig {
+@@ -1360,6 +1379,7 @@ public class PurpurWorldConfig {
          creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
          creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
          creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
@@ -1318,7 +1318,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean dolphinRidable = false;
-@@ -1307,6 +1327,7 @@ public class PurpurWorldConfig {
+@@ -1371,6 +1391,7 @@ public class PurpurWorldConfig {
      public boolean dolphinDisableTreasureSearching = false;
      public boolean dolphinTakeDamageFromWater = false;
      public double dolphinNaturallyAggressiveToPlayersChance = 0.0D;
@@ -1326,7 +1326,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void dolphinSettings() {
          dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
          dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
-@@ -1322,6 +1343,7 @@ public class PurpurWorldConfig {
+@@ -1386,6 +1407,7 @@ public class PurpurWorldConfig {
          dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
          dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);
          dolphinNaturallyAggressiveToPlayersChance = getDouble("mobs.dolphin.naturally-aggressive-to-players-chance", dolphinNaturallyAggressiveToPlayersChance);
@@ -1334,7 +1334,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean donkeyRidableInWater = false;
-@@ -1333,6 +1355,7 @@ public class PurpurWorldConfig {
+@@ -1397,6 +1419,7 @@ public class PurpurWorldConfig {
      public double donkeyMovementSpeedMax = 0.175D;
      public int donkeyBreedingTicks = 6000;
      public boolean donkeyTakeDamageFromWater = false;
@@ -1342,7 +1342,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void donkeySettings() {
          donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1350,6 +1373,7 @@ public class PurpurWorldConfig {
+@@ -1414,6 +1437,7 @@ public class PurpurWorldConfig {
          donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
          donkeyBreedingTicks = getInt("mobs.donkey.breeding-delay-ticks", donkeyBreedingTicks);
          donkeyTakeDamageFromWater = getBoolean("mobs.donkey.takes-damage-from-water", donkeyTakeDamageFromWater);
@@ -1350,7 +1350,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean drownedRidable = false;
-@@ -1362,6 +1386,7 @@ public class PurpurWorldConfig {
+@@ -1426,6 +1450,7 @@ public class PurpurWorldConfig {
      public boolean drownedJockeyTryExistingChickens = true;
      public boolean drownedTakeDamageFromWater = false;
      public boolean drownedBreakDoors = false;
@@ -1358,7 +1358,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void drownedSettings() {
          drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
          drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
-@@ -1378,12 +1403,14 @@ public class PurpurWorldConfig {
+@@ -1442,12 +1467,14 @@ public class PurpurWorldConfig {
          drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
          drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
          drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors);
@@ -1373,7 +1373,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void elderGuardianSettings() {
          elderGuardianRidable = getBoolean("mobs.elder_guardian.ridable", elderGuardianRidable);
          elderGuardianControllable = getBoolean("mobs.elder_guardian.controllable", elderGuardianControllable);
-@@ -1394,6 +1421,7 @@ public class PurpurWorldConfig {
+@@ -1458,6 +1485,7 @@ public class PurpurWorldConfig {
          }
          elderGuardianMaxHealth = getDouble("mobs.elder_guardian.attributes.max_health", elderGuardianMaxHealth);
          elderGuardianTakeDamageFromWater = getBoolean("mobs.elder_guardian.takes-damage-from-water", elderGuardianTakeDamageFromWater);
@@ -1381,7 +1381,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean enderDragonRidable = false;
-@@ -1439,6 +1467,7 @@ public class PurpurWorldConfig {
+@@ -1503,6 +1531,7 @@ public class PurpurWorldConfig {
      public boolean endermanIgnorePlayerDragonHead = false;
      public boolean endermanDisableStareAggro = false;
      public boolean endermanIgnoreProjectiles = false;
@@ -1389,7 +1389,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void endermanSettings() {
          endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
          endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
-@@ -1462,6 +1491,7 @@ public class PurpurWorldConfig {
+@@ -1526,6 +1555,7 @@ public class PurpurWorldConfig {
          endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
          endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);
          endermanIgnoreProjectiles = getBoolean("mobs.enderman.ignore-projectiles", endermanIgnoreProjectiles);
@@ -1397,7 +1397,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean endermiteRidable = false;
-@@ -1469,6 +1499,7 @@ public class PurpurWorldConfig {
+@@ -1533,6 +1563,7 @@ public class PurpurWorldConfig {
      public boolean endermiteControllable = true;
      public double endermiteMaxHealth = 8.0D;
      public boolean endermiteTakeDamageFromWater = false;
@@ -1405,7 +1405,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void endermiteSettings() {
          endermiteRidable = getBoolean("mobs.endermite.ridable", endermiteRidable);
          endermiteRidableInWater = getBoolean("mobs.endermite.ridable-in-water", endermiteRidableInWater);
-@@ -1480,6 +1511,7 @@ public class PurpurWorldConfig {
+@@ -1544,6 +1575,7 @@ public class PurpurWorldConfig {
          }
          endermiteMaxHealth = getDouble("mobs.endermite.attributes.max_health", endermiteMaxHealth);
          endermiteTakeDamageFromWater = getBoolean("mobs.endermite.takes-damage-from-water", endermiteTakeDamageFromWater);
@@ -1413,7 +1413,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean evokerRidable = false;
-@@ -1488,6 +1520,7 @@ public class PurpurWorldConfig {
+@@ -1552,6 +1584,7 @@ public class PurpurWorldConfig {
      public double evokerMaxHealth = 24.0D;
      public boolean evokerBypassMobGriefing = false;
      public boolean evokerTakeDamageFromWater = false;
@@ -1421,7 +1421,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void evokerSettings() {
          evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
          evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
-@@ -1500,6 +1533,7 @@ public class PurpurWorldConfig {
+@@ -1564,6 +1597,7 @@ public class PurpurWorldConfig {
          evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
          evokerBypassMobGriefing = getBoolean("mobs.evoker.bypass-mob-griefing", evokerBypassMobGriefing);
          evokerTakeDamageFromWater = getBoolean("mobs.evoker.takes-damage-from-water", evokerTakeDamageFromWater);
@@ -1429,7 +1429,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean foxRidable = false;
-@@ -1510,6 +1544,7 @@ public class PurpurWorldConfig {
+@@ -1574,6 +1608,7 @@ public class PurpurWorldConfig {
      public int foxBreedingTicks = 6000;
      public boolean foxBypassMobGriefing = false;
      public boolean foxTakeDamageFromWater = false;
@@ -1437,7 +1437,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void foxSettings() {
          foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
          foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
-@@ -1524,6 +1559,7 @@ public class PurpurWorldConfig {
+@@ -1588,6 +1623,7 @@ public class PurpurWorldConfig {
          foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
          foxBypassMobGriefing = getBoolean("mobs.fox.bypass-mob-griefing", foxBypassMobGriefing);
          foxTakeDamageFromWater = getBoolean("mobs.fox.takes-damage-from-water", foxTakeDamageFromWater);
@@ -1445,7 +1445,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean frogRidable = false;
-@@ -1545,6 +1581,7 @@ public class PurpurWorldConfig {
+@@ -1609,6 +1645,7 @@ public class PurpurWorldConfig {
      public double ghastMaxY = 320D;
      public double ghastMaxHealth = 10.0D;
      public boolean ghastTakeDamageFromWater = false;
@@ -1453,7 +1453,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void ghastSettings() {
          ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable);
          ghastRidableInWater = getBoolean("mobs.ghast.ridable-in-water", ghastRidableInWater);
-@@ -1557,6 +1594,7 @@ public class PurpurWorldConfig {
+@@ -1621,6 +1658,7 @@ public class PurpurWorldConfig {
          }
          ghastMaxHealth = getDouble("mobs.ghast.attributes.max_health", ghastMaxHealth);
          ghastTakeDamageFromWater = getBoolean("mobs.ghast.takes-damage-from-water", ghastTakeDamageFromWater);
@@ -1461,7 +1461,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean giantRidable = false;
-@@ -1570,6 +1608,7 @@ public class PurpurWorldConfig {
+@@ -1634,6 +1672,7 @@ public class PurpurWorldConfig {
      public boolean giantHaveAI = false;
      public boolean giantHaveHostileAI = false;
      public boolean giantTakeDamageFromWater = false;
@@ -1469,7 +1469,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void giantSettings() {
          giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
          giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
-@@ -1591,6 +1630,7 @@ public class PurpurWorldConfig {
+@@ -1655,6 +1694,7 @@ public class PurpurWorldConfig {
          giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI);
          giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
          giantTakeDamageFromWater = getBoolean("mobs.giant.takes-damage-from-water", giantTakeDamageFromWater);
@@ -1477,7 +1477,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean glowSquidRidable = false;
-@@ -1598,12 +1638,14 @@ public class PurpurWorldConfig {
+@@ -1662,12 +1702,14 @@ public class PurpurWorldConfig {
      public double glowSquidMaxHealth = 10.0D;
      public boolean glowSquidsCanFly = false;
      public boolean glowSquidTakeDamageFromWater = false;
@@ -1492,7 +1492,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean goatRidable = false;
-@@ -1612,6 +1654,7 @@ public class PurpurWorldConfig {
+@@ -1676,6 +1718,7 @@ public class PurpurWorldConfig {
      public double goatMaxHealth = 10.0D;
      public int goatBreedingTicks = 6000;
      public boolean goatTakeDamageFromWater = false;
@@ -1500,7 +1500,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void goatSettings() {
          goatRidable = getBoolean("mobs.goat.ridable", goatRidable);
          goatRidableInWater = getBoolean("mobs.goat.ridable-in-water", goatRidableInWater);
-@@ -1619,12 +1662,14 @@ public class PurpurWorldConfig {
+@@ -1683,12 +1726,14 @@ public class PurpurWorldConfig {
          goatMaxHealth = getDouble("mobs.goat.attributes.max_health", goatMaxHealth);
          goatBreedingTicks = getInt("mobs.goat.breeding-delay-ticks", goatBreedingTicks);
          goatTakeDamageFromWater = getBoolean("mobs.goat.takes-damage-from-water", goatTakeDamageFromWater);
@@ -1515,7 +1515,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void guardianSettings() {
          guardianRidable = getBoolean("mobs.guardian.ridable", guardianRidable);
          guardianControllable = getBoolean("mobs.guardian.controllable", guardianControllable);
-@@ -1635,6 +1680,7 @@ public class PurpurWorldConfig {
+@@ -1699,6 +1744,7 @@ public class PurpurWorldConfig {
          }
          guardianMaxHealth = getDouble("mobs.guardian.attributes.max_health", guardianMaxHealth);
          guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
@@ -1523,7 +1523,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean forceHalloweenSeason = false;
-@@ -1650,6 +1696,7 @@ public class PurpurWorldConfig {
+@@ -1714,6 +1760,7 @@ public class PurpurWorldConfig {
      public double hoglinMaxHealth = 40.0D;
      public int hoglinBreedingTicks = 6000;
      public boolean hoglinTakeDamageFromWater = false;
@@ -1531,7 +1531,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void hoglinSettings() {
          hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
          hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
-@@ -1662,6 +1709,7 @@ public class PurpurWorldConfig {
+@@ -1726,6 +1773,7 @@ public class PurpurWorldConfig {
          hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
          hoglinBreedingTicks = getInt("mobs.hoglin.breeding-delay-ticks", hoglinBreedingTicks);
          hoglinTakeDamageFromWater = getBoolean("mobs.hoglin.takes-damage-from-water", hoglinTakeDamageFromWater);
@@ -1539,7 +1539,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean horseRidableInWater = false;
-@@ -1673,6 +1721,7 @@ public class PurpurWorldConfig {
+@@ -1737,6 +1785,7 @@ public class PurpurWorldConfig {
      public double horseMovementSpeedMax = 0.3375D;
      public int horseBreedingTicks = 6000;
      public boolean horseTakeDamageFromWater = false;
@@ -1547,7 +1547,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void horseSettings() {
          horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1690,6 +1739,7 @@ public class PurpurWorldConfig {
+@@ -1754,6 +1803,7 @@ public class PurpurWorldConfig {
          horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
          horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
          horseTakeDamageFromWater = getBoolean("mobs.horse.takes-damage-from-water", horseTakeDamageFromWater);
@@ -1555,7 +1555,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean huskRidable = false;
-@@ -1701,6 +1751,7 @@ public class PurpurWorldConfig {
+@@ -1765,6 +1815,7 @@ public class PurpurWorldConfig {
      public double huskJockeyChance = 0.05D;
      public boolean huskJockeyTryExistingChickens = true;
      public boolean huskTakeDamageFromWater = false;
@@ -1563,7 +1563,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void huskSettings() {
          huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
          huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
-@@ -1716,6 +1767,7 @@ public class PurpurWorldConfig {
+@@ -1780,6 +1831,7 @@ public class PurpurWorldConfig {
          huskJockeyChance = getDouble("mobs.husk.jockey.chance", huskJockeyChance);
          huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
          huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater);
@@ -1571,7 +1571,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean illusionerRidable = false;
-@@ -1725,6 +1777,7 @@ public class PurpurWorldConfig {
+@@ -1789,6 +1841,7 @@ public class PurpurWorldConfig {
      public double illusionerFollowRange = 18.0D;
      public double illusionerMaxHealth = 32.0D;
      public boolean illusionerTakeDamageFromWater = false;
@@ -1579,7 +1579,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void illusionerSettings() {
          illusionerRidable = getBoolean("mobs.illusioner.ridable", illusionerRidable);
          illusionerRidableInWater = getBoolean("mobs.illusioner.ridable-in-water", illusionerRidableInWater);
-@@ -1742,6 +1795,7 @@ public class PurpurWorldConfig {
+@@ -1806,6 +1859,7 @@ public class PurpurWorldConfig {
          }
          illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max_health", illusionerMaxHealth);
          illusionerTakeDamageFromWater = getBoolean("mobs.illusioner.takes-damage-from-water", illusionerTakeDamageFromWater);
@@ -1587,7 +1587,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean ironGolemRidable = false;
-@@ -1752,6 +1806,7 @@ public class PurpurWorldConfig {
+@@ -1816,6 +1870,7 @@ public class PurpurWorldConfig {
      public boolean ironGolemTakeDamageFromWater = false;
      public boolean ironGolemPoppyCalm = false;
      public boolean ironGolemHealCalm = false;
@@ -1595,7 +1595,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void ironGolemSettings() {
          ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
          ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
-@@ -1766,6 +1821,7 @@ public class PurpurWorldConfig {
+@@ -1830,6 +1885,7 @@ public class PurpurWorldConfig {
          ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater);
          ironGolemPoppyCalm = getBoolean("mobs.iron_golem.poppy-calms-anger", ironGolemPoppyCalm);
          ironGolemHealCalm = getBoolean("mobs.iron_golem.healing-calms-anger", ironGolemHealCalm);
@@ -1603,7 +1603,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean llamaRidable = false;
-@@ -1780,6 +1836,7 @@ public class PurpurWorldConfig {
+@@ -1844,6 +1900,7 @@ public class PurpurWorldConfig {
      public int llamaBreedingTicks = 6000;
      public boolean llamaTakeDamageFromWater = false;
      public boolean llamaJoinCaravans = true;
@@ -1611,7 +1611,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void llamaSettings() {
          llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
          llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
-@@ -1800,6 +1857,7 @@ public class PurpurWorldConfig {
+@@ -1864,6 +1921,7 @@ public class PurpurWorldConfig {
          llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
          llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater);
          llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans);
@@ -1619,7 +1619,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean magmaCubeRidable = false;
-@@ -1810,6 +1868,7 @@ public class PurpurWorldConfig {
+@@ -1874,6 +1932,7 @@ public class PurpurWorldConfig {
      public Map<Integer, Double> magmaCubeMaxHealthCache = new HashMap<>();
      public Map<Integer, Double> magmaCubeAttackDamageCache = new HashMap<>();
      public boolean magmaCubeTakeDamageFromWater = false;
@@ -1627,7 +1627,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void magmaCubeSettings() {
          magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable);
          magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater);
-@@ -1824,6 +1883,7 @@ public class PurpurWorldConfig {
+@@ -1888,6 +1947,7 @@ public class PurpurWorldConfig {
          magmaCubeMaxHealthCache.clear();
          magmaCubeAttackDamageCache.clear();
          magmaCubeTakeDamageFromWater = getBoolean("mobs.magma_cube.takes-damage-from-water", magmaCubeTakeDamageFromWater);
@@ -1635,7 +1635,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean mooshroomRidable = false;
-@@ -1832,6 +1892,7 @@ public class PurpurWorldConfig {
+@@ -1896,6 +1956,7 @@ public class PurpurWorldConfig {
      public double mooshroomMaxHealth = 10.0D;
      public int mooshroomBreedingTicks = 6000;
      public boolean mooshroomTakeDamageFromWater = false;
@@ -1643,7 +1643,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void mooshroomSettings() {
          mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
          mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
-@@ -1844,6 +1905,7 @@ public class PurpurWorldConfig {
+@@ -1908,6 +1969,7 @@ public class PurpurWorldConfig {
          mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
          mooshroomBreedingTicks = getInt("mobs.mooshroom.breeding-delay-ticks", mooshroomBreedingTicks);
          mooshroomTakeDamageFromWater = getBoolean("mobs.mooshroom.takes-damage-from-water", mooshroomTakeDamageFromWater);
@@ -1651,7 +1651,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean muleRidableInWater = false;
-@@ -1855,6 +1917,7 @@ public class PurpurWorldConfig {
+@@ -1919,6 +1981,7 @@ public class PurpurWorldConfig {
      public double muleMovementSpeedMax = 0.175D;
      public int muleBreedingTicks = 6000;
      public boolean muleTakeDamageFromWater = false;
@@ -1659,7 +1659,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void muleSettings() {
          muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
          if (PurpurConfig.version < 10) {
-@@ -1872,6 +1935,7 @@ public class PurpurWorldConfig {
+@@ -1936,6 +1999,7 @@ public class PurpurWorldConfig {
          muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
          muleBreedingTicks = getInt("mobs.mule.breeding-delay-ticks", muleBreedingTicks);
          muleTakeDamageFromWater = getBoolean("mobs.mule.takes-damage-from-water", muleTakeDamageFromWater);
@@ -1667,7 +1667,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean ocelotRidable = false;
-@@ -1880,6 +1944,7 @@ public class PurpurWorldConfig {
+@@ -1944,6 +2008,7 @@ public class PurpurWorldConfig {
      public double ocelotMaxHealth = 10.0D;
      public int ocelotBreedingTicks = 6000;
      public boolean ocelotTakeDamageFromWater = false;
@@ -1675,7 +1675,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void ocelotSettings() {
          ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
          ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
-@@ -1892,6 +1957,7 @@ public class PurpurWorldConfig {
+@@ -1956,6 +2021,7 @@ public class PurpurWorldConfig {
          ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
          ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks);
          ocelotTakeDamageFromWater = getBoolean("mobs.ocelot.takes-damage-from-water", ocelotTakeDamageFromWater);
@@ -1683,7 +1683,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean pandaRidable = false;
-@@ -1900,6 +1966,7 @@ public class PurpurWorldConfig {
+@@ -1964,6 +2030,7 @@ public class PurpurWorldConfig {
      public double pandaMaxHealth = 20.0D;
      public int pandaBreedingTicks = 6000;
      public boolean pandaTakeDamageFromWater = false;
@@ -1691,7 +1691,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void pandaSettings() {
          pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
          pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
-@@ -1912,6 +1979,7 @@ public class PurpurWorldConfig {
+@@ -1976,6 +2043,7 @@ public class PurpurWorldConfig {
          pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
          pandaBreedingTicks = getInt("mobs.panda.breeding-delay-ticks", pandaBreedingTicks);
          pandaTakeDamageFromWater = getBoolean("mobs.panda.takes-damage-from-water", pandaTakeDamageFromWater);
@@ -1699,7 +1699,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean parrotRidable = false;
-@@ -1921,6 +1989,7 @@ public class PurpurWorldConfig {
+@@ -1985,6 +2053,7 @@ public class PurpurWorldConfig {
      public double parrotMaxHealth = 6.0D;
      public boolean parrotTakeDamageFromWater = false;
      public boolean parrotBreedable = false;
@@ -1707,7 +1707,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void parrotSettings() {
          parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
          parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
-@@ -1934,6 +2003,7 @@ public class PurpurWorldConfig {
+@@ -1998,6 +2067,7 @@ public class PurpurWorldConfig {
          parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
          parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);
          parrotBreedable = getBoolean("mobs.parrot.can-breed", parrotBreedable);
@@ -1715,7 +1715,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean phantomRidable = false;
-@@ -1961,6 +2031,7 @@ public class PurpurWorldConfig {
+@@ -2025,6 +2095,7 @@ public class PurpurWorldConfig {
      public boolean phantomBurnInDaylight = true;
      public boolean phantomFlamesOnSwoop = false;
      public boolean phantomTakeDamageFromWater = false;
@@ -1723,7 +1723,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -1996,6 +2067,7 @@ public class PurpurWorldConfig {
+@@ -2060,6 +2131,7 @@ public class PurpurWorldConfig {
          phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
          phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
          phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
@@ -1731,7 +1731,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean pigRidable = false;
-@@ -2005,6 +2077,7 @@ public class PurpurWorldConfig {
+@@ -2069,6 +2141,7 @@ public class PurpurWorldConfig {
      public boolean pigGiveSaddleBack = false;
      public int pigBreedingTicks = 6000;
      public boolean pigTakeDamageFromWater = false;
@@ -1739,7 +1739,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void pigSettings() {
          pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
          pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
-@@ -2018,6 +2091,7 @@ public class PurpurWorldConfig {
+@@ -2082,6 +2155,7 @@ public class PurpurWorldConfig {
          pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
          pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks);
          pigTakeDamageFromWater = getBoolean("mobs.pig.takes-damage-from-water", pigTakeDamageFromWater);
@@ -1747,7 +1747,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean piglinRidable = false;
-@@ -2027,6 +2101,7 @@ public class PurpurWorldConfig {
+@@ -2091,6 +2165,7 @@ public class PurpurWorldConfig {
      public boolean piglinBypassMobGriefing = false;
      public boolean piglinTakeDamageFromWater = false;
      public int piglinPortalSpawnModifier = 2000;
@@ -1755,7 +1755,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -2040,6 +2115,7 @@ public class PurpurWorldConfig {
+@@ -2104,6 +2179,7 @@ public class PurpurWorldConfig {
          piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
          piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
          piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
@@ -1763,7 +1763,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean piglinBruteRidable = false;
-@@ -2047,6 +2123,7 @@ public class PurpurWorldConfig {
+@@ -2111,6 +2187,7 @@ public class PurpurWorldConfig {
      public boolean piglinBruteControllable = true;
      public double piglinBruteMaxHealth = 50.0D;
      public boolean piglinBruteTakeDamageFromWater = false;
@@ -1771,7 +1771,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void piglinBruteSettings() {
          piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
          piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
-@@ -2058,6 +2135,7 @@ public class PurpurWorldConfig {
+@@ -2122,6 +2199,7 @@ public class PurpurWorldConfig {
          }
          piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
          piglinBruteTakeDamageFromWater = getBoolean("mobs.piglin_brute.takes-damage-from-water", piglinBruteTakeDamageFromWater);
@@ -1779,7 +1779,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean pillagerRidable = false;
-@@ -2066,6 +2144,7 @@ public class PurpurWorldConfig {
+@@ -2130,6 +2208,7 @@ public class PurpurWorldConfig {
      public double pillagerMaxHealth = 24.0D;
      public boolean pillagerBypassMobGriefing = false;
      public boolean pillagerTakeDamageFromWater = false;
@@ -1787,7 +1787,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void pillagerSettings() {
          pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
          pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
-@@ -2078,6 +2157,7 @@ public class PurpurWorldConfig {
+@@ -2142,6 +2221,7 @@ public class PurpurWorldConfig {
          pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
          pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing);
          pillagerTakeDamageFromWater = getBoolean("mobs.pillager.takes-damage-from-water", pillagerTakeDamageFromWater);
@@ -1795,7 +1795,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean polarBearRidable = false;
-@@ -2088,6 +2168,7 @@ public class PurpurWorldConfig {
+@@ -2152,6 +2232,7 @@ public class PurpurWorldConfig {
      public Item polarBearBreedableItem = null;
      public int polarBearBreedingTicks = 6000;
      public boolean polarBearTakeDamageFromWater = false;
@@ -1803,7 +1803,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void polarBearSettings() {
          polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
          polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
-@@ -2103,12 +2184,14 @@ public class PurpurWorldConfig {
+@@ -2167,12 +2248,14 @@ public class PurpurWorldConfig {
          if (item != Items.AIR) polarBearBreedableItem = item;
          polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
          polarBearTakeDamageFromWater = getBoolean("mobs.polar_bear.takes-damage-from-water", polarBearTakeDamageFromWater);
@@ -1818,7 +1818,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void pufferfishSettings() {
          pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
          pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable);
-@@ -2119,6 +2202,7 @@ public class PurpurWorldConfig {
+@@ -2183,6 +2266,7 @@ public class PurpurWorldConfig {
          }
          pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
          pufferfishTakeDamageFromWater = getBoolean("mobs.pufferfish.takes-damage-from-water", pufferfishTakeDamageFromWater);
@@ -1826,7 +1826,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean rabbitRidable = false;
-@@ -2130,6 +2214,7 @@ public class PurpurWorldConfig {
+@@ -2194,6 +2278,7 @@ public class PurpurWorldConfig {
      public int rabbitBreedingTicks = 6000;
      public boolean rabbitBypassMobGriefing = false;
      public boolean rabbitTakeDamageFromWater = false;
@@ -1834,7 +1834,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void rabbitSettings() {
          rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
          rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
-@@ -2145,6 +2230,7 @@ public class PurpurWorldConfig {
+@@ -2209,6 +2294,7 @@ public class PurpurWorldConfig {
          rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
          rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing);
          rabbitTakeDamageFromWater = getBoolean("mobs.rabbit.takes-damage-from-water", rabbitTakeDamageFromWater);
@@ -1842,7 +1842,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean ravagerRidable = false;
-@@ -2154,6 +2240,7 @@ public class PurpurWorldConfig {
+@@ -2218,6 +2304,7 @@ public class PurpurWorldConfig {
      public boolean ravagerBypassMobGriefing = false;
      public boolean ravagerTakeDamageFromWater = false;
      public List<Block> ravagerGriefableBlocks = new ArrayList<>();
@@ -1850,7 +1850,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void ravagerSettings() {
          ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
          ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
-@@ -2183,12 +2270,14 @@ public class PurpurWorldConfig {
+@@ -2247,12 +2334,14 @@ public class PurpurWorldConfig {
                  ravagerGriefableBlocks.add(block);
              }
          });
@@ -1865,7 +1865,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void salmonSettings() {
          salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
          salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable);
-@@ -2199,6 +2288,7 @@ public class PurpurWorldConfig {
+@@ -2263,6 +2352,7 @@ public class PurpurWorldConfig {
          }
          salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
          salmonTakeDamageFromWater = getBoolean("mobs.salmon.takes-damage-from-water", salmonTakeDamageFromWater);
@@ -1873,7 +1873,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean sheepRidable = false;
-@@ -2208,6 +2298,7 @@ public class PurpurWorldConfig {
+@@ -2272,6 +2362,7 @@ public class PurpurWorldConfig {
      public int sheepBreedingTicks = 6000;
      public boolean sheepBypassMobGriefing = false;
      public boolean sheepTakeDamageFromWater = false;
@@ -1881,7 +1881,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void sheepSettings() {
          sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
          sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -2221,6 +2312,7 @@ public class PurpurWorldConfig {
+@@ -2285,6 +2376,7 @@ public class PurpurWorldConfig {
          sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
          sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
          sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
@@ -1889,7 +1889,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean shulkerRidable = false;
-@@ -2234,6 +2326,7 @@ public class PurpurWorldConfig {
+@@ -2298,6 +2390,7 @@ public class PurpurWorldConfig {
      public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
      public boolean shulkerSpawnFromBulletRandomColor = false;
      public boolean shulkerChangeColorWithDye = false;
@@ -1897,7 +1897,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void shulkerSettings() {
          shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
          shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
-@@ -2251,6 +2344,7 @@ public class PurpurWorldConfig {
+@@ -2315,6 +2408,7 @@ public class PurpurWorldConfig {
          shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
          shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);
          shulkerChangeColorWithDye = getBoolean("mobs.shulker.change-color-with-dye", shulkerChangeColorWithDye);
@@ -1905,7 +1905,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean silverfishRidable = false;
-@@ -2259,6 +2353,7 @@ public class PurpurWorldConfig {
+@@ -2323,6 +2417,7 @@ public class PurpurWorldConfig {
      public double silverfishMaxHealth = 8.0D;
      public boolean silverfishBypassMobGriefing = false;
      public boolean silverfishTakeDamageFromWater = false;
@@ -1913,7 +1913,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void silverfishSettings() {
          silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
          silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
-@@ -2271,6 +2366,7 @@ public class PurpurWorldConfig {
+@@ -2335,6 +2430,7 @@ public class PurpurWorldConfig {
          silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
          silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing);
          silverfishTakeDamageFromWater = getBoolean("mobs.silverfish.takes-damage-from-water", silverfishTakeDamageFromWater);
@@ -1921,7 +1921,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean skeletonRidable = false;
-@@ -2278,6 +2374,7 @@ public class PurpurWorldConfig {
+@@ -2342,6 +2438,7 @@ public class PurpurWorldConfig {
      public boolean skeletonControllable = true;
      public double skeletonMaxHealth = 20.0D;
      public boolean skeletonTakeDamageFromWater = false;
@@ -1929,23 +1929,23 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2289,6 +2386,7 @@ public class PurpurWorldConfig {
+@@ -2353,6 +2450,7 @@ public class PurpurWorldConfig {
          }
          skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
          skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
 +        skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
      }
  
-     public boolean skeletonHorseRidableInWater = true;
-@@ -2300,6 +2398,7 @@ public class PurpurWorldConfig {
+     public boolean skeletonHorseRidable = false;
+@@ -2365,6 +2463,7 @@ public class PurpurWorldConfig {
      public double skeletonHorseMovementSpeedMin = 0.2D;
      public double skeletonHorseMovementSpeedMax = 0.2D;
      public boolean skeletonHorseTakeDamageFromWater = false;
 +    public boolean skeletonHorseAlwaysDropExp = false;
      private void skeletonHorseSettings() {
+         skeletonHorseRidable = getBoolean("mobs.skeleton_horse.ridable", skeletonHorseRidable);
          skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
-         skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
-@@ -2316,6 +2415,7 @@ public class PurpurWorldConfig {
+@@ -2382,6 +2481,7 @@ public class PurpurWorldConfig {
          skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin);
          skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax);
          skeletonHorseTakeDamageFromWater = getBoolean("mobs.skeleton_horse.takes-damage-from-water", skeletonHorseTakeDamageFromWater);
@@ -1953,7 +1953,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean slimeRidable = false;
-@@ -2326,6 +2426,7 @@ public class PurpurWorldConfig {
+@@ -2392,6 +2492,7 @@ public class PurpurWorldConfig {
      public Map<Integer, Double> slimeMaxHealthCache = new HashMap<>();
      public Map<Integer, Double> slimeAttackDamageCache = new HashMap<>();
      public boolean slimeTakeDamageFromWater = false;
@@ -1961,7 +1961,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void slimeSettings() {
          slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
          slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
-@@ -2340,6 +2441,7 @@ public class PurpurWorldConfig {
+@@ -2406,6 +2507,7 @@ public class PurpurWorldConfig {
          slimeMaxHealthCache.clear();
          slimeAttackDamageCache.clear();
          slimeTakeDamageFromWater = getBoolean("mobs.slime.takes-damage-from-water", slimeTakeDamageFromWater);
@@ -1969,7 +1969,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean snowGolemRidable = false;
-@@ -2355,6 +2457,7 @@ public class PurpurWorldConfig {
+@@ -2420,6 +2522,7 @@ public class PurpurWorldConfig {
      public double snowGolemAttackDistance = 1.25D;
      public boolean snowGolemBypassMobGriefing = false;
      public boolean snowGolemTakeDamageFromWater = true;
@@ -1977,7 +1977,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void snowGolemSettings() {
          snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
          snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
-@@ -2374,6 +2477,7 @@ public class PurpurWorldConfig {
+@@ -2438,6 +2541,7 @@ public class PurpurWorldConfig {
          snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
          snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
          snowGolemTakeDamageFromWater = getBoolean("mobs.snow_golem.takes-damage-from-water", snowGolemTakeDamageFromWater);
@@ -1985,7 +1985,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean snifferRidable = false;
-@@ -2396,6 +2500,7 @@ public class PurpurWorldConfig {
+@@ -2460,6 +2564,7 @@ public class PurpurWorldConfig {
      public double squidOffsetWaterCheck = 0.0D;
      public boolean squidsCanFly = false;
      public boolean squidTakeDamageFromWater = false;
@@ -1993,7 +1993,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -2409,6 +2514,7 @@ public class PurpurWorldConfig {
+@@ -2473,6 +2578,7 @@ public class PurpurWorldConfig {
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
          squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
          squidTakeDamageFromWater = getBoolean("mobs.squid.takes-damage-from-water", squidTakeDamageFromWater);
@@ -2001,7 +2001,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean spiderRidable = false;
-@@ -2416,6 +2522,7 @@ public class PurpurWorldConfig {
+@@ -2480,6 +2586,7 @@ public class PurpurWorldConfig {
      public boolean spiderControllable = true;
      public double spiderMaxHealth = 16.0D;
      public boolean spiderTakeDamageFromWater = false;
@@ -2009,7 +2009,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void spiderSettings() {
          spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
          spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
-@@ -2427,6 +2534,7 @@ public class PurpurWorldConfig {
+@@ -2491,6 +2598,7 @@ public class PurpurWorldConfig {
          }
          spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
          spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater);
@@ -2017,7 +2017,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean strayRidable = false;
-@@ -2434,6 +2542,7 @@ public class PurpurWorldConfig {
+@@ -2498,6 +2606,7 @@ public class PurpurWorldConfig {
      public boolean strayControllable = true;
      public double strayMaxHealth = 20.0D;
      public boolean strayTakeDamageFromWater = false;
@@ -2025,7 +2025,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void straySettings() {
          strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
          strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
-@@ -2445,6 +2554,7 @@ public class PurpurWorldConfig {
+@@ -2509,6 +2618,7 @@ public class PurpurWorldConfig {
          }
          strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
          strayTakeDamageFromWater = getBoolean("mobs.stray.takes-damage-from-water", strayTakeDamageFromWater);
@@ -2033,7 +2033,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean striderRidable = false;
-@@ -2454,6 +2564,7 @@ public class PurpurWorldConfig {
+@@ -2518,6 +2628,7 @@ public class PurpurWorldConfig {
      public int striderBreedingTicks = 6000;
      public boolean striderGiveSaddleBack = false;
      public boolean striderTakeDamageFromWater = true;
@@ -2041,7 +2041,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void striderSettings() {
          striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
          striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
-@@ -2467,6 +2578,7 @@ public class PurpurWorldConfig {
+@@ -2531,6 +2642,7 @@ public class PurpurWorldConfig {
          striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
          striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
          striderTakeDamageFromWater = getBoolean("mobs.strider.takes-damage-from-water", striderTakeDamageFromWater);
@@ -2049,7 +2049,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean tadpoleRidable = false;
-@@ -2489,6 +2601,7 @@ public class PurpurWorldConfig {
+@@ -2553,6 +2665,7 @@ public class PurpurWorldConfig {
      public double traderLlamaMovementSpeedMax = 0.175D;
      public int traderLlamaBreedingTicks = 6000;
      public boolean traderLlamaTakeDamageFromWater = false;
@@ -2057,7 +2057,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void traderLlamaSettings() {
          traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
          traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
-@@ -2508,12 +2621,14 @@ public class PurpurWorldConfig {
+@@ -2572,12 +2685,14 @@ public class PurpurWorldConfig {
          traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
          traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
          traderLlamaTakeDamageFromWater = getBoolean("mobs.trader_llama.takes-damage-from-water", traderLlamaTakeDamageFromWater);
@@ -2072,7 +2072,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void tropicalFishSettings() {
          tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
          tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
-@@ -2524,6 +2639,7 @@ public class PurpurWorldConfig {
+@@ -2588,6 +2703,7 @@ public class PurpurWorldConfig {
          }
          tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
          tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater);
@@ -2080,7 +2080,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean turtleRidable = false;
-@@ -2532,6 +2648,7 @@ public class PurpurWorldConfig {
+@@ -2596,6 +2712,7 @@ public class PurpurWorldConfig {
      public double turtleMaxHealth = 30.0D;
      public int turtleBreedingTicks = 6000;
      public boolean turtleTakeDamageFromWater = false;
@@ -2088,7 +2088,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void turtleSettings() {
          turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
          turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
-@@ -2544,6 +2661,7 @@ public class PurpurWorldConfig {
+@@ -2608,6 +2725,7 @@ public class PurpurWorldConfig {
          turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
          turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
          turtleTakeDamageFromWater = getBoolean("mobs.turtle.takes-damage-from-water", turtleTakeDamageFromWater);
@@ -2096,7 +2096,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean vexRidable = false;
-@@ -2552,6 +2670,7 @@ public class PurpurWorldConfig {
+@@ -2616,6 +2734,7 @@ public class PurpurWorldConfig {
      public double vexMaxY = 320D;
      public double vexMaxHealth = 14.0D;
      public boolean vexTakeDamageFromWater = false;
@@ -2104,7 +2104,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void vexSettings() {
          vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
          vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
-@@ -2564,6 +2683,7 @@ public class PurpurWorldConfig {
+@@ -2628,6 +2747,7 @@ public class PurpurWorldConfig {
          }
          vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
          vexTakeDamageFromWater = getBoolean("mobs.vex.takes-damage-from-water", vexTakeDamageFromWater);
@@ -2112,7 +2112,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean villagerRidable = false;
-@@ -2579,6 +2699,7 @@ public class PurpurWorldConfig {
+@@ -2643,6 +2763,7 @@ public class PurpurWorldConfig {
      public boolean villagerBypassMobGriefing = false;
      public boolean villagerTakeDamageFromWater = false;
      public boolean villagerAllowTrading = true;
@@ -2120,7 +2120,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2598,6 +2719,7 @@ public class PurpurWorldConfig {
+@@ -2662,6 +2783,7 @@ public class PurpurWorldConfig {
          villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
          villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
          villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
@@ -2128,7 +2128,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean vindicatorRidable = false;
-@@ -2606,6 +2728,7 @@ public class PurpurWorldConfig {
+@@ -2670,6 +2792,7 @@ public class PurpurWorldConfig {
      public double vindicatorMaxHealth = 24.0D;
      public double vindicatorJohnnySpawnChance = 0D;
      public boolean vindicatorTakeDamageFromWater = false;
@@ -2136,7 +2136,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void vindicatorSettings() {
          vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
          vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
-@@ -2618,6 +2741,7 @@ public class PurpurWorldConfig {
+@@ -2682,6 +2805,7 @@ public class PurpurWorldConfig {
          vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
          vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
          vindicatorTakeDamageFromWater = getBoolean("mobs.vindicator.takes-damage-from-water", vindicatorTakeDamageFromWater);
@@ -2144,7 +2144,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean wanderingTraderRidable = false;
-@@ -2628,6 +2752,7 @@ public class PurpurWorldConfig {
+@@ -2692,6 +2816,7 @@ public class PurpurWorldConfig {
      public boolean wanderingTraderCanBeLeashed = false;
      public boolean wanderingTraderTakeDamageFromWater = false;
      public boolean wanderingTraderAllowTrading = true;
@@ -2152,7 +2152,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void wanderingTraderSettings() {
          wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
          wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
-@@ -2642,6 +2767,7 @@ public class PurpurWorldConfig {
+@@ -2706,6 +2831,7 @@ public class PurpurWorldConfig {
          wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
          wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);
          wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading);
@@ -2160,7 +2160,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean wardenRidable = false;
-@@ -2658,6 +2784,7 @@ public class PurpurWorldConfig {
+@@ -2722,6 +2848,7 @@ public class PurpurWorldConfig {
      public boolean witchControllable = true;
      public double witchMaxHealth = 26.0D;
      public boolean witchTakeDamageFromWater = false;
@@ -2168,7 +2168,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void witchSettings() {
          witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
          witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
-@@ -2669,6 +2796,7 @@ public class PurpurWorldConfig {
+@@ -2733,6 +2860,7 @@ public class PurpurWorldConfig {
          }
          witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
          witchTakeDamageFromWater = getBoolean("mobs.witch.takes-damage-from-water", witchTakeDamageFromWater);
@@ -2176,7 +2176,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean witherRidable = false;
-@@ -2683,6 +2811,7 @@ public class PurpurWorldConfig {
+@@ -2747,6 +2875,7 @@ public class PurpurWorldConfig {
      public boolean witherCanRideVehicles = false;
      public float witherExplosionRadius = 1.0F;
      public boolean witherPlaySpawnSound = true;
@@ -2184,7 +2184,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -2705,6 +2834,7 @@ public class PurpurWorldConfig {
+@@ -2769,6 +2898,7 @@ public class PurpurWorldConfig {
          witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
          witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
          witherPlaySpawnSound = getBoolean("mobs.wither.play-spawn-sound", witherPlaySpawnSound);
@@ -2192,7 +2192,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -2712,6 +2842,7 @@ public class PurpurWorldConfig {
+@@ -2776,6 +2906,7 @@ public class PurpurWorldConfig {
      public boolean witherSkeletonControllable = true;
      public double witherSkeletonMaxHealth = 20.0D;
      public boolean witherSkeletonTakeDamageFromWater = false;
@@ -2200,7 +2200,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void witherSkeletonSettings() {
          witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
          witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
-@@ -2723,6 +2854,7 @@ public class PurpurWorldConfig {
+@@ -2787,6 +2918,7 @@ public class PurpurWorldConfig {
          }
          witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
          witherSkeletonTakeDamageFromWater = getBoolean("mobs.wither_skeleton.takes-damage-from-water", witherSkeletonTakeDamageFromWater);
@@ -2208,7 +2208,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean wolfRidable = false;
-@@ -2734,6 +2866,7 @@ public class PurpurWorldConfig {
+@@ -2798,6 +2930,7 @@ public class PurpurWorldConfig {
      public double wolfNaturalRabid = 0.0D;
      public int wolfBreedingTicks = 6000;
      public boolean wolfTakeDamageFromWater = false;
@@ -2216,7 +2216,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void wolfSettings() {
          wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
          wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -2753,6 +2886,7 @@ public class PurpurWorldConfig {
+@@ -2817,6 +2950,7 @@ public class PurpurWorldConfig {
          wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
          wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
          wolfTakeDamageFromWater = getBoolean("mobs.wolf.takes-damage-from-water", wolfTakeDamageFromWater);
@@ -2224,7 +2224,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean zoglinRidable = false;
-@@ -2760,6 +2894,7 @@ public class PurpurWorldConfig {
+@@ -2824,6 +2958,7 @@ public class PurpurWorldConfig {
      public boolean zoglinControllable = true;
      public double zoglinMaxHealth = 40.0D;
      public boolean zoglinTakeDamageFromWater = false;
@@ -2232,7 +2232,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void zoglinSettings() {
          zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
          zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
-@@ -2771,6 +2906,7 @@ public class PurpurWorldConfig {
+@@ -2835,6 +2970,7 @@ public class PurpurWorldConfig {
          }
          zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
          zoglinTakeDamageFromWater = getBoolean("mobs.zoglin.takes-damage-from-water", zoglinTakeDamageFromWater);
@@ -2240,7 +2240,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean zombieRidable = false;
-@@ -2784,6 +2920,7 @@ public class PurpurWorldConfig {
+@@ -2848,6 +2984,7 @@ public class PurpurWorldConfig {
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      public boolean zombieBypassMobGriefing = false;
      public boolean zombieTakeDamageFromWater = false;
@@ -2248,23 +2248,23 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2801,6 +2938,7 @@ public class PurpurWorldConfig {
+@@ -2865,6 +3002,7 @@ public class PurpurWorldConfig {
          zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
          zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
 +        zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);
      }
  
-     public boolean zombieHorseRidableInWater = false;
-@@ -2813,6 +2951,7 @@ public class PurpurWorldConfig {
+     public boolean zombieHorseRidable = false;
+@@ -2878,6 +3016,7 @@ public class PurpurWorldConfig {
      public double zombieHorseMovementSpeedMax = 0.2D;
      public double zombieHorseSpawnChance = 0.0D;
      public boolean zombieHorseTakeDamageFromWater = false;
 +    public boolean zombieHorseAlwaysDropExp = false;
      private void zombieHorseSettings() {
+         zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
-         zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
-@@ -2830,6 +2969,7 @@ public class PurpurWorldConfig {
+@@ -2896,6 +3035,7 @@ public class PurpurWorldConfig {
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
          zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
          zombieHorseTakeDamageFromWater = getBoolean("mobs.zombie_horse.takes-damage-from-water", zombieHorseTakeDamageFromWater);
@@ -2272,7 +2272,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean zombieVillagerRidable = false;
-@@ -2844,6 +2984,7 @@ public class PurpurWorldConfig {
+@@ -2910,6 +3050,7 @@ public class PurpurWorldConfig {
      public int zombieVillagerCuringTimeMin = 3600;
      public int zombieVillagerCuringTimeMax = 6000;
      public boolean zombieVillagerCureEnabled = true;
@@ -2280,7 +2280,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -2862,6 +3003,7 @@ public class PurpurWorldConfig {
+@@ -2928,6 +3069,7 @@ public class PurpurWorldConfig {
          zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
          zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
          zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
@@ -2288,7 +2288,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -2874,6 +3016,7 @@ public class PurpurWorldConfig {
+@@ -2940,6 +3082,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
      public boolean zombifiedPiglinTakeDamageFromWater = false;
@@ -2296,7 +2296,7 @@ index 3d07df1fbe7116df6f97a2fb3931e739c38b671e..41b856485bbb6872cc49cfdc460303e4
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2890,6 +3033,7 @@ public class PurpurWorldConfig {
+@@ -2956,6 +3099,7 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
          zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
diff --git a/patches/server/0228-Grindstone-API.patch b/patches/server/0220-Grindstone-API.patch
similarity index 92%
rename from patches/server/0228-Grindstone-API.patch
rename to patches/server/0220-Grindstone-API.patch
index 62b41be83..479f112fa 100644
--- a/patches/server/0228-Grindstone-API.patch
+++ b/patches/server/0220-Grindstone-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Grindstone API
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 132a07e226ae3ac6b5abc6f53c62345e2ab2f31f..3b721092a7a73472756064e0eb91d3220fdc4bc8 100644
+index 5824636332eb35ae6bee9cc0661ee95901bb8c4b..1d181de9c8fd45b4d9f0230f80d5752ff5c1a432 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -95,9 +95,11 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -21,7 +21,7 @@ index 132a07e226ae3ac6b5abc6f53c62345e2ab2f31f..3b721092a7a73472756064e0eb91d322
                      }
  
                      world.levelEvent(1042, blockposition, 0);
-@@ -341,7 +343,9 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+@@ -393,7 +395,9 @@ public class GrindstoneMenu extends AbstractContainerMenu {
                  return ItemStack.EMPTY;
              }
  
diff --git a/patches/server/0229-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0221-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
similarity index 83%
rename from patches/server/0229-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
rename to patches/server/0221-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
index 21996dc6f..9b761a70a 100644
--- a/patches/server/0229-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
+++ b/patches/server/0221-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Ability for hoe to replant crops and nether warts
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BushBlock.java b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-index 03fde6e47c4a347c62fe9b4a3351769aedf874f6..ca906b0250e5332f7ececf1419ca6d2c1d385adc 100644
+index a7b4b5600e3c889c69ac22294899713d50b5fe5c..a27e298ffdfa6956be9cde429d2cd45483a51fed 100644
 --- a/src/main/java/net/minecraft/world/level/block/BushBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BushBlock.java
-@@ -48,4 +48,24 @@ public class BushBlock extends Block {
-     public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) {
-         return type == PathComputationType.AIR && !this.hasCollision ? true : super.isPathfindable(state, world, pos, type);
+@@ -52,4 +52,24 @@ public abstract class BushBlock extends Block {
+     protected boolean isPathfindable(BlockState state, PathComputationType type) {
+         return type == PathComputationType.AIR && !this.hasCollision ? true : super.isPathfindable(state, type);
      }
 +
 +    // Purpur start
@@ -34,50 +34,50 @@ index 03fde6e47c4a347c62fe9b4a3351769aedf874f6..ca906b0250e5332f7ececf1419ca6d2c
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-index 3f429f083f45d34effc273ccaa5db4da089f7355..61d051f42d8c3d1f039b97fdc7a61b54f57ee86a 100644
+index a69e7e8da81bd13578d230cc1e3f0f900817cbfd..5a190834baef60c7b61074393f8856a933902d81 100644
 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java
-@@ -207,4 +207,15 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
+@@ -214,4 +214,15 @@ public class CropBlock extends BushBlock implements BonemealableBlock {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(CropBlock.AGE);
      }
 +
 +    // Purpur start
 +    @Override
-+    public void playerDestroy(Level world, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, @javax.annotation.Nullable net.minecraft.world.level.block.entity.BlockEntity blockEntity, ItemStack itemInHand, boolean includeDrops) {
++    public void playerDestroy(Level world, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, @javax.annotation.Nullable net.minecraft.world.level.block.entity.BlockEntity blockEntity, ItemStack itemInHand, boolean includeDrops, boolean dropExp) {
 +        if (world.purpurConfig.hoeReplantsCrops && itemInHand.getItem() instanceof net.minecraft.world.item.HoeItem) {
 +            super.playerDestroyAndReplant(world, player, pos, state, blockEntity, itemInHand, getBaseSeedId());
 +        } else {
-+            super.playerDestroy(world, player, pos, state, blockEntity, itemInHand, includeDrops);
++            super.playerDestroy(world, player, pos, state, blockEntity, itemInHand, includeDrops, dropExp);
 +        }
 +    }
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
-index e55720c4d2fbdf6aae526910e87a67c29cf906fd..74fedd3e401c6d58c03c0579f4b919114404fd78 100644
+index acbd60a2f162fe0e254e36d0e8e7face3fc8a7b3..da1c7999ca64199387054de46489d3ff4a299289 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
-@@ -60,4 +60,15 @@ public class NetherWartBlock extends BushBlock {
+@@ -68,4 +68,15 @@ public class NetherWartBlock extends BushBlock {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(NetherWartBlock.AGE);
      }
 +
 +    // Purpur start
 +    @Override
-+    public void playerDestroy(net.minecraft.world.level.Level world, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, @javax.annotation.Nullable net.minecraft.world.level.block.entity.BlockEntity blockEntity, ItemStack itemInHand, boolean includeDrops) {
++    public void playerDestroy(net.minecraft.world.level.Level world, net.minecraft.world.entity.player.Player player, BlockPos pos, BlockState state, @javax.annotation.Nullable net.minecraft.world.level.block.entity.BlockEntity blockEntity, ItemStack itemInHand, boolean includeDrops, boolean dropExp) {
 +        if (world.purpurConfig.hoeReplantsNetherWarts && itemInHand.getItem() instanceof net.minecraft.world.item.HoeItem) {
 +            super.playerDestroyAndReplant(world, player, pos, state, blockEntity, itemInHand, Items.NETHER_WART);
 +        } else {
-+            super.playerDestroy(world, player, pos, state, blockEntity, itemInHand, includeDrops);
++            super.playerDestroy(world, player, pos, state, blockEntity, itemInHand, includeDrops, dropExp);
 +        }
 +    }
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 41b856485bbb6872cc49cfdc460303e465c3143e..bda73dd90c7d5e72996efca0a41e7f4785c6f548 100644
+index fd8c8c6e563662926002fb1c72aaea0ba2999cdb..b492b7f6c8c959fa379bd75d5d89e99065421e93 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -543,6 +543,8 @@ public class PurpurWorldConfig {
+@@ -548,6 +548,8 @@ public class PurpurWorldConfig {
      public Map<Block, Weatherable> axeWeatherables = new HashMap<>();
      public Map<Block, Tillable> hoeTillables = new HashMap<>();
      public Map<Block, Flattenable> shovelFlattenables = new HashMap<>();
@@ -86,7 +86,7 @@ index 41b856485bbb6872cc49cfdc460303e465c3143e..bda73dd90c7d5e72996efca0a41e7f47
      private void toolSettings() {
          axeStrippables.clear();
          axeWaxables.clear();
-@@ -736,6 +738,8 @@ public class PurpurWorldConfig {
+@@ -815,6 +817,8 @@ public class PurpurWorldConfig {
              });
              shovelFlattenables.put(block, new Flattenable(into, drops));
          });
diff --git a/patches/server/0231-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0222-Turtle-eggs-random-tick-crack-chance.patch
similarity index 82%
rename from patches/server/0231-Turtle-eggs-random-tick-crack-chance.patch
rename to patches/server/0222-Turtle-eggs-random-tick-crack-chance.patch
index 78b87573e..0e08edaa4 100644
--- a/patches/server/0231-Turtle-eggs-random-tick-crack-chance.patch
+++ b/patches/server/0222-Turtle-eggs-random-tick-crack-chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Turtle eggs random tick crack chance
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 9c834e3deed07eb70e6a57df2db732c1e2334737..8e975daca6a50c95d7fb620f2756b8bb2b7c7d6b 100644
+index 0c732cfbd9ce50198a3f85ae8ef2263d7ae0bc1a..2f0e8aeb9c45853fca12ddd78a7d51813a600e67 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-@@ -162,7 +162,7 @@ public class TurtleEggBlock extends Block {
+@@ -170,7 +170,7 @@ public class TurtleEggBlock extends Block {
      private boolean shouldUpdateHatchLevel(Level world) {
          float f = world.getTimeOfDay(1.0F);
  
@@ -18,12 +18,12 @@ index 9c834e3deed07eb70e6a57df2db732c1e2334737..8e975daca6a50c95d7fb620f2756b8bb
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fad281ec8314d4431126abbcea997932401ea95e..c300838d83652a36389694e7afbec5feff11cd8a 100644
+index b492b7f6c8c959fa379bd75d5d89e99065421e93..9ed53d42189f7f7562ed96b4af39a02db2cb2ff5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1011,11 +1011,13 @@ public class PurpurWorldConfig {
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
+@@ -1075,11 +1075,13 @@ public class PurpurWorldConfig {
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
      public boolean turtleEggsBypassMobGriefing = false;
 +    public int turtleEggsRandomTickCrackChance = 500;
      private void turtleEggSettings() {
diff --git a/patches/server/0232-Mob-head-visibility-percent.patch b/patches/server/0223-Mob-head-visibility-percent.patch
similarity index 87%
rename from patches/server/0232-Mob-head-visibility-percent.patch
rename to patches/server/0223-Mob-head-visibility-percent.patch
index 29b22fe15..fb48f5b3b 100644
--- a/patches/server/0232-Mob-head-visibility-percent.patch
+++ b/patches/server/0223-Mob-head-visibility-percent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Mob head visibility percent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cf997f8811aacd32946d81de87b1683910374e42..7a5b7e2d50c98774d8bc50a9c83d15a67996fc90 100644
+index 549579f2bc2e1fd23ece1ead543e3e5242f52ce0..119d2e57995fa20f34b88963b93c945ff87e0cab 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1040,9 +1040,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1071,9 +1071,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
              ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
              EntityType<?> entitytypes = entity.getType();
  
@@ -32,10 +32,10 @@ index cf997f8811aacd32946d81de87b1683910374e42..7a5b7e2d50c98774d8bc50a9c83d15a6
              // Purpur start
              if (entity instanceof LivingEntity entityliving) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953cacbf178 100644
+index 9ed53d42189f7f7562ed96b4af39a02db2cb2ff5..77ee5bc60d953e72c6695ce1ce19276f61ae2057 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1305,6 +1305,7 @@ public class PurpurWorldConfig {
+@@ -1369,6 +1369,7 @@ public class PurpurWorldConfig {
      public boolean creeperExplodeWhenKilled = false;
      public boolean creeperHealthRadius = false;
      public boolean creeperAlwaysDropExp = false;
@@ -43,7 +43,7 @@ index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -1322,6 +1323,7 @@ public class PurpurWorldConfig {
+@@ -1386,6 +1387,7 @@ public class PurpurWorldConfig {
          creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
          creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
          creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -51,7 +51,7 @@ index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953
      }
  
      public boolean dolphinRidable = false;
-@@ -2108,6 +2110,7 @@ public class PurpurWorldConfig {
+@@ -2172,6 +2174,7 @@ public class PurpurWorldConfig {
      public boolean piglinTakeDamageFromWater = false;
      public int piglinPortalSpawnModifier = 2000;
      public boolean piglinAlwaysDropExp = false;
@@ -59,7 +59,7 @@ index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -2122,6 +2125,7 @@ public class PurpurWorldConfig {
+@@ -2186,6 +2189,7 @@ public class PurpurWorldConfig {
          piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
          piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
          piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
@@ -67,7 +67,7 @@ index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953
      }
  
      public boolean piglinBruteRidable = false;
-@@ -2383,6 +2387,7 @@ public class PurpurWorldConfig {
+@@ -2445,6 +2449,7 @@ public class PurpurWorldConfig {
      public double skeletonMaxHealth = 20.0D;
      public boolean skeletonTakeDamageFromWater = false;
      public boolean skeletonAlwaysDropExp = false;
@@ -75,15 +75,15 @@ index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2395,6 +2400,7 @@ public class PurpurWorldConfig {
+@@ -2457,6 +2462,7 @@ public class PurpurWorldConfig {
          skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
          skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
          skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
 +        skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
      }
  
-     public boolean skeletonHorseRidableInWater = true;
-@@ -2929,6 +2935,7 @@ public class PurpurWorldConfig {
+     public boolean skeletonHorseRidable = false;
+@@ -2991,6 +2997,7 @@ public class PurpurWorldConfig {
      public boolean zombieBypassMobGriefing = false;
      public boolean zombieTakeDamageFromWater = false;
      public boolean zombieAlwaysDropExp = false;
@@ -91,11 +91,11 @@ index c300838d83652a36389694e7afbec5feff11cd8a..a5f86aa5c3cd08dddb147c338a124953
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2947,6 +2954,7 @@ public class PurpurWorldConfig {
+@@ -3009,6 +3016,7 @@ public class PurpurWorldConfig {
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
          zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
          zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);
 +        zombieHeadVisibilityPercent = getDouble("mobs.zombie.head-visibility-percent", zombieHeadVisibilityPercent);
      }
  
-     public boolean zombieHorseRidableInWater = false;
+     public boolean zombieHorseRidable = false;
diff --git a/patches/server/0223-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0223-Persistent-BlockEntity-Lore-and-DisplayName.patch
deleted file mode 100644
index f9074e9dc..000000000
--- a/patches/server/0223-Persistent-BlockEntity-Lore-and-DisplayName.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 30 Sep 2020 14:32:46 -0700
-Subject: [PATCH] Persistent BlockEntity Lore and DisplayName
-
-Makes it so that when a BlockEntity is placed in the world and then broken,
-the dropped ItemStack retains any original custom display name/lore.
-
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index ec58193ebd73130f14dc5d8f51caa913b2036fc5..41728bcbd5ca3585da64f7c3289b26977f90c229 100644
---- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -153,7 +153,24 @@ public class BlockItem extends Item {
-     }
- 
-     protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) {
--        return BlockItem.updateCustomBlockEntityTag(world, player, pos, stack);
-+        // Purpur start
-+        boolean handled = updateCustomBlockEntityTag(world, player, pos, stack);
-+        if (world.purpurConfig.persistentTileEntityDisplayNames && stack.hasTag()) {
-+            CompoundTag display = stack.getTagElement("display");
-+            if (display != null) {
-+                BlockEntity blockEntity = world.getBlockEntity(pos);
-+                if (blockEntity != null) {
-+                    if (display.contains("Name", 8)) {
-+                        blockEntity.setPersistentDisplayName(display.getString("Name"));
-+                    }
-+                    if (display.contains("Lore", 9)) {
-+                        blockEntity.setPersistentLore(display.getList("Lore", 8));
-+                    }
-+                }
-+            }
-+        }
-+        return handled;
-+        // Purpur end
-     }
- 
-     @Nullable
-diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index f65b54919d19d2ddc7261cc36853babbaef3c822..cee9e07a250ed61570cf9787236308f91724f02f 100644
---- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -62,6 +62,13 @@ import net.minecraft.world.phys.shapes.Shapes;
- import net.minecraft.world.phys.shapes.VoxelShape;
- import org.slf4j.Logger;
- 
-+// Purpur start
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.nbt.ListTag;
-+import net.minecraft.nbt.StringTag;
-+import net.minecraft.world.Nameable;
-+// Purpur end
-+
- public class Block extends BlockBehaviour implements ItemLike {
- 
-     private static final Logger LOGGER = LogUtils.getLogger();
-@@ -313,7 +320,7 @@ public class Block extends BlockBehaviour implements ItemLike {
-     public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
-         if (world instanceof ServerLevel) {
-             Block.getDrops(state, (ServerLevel) world, pos, blockEntity).forEach((itemstack) -> {
--                Block.popResource((ServerLevel) world, pos, itemstack);
-+                Block.popResource((ServerLevel) world, pos, applyDisplayNameAndLoreFromTile(itemstack, blockEntity)); // Purpur
-             });
-             state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
-         }
-@@ -329,7 +336,7 @@ public class Block extends BlockBehaviour implements ItemLike {
-             io.papermc.paper.event.block.BlockBreakBlockEvent event = new io.papermc.paper.event.block.BlockBreakBlockEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, pos), org.bukkit.craftbukkit.block.CraftBlock.at(world, source), items);
-             event.callEvent();
-             for (var drop : event.getDrops()) {
--                popResource(world.getMinecraftWorld(), pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop));
-+                popResource(world.getMinecraftWorld(), pos, applyDisplayNameAndLoreFromTile(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop), blockEntity)); // Purpur
-             }
-             state.spawnAfterBreak(world.getMinecraftWorld(), pos, ItemStack.EMPTY, true);
-         }
-@@ -340,13 +347,53 @@ public class Block extends BlockBehaviour implements ItemLike {
-     public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
-         if (world instanceof ServerLevel) {
-             Block.getDrops(state, (ServerLevel) world, pos, blockEntity, entity, tool).forEach((itemstack1) -> {
--                Block.popResource(world, pos, itemstack1);
-+                Block.popResource(world, pos, applyDisplayNameAndLoreFromTile(itemstack1, blockEntity)); // Purpur
-             });
-             state.spawnAfterBreak((ServerLevel) world, pos, tool, true);
-         }
- 
-     }
- 
-+    // Purpur start
-+    private static ItemStack applyDisplayNameAndLoreFromTile(ItemStack stack, BlockEntity blockEntity) {
-+        if (stack.getItem() instanceof BlockItem) {
-+            if (blockEntity != null && blockEntity.getLevel() instanceof ServerLevel && blockEntity.getLevel().purpurConfig.persistentTileEntityDisplayNames) {
-+                String name = blockEntity.getPersistentDisplayName();
-+                ListTag lore = blockEntity.getPersistentLore();
-+                if (blockEntity instanceof Nameable) {
-+                    Nameable namedTile = (Nameable) blockEntity;
-+                    if (namedTile.hasCustomName()) {
-+                        name = Component.Serializer.toJson(namedTile.getCustomName());
-+                    }
-+                }
-+
-+                if (name != null || lore != null) {
-+                    CompoundTag display = stack.getTagElement("display");
-+                    if (display == null) {
-+                        display = new CompoundTag();
-+                    }
-+
-+                    if (name != null) {
-+                        display.put("Name", StringTag.valueOf(name));
-+                    }
-+                    if (lore != null) {
-+                        display.put("Lore", lore);
-+                    }
-+
-+                    CompoundTag tag = stack.getTag();
-+                    if (tag == null) {
-+                        tag = new CompoundTag();
-+                    }
-+                    tag.put("display", display);
-+
-+                    stack.setTag(tag);
-+                }
-+            }
-+        }
-+        return stack;
-+    }
-+    // Purpur end
-+
-     public static void popResource(Level world, BlockPos pos, ItemStack stack) {
-         double d0 = (double) EntityType.ITEM.getHeight() / 2.0D;
-         double d1 = (double) pos.getX() + 0.5D + Mth.nextDouble(world.random, -0.25D, 0.25D);
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 370a25d2deb54f10a35ee24d9e7e92fbfde60edf..2f19f6ac5de454845f5d13a3ebb93af625b2afc8 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -6,6 +6,8 @@ import net.minecraft.CrashReportCategory;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.registries.BuiltInRegistries;
- import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.nbt.ListTag;
-+import net.minecraft.nbt.StringTag;
- import net.minecraft.network.protocol.Packet;
- import net.minecraft.network.protocol.game.ClientGamePacketListener;
- import net.minecraft.resources.ResourceLocation;
-@@ -73,10 +75,27 @@ public abstract class BlockEntity {
-         if (persistentDataTag instanceof CompoundTag) {
-             this.persistentDataContainer.putAll((CompoundTag) persistentDataTag);
-         }
-+        // Purpur start
-+        if (nbt.contains("Purpur.persistentDisplayName")) {
-+            this.persistentDisplayName = nbt.getString("Purpur.persistentDisplayName");
-+        }
-+        if (nbt.contains("Purpur.persistentLore")) {
-+            this.persistentLore = nbt.getList("Purpur.persistentLore", 8);
-+        }
-+        // Purpur end
-     }
-     // CraftBukkit end
- 
--    protected void saveAdditional(CompoundTag nbt) {}
-+    protected void saveAdditional(CompoundTag nbt) {
-+        // Purpur start
-+        if (this.persistentDisplayName != null) {
-+            nbt.put("Purpur.persistentDisplayName", StringTag.valueOf(this.persistentDisplayName));
-+        }
-+        if (this.persistentLore != null) {
-+            nbt.put("Purpur.persistentLore", this.persistentLore);
-+        }
-+        // Purpur end
-+    }
- 
-     public final CompoundTag saveWithFullMetadata() {
-         CompoundTag nbttagcompound = this.saveWithoutMetadata();
-@@ -263,4 +282,24 @@ public abstract class BlockEntity {
-     }
-     // Paper end
- 
-+    // Purpur start
-+    private String persistentDisplayName = null;
-+    private ListTag persistentLore = null;
-+
-+    public void setPersistentDisplayName(String json) {
-+        this.persistentDisplayName = json;
-+    }
-+
-+    public void setPersistentLore(ListTag lore) {
-+        this.persistentLore = lore;
-+    }
-+
-+    public String getPersistentDisplayName() {
-+        return this.persistentDisplayName;
-+    }
-+
-+    public ListTag getPersistentLore() {
-+        return this.persistentLore;
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cbf30293766899b7aa66dc922ba76395feca1094..0f8384ba3bb9b6f36bb36bf833c260076b49014e 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -130,6 +130,7 @@ public class PurpurWorldConfig {
-     public boolean milkCuresBadOmen = true;
-     public boolean noteBlockIgnoreAbove = false;
-     public boolean persistentDroppableEntityDisplayNames = true;
-+    public boolean persistentTileEntityDisplayNames = false;
-     public boolean projectilesBypassMobGriefing = false;
-     public boolean tickFluids = true;
-     public double mobsBlindnessMultiplier = 1;
-@@ -153,6 +154,7 @@ public class PurpurWorldConfig {
-         imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
-         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
-         noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
-+        persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
-         persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
-         projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing);
-         tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids);
diff --git a/patches/server/0233-Configurable-valid-characters-for-usernames.patch b/patches/server/0224-Configurable-valid-characters-for-usernames.patch
similarity index 59%
rename from patches/server/0233-Configurable-valid-characters-for-usernames.patch
rename to patches/server/0224-Configurable-valid-characters-for-usernames.patch
index d32428a81..ca0221545 100644
--- a/patches/server/0233-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0224-Configurable-valid-characters-for-usernames.patch
@@ -4,21 +4,20 @@ Date: Sat, 1 Jan 2022 18:38:58 -0600
 Subject: [PATCH] Configurable valid characters for usernames
 
 
-diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index e615e417627840d645db259bc9640a0471a52b05..f0bbc48e2df1da42e4bf9f7113451738b986fbbf 100644
---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -141,6 +141,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+diff --git a/src/main/java/net/minecraft/util/StringUtil.java b/src/main/java/net/minecraft/util/StringUtil.java
+index 0bd191acb9596d3aa21c337230d26f09d26f6888..20211f40aeeade9217ece087688974bdf55afc56 100644
+--- a/src/main/java/net/minecraft/util/StringUtil.java
++++ b/src/main/java/net/minecraft/util/StringUtil.java
+@@ -69,6 +69,7 @@ public class StringUtil {
+ 
+     // Paper start - Username validation
+     public static boolean isReasonablePlayerName(final String name) {
++        if (true) return org.purpurmc.purpur.PurpurConfig.usernameValidCharactersPattern.matcher(name).matches(); // Purpur
+         if (name.isEmpty() || name.length() > 16) {
              return false;
          }
- 
-+        if (true) return org.purpurmc.purpur.PurpurConfig.usernameValidCharactersPattern.matcher(in).matches(); // Purpur
-+
-         for (int i = 0, len = in.length(); i < len; ++i) {
-             char c = in.charAt(i);
- 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f562729f543ef2b5998c6c38c0a08b3ae4dab1bf..d56c2776d08306245618dca04cd39891bb61c1bd 100644
+index 9ded52a0022e33a6b69191b5fa758d6cc7eb076f..cd27c2a3343133d688592791bec2a031410ff93f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -452,4 +452,11 @@ public class PurpurConfig {
diff --git a/patches/server/0225-Shears-can-have-looting-enchantment.patch b/patches/server/0225-Shears-can-have-looting-enchantment.patch
new file mode 100644
index 000000000..059266542
--- /dev/null
+++ b/patches/server/0225-Shears-can-have-looting-enchantment.patch
@@ -0,0 +1,160 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@Gmail.com>
+Date: Mon, 3 Jan 2022 00:06:51 -0600
+Subject: [PATCH] Shears can have looting enchantment
+
+
+diff --git a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+index a024c697a65bbab27408da1d6a75e531d9719b47..e4fab82b369f2c2ea0d8c8acd814d06140d551fc 100644
+--- a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
++++ b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+@@ -105,7 +105,7 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
+                 if (ishearable.readyForShearing()) {
+                     // CraftBukkit start
+                     // Paper start - Add drops to shear events
+-                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops());
++                    org.bukkit.event.block.BlockShearEntityEvent event = CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem, ishearable.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.LOOTING, CraftItemStack.asNMSCopy(craftItem)))); // Purpur
+                     if (event.isCancelled()) {
+                         // Paper end - Add drops to shear events
+                         continue;
+diff --git a/src/main/java/net/minecraft/world/entity/Shearable.java b/src/main/java/net/minecraft/world/entity/Shearable.java
+index 2ee48ac3b665db2b02bcb1a30ec972d43a3725b0..59e8f5431ce5026209e1428b5fa5b5485dcfebc7 100644
+--- a/src/main/java/net/minecraft/world/entity/Shearable.java
++++ b/src/main/java/net/minecraft/world/entity/Shearable.java
+@@ -8,7 +8,7 @@ public interface Shearable {
+ 
+     boolean readyForShearing();
+     // Paper start - custom shear drops; ensure all implementing entities override this
+-    default java.util.List<net.minecraft.world.item.ItemStack> generateDefaultDrops() {
++    default java.util.List<net.minecraft.world.item.ItemStack> generateDefaultDrops(int looting) { // Purpur
+         return java.util.Collections.emptyList();
+     }
+     // Paper end - custom shear drops
+diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+index 06fac8dae42451f912c2db14d792461cee3dba83..a7c95199234231db14faa4a07953bcde57d9861d 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
++++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+@@ -161,7 +161,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+         } else if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
+             // CraftBukkit start
+             // Paper start - custom shear drops
+-            java.util.List<ItemStack> drops = this.generateDefaultDrops();
++            java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
+             org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
+             if (event != null) {
+                 if (event.isCancelled()) {
+@@ -209,13 +209,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+     @Override
+     public void shear(SoundSource shearedSoundCategory) {
+         // Paper start - custom shear drops
+-        this.shear(shearedSoundCategory, this.generateDefaultDrops());
++        this.shear(shearedSoundCategory, this.generateDefaultDrops(0)); // Purpur
+     }
+ 
+     @Override
+-    public java.util.List<ItemStack> generateDefaultDrops() {
++    public java.util.List<ItemStack> generateDefaultDrops(int looting) { // Purpur
+         java.util.List<ItemStack> dropEntities = new java.util.ArrayList<>(5);
+-        for (int i = 0; i < 5; ++i) {
++        for (int i = 0; i < 5 + (org.purpurmc.purpur.PurpurConfig.allowShearsLooting ? looting : 0); ++i) { // Purpur
+             dropEntities.add(new ItemStack(this.getVariant().getBlockState().getBlock()));
+         }
+         return dropEntities;
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+index 9e617b3f1ec4eac5f83bdf19a3563cdc81b008d8..6b1244d3957e7f62c96ffd34692b8916337839fd 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+@@ -297,7 +297,7 @@ public class Sheep extends Animal implements Shearable {
+             if (!this.level().isClientSide && this.readyForShearing()) {
+                 // CraftBukkit start
+                 // Paper start - custom shear drops
+-                java.util.List<ItemStack> drops = this.generateDefaultDrops();
++                java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
+                 org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
+                 if (event != null) {
+                     if (event.isCancelled()) {
+@@ -322,12 +322,13 @@ public class Sheep extends Animal implements Shearable {
+     @Override
+     public void shear(SoundSource shearedSoundCategory) {
+         // Paper start - custom shear drops
+-        this.shear(shearedSoundCategory, this.generateDefaultDrops());
++        this.shear(shearedSoundCategory, this.generateDefaultDrops(0)); // Purpur
+     }
+ 
+     @Override
+-    public java.util.List<ItemStack> generateDefaultDrops() {
++    public java.util.List<ItemStack> generateDefaultDrops(int looting) { // Purpur
+         int count = 1 + this.random.nextInt(3);
++        if (org.purpurmc.purpur.PurpurConfig.allowShearsLooting) count += looting; // Purpur
+         java.util.List<ItemStack> dropEntities = new java.util.ArrayList<>(count);
+         for (int j = 0; j < count; ++j) {
+             dropEntities.add(new ItemStack(Sheep.ITEM_BY_DYE.get(this.getColor())));
+diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+index 69cdccca01fe7d10e6d958e16d91efe08f699505..3b74931ae4e3a869d8db38c119e57b44af887859 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
++++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+@@ -189,7 +189,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+         if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
+             // CraftBukkit start
+             // Paper start - custom shear drops
+-            java.util.List<ItemStack> drops = this.generateDefaultDrops();
++            java.util.List<ItemStack> drops = this.generateDefaultDrops(net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
+             org.bukkit.event.player.PlayerShearEntityEvent event = CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand, drops);
+             if (event != null) {
+                 if (event.isCancelled()) {
+@@ -222,11 +222,20 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+     @Override
+     public void shear(SoundSource shearedSoundCategory) {
+         // Paper start - custom shear drops
+-        this.shear(shearedSoundCategory, this.generateDefaultDrops());
++        this.shear(shearedSoundCategory, this.generateDefaultDrops(0)); // Purpur
+     }
+ 
+     @Override
+-    public java.util.List<ItemStack> generateDefaultDrops() {
++    // Purpur start
++    public java.util.List<ItemStack> generateDefaultDrops(int looting) {
++        if (org.purpurmc.purpur.PurpurConfig.allowShearsLooting) {
++            java.util.ArrayList<ItemStack> list = new java.util.ArrayList<>();
++            for (int i = 0; i < 1 + looting; i++) {
++                list.add(new ItemStack(Items.CARVED_PUMPKIN));
++            }
++            return java.util.Collections.unmodifiableList(list);
++        }
++    // Purpur end
+         return java.util.Collections.singletonList(new ItemStack(Items.CARVED_PUMPKIN));
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+index e9f9b041ae7195e9d23bd446454b1d8c47a1ace1..03b1023e182744a84d324bdad082cc1b9e574e30 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+@@ -159,7 +159,7 @@ public class Bogged extends AbstractSkeleton implements Shearable {
+ 
+     // Paper start - shear drops API
+     @Override
+-    public java.util.List<ItemStack> generateDefaultDrops() {
++    public java.util.List<ItemStack> generateDefaultDrops(int looting) { // Purpur
+         final java.util.List<ItemStack> drops = new java.util.ArrayList<>();
+         this.generateShearedMushrooms(drops::add);
+         return drops;
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index cd27c2a3343133d688592791bec2a031410ff93f..91d5c175752f6ee850adada6802c8af8f833d9c7 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -391,6 +391,7 @@ public class PurpurConfig {
+ 
+     public static boolean allowInfinityMending = false;
+     public static boolean allowCrossbowInfinity = true;
++    public static boolean allowShearsLooting = false;
+     public static boolean allowUnsafeEnchants = false;
+     public static boolean allowInapplicableEnchants = true;
+     public static boolean allowIncompatibleEnchants = true;
+@@ -413,6 +414,7 @@ public class PurpurConfig {
+         }
+         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
+         allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
++        allowShearsLooting = getBoolean("settings.enchantment.allow-looting-on-shears", allowShearsLooting);
+         allowUnsafeEnchants = getBoolean("settings.enchantment.anvil.allow-unsafe-enchants", allowUnsafeEnchants);
+         allowInapplicableEnchants = getBoolean("settings.enchantment.anvil.allow-inapplicable-enchants", allowInapplicableEnchants);
+         allowIncompatibleEnchants = getBoolean("settings.enchantment.anvil.allow-incompatible-enchants", allowIncompatibleEnchants);
diff --git a/patches/server/0235-Stop-bees-from-dying-after-stinging.patch b/patches/server/0226-Stop-bees-from-dying-after-stinging.patch
similarity index 83%
rename from patches/server/0235-Stop-bees-from-dying-after-stinging.patch
rename to patches/server/0226-Stop-bees-from-dying-after-stinging.patch
index 35a96f6c4..43b8cccca 100644
--- a/patches/server/0235-Stop-bees-from-dying-after-stinging.patch
+++ b/patches/server/0226-Stop-bees-from-dying-after-stinging.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop bees from dying after stinging
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 1ddd4ad531e1c536bc3769dc84007d3a3c0350df..02e95af3c18b3da5a6a32a7536e903ca9c426249 100644
+index 926c30db9b28a30fe5d6c8d20f3972dec0d7b4d0..221c0051c7a0e20c1b7a464df26eb63c4e997eee 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -439,6 +439,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -435,6 +435,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              this.hurt(this.damageSources().drown(), 1.0F);
          }
  
@@ -17,10 +17,10 @@ index 1ddd4ad531e1c536bc3769dc84007d3a3c0350df..02e95af3c18b3da5a6a32a7536e903ca
              ++this.timeSinceSting;
              if (this.timeSinceSting % 5 == 0 && this.random.nextInt(Mth.clamp(1200 - this.timeSinceSting, 1, 1200)) == 0) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a5f86aa5c3cd08dddb147c338a124953cacbf178..60beda5c1f3b7ca562b8ba9ff48e0c6e50e89649 100644
+index 77ee5bc60d953e72c6695ce1ce19276f61ae2057..c57bf82ab2ef1827b76f57ed8aff9aee08706fb3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1106,6 +1106,7 @@ public class PurpurWorldConfig {
+@@ -1170,6 +1170,7 @@ public class PurpurWorldConfig {
      public boolean beeCanWorkAtNight = false;
      public boolean beeCanWorkInRain = false;
      public boolean beeAlwaysDropExp = false;
@@ -28,7 +28,7 @@ index a5f86aa5c3cd08dddb147c338a124953cacbf178..60beda5c1f3b7ca562b8ba9ff48e0c6e
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
-@@ -1122,6 +1123,7 @@ public class PurpurWorldConfig {
+@@ -1186,6 +1187,7 @@ public class PurpurWorldConfig {
          beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
          beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
          beeAlwaysDropExp = getBoolean("mobs.bee.always-drop-exp", beeAlwaysDropExp);
diff --git a/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch
new file mode 100644
index 000000000..18cb6556b
--- /dev/null
+++ b/patches/server/0227-Give-bee-counts-in-beehives-to-Purpur-clients.patch
@@ -0,0 +1,184 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Thu, 30 Dec 2021 09:56:43 -0600
+Subject: [PATCH] Give bee counts in beehives to Purpur clients
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 0f4fde2097b9db59b6c29935462f305f34747b3b..5081a631a94920db0307341261755eac399fea1e 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1071,6 +1071,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
+     public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
+         org.purpurmc.purpur.task.BossBarTask.stopAll(); // Purpur
++        org.purpurmc.purpur.task.BeehiveTask.instance().unregister(); // Purpur
+         this.isRestarting = isRestarting;
+         this.hasLoggedStop = true; // Paper - Debugging
+         if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index 29af03b8690e4d402d1e4e4516e4dc731b7b4323..56c6800ae5696397ffba2dc2e03930195a130112 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -388,6 +388,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+             }
+ 
+             org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur
++            if (org.purpurmc.purpur.PurpurConfig.beeCountPayload) org.purpurmc.purpur.task.BeehiveTask.instance().register(); // Purpur
+             return true;
+         }
+     }
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index 91d5c175752f6ee850adada6802c8af8f833d9c7..0d6b99822a3a743fe50362702afdca52f6a4a88e 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -434,6 +434,11 @@ public class PurpurConfig {
+         allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
+     }
+ 
++    public static boolean beeCountPayload = false;
++    private static void beeCountPayload() {
++        beeCountPayload = getBoolean("settings.bee-count-payload", beeCountPayload);
++    }
++
+     public static boolean loggerSuppressInitLegacyMaterialError = false;
+     public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
+     public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
+diff --git a/src/main/java/org/purpurmc/purpur/network/ClientboundBeehivePayload.java b/src/main/java/org/purpurmc/purpur/network/ClientboundBeehivePayload.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..57e195fd2d457295cda6c366684be5577aeef071
+--- /dev/null
++++ b/src/main/java/org/purpurmc/purpur/network/ClientboundBeehivePayload.java
+@@ -0,0 +1,27 @@
++package org.purpurmc.purpur.network;
++
++import net.minecraft.core.BlockPos;
++import net.minecraft.network.FriendlyByteBuf;
++import net.minecraft.network.codec.StreamCodec;
++import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
++import net.minecraft.resources.ResourceLocation;
++import org.jetbrains.annotations.NotNull;
++
++public record ClientboundBeehivePayload(BlockPos pos, int numOfBees) implements CustomPacketPayload {
++    public static final StreamCodec<FriendlyByteBuf, ClientboundBeehivePayload> STREAM_CODEC = CustomPacketPayload.codec(ClientboundBeehivePayload::write, ClientboundBeehivePayload::new);
++    public static final Type<ClientboundBeehivePayload> TYPE = new Type<>(new ResourceLocation("purpur", "beehive_s2c"));
++
++    public ClientboundBeehivePayload(FriendlyByteBuf friendlyByteBuf) {
++        this(friendlyByteBuf.readBlockPos(),  friendlyByteBuf.readInt());
++    }
++
++    private void write(FriendlyByteBuf friendlyByteBuf) {
++        friendlyByteBuf.writeBlockPos(this.pos);
++        friendlyByteBuf.writeInt(this.numOfBees);
++    }
++
++    @Override
++    public @NotNull Type<? extends CustomPacketPayload> type() {
++        return TYPE;
++    }
++}
+diff --git a/src/main/java/org/purpurmc/purpur/network/ServerboundBeehivePayload.java b/src/main/java/org/purpurmc/purpur/network/ServerboundBeehivePayload.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..27689754565bf048d1206d540913495d7194a54d
+--- /dev/null
++++ b/src/main/java/org/purpurmc/purpur/network/ServerboundBeehivePayload.java
+@@ -0,0 +1,26 @@
++package org.purpurmc.purpur.network;
++
++import net.minecraft.core.BlockPos;
++import net.minecraft.network.FriendlyByteBuf;
++import net.minecraft.network.codec.StreamCodec;
++import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
++import net.minecraft.resources.ResourceLocation;
++import org.jetbrains.annotations.NotNull;
++
++public record ServerboundBeehivePayload(BlockPos pos) implements CustomPacketPayload {
++    public static final StreamCodec<FriendlyByteBuf, ServerboundBeehivePayload> STREAM_CODEC = CustomPacketPayload.codec(ServerboundBeehivePayload::write, ServerboundBeehivePayload::new);
++    public static final Type<ServerboundBeehivePayload> TYPE = new Type<>(new ResourceLocation("purpur", "beehive_c2s"));
++
++    public ServerboundBeehivePayload(FriendlyByteBuf friendlyByteBuf) {
++        this(friendlyByteBuf.readBlockPos());
++    }
++
++    private void write(FriendlyByteBuf friendlyByteBuf) {
++        friendlyByteBuf.writeBlockPos(this.pos);
++    }
++
++    @Override
++    public @NotNull Type<? extends CustomPacketPayload> type() {
++        return TYPE;
++    }
++}
+diff --git a/src/main/java/org/purpurmc/purpur/task/BeehiveTask.java b/src/main/java/org/purpurmc/purpur/task/BeehiveTask.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..56fc359ea32228c2589ac30c9d00a9c4bea30db7
+--- /dev/null
++++ b/src/main/java/org/purpurmc/purpur/task/BeehiveTask.java
+@@ -0,0 +1,67 @@
++package org.purpurmc.purpur.task;
++
++import io.netty.buffer.Unpooled;
++import net.minecraft.network.FriendlyByteBuf;
++import net.minecraft.server.level.ServerPlayer;
++import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
++import net.minecraft.world.level.block.entity.BlockEntity;
++import org.bukkit.Bukkit;
++import org.bukkit.craftbukkit.entity.CraftPlayer;
++import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin;
++import org.bukkit.entity.Player;
++import org.bukkit.plugin.PluginBase;
++import org.bukkit.plugin.messaging.PluginMessageListener;
++import org.jetbrains.annotations.NotNull;
++import org.purpurmc.purpur.network.ClientboundBeehivePayload;
++import org.purpurmc.purpur.network.ServerboundBeehivePayload;
++
++public class BeehiveTask implements PluginMessageListener {
++
++    private static BeehiveTask instance;
++
++    public static BeehiveTask instance() {
++        if (instance == null) {
++            instance = new BeehiveTask();
++        }
++        return instance;
++    }
++
++    private final PluginBase plugin = new MinecraftInternalPlugin();
++
++    private BeehiveTask() {
++    }
++
++    public void register() {
++        Bukkit.getMessenger().registerOutgoingPluginChannel(this.plugin, ClientboundBeehivePayload.TYPE.id().toString());
++        Bukkit.getMessenger().registerIncomingPluginChannel(this.plugin, ServerboundBeehivePayload.TYPE.id().toString(), this);
++    }
++
++    public void unregister() {
++        Bukkit.getMessenger().unregisterOutgoingPluginChannel(this.plugin, ClientboundBeehivePayload.TYPE.id().toString());
++        Bukkit.getMessenger().unregisterIncomingPluginChannel(this.plugin, ServerboundBeehivePayload.TYPE.id().toString());
++    }
++
++    @Override
++    public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, byte[] bytes) {
++        FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.copiedBuffer(bytes));
++        ServerboundBeehivePayload payload = ServerboundBeehivePayload.STREAM_CODEC.decode(byteBuf);
++
++        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
++
++        // targeted block info max range specified in client at net.minecraft.client.gui.hud.DebugHud#render
++        if (!payload.pos().getCenter().closerThan(serverPlayer.position(), 20)) return; // Targeted Block info max range is 20
++        if (serverPlayer.level().getChunkIfLoaded(payload.pos()) == null) return;
++
++        BlockEntity blockEntity = serverPlayer.level().getBlockEntity(payload.pos());
++        if (!(blockEntity instanceof BeehiveBlockEntity beehive)) {
++            return;
++        }
++
++        ClientboundBeehivePayload customPacketPayload = new ClientboundBeehivePayload(payload.pos(), beehive.getOccupantCount());
++        FriendlyByteBuf friendlyByteBuf = new FriendlyByteBuf(Unpooled.buffer());
++        ClientboundBeehivePayload.STREAM_CODEC.encode(friendlyByteBuf, customPacketPayload);
++        byte[] byteArray = new byte[friendlyByteBuf.readableBytes()];
++        friendlyByteBuf.readBytes(byteArray);
++        player.sendPluginMessage(this.plugin, customPacketPayload.type().id().toString(), byteArray);
++    }
++}
diff --git a/patches/server/0227-Potion-NamespacedKey.patch b/patches/server/0227-Potion-NamespacedKey.patch
deleted file mode 100644
index 6093ea8d8..000000000
--- a/patches/server/0227-Potion-NamespacedKey.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Racci <tangentmoons@gmail.com>
-Date: Sat, 4 Dec 2021 00:07:05 +1100
-Subject: [PATCH] Potion NamespacedKey
-
-
-diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
-index 68e1b8271475996020af50b3b2cf04cd25aa6c85..4f2fcbcf90d6f5ee89e35c993a65cae6c5b7ed91 100644
---- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
-+++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java
-@@ -16,6 +16,7 @@ import net.minecraft.util.ExtraCodecs;
- import net.minecraft.util.Mth;
- import net.minecraft.world.entity.LivingEntity;
- import org.slf4j.Logger;
-+import org.bukkit.NamespacedKey;
- 
- public class MobEffectInstance implements Comparable<MobEffectInstance> {
-     private static final Logger LOGGER = LogUtils.getLogger();
-@@ -35,6 +36,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-     private boolean visible;
-     private boolean showIcon;
-     @Nullable
-+    private NamespacedKey key; // Purpur - add key
-     private MobEffectInstance hiddenEffect;
-     private final Optional<MobEffectInstance.FactorData> factorData;
- 
-@@ -54,17 +56,36 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-         this(type, duration, amplifier, ambient, visible, visible);
-     }
- 
-+    // Purpur start
-+    public MobEffectInstance(MobEffect type, int duration, int amplifier, boolean ambient, boolean visible, @Nullable NamespacedKey key) {
-+        this(type, duration, amplifier, ambient, visible, visible, key);
-+    }
-+    // Purpur end
-+
-     public MobEffectInstance(MobEffect type, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon) {
--        this(type, duration, amplifier, ambient, showParticles, showIcon, (MobEffectInstance)null, type.createFactorData());
-+        // Purpur start
-+        this(type, duration, amplifier, ambient, showParticles, showIcon, (MobEffectInstance)null, type.createFactorData(), (NamespacedKey)null);
-+    }
-+
-+    public MobEffectInstance(MobEffect type, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon, @Nullable NamespacedKey key) {
-+        this(type, duration, amplifier, ambient, showParticles, showIcon, (MobEffectInstance)null, type.createFactorData(), key);
-+        // Purpur end
-     }
- 
-     public MobEffectInstance(MobEffect type, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon, @Nullable MobEffectInstance hiddenEffect, Optional<MobEffectInstance.FactorData> factorCalculationData) {
-+        // Purpur start
-+        this(type, duration, amplifier, ambient, showParticles, showIcon, hiddenEffect, factorCalculationData, (NamespacedKey) null);
-+    }
-+
-+    public MobEffectInstance(MobEffect type, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon, @Nullable MobEffectInstance hiddenEffect, Optional<MobEffectInstance.FactorData> factorCalculationData, @Nullable NamespacedKey key) {
-+        // Purpur end
-         this.effect = type;
-         this.duration = duration;
-         this.amplifier = amplifier;
-         this.ambient = ambient;
-         this.visible = showParticles;
-         this.showIcon = showIcon;
-+        this.key = key; // Purpur - add key
-         this.hiddenEffect = hiddenEffect;
-         this.factorData = factorCalculationData;
-     }
-@@ -85,6 +106,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-         this.ambient = that.ambient;
-         this.visible = that.visible;
-         this.showIcon = that.showIcon;
-+        this.key = that.key; // Purpur - add key
-     }
- 
-     public boolean update(MobEffectInstance that) {
-@@ -129,6 +151,13 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-             bl = true;
-         }
- 
-+        // Purpur start
-+        if (that.key != this.key) {
-+            this.key = that.key;
-+            bl = true;
-+        }
-+        // Purpur end
-+
-         return bl;
-     }
- 
-@@ -172,6 +201,17 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-         return this.showIcon;
-     }
- 
-+    // Purpur start
-+    public boolean hasKey() {
-+        return this.key != null;
-+    }
-+
-+    @Nullable
-+    public NamespacedKey getKey() {
-+        return this.key;
-+    }
-+    // Purpur end
-+
-     public boolean tick(LivingEntity entity, Runnable overwriteCallback) {
-         if (this.hasRemainingDuration()) {
-             int i = this.isInfiniteDuration() ? entity.tickCount : this.duration;
-@@ -232,6 +272,12 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-             string = string + ", Show Icon: false";
-         }
- 
-+        // Purpur start
-+        if (this.hasKey()) {
-+            string = string + ", Key: " + this.key;
-+        }
-+        // Purpur end
-+
-         return string;
-     }
- 
-@@ -247,7 +293,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-             return false;
-         } else {
-             MobEffectInstance mobEffectInstance = (MobEffectInstance)object;
--            return this.duration == mobEffectInstance.duration && this.amplifier == mobEffectInstance.amplifier && this.ambient == mobEffectInstance.ambient && this.effect.equals(mobEffectInstance.effect);
-+            return this.duration == mobEffectInstance.duration && this.amplifier == mobEffectInstance.amplifier && this.ambient == mobEffectInstance.ambient && this.effect.equals(mobEffectInstance.effect) && this.key == mobEffectInstance.key; // Purpur - add key
-         }
-     }
- 
-@@ -272,6 +318,11 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-         nbt.putBoolean("ambient", this.isAmbient());
-         nbt.putBoolean("show_particles", this.isVisible());
-         nbt.putBoolean("show_icon", this.showIcon());
-+        // Purpur start
-+        if (this.key != null) {
-+            nbt.putString("key", this.key.toString());
-+        }
-+        // Purpur end
-         if (this.hiddenEffect != null) {
-             CompoundTag compoundTag = new CompoundTag();
-             this.hiddenEffect.save(compoundTag);
-@@ -306,6 +357,13 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-             bl3 = nbt.getBoolean("show_icon");
-         }
- 
-+        // Purpur start
-+        NamespacedKey key = null;
-+        if (nbt.contains("key")) {
-+            key = NamespacedKey.fromString(nbt.getString("key"));
-+        }
-+        // Purpur end
-+
-         MobEffectInstance mobEffectInstance = null;
-         if (nbt.contains("hidden_effect", 10)) {
-             mobEffectInstance = loadSpecifiedEffect(type, nbt.getCompound("hidden_effect"));
-@@ -318,7 +376,7 @@ public class MobEffectInstance implements Comparable<MobEffectInstance> {
-             optional = Optional.empty();
-         }
- 
--        return new MobEffectInstance(type, j, Math.max(i, 0), bl, bl2, bl3, mobEffectInstance, optional);
-+        return new MobEffectInstance(type, j, Math.max(i, 0), bl, bl2, bl3, mobEffectInstance, optional, key); // Purpur - add key
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 42b336a96e5c786b95356200da7d02bfd8b584dc..f79d79d7c9ca18ac711b81c8c3d94e2145aa5bf0 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -465,7 +465,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     @Override
-     public boolean addPotionEffect(PotionEffect effect, boolean force) {
-         org.spigotmc.AsyncCatcher.catchOp("effect add"); // Paper
--        this.getHandle().addEffect(new MobEffectInstance(CraftPotionEffectType.bukkitToMinecraft(effect.getType()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon
-+        this.getHandle().addEffect(new MobEffectInstance(CraftPotionEffectType.bukkitToMinecraft(effect.getType()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon(), effect.getKey()), EntityPotionEffectEvent.Cause.PLUGIN); // Purpur - add key // Paper - Don't ignore icon
-         return true;
-     }
- 
-@@ -486,7 +486,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     @Override
-     public PotionEffect getPotionEffect(PotionEffectType type) {
-         MobEffectInstance handle = this.getHandle().getEffect(CraftPotionEffectType.bukkitToMinecraft(type));
--        return (handle == null) ? null : new PotionEffect(CraftPotionEffectType.minecraftToBukkit(handle.getEffect()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient(), handle.isVisible());
-+        return (handle == null) ? null : new PotionEffect(CraftPotionEffectType.minecraftToBukkit(handle.getEffect()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient(), handle.isVisible(), handle.getKey()); // Purpur - add key
-     }
- 
-     @Override
-@@ -498,7 +498,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public Collection<PotionEffect> getActivePotionEffects() {
-         List<PotionEffect> effects = new ArrayList<PotionEffect>();
-         for (MobEffectInstance handle : this.getHandle().activeEffects.values()) {
--            effects.add(new PotionEffect(CraftPotionEffectType.minecraftToBukkit(handle.getEffect()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient(), handle.isVisible()));
-+            effects.add(new PotionEffect(CraftPotionEffectType.minecraftToBukkit(handle.getEffect()), handle.getDuration(), handle.getAmplifier(), handle.isAmbient(), handle.isVisible(), handle.getKey())); // Purpur - add key
-         }
-         return effects;
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
-index 5a71efd27180004ee91495d9255867dbdfa1783e..1dcc3405393d11836a21aa16e435be64c04f6e7d 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java
-@@ -43,6 +43,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
-     static final ItemMetaKey POTION_COLOR = new ItemMetaKey("CustomPotionColor", "custom-color");
-     static final ItemMetaKey ID = new ItemMetaKey("id", "potion-id");
-     static final ItemMetaKey DEFAULT_POTION = new ItemMetaKey("Potion", "potion-type");
-+    static final ItemMetaKey KEY = new ItemMetaKey("key", "namespacedkey"); // Purpur - add key
- 
-     // Having an initial "state" in ItemMeta seems bit dirty but the UNCRAFTABLE potion type
-     // is treated as the empty form of the meta because it represents an empty potion with no effect
-@@ -92,7 +93,13 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
-                 boolean ambient = effect.getBoolean(AMBIENT.NBT);
-                 boolean particles = effect.contains(SHOW_PARTICLES.NBT, CraftMagicNumbers.NBT.TAG_BYTE) ? effect.getBoolean(SHOW_PARTICLES.NBT) : true;
-                 boolean icon = effect.contains(SHOW_ICON.NBT, CraftMagicNumbers.NBT.TAG_BYTE) ? effect.getBoolean(SHOW_ICON.NBT) : particles;
--                this.customEffects.add(new PotionEffect(type, duration, amp, ambient, particles, icon));
-+                // Purpur start
-+                NamespacedKey key = null;
-+                if (tag.contains(KEY.NBT)) {
-+                    key = NamespacedKey.fromString(effect.getString(KEY.NBT));
-+                }
-+                this.customEffects.add(new PotionEffect(type, duration, amp, ambient, particles, icon, key));
-+                // Purpur end
-             }
-         }
-     }
-@@ -139,6 +146,11 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
-                 effectData.putBoolean(AMBIENT.NBT, effect.isAmbient());
-                 effectData.putBoolean(SHOW_PARTICLES.NBT, effect.hasParticles());
-                 effectData.putBoolean(SHOW_ICON.NBT, effect.hasIcon());
-+                // Purpur start
-+                if (effect.hasKey()) {
-+                    effectData.putString(KEY.NBT, effect.getKey().toString());
-+                }
-+                // Purpur end
-                 effectList.add(effectData);
-             }
-         }
-@@ -200,7 +212,7 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta {
-         if (index != -1) {
-             if (overwrite) {
-                 PotionEffect old = this.customEffects.get(index);
--                if (old.getAmplifier() == effect.getAmplifier() && old.getDuration() == effect.getDuration() && old.isAmbient() == effect.isAmbient()) {
-+                if (old.getAmplifier() == effect.getAmplifier() && old.getDuration() == effect.getDuration() && old.isAmbient() == effect.isAmbient() && old.getKey() == effect.getKey()) { // Purpur - add key
-                     return false;
-                 }
-                 this.customEffects.set(index, effect);
-diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
-index 354393cbf0f113f14e936b40da56125a3130cbd9..a1ef7ecdf272546bdd76bb4b2ecd86a69c51c777 100644
---- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
-+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
-@@ -101,7 +101,7 @@ public class CraftPotionUtil {
- 
-     public static MobEffectInstance fromBukkit(PotionEffect effect) {
-         MobEffect type = CraftPotionEffectType.bukkitToMinecraft(effect.getType());
--        return new MobEffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles());
-+        return new MobEffectInstance(type, effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.getKey()); // Purpur - add key
-     }
- 
-     public static PotionEffect toBukkit(MobEffectInstance effect) {
-@@ -110,7 +110,7 @@ public class CraftPotionUtil {
-         int duration = effect.getDuration();
-         boolean ambient = effect.isAmbient();
-         boolean particles = effect.isVisible();
--        return new PotionEffect(type, duration, amp, ambient, particles);
-+        return new PotionEffect(type, duration, amp, ambient, particles, effect.getKey()); // Purpur - add key
-     }
- 
-     public static boolean equals(MobEffect mobEffect, PotionEffectType type) {
-diff --git a/src/test/java/org/bukkit/potion/PotionTest.java b/src/test/java/org/bukkit/potion/PotionTest.java
-index 70a655df7195da8e037c22064c4ebfe5d771e884..cfdf155af7ec29dd221989edbd8623d27529f9e6 100644
---- a/src/test/java/org/bukkit/potion/PotionTest.java
-+++ b/src/test/java/org/bukkit/potion/PotionTest.java
-@@ -9,6 +9,7 @@ import net.minecraft.resources.ResourceLocation;
- import net.minecraft.world.effect.MobEffect;
- import net.minecraft.world.effect.MobEffectInstance;
- import net.minecraft.world.item.alchemy.Potion;
-+import org.bukkit.NamespacedKey;
- import org.bukkit.craftbukkit.potion.CraftPotionEffectType;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.jupiter.api.Test;
-@@ -46,4 +47,27 @@ public class PotionTest extends AbstractTestingBase {
-             assertEquals(bukkit, byName, "Same type not returned by name " + key);
-         }
-     }
-+
-+    // Purpur start
-+    @Test
-+    public void testNamespacedKey() {
-+        NamespacedKey key = new NamespacedKey("testnamespace", "testkey");
-+        PotionEffect namedSpacedEffect = new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 20, 0, true, true, true, key);
-+        assertNotNull(namedSpacedEffect.getKey());
-+        assertTrue(namedSpacedEffect.hasKey());
-+        assertFalse(namedSpacedEffect.withKey(null).hasKey());
-+
-+        PotionEffect effect = new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 20, 0, true, true, true);
-+        assertNull(effect.getKey());
-+        assertFalse(effect.hasKey());
-+        assertTrue(namedSpacedEffect.withKey(key).hasKey());
-+
-+        Map<String, Object> s1 = namedSpacedEffect.serialize();
-+        Map<String, Object> s2 = effect.serialize();
-+        assertTrue(s1.containsKey("namespacedKey"));
-+        assertFalse(s2.containsKey("namespacedKey"));
-+        assertNotNull(new PotionEffect(s1).getKey());
-+        assertNull(new PotionEffect(s2).getKey());
-+    }
-+    // Purpur end
- }
diff --git a/patches/server/0237-Configurable-farmland-trample-height.patch b/patches/server/0228-Configurable-farmland-trample-height.patch
similarity index 90%
rename from patches/server/0237-Configurable-farmland-trample-height.patch
rename to patches/server/0228-Configurable-farmland-trample-height.patch
index 41e01486d..0501b9fda 100644
--- a/patches/server/0237-Configurable-farmland-trample-height.patch
+++ b/patches/server/0228-Configurable-farmland-trample-height.patch
@@ -22,10 +22,10 @@ Value set -> Actual fall distance needed to trample
    6.0 -> 6.75
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 56e66fcd840d0d3681ba671d1ffc51b232631461..d566f67f8f6f1748023430de4f191881b79e44a1 100644
+index 12a0c69f8fec30fad64cbb00af2ca1bbf0ea5153..d0ec0722496ed931b48c4e7076fddbb1ed36e111 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -101,7 +101,7 @@ public class FarmBlock extends Block {
+@@ -111,7 +111,7 @@ public class FarmBlock extends Block {
      @Override
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
          super.fallOn(world, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
@@ -35,10 +35,10 @@ index 56e66fcd840d0d3681ba671d1ffc51b232631461..d566f67f8f6f1748023430de4f191881
              org.bukkit.event.Cancellable cancellable;
              if (entity instanceof Player) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 60beda5c1f3b7ca562b8ba9ff48e0c6e50e89649..3d1107d954d8dd040895908ddadf2c11c437a9ef 100644
+index c57bf82ab2ef1827b76f57ed8aff9aee08706fb3..ed600eacc335f9468db65e0ebde622451ab7a6a8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -889,6 +889,7 @@ public class PurpurWorldConfig {
+@@ -968,6 +968,7 @@ public class PurpurWorldConfig {
      public boolean farmlandTramplingDisabled = false;
      public boolean farmlandTramplingOnlyPlayers = false;
      public boolean farmlandTramplingFeatherFalling = false;
@@ -46,7 +46,7 @@ index 60beda5c1f3b7ca562b8ba9ff48e0c6e50e89649..3d1107d954d8dd040895908ddadf2c11
      private void farmlandSettings() {
          farmlandBypassMobGriefing = getBoolean("blocks.farmland.bypass-mob-griefing", farmlandBypassMobGriefing);
          farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
-@@ -896,6 +897,7 @@ public class PurpurWorldConfig {
+@@ -975,6 +976,7 @@ public class PurpurWorldConfig {
          farmlandTramplingDisabled = getBoolean("blocks.farmland.disable-trampling", farmlandTramplingDisabled);
          farmlandTramplingOnlyPlayers = getBoolean("blocks.farmland.only-players-trample", farmlandTramplingOnlyPlayers);
          farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
diff --git a/patches/server/0238-Configurable-player-pickup-exp-delay.patch b/patches/server/0229-Configurable-player-pickup-exp-delay.patch
similarity index 85%
rename from patches/server/0238-Configurable-player-pickup-exp-delay.patch
rename to patches/server/0229-Configurable-player-pickup-exp-delay.patch
index 5d9cec27e..ce253f4c1 100644
--- a/patches/server/0238-Configurable-player-pickup-exp-delay.patch
+++ b/patches/server/0229-Configurable-player-pickup-exp-delay.patch
@@ -9,23 +9,23 @@ players still only pick up one orb every tick. However, setting this
 to any negative number will pick up all orbs instantly.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 2bd576849403bc2cfae298c2210616192ddc38db..b2233635b6acc35ea3668c36c56e57f15420ac62 100644
+index 7ca70e9ddda24e2fe661c7b13fa439a6c19726dd..ce608784e0e35b67dde377436aaf42c956ce0644 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -313,7 +313,7 @@ public class ExperienceOrb extends Entity {
+@@ -320,7 +320,7 @@ public class ExperienceOrb extends Entity {
      public void playerTouch(Player player) {
          if (!this.level().isClientSide) {
-             if (player.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper
+             if (player.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent
 -                player.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(player, 2, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2;
 +                player.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(player, this.level().purpurConfig.playerExpPickupDelay, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2; // Purpur
                  player.take(this, 1);
                  int i = this.repairPlayerItems(player, this.value);
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 52b4ffc17ac913bf64cf6a6b7a37ae6e5af9bd87..20c3d3c9d2150574e9b4761dc1bda11cee04862f 100644
+index 0460bdb52ce6b29cf57ef8f2d7f430e761c82d85..845c4af5d5d38d54de4a1b20fe32bf5dd4776a29 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -636,7 +636,7 @@ public abstract class Player extends LivingEntity {
+@@ -632,7 +632,7 @@ public abstract class Player extends LivingEntity {
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();
  
@@ -35,10 +35,10 @@ index 52b4ffc17ac913bf64cf6a6b7a37ae6e5af9bd87..20c3d3c9d2150574e9b4761dc1bda11c
                  } else if (!entity.isRemoved()) {
                      this.touch(entity);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3d1107d954d8dd040895908ddadf2c11c437a9ef..f0f83c4570c79ed88275631ee35aa20e5ef27748 100644
+index ed600eacc335f9468db65e0ebde622451ab7a6a8..ae3e4547a7bd00432d51ead5bdef5703499c297f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -422,6 +422,7 @@ public class PurpurWorldConfig {
+@@ -428,6 +428,7 @@ public class PurpurWorldConfig {
      public boolean playerRidableInWater = false;
      public boolean playerRemoveBindingWithWeakness = false;
      public int shiftRightClickRepairsMendingPoints = 0;
@@ -46,11 +46,11 @@ index 3d1107d954d8dd040895908ddadf2c11c437a9ef..f0f83c4570c79ed88275631ee35aa20e
      private void playerSettings() {
          if (PurpurConfig.version < 19) {
              boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -449,6 +450,7 @@ public class PurpurWorldConfig {
+@@ -453,6 +454,7 @@ public class PurpurWorldConfig {
          playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
          playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
          shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
 +        playerExpPickupDelay = getInt("gameplay-mechanics.player.exp-pickup-delay-ticks", playerExpPickupDelay);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0239-Allow-void-trading.patch b/patches/server/0230-Allow-void-trading.patch
similarity index 80%
rename from patches/server/0239-Allow-void-trading.patch
rename to patches/server/0230-Allow-void-trading.patch
index 7d1e315f4..6230ad656 100644
--- a/patches/server/0239-Allow-void-trading.patch
+++ b/patches/server/0230-Allow-void-trading.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Allow void trading
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 492a50f3b619753f8a353c739a3f10c44dfa7861..3c8585976bbfcb33c26ee5fde8448805e0f97e1a 100644
+index 42db3e64b120b753e98a0fd7e3f56c7d28256fd2..ae2b9732b2795ea7faec96af4c27ccb04f772307 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2878,7 +2878,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2855,7 +2855,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
-                 // Paper start
+                 // Paper start - Fix merchant inventory not closing on entity removal
 -                if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) {
 +                if (!entity.level().purpurConfig.playerVoidTrading && entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) { // Purpur
                      merchant.getTrader().closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED);
                  }
-                 // Paper end
+                 // Paper end - Fix merchant inventory not closing on entity removal
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f0f83c4570c79ed88275631ee35aa20e5ef27748..6008732a98759ac23daab766ea986162b816945f 100644
+index ae3e4547a7bd00432d51ead5bdef5703499c297f..38f417bde3e05124a9ebc23c2c5ea2f4d9d7cefe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -423,6 +423,7 @@ public class PurpurWorldConfig {
+@@ -429,6 +429,7 @@ public class PurpurWorldConfig {
      public boolean playerRemoveBindingWithWeakness = false;
      public int shiftRightClickRepairsMendingPoints = 0;
      public int playerExpPickupDelay = 2;
@@ -29,11 +29,11 @@ index f0f83c4570c79ed88275631ee35aa20e5ef27748..6008732a98759ac23daab766ea986162
      private void playerSettings() {
          if (PurpurConfig.version < 19) {
              boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-@@ -451,6 +452,7 @@ public class PurpurWorldConfig {
+@@ -455,6 +456,7 @@ public class PurpurWorldConfig {
          playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
          shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
          playerExpPickupDelay = getInt("gameplay-mechanics.player.exp-pickup-delay-ticks", playerExpPickupDelay);
 +        playerVoidTrading = getBoolean("gameplay-mechanics.player.allow-void-trading", playerVoidTrading);
      }
  
-     private static boolean projectileDespawnRateSettingsMigrated = false;
+     public boolean silkTouchEnabled = false;
diff --git a/patches/server/0230-Shearing-jeb-produces-random-color-wool.patch b/patches/server/0230-Shearing-jeb-produces-random-color-wool.patch
deleted file mode 100644
index 94433ce00..000000000
--- a/patches/server/0230-Shearing-jeb-produces-random-color-wool.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Fri, 31 Dec 2021 06:03:12 -0600
-Subject: [PATCH] Shearing jeb produces random color wool
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index f2d0c67709e38209a8a02e98f4392b9e0a53c211..fb477c3c594bb81e92ae0c606635c309840d0dc5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -317,7 +317,7 @@ public class Sheep extends Animal implements Shearable {
- 
-         for (int j = 0; j < i; ++j) {
-             this.forceDrops = true; // CraftBukkit
--            ItemEntity entityitem = this.spawnAtLocation((ItemLike) Sheep.ITEM_BY_DYE.get(this.getColor()), 1);
-+            ItemEntity entityitem = this.spawnAtLocation((ItemLike) Sheep.ITEM_BY_DYE.get(this.level().purpurConfig.sheepShearJebRandomColor && hasCustomName() && getCustomName().getString().equals("jeb_") ? DyeColor.random(this.level().random) : this.getColor()), 1); // Purpur
-             this.forceDrops = false; // CraftBukkit
- 
-             if (entityitem != null) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index bda73dd90c7d5e72996efca0a41e7f4785c6f548..fad281ec8314d4431126abbcea997932401ea95e 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2303,6 +2303,7 @@ public class PurpurWorldConfig {
-     public boolean sheepBypassMobGriefing = false;
-     public boolean sheepTakeDamageFromWater = false;
-     public boolean sheepAlwaysDropExp = false;
-+    public boolean sheepShearJebRandomColor = false;
-     private void sheepSettings() {
-         sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
-         sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
-@@ -2317,6 +2318,7 @@ public class PurpurWorldConfig {
-         sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
-         sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
-         sheepAlwaysDropExp = getBoolean("mobs.sheep.always-drop-exp", sheepAlwaysDropExp);
-+        sheepShearJebRandomColor = getBoolean("mobs.sheep.jeb-shear-random-color", sheepShearJebRandomColor);
-     }
- 
-     public boolean shulkerRidable = false;
diff --git a/patches/server/0240-Configurable-phantom-size.patch b/patches/server/0231-Configurable-phantom-size.patch
similarity index 84%
rename from patches/server/0240-Configurable-phantom-size.patch
rename to patches/server/0231-Configurable-phantom-size.patch
index 54fe29305..be3b119dc 100644
--- a/patches/server/0240-Configurable-phantom-size.patch
+++ b/patches/server/0231-Configurable-phantom-size.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Configurable phantom size
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index ab9ed9acc394dedf2151b83ff5cf998e0e0be21e..355445b7f8972cb789d33f59d03c382f238c294d 100644
+index 0d81540d048cd4a08962bd24d3bdd49db708f83f..26077bd6eeedbdae84613188cb0f336abb3563d2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -272,7 +272,11 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -265,7 +265,11 @@ public class Phantom extends FlyingMob implements Enemy {
      @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
+     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData) {
          this.anchorPoint = this.blockPosition().above(5);
 -        this.setPhantomSize(0);
 +        // Purpur start
@@ -18,14 +18,14 @@ index ab9ed9acc394dedf2151b83ff5cf998e0e0be21e..355445b7f8972cb789d33f59d03c382f
 +        int max = world.getLevel().purpurConfig.phantomMaxSize;
 +        this.setPhantomSize(min == max ? min : world.getRandom().nextInt(max + 1 - min) + min);
 +        // Purpur end
-         return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
+         return super.finalizeSpawn(world, difficulty, spawnReason, entityData);
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6008732a98759ac23daab766ea986162b816945f..807ca55a5734fccb10b1aae2d99e0b37aeffc614 100644
+index 38f417bde3e05124a9ebc23c2c5ea2f4d9d7cefe..b66b8eda76779e3e5807907dc3ce28e4504299a0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2048,6 +2048,8 @@ public class PurpurWorldConfig {
+@@ -2112,6 +2112,8 @@ public class PurpurWorldConfig {
      public boolean phantomFlamesOnSwoop = false;
      public boolean phantomTakeDamageFromWater = false;
      public boolean phantomAlwaysDropExp = false;
@@ -34,7 +34,7 @@ index 6008732a98759ac23daab766ea986162b816945f..807ca55a5734fccb10b1aae2d99e0b37
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -2084,6 +2086,13 @@ public class PurpurWorldConfig {
+@@ -2148,6 +2150,13 @@ public class PurpurWorldConfig {
          phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
          phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
          phantomAlwaysDropExp = getBoolean("mobs.phantom.always-drop-exp", phantomAlwaysDropExp);
diff --git a/patches/server/0242-Max-joins-per-second.patch b/patches/server/0232-Max-joins-per-second.patch
similarity index 77%
rename from patches/server/0242-Max-joins-per-second.patch
rename to patches/server/0232-Max-joins-per-second.patch
index 9459c82e2..14ae2c131 100644
--- a/patches/server/0242-Max-joins-per-second.patch
+++ b/patches/server/0232-Max-joins-per-second.patch
@@ -6,17 +6,17 @@ Subject: [PATCH] Max joins per second
 When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index c0ea20dcee8bb293df96bc6ee019e50ad6b383fd..ff99d6fa919391d43b7737a2819cf9ebb7e134da 100644
+index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..71b021513f30376c7b09d83059deea89cc92385f 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -569,11 +569,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-     private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper
-     private static int joinAttemptsThisTick; // Paper
-     private static int currTick; // Paper
+@@ -608,11 +608,20 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world
+     private static int joinAttemptsThisTick; // Paper - Buffer joins to world
+     private static int currTick; // Paper - Buffer joins to world
 +    private static int tickSecond; // Purpur
      public void tick() {
          this.flushQueue();
-         // Paper start
+         // Paper start - Buffer joins to world
          if (Connection.currTick != net.minecraft.server.MinecraftServer.currentTick) {
              Connection.currTick = net.minecraft.server.MinecraftServer.currentTick;
 +            // Purpur start
@@ -29,12 +29,12 @@ index c0ea20dcee8bb293df96bc6ee019e50ad6b383fd..ff99d6fa919391d43b7737a2819cf9eb
 +            // Purpur end
              Connection.joinAttemptsThisTick = 0;
          }
-         // Paper end
+         // Paper end - Buffer joins to world
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index fa81039056af14c37426a508b7b2da77e8b50737..44e8822dae170c07e48ae016826a6710b7d7e29a 100644
+index 0d6b99822a3a743fe50362702afdca52f6a4a88e..5879af630bc3711a17d51f455585ccd31f7a6d88 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -451,8 +451,10 @@ public class PurpurConfig {
+@@ -456,8 +456,10 @@ public class PurpurConfig {
      }
  
      public static boolean useUPnP = false;
diff --git a/patches/server/0243-Configurable-minimum-demand-for-trades.patch b/patches/server/0233-Configurable-minimum-demand-for-trades.patch
similarity index 81%
rename from patches/server/0243-Configurable-minimum-demand-for-trades.patch
rename to patches/server/0233-Configurable-minimum-demand-for-trades.patch
index 5b7a62303..19a768732 100644
--- a/patches/server/0243-Configurable-minimum-demand-for-trades.patch
+++ b/patches/server/0233-Configurable-minimum-demand-for-trades.patch
@@ -9,10 +9,10 @@ This patch adds a config option to allow the minimum demand to instead
 be configurable.
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 1ad37f05e37551c72f780c56ff0c01ccc4907ed4..54c96e3e2a0b7efe082a0cb48492c0605d0db51b 100644
+index 17a247455dd853ae98e2f82f64a99bccc4d27438..4fa66af33ede3949f4e0236c806e3373f9dea730 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -546,7 +546,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -545,7 +545,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          while (iterator.hasNext()) {
              MerchantOffer merchantrecipe = (MerchantOffer) iterator.next();
  
@@ -22,28 +22,28 @@ index 1ad37f05e37551c72f780c56ff0c01ccc4907ed4..54c96e3e2a0b7efe082a0cb48492c060
  
      }
 diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-index 4f7457578ab3118d10e0d5dfc23d79c9b20c2f44..e03ce53b93d1b9366f2a7f14f341750a163ae0db 100644
+index 0efc8d997b34302c3e0a5d7ec73a11a940dbeefe..af157881d440b34cfe79fbc9b03cc9ef28515eb8 100644
 --- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
 +++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-@@ -149,7 +149,12 @@ public class MerchantOffer {
+@@ -131,7 +131,12 @@ public class MerchantOffer {
      }
  
      public void updateDemand() {
--        this.demand = Math.max(0, this.demand + this.uses - (this.maxUses - this.uses)); // Paper
+-        this.demand = Math.max(0, this.demand + this.uses - (this.maxUses - this.uses)); // Paper - Fix MC-163962
 +        // Purpur start
 +        this.updateDemand(0);
 +    }
 +    public void updateDemand(int minimumDemand) {
-+        this.demand = Math.max(minimumDemand, this.demand + this.uses - (this.maxUses - this.uses));
++        this.demand = Math.max(minimumDemand, this.demand + this.uses - (this.maxUses - this.uses)); // Paper - Fix MC-163962
 +        // Purpur end
      }
  
      public ItemStack assemble() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 807ca55a5734fccb10b1aae2d99e0b37aeffc614..321c625b1374e1a5676459d33f071d62ad45437b 100644
+index b66b8eda76779e3e5807907dc3ce28e4504299a0..e9bd0ab6bdfe6662ac26732bb91c3c21e91c4225 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2731,6 +2731,7 @@ public class PurpurWorldConfig {
+@@ -2793,6 +2793,7 @@ public class PurpurWorldConfig {
      public boolean villagerTakeDamageFromWater = false;
      public boolean villagerAllowTrading = true;
      public boolean villagerAlwaysDropExp = false;
@@ -51,7 +51,7 @@ index 807ca55a5734fccb10b1aae2d99e0b37aeffc614..321c625b1374e1a5676459d33f071d62
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2751,6 +2752,7 @@ public class PurpurWorldConfig {
+@@ -2813,6 +2814,7 @@ public class PurpurWorldConfig {
          villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
          villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
          villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
diff --git a/patches/server/0244-Lobotomize-stuck-villagers.patch b/patches/server/0234-Lobotomize-stuck-villagers.patch
similarity index 79%
rename from patches/server/0244-Lobotomize-stuck-villagers.patch
rename to patches/server/0234-Lobotomize-stuck-villagers.patch
index 45e66ed8e..bcb788061 100644
--- a/patches/server/0244-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0234-Lobotomize-stuck-villagers.patch
@@ -5,31 +5,32 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 54c96e3e2a0b7efe082a0cb48492c0605d0db51b..6760c9cc9ee244b7adca379d7e34696c48b65dbf 100644
+index 4fa66af33ede3949f4e0236c806e3373f9dea730..dd74825c04543ae8c0bb1ab5eef6c8a152b621fd 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -141,6 +141,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -142,6 +142,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }, MemoryModuleType.MEETING_POINT, (entityvillager, holder) -> {
          return holder.is(PoiTypes.MEETING);
      });
 +    private boolean isLobotomized = false; public boolean isLobotomized() { return this.isLobotomized; } // Purpur
 +    private int notLobotomizedCount = 0; // Purpur
  
-     public long nextGolemPanic = -1; // Pufferfish
- 
-@@ -200,6 +202,47 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+     public Villager(EntityType<? extends Villager> entityType, Level world) {
+         this(entityType, world, VillagerType.PLAINS);
+@@ -199,6 +201,48 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return this.level().purpurConfig.villagerAlwaysDropExp;
      }
  
 +    private boolean checkLobotomized() {
 +        int interval = this.level().purpurConfig.villagerLobotomizeCheckInterval;
++        boolean shouldCheckForTradeLocked = this.level().purpurConfig.villagerLobotomizeWaitUntilTradeLocked;
 +        if (this.notLobotomizedCount > 3) {
 +            // check half as often if not lobotomized for the last 3+ consecutive checks
 +            interval *= 2;
 +        }
 +        if (this.level().getGameTime() % interval == 0) {
 +            // offset Y for short blocks like dirt_path/farmland
-+            this.isLobotomized = !canTravelFrom(BlockPos.containing(this.position().x, this.getBoundingBox().minY + 0.0625D, this.position().z));
++            this.isLobotomized = !(shouldCheckForTradeLocked && this.getVillagerXp() == 0) && !canTravelFrom(BlockPos.containing(this.position().x, this.getBoundingBox().minY + 0.0625D, this.position().z));
 +
 +            if (this.isLobotomized) {
 +                this.notLobotomizedCount = 0;
@@ -65,7 +66,7 @@ index 54c96e3e2a0b7efe082a0cb48492c0605d0db51b..6760c9cc9ee244b7adca379d7e34696c
      @Override
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
-@@ -297,14 +340,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -295,10 +339,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          // Paper start
          this.customServerAiStep(false);
      }
@@ -73,27 +74,21 @@ index 54c96e3e2a0b7efe082a0cb48492c0605d0db51b..6760c9cc9ee244b7adca379d7e34696c
 +    protected void customServerAiStep(boolean inactive) { // Purpur - not final
          // Paper end
          this.level().getProfiler().push("villagerBrain");
--        // Pufferfish start
--        if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) { // Purpur - only use brain if no rider
--            this.getBrain().tick((ServerLevel) this.level(), this); // Paper
 +        // Purpur start
 +        if (this.level().purpurConfig.villagerLobotomizeEnabled) {
 +            // treat as inactive if lobotomized
 +            inactive = inactive || checkLobotomized();
 +        } else {
-+            // clean up state for API
 +            this.isLobotomized = false;
-         }
--        // Pufferfish end
-+        if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Purpur - only use brain if no rider
-+            this.getBrain().tick((ServerLevel) this.level(), this); // Paper
-+        else if (this.isLobotomized && shouldRestock()) restock();
++        }
 +        // Purpur end
-         this.level().getProfiler().pop();
-         if (this.assignProfessionWhenSpawned) {
-             this.assignProfessionWhenSpawned = false;
+         if (!inactive) this.getBrain().tick((ServerLevel) this.level(), this); // Paper
++        else if (this.isLobotomized && shouldRestock()) restock(); // Purpur
+         /*// Purpur start // Purpur - TODO: Pufferfish
+         if (!inactive && (getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) { // Purpur - only use brain if no rider
+             this.getBrain().tick((ServerLevel) this.level(), this); // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index a67b5d20b956e0bf801c9eeb9330567c21927010..15c7dd5ae4ea040b91b665e5ce05c0d35ab1604e 100644
+index 6c15d40979fd3e3d246a447c432b321fbf29ada3..6ace76a829c88e2e747dbbcce0a6582c615fc56d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -252,4 +252,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
@@ -109,19 +104,20 @@ index a67b5d20b956e0bf801c9eeb9330567c21927010..15c7dd5ae4ea040b91b665e5ce05c0d3
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 321c625b1374e1a5676459d33f071d62ad45437b..3fa481c71331a19b58511392a840f47915639ce2 100644
+index e9bd0ab6bdfe6662ac26732bb91c3c21e91c4225..bf5c8eb060d88681166d4fff1704c8c63e6327ab 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2732,6 +2732,8 @@ public class PurpurWorldConfig {
+@@ -2794,6 +2794,9 @@ public class PurpurWorldConfig {
      public boolean villagerAllowTrading = true;
      public boolean villagerAlwaysDropExp = false;
      public int villagerMinimumDemand = 0;
 +    public boolean villagerLobotomizeEnabled = false;
 +    public int villagerLobotomizeCheckInterval = 100;
++    public boolean villagerLobotomizeWaitUntilTradeLocked = false;
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2753,6 +2755,17 @@ public class PurpurWorldConfig {
+@@ -2815,6 +2818,18 @@ public class PurpurWorldConfig {
          villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
          villagerAlwaysDropExp = getBoolean("mobs.villager.always-drop-exp", villagerAlwaysDropExp);
          villagerMinimumDemand = getInt("mobs.villager.minimum-demand", villagerMinimumDemand);
@@ -136,6 +132,7 @@ index 321c625b1374e1a5676459d33f071d62ad45437b..3fa481c71331a19b58511392a840f479
 +        }
 +        villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
 +        villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
++        villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked);
      }
  
      public boolean vindicatorRidable = false;
diff --git a/patches/server/0234-Shears-can-have-looting-enchantment.patch b/patches/server/0234-Shears-can-have-looting-enchantment.patch
deleted file mode 100644
index 01fadb23a..000000000
--- a/patches/server/0234-Shears-can-have-looting-enchantment.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@Gmail.com>
-Date: Mon, 3 Jan 2022 00:06:51 -0600
-Subject: [PATCH] Shears can have looting enchantment
-
-
-diff --git a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
-index e17090003988ad2c890d48666c2234b14d511345..433f1f11b8b92c7d48352416f79ab5a394c33287 100644
---- a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
-@@ -107,7 +107,7 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
-                         continue;
-                     }
-                     // CraftBukkit end
--                    ishearable.shear(SoundSource.BLOCKS);
-+                    ishearable.shear(SoundSource.BLOCKS, net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.MOB_LOOTING, CraftItemStack.asNMSCopy(craftItem))); // Purpur
-                     worldserver.gameEvent((Entity) null, GameEvent.SHEAR, blockposition);
-                     return true;
-                 }
-diff --git a/src/main/java/net/minecraft/world/entity/Shearable.java b/src/main/java/net/minecraft/world/entity/Shearable.java
-index 5e8cc5cfac8888628c6d513148f41be09ca65a2c..a089fc61ec09be6b7490375489178dc6ba5a644b 100644
---- a/src/main/java/net/minecraft/world/entity/Shearable.java
-+++ b/src/main/java/net/minecraft/world/entity/Shearable.java
-@@ -3,7 +3,13 @@ package net.minecraft.world.entity;
- import net.minecraft.sounds.SoundSource;
- 
- public interface Shearable {
--    void shear(SoundSource shearedSoundCategory);
-+    // Purpur start
-+    default void shear(SoundSource shearedSoundCategory) {
-+        shear(shearedSoundCategory, 0);
-+    }
-+
-+    void shear(SoundSource shearedSoundCategory, int looting);
-+    // Purpur end
- 
-     boolean readyForShearing();
- }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index ab5b150b379598861666ad32906e1fe454437063..59ef1070c6c1ac876e097cd23835e4ed8b6e732f 100644
---- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -163,7 +163,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-                 return tryRide(player, hand); // Purpur
-             }
-             // CraftBukkit end
--            this.shear(SoundSource.PLAYERS);
-+            this.shear(SoundSource.PLAYERS, net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
-             this.gameEvent(GameEvent.SHEAR, player);
-             if (!this.level().isClientSide) {
-                 itemstack.hurtAndBreak(1, player, (entityhuman1) -> {
-@@ -203,7 +203,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-     }
- 
-     @Override
--    public void shear(SoundSource shearedSoundCategory) {
-+    public void shear(SoundSource shearedSoundCategory, int looting) { // Purpur
-         this.level().playSound((Player) null, (Entity) this, SoundEvents.MOOSHROOM_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
-         if (!this.level().isClientSide()) {
-             Cow entitycow = (Cow) EntityType.COW.create(this.level());
-@@ -239,7 +239,7 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-                 this.discard(); // CraftBukkit - from above
-                 // CraftBukkit end
- 
--                for (int i = 0; i < 5; ++i) {
-+                for (int i = 0; i < 5 + (org.purpurmc.purpur.PurpurConfig.allowShearsLooting ? looting : 0); ++i) {
-                     // CraftBukkit start
-                     ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(1.0D), this.getZ(), new ItemStack(this.getVariant().blockState.getBlock()));
-                     EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index fb477c3c594bb81e92ae0c606635c309840d0dc5..8502fc1331c2e94992ab39e4e7ea0f36e83b06a5 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -295,7 +295,7 @@ public class Sheep extends Animal implements Shearable {
-                     return InteractionResult.PASS;
-                 }
-                 // CraftBukkit end
--                this.shear(SoundSource.PLAYERS);
-+                this.shear(SoundSource.PLAYERS, net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
-                 this.gameEvent(GameEvent.SHEAR, player);
-                 itemstack.hurtAndBreak(1, player, (entityhuman1) -> {
-                     entityhuman1.broadcastBreakEvent(hand);
-@@ -310,10 +310,11 @@ public class Sheep extends Animal implements Shearable {
-     }
- 
-     @Override
--    public void shear(SoundSource shearedSoundCategory) {
-+    public void shear(SoundSource shearedSoundCategory, int looting) { // Purpur
-         this.level().playSound((Player) null, (Entity) this, SoundEvents.SHEEP_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
-         this.setSheared(true);
-         int i = 1 + this.random.nextInt(3);
-+        if (org.purpurmc.purpur.PurpurConfig.allowShearsLooting) i += looting; // Purpur
- 
-         for (int j = 0; j < i; ++j) {
-             this.forceDrops = true; // CraftBukkit
-diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index fc8526af7e1df15794b4560b58e7f6a47508aa08..8b364fe9f3a3d47ae6daa331b8f16941ca17432a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -199,7 +199,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-                 return tryRide(player, hand); // Purpur
-             }
-             // CraftBukkit end
--            this.shear(SoundSource.PLAYERS);
-+            this.shear(SoundSource.PLAYERS, net.minecraft.world.item.enchantment.EnchantmentHelper.getMobLooting(player)); // Purpur
-             this.gameEvent(GameEvent.SHEAR, player);
-             if (!this.level().isClientSide) {
-                 itemstack.hurtAndBreak(1, player, (entityhuman1) -> {
-@@ -222,12 +222,13 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
-     }
- 
-     @Override
--    public void shear(SoundSource shearedSoundCategory) {
-+    public void shear(SoundSource shearedSoundCategory, int looting) { // Purpur
-         this.level().playSound((Player) null, (Entity) this, SoundEvents.SNOW_GOLEM_SHEAR, shearedSoundCategory, 1.0F, 1.0F);
-         if (!this.level().isClientSide()) {
-             this.setPumpkin(false);
-             this.forceDrops = true; // CraftBukkit
-             if (level().purpurConfig.snowGolemDropsPumpkin) // Purpur
-+            for (int i = 0; i < 1 + (org.purpurmc.purpur.PurpurConfig.allowShearsLooting ? looting : 0); i++) // Purpur
-             this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7F);
-             this.forceDrops = false; // CraftBukkit
-         }
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
-index 859435f747ceef860cb4e9e825a7353ea3b90798..fc2c35f57436371cb0111aedfd289ac95d506d07 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentCategory.java
-@@ -128,6 +128,12 @@ public enum EnchantmentCategory {
-         public boolean canEnchant(Item item) {
-             return item instanceof BowItem || item instanceof CrossbowItem;
-         }
-+    },
-+    WEAPON_AND_SHEARS {
-+        @Override
-+        public boolean canEnchant(Item item) {
-+            return WEAPON.canEnchant(item) || item instanceof net.minecraft.world.item.ShearsItem;
-+        }
-     // Purpur end
-     };
- 
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java b/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
-index 7f1ffc0ac402fcf0ec086986e959ecc9f78dde03..1351d52374d1c2367932e5ecd5f4637955fb14c9 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
-@@ -7,6 +7,14 @@ public class LootBonusEnchantment extends Enchantment {
-         super(rarity, target, slotTypes);
-     }
- 
-+    // Purpur start
-+    @Override
-+    public boolean canEnchant(net.minecraft.world.item.ItemStack stack) {
-+        // we have to cheat the system because this class is loaded before purpur's config is loaded
-+        return (org.purpurmc.purpur.PurpurConfig.allowShearsLooting && this.category == EnchantmentCategory.WEAPON ? EnchantmentCategory.WEAPON_AND_SHEARS : this.category).canEnchant(stack.getItem());
-+    }
-+    // Purpur end
-+
-     @Override
-     public int getMinCost(int level) {
-         return 15 + (level - 1) * 9;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index d56c2776d08306245618dca04cd39891bb61c1bd..730a4a2e46aeb233d8036e8d7e1749dcb397e6c0 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -391,6 +391,7 @@ public class PurpurConfig {
- 
-     public static boolean allowInfinityMending = false;
-     public static boolean allowCrossbowInfinity = false;
-+    public static boolean allowShearsLooting = false;
-     public static boolean allowUnsafeEnchants = false;
-     public static boolean allowInapplicableEnchants = true;
-     public static boolean allowIncompatibleEnchants = true;
-@@ -413,6 +414,7 @@ public class PurpurConfig {
-         }
-         allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
-         allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);
-+        allowShearsLooting = getBoolean("settings.enchantment.allow-looting-on-shears", allowShearsLooting);
-         allowUnsafeEnchants = getBoolean("settings.enchantment.anvil.allow-unsafe-enchants", allowUnsafeEnchants);
-         allowInapplicableEnchants = getBoolean("settings.enchantment.anvil.allow-inapplicable-enchants", allowInapplicableEnchants);
-         allowIncompatibleEnchants = getBoolean("settings.enchantment.anvil.allow-incompatible-enchants", allowIncompatibleEnchants);
diff --git a/patches/server/0245-Option-for-villager-display-trade-item.patch b/patches/server/0235-Option-for-villager-display-trade-item.patch
similarity index 69%
rename from patches/server/0245-Option-for-villager-display-trade-item.patch
rename to patches/server/0235-Option-for-villager-display-trade-item.patch
index 98e7dfb00..2742b5219 100644
--- a/patches/server/0245-Option-for-villager-display-trade-item.patch
+++ b/patches/server/0235-Option-for-villager-display-trade-item.patch
@@ -5,33 +5,33 @@ Subject: [PATCH] Option for villager display trade item
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
-index c3e0b1f11b58668f9f24eb421abc340e1b49dfac..d809fa4f96e2c528075f544355397903996ecaf6 100644
+index 18dad0825616c4167a0a7555689ee64910a87e09..6945992491027d43eca4f1ca697ad45ce06ded55 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
-@@ -42,6 +42,7 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
+@@ -46,6 +46,7 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
  
      @Override
      public boolean canStillUse(ServerLevel world, Villager entity, long time) {
 +        if (!entity.level().purpurConfig.villagerDisplayTradeItem) return false; // Purpur
-         return this.checkExtraStartConditions(world, entity) && this.lookTime > 0 && entity.getBrain().getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
-     }
- 
+         return this.checkExtraStartConditions(world, entity)
+             && this.lookTime > 0
+             && entity.getBrain().getMemory(MemoryModuleType.INTERACTION_TARGET).isPresent();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3fa481c71331a19b58511392a840f47915639ce2..38d13eb230cfb33a450b8a9a1a3c6aa2efe5b053 100644
+index bf5c8eb060d88681166d4fff1704c8c63e6327ab..aec0e4eec5095c12c7f52e5f955a6a04d05c9819 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2734,6 +2734,7 @@ public class PurpurWorldConfig {
-     public int villagerMinimumDemand = 0;
+@@ -2797,6 +2797,7 @@ public class PurpurWorldConfig {
      public boolean villagerLobotomizeEnabled = false;
      public int villagerLobotomizeCheckInterval = 100;
+     public boolean villagerLobotomizeWaitUntilTradeLocked = false;
 +    public boolean villagerDisplayTradeItem = true;
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2766,6 +2767,7 @@ public class PurpurWorldConfig {
-         }
+@@ -2830,6 +2831,7 @@ public class PurpurWorldConfig {
          villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
          villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
+         villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked);
 +        villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);
      }
  
diff --git a/patches/server/0236-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0236-Give-bee-counts-in-beehives-to-Purpur-clients.patch
deleted file mode 100644
index 6930dc878..000000000
--- a/patches/server/0236-Give-bee-counts-in-beehives-to-Purpur-clients.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Thu, 30 Dec 2021 09:56:43 -0600
-Subject: [PATCH] Give bee counts in beehives to Purpur clients
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ef25e6f4a36e98279061a8f066b37be956b92d49..7951d617accb093e650d0ca30e2088b5a795d2a2 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1019,6 +1019,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
-     public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
-         org.purpurmc.purpur.task.BossBarTask.stopAll(); // Purpur
-+        org.purpurmc.purpur.task.BeehiveTask.instance().unregister(); // Purpur
-         this.isRestarting = isRestarting;
-         this.hasLoggedStop = true; // Paper
-         if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 21ea9ed1eaf767b7af3ccafbf5fdb88b4a9dc917..fdda6d2767749d0c2affbf3fba494e000bc47036 100644
---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -375,6 +375,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
- 
-             if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
-             org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur
-+            org.purpurmc.purpur.task.BeehiveTask.instance().register(); // Purpur
-             return true;
-         }
-     }
-diff --git a/src/main/java/org/purpurmc/purpur/task/BeehiveTask.java b/src/main/java/org/purpurmc/purpur/task/BeehiveTask.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8a5faed6c1ac6850b87405e774e4393877d61c92
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/task/BeehiveTask.java
-@@ -0,0 +1,92 @@
-+package org.purpurmc.purpur.task;
-+
-+import com.google.common.io.ByteArrayDataInput;
-+import com.google.common.io.ByteArrayDataOutput;
-+import com.google.common.io.ByteStreams;
-+import io.netty.buffer.Unpooled;
-+import net.minecraft.core.BlockPos;
-+import net.minecraft.network.FriendlyByteBuf;
-+import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
-+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.level.ServerPlayer;
-+import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
-+import net.minecraft.world.level.block.entity.BlockEntity;
-+import org.bukkit.Bukkit;
-+import org.bukkit.craftbukkit.entity.CraftPlayer;
-+import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin;
-+import org.bukkit.entity.Player;
-+import org.bukkit.plugin.PluginBase;
-+import org.bukkit.plugin.messaging.PluginMessageListener;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class BeehiveTask implements PluginMessageListener {
-+    public static final ResourceLocation BEEHIVE_C2S = new ResourceLocation("purpur", "beehive_c2s");
-+    public static final ResourceLocation BEEHIVE_S2C = new ResourceLocation("purpur", "beehive_s2c");
-+
-+    private static BeehiveTask instance;
-+
-+    public static BeehiveTask instance() {
-+        if (instance == null) {
-+            instance = new BeehiveTask();
-+        }
-+        return instance;
-+    }
-+
-+    private final PluginBase plugin = new MinecraftInternalPlugin();
-+
-+    private BeehiveTask() {
-+    }
-+
-+    public void register() {
-+        Bukkit.getMessenger().registerOutgoingPluginChannel(this.plugin, BEEHIVE_S2C.toString());
-+        Bukkit.getMessenger().registerIncomingPluginChannel(this.plugin, BEEHIVE_C2S.toString(), this);
-+    }
-+
-+    public void unregister() {
-+        Bukkit.getMessenger().unregisterOutgoingPluginChannel(this.plugin, BEEHIVE_S2C.toString());
-+        Bukkit.getMessenger().unregisterIncomingPluginChannel(this.plugin, BEEHIVE_C2S.toString());
-+    }
-+
-+    @Override
-+    public void onPluginMessageReceived(@NotNull String channel, Player player, byte[] bytes) {
-+        ByteArrayDataInput in = in(bytes);
-+        long packedPos = in.readLong();
-+        BlockPos pos = BlockPos.of(packedPos);
-+
-+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
-+
-+        BlockEntity blockEntity = serverPlayer.level().getBlockEntity(pos);
-+        if (!(blockEntity instanceof BeehiveBlockEntity beehive)) {
-+            return;
-+        }
-+
-+        ByteArrayDataOutput out = out();
-+
-+        out.writeInt(beehive.getOccupantCount());
-+        out.writeLong(packedPos);
-+
-+        FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.wrappedBuffer(out.toByteArray()));
-+        serverPlayer.connection.send(new ClientboundCustomPayloadPacket(new CustomPacketPayload() {
-+            @Override
-+            public void write(final FriendlyByteBuf buf) {
-+                buf.writeBytes(byteBuf.copy());
-+            }
-+
-+            @Override
-+            public ResourceLocation id() {
-+                return BEEHIVE_S2C;
-+            }
-+        }));
-+    }
-+
-+    @SuppressWarnings("UnstableApiUsage")
-+    private static ByteArrayDataOutput out() {
-+        return ByteStreams.newDataOutput();
-+    }
-+
-+    @SuppressWarnings("UnstableApiUsage")
-+    private static ByteArrayDataInput in(byte[] bytes) {
-+        return ByteStreams.newDataInput(bytes);
-+    }
-+}
diff --git a/patches/server/0246-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0236-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
similarity index 83%
rename from patches/server/0246-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
rename to patches/server/0236-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
index 9b6db0573..e9256eddd 100644
--- a/patches/server/0246-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
+++ b/patches/server/0236-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] MC-238526 - Fix spawner not spawning water animals correctly
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
-index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..c8c6fed3f93903bb5c6145930538d415f6f59738 100644
+index 6f22705072fecbe91196e4966fca2eeec060f120..ed2ae44f7cef5aed17d10cc8a7df0a2276f9f16b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java
-@@ -82,6 +82,6 @@ public abstract class WaterAnimal extends PathfinderMob {
+@@ -72,6 +72,6 @@ public abstract class WaterAnimal extends PathfinderMob {
          i = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.maximum.or(i);
          j = world.getMinecraftWorld().paperConfig().entities.spawning.wateranimalSpawnHeight.minimum.or(j);
-         // Paper end
+         // Paper end - Make water animal spawn height configurable
 -        return pos.getY() >= j && pos.getY() <= i && world.getFluidState(pos.below()).is(FluidTags.WATER) && world.getBlockState(pos.above()).is(Blocks.WATER);
 +        return ((reason == MobSpawnType.SPAWNER && world.getMinecraftWorld().purpurConfig.spawnerFixMC238526) || (pos.getY() >= j && pos.getY() <= i)) && world.getFluidState(pos.below()).is(FluidTags.WATER) && world.getBlockState(pos.above()).is(Blocks.WATER); // Purpur
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 38d13eb230cfb33a450b8a9a1a3c6aa2efe5b053..db1e6276243ee849757bed15f8308474afe56790 100644
+index aec0e4eec5095c12c7f52e5f955a6a04d05c9819..05307f584d96b95e9b81239316a256310422c039 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -998,8 +998,10 @@ public class PurpurWorldConfig {
+@@ -1062,8 +1062,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean spawnerDeactivateByRedstone = false;
diff --git a/patches/server/0247-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0237-Config-for-mob-last-hurt-by-player-time.patch
similarity index 87%
rename from patches/server/0247-Config-for-mob-last-hurt-by-player-time.patch
rename to patches/server/0237-Config-for-mob-last-hurt-by-player-time.patch
index 4752bad87..ae1b68e82 100644
--- a/patches/server/0247-Config-for-mob-last-hurt-by-player-time.patch
+++ b/patches/server/0237-Config-for-mob-last-hurt-by-player-time.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for mob last hurt by player time
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7a5b7e2d50c98774d8bc50a9c83d15a67996fc90..ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71 100644
+index 119d2e57995fa20f34b88963b93c945ff87e0cab..36022a0ab50655363d26be7dba765e2261baccdf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1538,13 +1538,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1561,13 +1561,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  if (entity1 instanceof net.minecraft.world.entity.player.Player) {
                      net.minecraft.world.entity.player.Player entityhuman = (net.minecraft.world.entity.player.Player) entity1;
  
@@ -25,10 +25,10 @@ index 7a5b7e2d50c98774d8bc50a9c83d15a67996fc90..ffc25a5f8e8ec479a7454920ccf66ef1
  
                          if (entityliving2 instanceof net.minecraft.world.entity.player.Player) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f79d79d7c9ca18ac711b81c8c3d94e2145aa5bf0..2dbc48d7d5912c46f4d1edaa55047215b123d1ed 100644
+index 1a8a76aa31bd1d1670be6e9cada162c540084cf9..b452ebbe11145987fb5e66b39993898457322080 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -453,7 +453,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -505,7 +505,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          net.minecraft.server.level.ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
          getHandle().lastHurtByPlayer = entityPlayer;
          getHandle().lastHurtByMob = entityPlayer;
@@ -38,10 +38,10 @@ index f79d79d7c9ca18ac711b81c8c3d94e2145aa5bf0..2dbc48d7d5912c46f4d1edaa55047215
      // Paper end
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index db1e6276243ee849757bed15f8308474afe56790..a5e9e56c86de0ae3b8053367dac777c94a990a30 100644
+index 05307f584d96b95e9b81239316a256310422c039..389aac3c02c16bbfe3f266e66e53f6107b27e4dd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -142,6 +142,7 @@ public class PurpurWorldConfig {
+@@ -143,6 +143,7 @@ public class PurpurWorldConfig {
      public boolean mobsIgnoreRails = false;
      public boolean rainStopsAfterSleep = true;
      public boolean thunderStopsAfterSleep = true;
@@ -49,7 +49,7 @@ index db1e6276243ee849757bed15f8308474afe56790..a5e9e56c86de0ae3b8053367dac777c9
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative);
-@@ -167,6 +168,7 @@ public class PurpurWorldConfig {
+@@ -175,6 +176,7 @@ public class PurpurWorldConfig {
          mobsIgnoreRails = getBoolean("gameplay-mechanics.mobs-ignore-rails", mobsIgnoreRails);
          rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
          thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
diff --git a/patches/server/0238-Anvil-repair-damage-options.patch b/patches/server/0238-Anvil-repair-damage-options.patch
new file mode 100644
index 000000000..1d67d451e
--- /dev/null
+++ b/patches/server/0238-Anvil-repair-damage-options.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: 12emin34 <macanovic.emin@gmail.com>
+Date: Sat, 12 Feb 2022 01:08:18 +0100
+Subject: [PATCH] Anvil repair/damage options
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
+index 923357251ad950ec4f893e8771fcfa99de8a60c5..78a341ac80806f86f2ca0bd895fb091a9257519e 100644
+--- a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
+@@ -59,6 +59,53 @@ public class AnvilBlock extends FallingBlock {
+         return this.defaultBlockState().setValue(FACING, ctx.getHorizontalDirection().getClockWise());
+     }
+ 
++    // Purpur start - repairable/damageable anvils
++    @Override
++    protected net.minecraft.world.ItemInteractionResult useItemOn(final net.minecraft.world.item.ItemStack stack, final BlockState state, final Level world, final BlockPos pos, final Player player, final net.minecraft.world.InteractionHand hand, final BlockHitResult hit) {
++        if (world.purpurConfig.anvilRepairIngotsAmount > 0 && stack.is(net.minecraft.world.item.Items.IRON_INGOT)) {
++            if (stack.getCount() < world.purpurConfig.anvilRepairIngotsAmount) {
++                // not enough iron ingots, play "error" sound and consume
++                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
++                return net.minecraft.world.ItemInteractionResult.CONSUME;
++            }
++            if (state.is(Blocks.DAMAGED_ANVIL)) {
++                world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
++            } else if (state.is(Blocks.CHIPPED_ANVIL)) {
++                world.setBlock(pos, Blocks.ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
++            } else if (state.is(Blocks.ANVIL)) {
++                // anvil is already fully repaired, play "error" sound and consume
++                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
++                return net.minecraft.world.ItemInteractionResult.CONSUME;
++            }
++            if (!player.getAbilities().instabuild) {
++                stack.shrink(world.purpurConfig.anvilRepairIngotsAmount);
++            }
++            world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_PLACE, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
++            return net.minecraft.world.ItemInteractionResult.CONSUME;
++        }
++        if (world.purpurConfig.anvilDamageObsidianAmount > 0 && stack.is(net.minecraft.world.item.Items.OBSIDIAN)) {
++            if (stack.getCount() < world.purpurConfig.anvilDamageObsidianAmount) {
++                // not enough obsidian, play "error" sound and consume
++                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
++                return net.minecraft.world.ItemInteractionResult.CONSUME;
++            }
++            if (state.is(Blocks.DAMAGED_ANVIL)) {
++                world.destroyBlock(pos, false);
++            } else if (state.is(Blocks.CHIPPED_ANVIL)) {
++                world.setBlock(pos, Blocks.DAMAGED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
++            } else if (state.is(Blocks.ANVIL)) {
++                world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
++            }
++            if (!player.getAbilities().instabuild) {
++                stack.shrink(world.purpurConfig.anvilDamageObsidianAmount);
++            }
++            world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_LAND, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
++            return net.minecraft.world.ItemInteractionResult.CONSUME;
++        }
++        return net.minecraft.world.ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
++    }
++    // Purpur end
++
+     @Override
+     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
+         if (world.isClientSide) {
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+index 389aac3c02c16bbfe3f266e66e53f6107b27e4dd..fbb2ecbf00395175d7660c5a9fe4987db9ce13b1 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -829,9 +829,13 @@ public class PurpurWorldConfig {
+ 
+     public boolean anvilAllowColors = false;
+     public boolean anvilColorsUseMiniMessage;
++    public int anvilRepairIngotsAmount = 0;
++    public int anvilDamageObsidianAmount = 0;
+     private void anvilSettings() {
+         anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
+         anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
++        anvilRepairIngotsAmount = getInt("blocks.anvil.iron-ingots-used-for-repair", anvilRepairIngotsAmount);
++        anvilDamageObsidianAmount = getInt("blocks.anvil.obsidian-used-for-damage", anvilDamageObsidianAmount);
+     }
+ 
+     public double azaleaGrowthChance = 0.0D;
diff --git a/patches/server/0249-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0239-Option-to-disable-turtle-egg-trampling-with-feather-.patch
similarity index 81%
rename from patches/server/0249-Option-to-disable-turtle-egg-trampling-with-feather-.patch
rename to patches/server/0239-Option-to-disable-turtle-egg-trampling-with-feather-.patch
index 7889c0c86..79abce6ed 100644
--- a/patches/server/0249-Option-to-disable-turtle-egg-trampling-with-feather-.patch
+++ b/patches/server/0239-Option-to-disable-turtle-egg-trampling-with-feather-.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Option to disable turtle egg trampling with feather falling
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-index 8e975daca6a50c95d7fb620f2756b8bb2b7c7d6b..e23b920be6702ef6faf97b42fb8a87442707d6be 100644
+index 2f0e8aeb9c45853fca12ddd78a7d51813a600e67..08ba90f760abb9fb62311dddd7b5bdbd0d9518d7 100644
 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java
-@@ -211,7 +211,13 @@ public class TurtleEggBlock extends Block {
+@@ -219,7 +219,13 @@ public class TurtleEggBlock extends Block {
          if (!(entity instanceof LivingEntity)) {
              return false;
          }
 -        if (entity instanceof Player) return true;
 +        if (world.purpurConfig.turtleEggsTramplingFeatherFalling) {
-+            java.util.Iterator<ItemStack> armor = entity.getArmorSlots().iterator();
-+            return !armor.hasNext() || net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FALL_PROTECTION, armor.next()) < (int) entity.fallDistance;
++            java.util.Iterator<ItemStack> armor = ((LivingEntity) entity).getArmorSlots().iterator();
++            return !armor.hasNext() || net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.FEATHER_FALLING, armor.next()) < (int) entity.fallDistance;
 +        }
 +        if (entity instanceof Player) {
 +            return true;
@@ -24,11 +24,11 @@ index 8e975daca6a50c95d7fb620f2756b8bb2b7c7d6b..e23b920be6702ef6faf97b42fb8a8744
          return world.purpurConfig.turtleEggsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
          // Purpur end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6ae50abd3d1bb4e5ff6f8865ca6f4303c8144b0e..ce4f8f9661c6c0d09fa517861aae80559859f09f 100644
+index fbb2ecbf00395175d7660c5a9fe4987db9ce13b1..ebce13b3a25f26c22bbe8a25d38b76027b630401 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1026,12 +1026,14 @@ public class PurpurWorldConfig {
-     public boolean turtleEggsBreakFromMinecarts = true;
+@@ -1090,12 +1090,14 @@ public class PurpurWorldConfig {
+     public boolean turtleEggsBreakFromMinecarts = false;
      public boolean turtleEggsBypassMobGriefing = false;
      public int turtleEggsRandomTickCrackChance = 500;
 +    public boolean turtleEggsTramplingFeatherFalling = false;
diff --git a/patches/server/0240-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0240-Add-toggle-for-enchant-level-clamping.patch
new file mode 100644
index 000000000..e1bddbfc0
--- /dev/null
+++ b/patches/server/0240-Add-toggle-for-enchant-level-clamping.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: 12emin34 <macanovic.emin@gmail.com>
+Date: Sat, 30 Apr 2022 10:32:40 +0200
+Subject: [PATCH] Add toggle for enchant level clamping
+
+
+diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+index 5443013060b62e3bfcc51cddca96d1c0bc59fe72..8925440dbc35dbc4a7d59f13511d7afeda803260 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -119,6 +119,11 @@ public class Main {
+                 JvmProfiler.INSTANCE.start(Environment.SERVER);
+             }
+ 
++            // Purpur start - load config files early
++            org.bukkit.configuration.file.YamlConfiguration purpurConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("purpur-settings"));
++            org.purpurmc.purpur.PurpurConfig.clampEnchantLevels = purpurConfiguration.getBoolean("settings.enchantment.clamp-levels");
++            // Purpur end - load config files early
++
+             io.papermc.paper.plugin.PluginInitializerManager.load(optionset); // Paper
+             Bootstrap.bootStrap();
+             Bootstrap.validate();
+diff --git a/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java b/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java
+index af18de11dd55938b6091f5ab183bd3fe4e8df152..2c741860afa1fa4d5798c68b84ec3fe13157ff09 100644
+--- a/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java
++++ b/src/main/java/net/minecraft/world/item/enchantment/ItemEnchantments.java
+@@ -37,7 +37,7 @@ public class ItemEnchantments implements TooltipProvider {
+     public static final ItemEnchantments EMPTY = new ItemEnchantments(new Object2IntAVLTreeMap<>(ENCHANTMENT_ORDER), true);
+     // Paper end
+     public static final int MAX_LEVEL = 255;
+-    private static final Codec<Integer> LEVEL_CODEC = Codec.intRange(0, 255);
++    private static final Codec<Integer> LEVEL_CODEC = Codec.intRange(0, (org.purpurmc.purpur.PurpurConfig.clampEnchantLevels ? 255 : 32767)); // Purpur
+     private static final Codec<Object2IntAVLTreeMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap( // Paper
+             BuiltInRegistries.ENCHANTMENT.holderByNameCodec(), LEVEL_CODEC
+         )
+@@ -72,7 +72,7 @@ public class ItemEnchantments implements TooltipProvider {
+ 
+         for (Entry<Holder<Enchantment>> entry : enchantments.object2IntEntrySet()) {
+             int i = entry.getIntValue();
+-            if (i < 0 || i > 255) {
++            if (i < 0 || i > (org.purpurmc.purpur.PurpurConfig.clampEnchantLevels ? 255 : 32767)) { // Purpur
+                 throw new IllegalArgumentException("Enchantment " + entry.getKey() + " has invalid level " + i);
+             }
+         }
+@@ -169,13 +169,13 @@ public class ItemEnchantments implements TooltipProvider {
+             if (level <= 0) {
+                 this.enchantments.removeInt(enchantment.builtInRegistryHolder());
+             } else {
+-                this.enchantments.put(enchantment.builtInRegistryHolder(), Math.min(level, 255));
++                this.enchantments.put(enchantment.builtInRegistryHolder(), Math.min(level, (org.purpurmc.purpur.PurpurConfig.clampEnchantLevels ? 255 : 32767)));
+             }
+         }
+ 
+         public void upgrade(Enchantment enchantment, int level) {
+             if (level > 0) {
+-                this.enchantments.merge(enchantment.builtInRegistryHolder(), Math.min(level, 255), Integer::max);
++                this.enchantments.merge(enchantment.builtInRegistryHolder(), Math.min(level, (org.purpurmc.purpur.PurpurConfig.clampEnchantLevels ? 255 : 32767)), Integer::max);
+             }
+         }
+ 
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index 5879af630bc3711a17d51f455585ccd31f7a6d88..7462474f7eff9f50644d0b7ceac341f237c93df0 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -398,6 +398,7 @@ public class PurpurConfig {
+     public static boolean allowHigherEnchantsLevels = true;
+     public static boolean allowUnsafeEnchantCommand = false;
+     public static boolean replaceIncompatibleEnchants = false;
++    public static boolean clampEnchantLevels = true;
+     private static void enchantmentSettings() {
+         if (version < 5) {
+             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
+@@ -421,6 +422,7 @@ public class PurpurConfig {
+         allowHigherEnchantsLevels = getBoolean("settings.enchantment.anvil.allow-higher-enchants-levels", allowHigherEnchantsLevels);
+         allowUnsafeEnchantCommand = getBoolean("settings.enchantment.allow-unsafe-enchant-command", allowUnsafeEnchants); // allowUnsafeEnchants as default for backwards compatability
+         replaceIncompatibleEnchants = getBoolean("settings.enchantment.anvil.replace-incompatible-enchants", replaceIncompatibleEnchants);
++        clampEnchantLevels = getBoolean("settings.enchantment.clamp-levels", clampEnchantLevels);
+     }
+ 
+     public static boolean endermanShortHeight = false;
diff --git a/patches/server/0251-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0241-Skip-junit-tests-for-purpur-commands.patch
similarity index 80%
rename from patches/server/0251-Skip-junit-tests-for-purpur-commands.patch
rename to patches/server/0241-Skip-junit-tests-for-purpur-commands.patch
index bd9cfd575..d8c96ae4a 100644
--- a/patches/server/0251-Skip-junit-tests-for-purpur-commands.patch
+++ b/patches/server/0241-Skip-junit-tests-for-purpur-commands.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Skip junit tests for purpur commands
 
 
 diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-index afeb4271fffb7546209f1e651214065187c88302..81bc3af856b8af019fd13e1da1f7cccd526b7cf0 100644
+index 2f3ff50bf3f70b6b404d02d5ffcc079162a63bc1..4e57fdf21d4b7789cd7c3d3a18ddc6227bc77792 100644
 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
 +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
-@@ -45,6 +45,7 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase {
-         Set<String> foundPerms = new HashSet<>();
-         for (CommandNode<CommandSourceStack> child : root.getChildren()) {
-             final String vanillaPerm = VanillaCommandWrapper.getPermission(child);
+@@ -48,6 +48,7 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase {
+             if ("bukkit.command.paper.pgive".equals(vanillaPerm)) { // skip our custom give command
+                 continue;
+             }
 +            if (TO_SKIP.contains(vanillaPerm)) continue; // Purpur
              if (!perms.contains(vanillaPerm)) {
                  missing.add("Missing permission for " + child.getName() + " (" + vanillaPerm + ") command");
              } else {
-@@ -57,6 +58,25 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase {
+@@ -60,6 +61,25 @@ public class MinecraftCommandPermissionsTest extends AbstractTestingBase {
      }
  
      private static final List<String> TO_SKIP = List.of(
diff --git a/patches/server/0252-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0242-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 80%
rename from patches/server/0252-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0242-Implement-configurable-search-radius-for-villagers-t.patch
index 8838fe09e..fbf0fc98e 100644
--- a/patches/server/0252-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0242-Implement-configurable-search-radius-for-villagers-t.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 6760c9cc9ee244b7adca379d7e34696c48b65dbf..9682676aa68cf5927facd60ef061006579c1f893 100644
+index dd74825c04543ae8c0bb1ab5eef6c8a152b621fd..dcf580d852ede8ea01f5d91944a224ec6eca73e4 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -1101,6 +1101,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -1095,6 +1095,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
  
      public void spawnGolemIfNeeded(ServerLevel world, long time, int requiredCount) {
@@ -18,21 +18,21 @@ index 6760c9cc9ee244b7adca379d7e34696c48b65dbf..9682676aa68cf5927facd60ef0610065
              AABB axisalignedbb = this.getBoundingBox().inflate(10.0D, 10.0D, 10.0D);
              List<Villager> list = world.getEntitiesOfClass(Villager.class, axisalignedbb);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ce4f8f9661c6c0d09fa517861aae80559859f09f..b964bad8d599e093ad312a9dedf1a33856ce9ec1 100644
+index ebce13b3a25f26c22bbe8a25d38b76027b630401..31497cad3276cc2e9bd5a0e745619eb04fecf25a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2745,6 +2745,8 @@ public class PurpurWorldConfig {
-     public boolean villagerLobotomizeEnabled = false;
+@@ -2808,6 +2808,8 @@ public class PurpurWorldConfig {
      public int villagerLobotomizeCheckInterval = 100;
+     public boolean villagerLobotomizeWaitUntilTradeLocked = false;
      public boolean villagerDisplayTradeItem = true;
 +    public int villagerSpawnIronGolemRadius = 0;
 +    public int villagerSpawnIronGolemLimit = 0;
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -2778,6 +2780,8 @@ public class PurpurWorldConfig {
-         villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
+@@ -2842,6 +2844,8 @@ public class PurpurWorldConfig {
          villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
+         villagerLobotomizeWaitUntilTradeLocked = getBoolean("mobs.villager.lobotomize.wait-until-trade-locked", villagerLobotomizeWaitUntilTradeLocked);
          villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);
 +        villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
 +        villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
diff --git a/patches/server/0243-Stonecutter-damage.patch b/patches/server/0243-Stonecutter-damage.patch
new file mode 100644
index 000000000..16c3d43be
--- /dev/null
+++ b/patches/server/0243-Stonecutter-damage.patch
@@ -0,0 +1,160 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Wed, 8 Jun 2022 14:19:35 -0400
+Subject: [PATCH] Stonecutter damage
+
+
+diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+index a375d40ec6365ba8704ba3ece22dd5b2de9857b5..357a79d72a2de02a019595e457fe432bf409e516 100644
+--- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
++++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+@@ -101,6 +101,8 @@ public class CombatTracker {
+                 // Purpur start
+                 if (damageSource.isScissors()) {
+                     return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgRunWithScissors, this.mob);
++                } else if (damageSource.isStonecutter()) {
++                    return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgStonecutter, this.mob);
+                 }
+                 // Purpur end
+                 return damageSource.getLocalizedDeathMessage(this.mob);
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+index 894668c96ac36e737910a25cf89651236246200c..812091bf6efc067b21b9723b8241360d4b4c79e7 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -30,6 +30,7 @@ public class DamageSource {
+     private boolean melting = false;
+     private boolean poison = false;
+     private boolean scissors = false; // Purpur
++    private boolean stonecutter = false; // Purpur
+     @Nullable
+     private Entity customEventDamager = null; // This field is a helper for when causing entity damage is not set by vanilla // Paper - fix DamageSource API
+ 
+@@ -69,6 +70,15 @@ public class DamageSource {
+     public boolean isScissors() {
+         return this.scissors;
+     }
++
++    public DamageSource stonecutter() {
++        this.stonecutter = true;
++        return this;
++    }
++
++    public boolean isStonecutter() {
++        return this.stonecutter;
++    }
+     // Purpur end
+ 
+     // Paper start - fix DamageSource API
+@@ -114,6 +124,7 @@ public class DamageSource {
+         damageSource.poison = this.isPoison();
+         damageSource.melting = this.isMelting();
+         damageSource.scissors = this.isScissors(); // Purpur
++        damageSource.stonecutter = this.isStonecutter(); // Purpur
+         return damageSource;
+     }
+     // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+index 13b596a1e06fa66396c43a6c72659d4342bf6549..5ffe772e29dfd422b664e8123e7f5cf396158674 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
+@@ -45,12 +45,14 @@ public class DamageSources {
+     private final DamageSource melting;
+     private final DamageSource poison;
+     private final DamageSource scissors; // Purpur
++    private final DamageSource stonecutter; // Purpur
+ 
+     public DamageSources(RegistryAccess registryManager) {
+         this.damageTypes = registryManager.registryOrThrow(Registries.DAMAGE_TYPE);
+         this.melting = this.source(DamageTypes.ON_FIRE).melting();
+         this.poison = this.source(DamageTypes.MAGIC).poison();
+         this.scissors = this.source(DamageTypes.MAGIC).scissors(); // Purpur
++        this.stonecutter = this.source(DamageTypes.MAGIC).stonecutter(); // Purpur
+         // CraftBukkit end
+         this.inFire = this.source(DamageTypes.IN_FIRE);
+         this.lightningBolt = this.source(DamageTypes.LIGHTNING_BOLT);
+@@ -103,6 +105,9 @@ public class DamageSources {
+     public DamageSource scissors() {
+         return this.scissors;
+     }
++    public DamageSource stonecutter() {
++        return this.stonecutter;
++    }
+     // Purpur end
+ 
+     public DamageSource inFire() {
+diff --git a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
+index c6ecb378d0cb2ac05b8f22f92fb85df060038f77..b0199a8ffb1ea4cafeadedb8b833063db177b3cd 100644
+--- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
+@@ -98,4 +98,14 @@ public class StonecutterBlock extends Block {
+     protected boolean isPathfindable(BlockState state, PathComputationType type) {
+         return false;
+     }
++
++    // Purpur start
++    @Override
++    public void stepOn(Level level, BlockPos pos, BlockState state, net.minecraft.world.entity.Entity entity) {
++        if (level.purpurConfig.stonecutterDamage > 0.0F && entity instanceof net.minecraft.world.entity.LivingEntity) {
++            entity.hurt(entity.damageSources().stonecutter().directBlock(level, pos), level.purpurConfig.stonecutterDamage);
++        }
++        super.stepOn(level, pos, state, entity);
++    }
++    // Purpur end
+ }
+diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+index 31ae0f466ae522d767907ec5066b26695f327b96..f26383cf896785333dbd6f86348d5a5f67a6731f 100644
+--- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
++++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
+@@ -491,7 +491,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
+             return PathType.TRAPDOOR;
+         } else if (blockState.is(Blocks.POWDER_SNOW)) {
+             return PathType.POWDER_SNOW;
+-        } else if (blockState.is(Blocks.CACTUS) || blockState.is(Blocks.SWEET_BERRY_BUSH)) {
++        } else if (blockState.is(Blocks.CACTUS) || blockState.is(Blocks.SWEET_BERRY_BUSH) || blockState.is(Blocks.STONECUTTER)) { // Purpur
+             return PathType.DAMAGE_OTHER;
+         } else if (blockState.is(Blocks.HONEY_BLOCK)) {
+             return PathType.STICKY_HONEY;
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index a49193a023bbd9b65bcd3652dc9c241720500755..6fed586c9a778f7a57e1b4ca2e6f2dbc15c8769d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1130,7 +1130,7 @@ public class CraftEventFactory {
+             return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.LAVA, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
+         } else if (source.getDirectBlock() != null) {
+             DamageCause cause;
+-            if (source.is(DamageTypes.CACTUS) || source.is(DamageTypes.SWEET_BERRY_BUSH) || source.is(DamageTypes.STALAGMITE) || source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_ANVIL)) {
++            if (source.is(DamageTypes.CACTUS) || source.is(DamageTypes.SWEET_BERRY_BUSH) || source.is(DamageTypes.STALAGMITE) || source.is(DamageTypes.FALLING_STALACTITE) || source.is(DamageTypes.FALLING_ANVIL) || source.isStonecutter()) { // Purpur
+                 cause = DamageCause.CONTACT;
+             } else if (source.is(DamageTypes.HOT_FLOOR)) {
+                 cause = DamageCause.HOT_FLOOR;
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index 7462474f7eff9f50644d0b7ceac341f237c93df0..cb8f67f0ad3531b110613c0ffb3c0cc23da23529 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -209,8 +209,10 @@ public class PurpurConfig {
+     }
+ 
+     public static String deathMsgRunWithScissors = "<player> slipped and fell on their shears";
++    public static String deathMsgStonecutter = "<player> has sawed themself in half";
+     private static void deathMessages() {
+         deathMsgRunWithScissors = getString("settings.messages.death-message.run-with-scissors", deathMsgRunWithScissors);
++        deathMsgStonecutter = getString("settings.messages.death-message.stonecutter", deathMsgStonecutter);
+     }
+ 
+     public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+index 31497cad3276cc2e9bd5a0e745619eb04fecf25a..37f638b7f1fe63a2b8e44b40a4ef6f6f419684fc 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -1085,6 +1085,11 @@ public class PurpurWorldConfig {
+         spongeAbsorbsWaterFromMud = getBoolean("blocks.sponge.absorbs-water-from-mud", spongeAbsorbsWaterFromMud);
+     }
+ 
++    public float stonecutterDamage = 0.0F;
++    private void stonecutterSettings() {
++        stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
++    }
++
+     public boolean turtleEggsBreakFromExpOrbs = false;
+     public boolean turtleEggsBreakFromItems = false;
+     public boolean turtleEggsBreakFromMinecarts = false;
diff --git a/patches/server/0254-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0244-Configurable-damage-settings-for-magma-blocks.patch
similarity index 76%
rename from patches/server/0254-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/server/0244-Configurable-damage-settings-for-magma-blocks.patch
index 027a8ae10..dc19fb56d 100644
--- a/patches/server/0254-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0244-Configurable-damage-settings-for-magma-blocks.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/MagmaBlock.java b/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
-index 1b766045687e4dcded5cbcc50b746c55b9a34e22..be365914856593bb3c4e1945cc990786072f2953 100644
+index 77bbdc15472d656fd40e841a70e34d3d31580819..55ae530fac54236ea5614f8e92c30febc744f179 100644
 --- a/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/MagmaBlock.java
-@@ -22,7 +22,7 @@ public class MagmaBlock extends Block {
+@@ -29,7 +29,7 @@ public class MagmaBlock extends Block {
  
      @Override
      public void stepOn(Level world, BlockPos pos, BlockState state, Entity entity) {
 -        if (!entity.isSteppingCarefully() && entity instanceof LivingEntity && !EnchantmentHelper.hasFrostWalker((LivingEntity) entity)) {
 +        if ((!entity.isSteppingCarefully() || world.purpurConfig.magmaBlockDamageWhenSneaking) && entity instanceof LivingEntity && (world.purpurConfig.magmaBlockDamageWithFrostWalker || !EnchantmentHelper.hasFrostWalker((LivingEntity) entity))) { // Purpur
-             org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()); // CraftBukkit
-             entity.hurt(world.damageSources().hotFloor(), 1.0F);
-             org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
+             entity.hurt(world.damageSources().hotFloor().directBlock(world, pos), 1.0F); // CraftBukkit
+         }
+ 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 417322e7cf09eb56acf5fc398ce2319b54c4477a..93e601cad7c26024fe195ee5217c8d65c1b083e4 100644
+index 37f638b7f1fe63a2b8e44b40a4ef6f6f419684fc..8e95fce5be2c9ba2893b2ccc60a2fd6ea2927a62 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -952,6 +952,13 @@ public class PurpurWorldConfig {
+@@ -1026,6 +1026,13 @@ public class PurpurWorldConfig {
          pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
      }
  
diff --git a/patches/server/0255-Add-config-for-snow-on-blue-ice.patch b/patches/server/0245-Add-config-for-snow-on-blue-ice.patch
similarity index 82%
rename from patches/server/0255-Add-config-for-snow-on-blue-ice.patch
rename to patches/server/0245-Add-config-for-snow-on-blue-ice.patch
index 102753e6d..543e3dec5 100644
--- a/patches/server/0255-Add-config-for-snow-on-blue-ice.patch
+++ b/patches/server/0245-Add-config-for-snow-on-blue-ice.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add config for snow on blue ice
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java b/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java
-index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a120a4786c 100644
+index 93e8e5107ac047c1f2579b4fe6b0a202edb695f6..f82d275aac7bf3949d3dcc412c7e39e115c69458 100644
 --- a/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SnowLayerBlock.java
-@@ -81,6 +81,12 @@ public class SnowLayerBlock extends Block {
-     public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
+@@ -88,6 +88,12 @@ public class SnowLayerBlock extends Block {
+     protected boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
          BlockState iblockdata1 = world.getBlockState(pos.below());
  
 +        // Purpur start
@@ -22,10 +22,10 @@ index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a1
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 93e601cad7c26024fe195ee5217c8d65c1b083e4..ea082eed28b9d63514291a094ebd99b8670e7910 100644
+index 8e95fce5be2c9ba2893b2ccc60a2fd6ea2927a62..59cabf7be670c05af5c5a24080fb65e318f5a843 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -933,9 +933,11 @@ public class PurpurWorldConfig {
+@@ -1007,9 +1007,11 @@ public class PurpurWorldConfig {
  
      public boolean mobsSpawnOnPackedIce = true;
      public boolean mobsSpawnOnBlueIce = true;
diff --git a/patches/server/0256-Skeletons-eat-wither-roses.patch b/patches/server/0246-Skeletons-eat-wither-roses.patch
similarity index 91%
rename from patches/server/0256-Skeletons-eat-wither-roses.patch
rename to patches/server/0246-Skeletons-eat-wither-roses.patch
index cf22f9748..63e86f8d5 100644
--- a/patches/server/0256-Skeletons-eat-wither-roses.patch
+++ b/patches/server/0246-Skeletons-eat-wither-roses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skeletons eat wither roses
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1ef5121b57 100644
+index 1aae461eed332fe31c1449c47d0928f655c740da..9eb6ed001bfc578311300977dda6f3f156d07190 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -14,6 +14,16 @@ import net.minecraft.world.item.Items;
@@ -79,7 +79,7 @@ index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1e
 +        }
 +
 +        this.level().addFreshEntity(skeleton);
-+        this.remove(RemovalReason.DISCARDED);
++        this.remove(RemovalReason.DISCARDED, org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +        if (!player.getAbilities().instabuild) {
 +            stack.shrink(1);
 +        }
@@ -94,10 +94,10 @@ index 9b43150a00d7fac85aa69f5a2dbffd0dfdae4b86..f4a47ac2c86cc95178922cce7320ba1e
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ea082eed28b9d63514291a094ebd99b8670e7910..40f127476d96b39ac107cb1d18dd08798612c952 100644
+index 59cabf7be670c05af5c5a24080fb65e318f5a843..e7f825ae88c7752468537c7df8c8fec6c1e0c983 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2429,6 +2429,7 @@ public class PurpurWorldConfig {
+@@ -2491,6 +2491,7 @@ public class PurpurWorldConfig {
      public boolean skeletonTakeDamageFromWater = false;
      public boolean skeletonAlwaysDropExp = false;
      public double skeletonHeadVisibilityPercent = 0.5D;
@@ -105,11 +105,11 @@ index ea082eed28b9d63514291a094ebd99b8670e7910..40f127476d96b39ac107cb1d18dd0879
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2442,6 +2443,7 @@ public class PurpurWorldConfig {
+@@ -2504,6 +2505,7 @@ public class PurpurWorldConfig {
          skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
          skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
          skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
 +        skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);
      }
  
-     public boolean skeletonHorseRidableInWater = true;
+     public boolean skeletonHorseRidable = false;
diff --git a/patches/server/0257-Enchantment-Table-Persists-Lapis.patch b/patches/server/0247-Enchantment-Table-Persists-Lapis.patch
similarity index 61%
rename from patches/server/0257-Enchantment-Table-Persists-Lapis.patch
rename to patches/server/0247-Enchantment-Table-Persists-Lapis.patch
index ba2f7c030..b419a33d8 100644
--- a/patches/server/0257-Enchantment-Table-Persists-Lapis.patch
+++ b/patches/server/0247-Enchantment-Table-Persists-Lapis.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Enchantment Table Persists Lapis
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a84842e3fe325 100644
+index 5b3e33807e0e13480e3359c0cf067719e5749237..c3a644b0f8c7c5622acc9e1a496f95d432718806 100644
 --- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-@@ -40,6 +40,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
+@@ -38,6 +38,12 @@ import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
  import org.bukkit.entity.Player;
  // CraftBukkit end
  
 +// Purpur start
 +import net.minecraft.world.level.block.entity.BlockEntity;
-+import net.minecraft.world.level.block.entity.EnchantmentTableBlockEntity;
++import net.minecraft.world.level.block.entity.EnchantingTableBlockEntity;
 +import org.bukkit.craftbukkit.entity.CraftHumanEntity;
 +// Purpur end
 +
  public class EnchantmentMenu extends AbstractContainerMenu {
  
      static final ResourceLocation EMPTY_SLOT_LAPIS_LAZULI = new ResourceLocation("item/empty_slot_lapis_lazuli");
-@@ -74,6 +80,22 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+@@ -72,6 +78,22 @@ public class EnchantmentMenu extends AbstractContainerMenu {
                  return context.getLocation();
              }
              // CraftBukkit end
@@ -34,7 +34,7 @@ index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a8484
 +                if (who.getHandle().level().purpurConfig.enchantmentTableLapisPersists) {
 +                    access.execute((level, pos) -> {
 +                        BlockEntity blockEntity = level.getBlockEntity(pos);
-+                        if (blockEntity instanceof EnchantmentTableBlockEntity enchantmentTable) {
++                        if (blockEntity instanceof EnchantingTableBlockEntity enchantmentTable) {
 +                            enchantmentTable.setLapis(this.getItem(1).getCount());
 +                        }
 +                    });
@@ -44,7 +44,7 @@ index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a8484
          };
          this.random = RandomSource.create();
          this.enchantmentSeed = DataSlot.standalone();
-@@ -99,6 +121,17 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+@@ -97,6 +119,17 @@ public class EnchantmentMenu extends AbstractContainerMenu {
              }
          });
  
@@ -52,7 +52,7 @@ index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a8484
 +        access.execute((level, pos) -> {
 +            if (level.purpurConfig.enchantmentTableLapisPersists) {
 +                BlockEntity blockEntity = level.getBlockEntity(pos);
-+                if (blockEntity instanceof EnchantmentTableBlockEntity enchantmentTable) {
++                if (blockEntity instanceof EnchantingTableBlockEntity enchantmentTable) {
 +                    this.getSlot(1).set(new ItemStack(Items.LAPIS_LAZULI, enchantmentTable.getLapis()));
 +                }
 +            }
@@ -62,7 +62,7 @@ index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a8484
          int j;
  
          for (j = 0; j < 3; ++j) {
-@@ -344,6 +377,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+@@ -332,6 +365,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
      public void removed(net.minecraft.world.entity.player.Player player) {
          super.removed(player);
          this.access.execute((world, blockposition) -> {
@@ -70,21 +70,12 @@ index c5c509fbb915c60dfa95aac8510684d0b9f8b0ff..d604b7ec46f08993647979ed220a8484
              this.clearContainer(player, this.enchantSlots);
          });
      }
-diff --git a/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java b/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java
-index 839b7bc9392906dca384003468746963631fe095..286f34eef22a85be3fe9747dc3c3f9a7d51f437c 100644
---- a/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java
-@@ -29,6 +29,8 @@ import net.minecraft.world.level.pathfinder.PathComputationType;
- import net.minecraft.world.phys.BlockHitResult;
- import net.minecraft.world.phys.shapes.CollisionContext;
- import net.minecraft.world.phys.shapes.VoxelShape;
-+import net.minecraft.world.Containers; // Purpur
-+import net.minecraft.world.item.Items; // Purpur
- 
- public class EnchantmentTableBlock extends BaseEntityBlock {
-     protected static final VoxelShape SHAPE = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D);
-@@ -121,4 +123,18 @@ public class EnchantmentTableBlock extends BaseEntityBlock {
-     public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) {
+diff --git a/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java b/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
+index 151e856dda3aa262c846ce8793650ee582bfb749..be0ed8a14e5726d5fcea1864302b18fb75fde2b4 100644
+--- a/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/EnchantingTableBlock.java
+@@ -124,4 +124,18 @@ public class EnchantingTableBlock extends BaseEntityBlock {
+     protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return false;
      }
 +
@@ -93,8 +84,8 @@ index 839b7bc9392906dca384003468746963631fe095..286f34eef22a85be3fe9747dc3c3f9a7
 +    public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean moved) {
 +        BlockEntity blockEntity = level.getBlockEntity(pos);
 +
-+        if (level.purpurConfig.enchantmentTableLapisPersists && blockEntity instanceof EnchantmentTableBlockEntity enchantmentTable) {
-+            Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), new ItemStack(Items.LAPIS_LAZULI, enchantmentTable.getLapis()));
++        if (level.purpurConfig.enchantmentTableLapisPersists && blockEntity instanceof EnchantingTableBlockEntity enchantmentTable) {
++            net.minecraft.world.Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.LAPIS_LAZULI, enchantmentTable.getLapis()));
 +            level.updateNeighbourForOutputSignal(pos, this);
 +        }
 +
@@ -102,37 +93,37 @@ index 839b7bc9392906dca384003468746963631fe095..286f34eef22a85be3fe9747dc3c3f9a7
 +    }
 +    // Purpur end
  }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e8bc8455d 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-@@ -24,6 +24,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
-     public float tRot;
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
+index d47bc2f54c4722a0b8c419b99ee57eb3cb25d750..fdeabdcc781b605d6f3ee18528fd380ffff95660 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantingTableBlockEntity.java
+@@ -28,6 +28,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
      private static final RandomSource RANDOM = RandomSource.create();
+     @Nullable
      private Component name;
 +    private int lapis = 0; // Purpur
  
-     public EnchantmentTableBlockEntity(BlockPos pos, BlockState state) {
+     public EnchantingTableBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.ENCHANTING_TABLE, pos, state);
-@@ -35,6 +36,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
+@@ -39,6 +40,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
          if (this.hasCustomName()) {
-             nbt.putString("CustomName", Component.Serializer.toJson(this.name));
+             nbt.putString("CustomName", Component.Serializer.toJson(this.name, registryLookup));
          }
 +        nbt.putInt("Purpur.Lapis", this.lapis); // Purpur
- 
      }
  
-@@ -44,6 +46,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
+     @Override
+@@ -47,6 +49,7 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
          if (nbt.contains("CustomName", 8)) {
-             this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException
+             this.name = parseCustomNameSafe(nbt.getString("CustomName"), registryLookup);
          }
 +        this.lapis = nbt.getInt("Purpur.Lapis"); // Purpur
- 
      }
  
-@@ -117,4 +120,14 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
-     public Component getCustomName() {
-         return this.name;
+     public static void bookAnimationTick(Level world, BlockPos pos, BlockState state, EnchantingTableBlockEntity blockEntity) {
+@@ -138,4 +141,14 @@ public class EnchantingTableBlockEntity extends BlockEntity implements Nameable
+     public void removeComponentsFromTag(CompoundTag nbt) {
+         nbt.remove("CustomName");
      }
 +
 +    // Purpur start
@@ -146,10 +137,10 @@ index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e
 +    // Purpur
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 40f127476d96b39ac107cb1d18dd08798612c952..9c90c8f1c6697a98049bf044ac061bb93e1a4363 100644
+index e7f825ae88c7752468537c7df8c8fec6c1e0c983..38f161e102c5202c79108ad150ff42af1a75658c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1464,6 +1464,11 @@ public class PurpurWorldConfig {
+@@ -1528,6 +1528,11 @@ public class PurpurWorldConfig {
          elderGuardianAlwaysDropExp = getBoolean("mobs.elder_guardian.always-drop-exp", elderGuardianAlwaysDropExp);
      }
  
diff --git a/patches/server/0248-Anvil-repair-damage-options.patch b/patches/server/0248-Anvil-repair-damage-options.patch
deleted file mode 100644
index e6cd11410..000000000
--- a/patches/server/0248-Anvil-repair-damage-options.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: 12emin34 <macanovic.emin@gmail.com>
-Date: Sat, 12 Feb 2022 01:08:18 +0100
-Subject: [PATCH] Anvil repair/damage options
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-index 5c5a3b169795bf8a527b316c666cbc2105c66622..020afeca950d2c7fb6c7b179d424548fd90f8b0d 100644
---- a/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/AnvilBlock.java
-@@ -55,6 +55,54 @@ public class AnvilBlock extends FallingBlock {
- 
-     @Override
-     public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-+        // Purpur start - repairable/damageable anvils
-+        if (world.purpurConfig.anvilRepairIngotsAmount > 0) {
-+            net.minecraft.world.item.ItemStack itemstack = player.getItemInHand(hand);
-+            if (itemstack.is(net.minecraft.world.item.Items.IRON_INGOT)) {
-+                if (itemstack.getCount() < world.purpurConfig.anvilRepairIngotsAmount) {
-+                    // not enough iron ingots, play "error" sound and consume
-+                    world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                    return InteractionResult.CONSUME;
-+                }
-+                if (state.is(Blocks.DAMAGED_ANVIL)) {
-+                    world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                } else if (state.is(Blocks.CHIPPED_ANVIL)) {
-+                    world.setBlock(pos, Blocks.ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                } else if (state.is(Blocks.ANVIL)) {
-+                    // anvil is already fully repaired, play "error" sound and consume
-+                    world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                    return InteractionResult.CONSUME;
-+                }
-+                if (!player.getAbilities().instabuild) {
-+                    itemstack.shrink(world.purpurConfig.anvilRepairIngotsAmount);
-+                }
-+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_PLACE, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                return InteractionResult.CONSUME;
-+            }
-+        }
-+        if (world.purpurConfig.anvilDamageObsidianAmount > 0) {
-+            net.minecraft.world.item.ItemStack itemstack = player.getItemInHand(hand);
-+            if (itemstack.is(net.minecraft.world.item.Items.OBSIDIAN)) {
-+                if (itemstack.getCount() < world.purpurConfig.anvilDamageObsidianAmount) {
-+                    // not enough obsidian, play "error" sound and consume
-+                    world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_HIT, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                    return InteractionResult.CONSUME;
-+                }
-+                if (state.is(Blocks.DAMAGED_ANVIL)) {
-+                    world.destroyBlock(pos, false);
-+                } else if (state.is(Blocks.CHIPPED_ANVIL)) {
-+                    world.setBlock(pos, Blocks.DAMAGED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                } else if (state.is(Blocks.ANVIL)) {
-+                    world.setBlock(pos, Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
-+                }
-+                if (!player.getAbilities().instabuild) {
-+                    itemstack.shrink(world.purpurConfig.anvilDamageObsidianAmount);
-+                }
-+                world.playSound(null, pos, net.minecraft.sounds.SoundEvents.ANVIL_LAND, net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F);
-+                return InteractionResult.CONSUME;
-+            }
-+        }
-+        // Purpur end
-         if (world.isClientSide) {
-             return InteractionResult.SUCCESS;
-         } else {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a5e9e56c86de0ae3b8053367dac777c94a990a30..6ae50abd3d1bb4e5ff6f8865ca6f4303c8144b0e 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -750,9 +750,13 @@ public class PurpurWorldConfig {
- 
-     public boolean anvilAllowColors = false;
-     public boolean anvilColorsUseMiniMessage;
-+    public int anvilRepairIngotsAmount = 0;
-+    public int anvilDamageObsidianAmount = 0;
-     private void anvilSettings() {
-         anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors);
-         anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
-+        anvilRepairIngotsAmount = getInt("blocks.anvil.iron-ingots-used-for-repair", anvilRepairIngotsAmount);
-+        anvilDamageObsidianAmount = getInt("blocks.anvil.obsidian-used-for-damage", anvilDamageObsidianAmount);
-     }
- 
-     public double azaleaGrowthChance = 0.0D;
diff --git a/patches/server/0258-Spark-Profiler.patch b/patches/server/0248-Spark-Profiler.patch
similarity index 78%
rename from patches/server/0258-Spark-Profiler.patch
rename to patches/server/0248-Spark-Profiler.patch
index c1d92008a..a8bab00ce 100644
--- a/patches/server/0258-Spark-Profiler.patch
+++ b/patches/server/0248-Spark-Profiler.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Spark Profiler
 Co-authored-by: granny <granny@purpurmc.org>
 
 diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
-index 89bf48fd581ee6580b91e2eb31dd532cb622df5e..e35da199be67e04c34df6bc09afd8d8122cb0487 100644
+index 6f14cb9a73faa1d0ae2939d08809d9f6c2a99e1d..4e98745670032038f7b4f8e1adabc1e00e7f15bf 100644
 --- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
-@@ -102,6 +102,7 @@ public class PluginInitializerManager {
-         java.util.List<File> files = (java.util.List<File>) optionSet.valuesOf("add-plugin");
-         // Register plugins from the flag
+@@ -112,6 +112,7 @@ public class PluginInitializerManager {
+         @SuppressWarnings("unchecked")
+         java.util.List<Path> files = ((java.util.List<File>) optionSet.valuesOf("add-plugin")).stream().map(File::toPath).toList();
          io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.PluginFlagProviderSource.INSTANCE, files);
 +        io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.SparkProviderSource.INSTANCE, new File("cache", "spark.jar").toPath()); // Purpur
      }
@@ -19,10 +19,10 @@ index 89bf48fd581ee6580b91e2eb31dd532cb622df5e..e35da199be67e04c34df6bc09afd8d81
      // This will be the end of me...
 diff --git a/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java b/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a7d1ae53eac94bc2dcf8bc78ef1da0d3b8554736
+index 0000000000000000000000000000000000000000..cb78dac8e072b5cb3c6e52e17c9ecdf708aeedc1
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/plugin/provider/source/SparkProviderSource.java
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,115 @@
 +package io.papermc.paper.plugin.provider.source;
 +
 +import com.mojang.logging.LogUtils;
@@ -44,26 +44,23 @@ index 0000000000000000000000000000000000000000..a7d1ae53eac94bc2dcf8bc78ef1da0d3
 +import org.bukkit.plugin.java.JavaPlugin;
 +import org.slf4j.Logger;
 +
-+public class SparkProviderSource extends FileProviderSource {
-+    public static final SparkProviderSource INSTANCE = new SparkProviderSource();
++public class SparkProviderSource implements ProviderSource<Path, Path> {
 +
++    public static final SparkProviderSource INSTANCE = new SparkProviderSource();
++    private static final FileProviderSource FILE_PROVIDER_SOURCE = new FileProviderSource("File '%s' specified by Purpur"::formatted);
 +    private static final Logger LOGGER = LogUtils.getClassLogger();
 +
-+    public SparkProviderSource() {
-+        super("File '%s' specified by Purpur"::formatted);
-+    }
-+
 +    @Override
-+    public void registerProviders(EntrypointHandler entrypointHandler, Path context) throws Exception {
++    public Path prepareContext(Path context) {
 +        // first, check if user doesn't want spark at all
 +        if (Boolean.getBoolean("Purpur.IReallyDontWantSpark")) {
-+            return; // boo!
++            return null; // boo!
 +        }
 +
 +        // second, check if user has their own spark
 +        if (hasSpark()) {
 +            LOGGER.info("Purpur: Using user-provided spark plugin instead of our own.");
-+            return; // let's hope it's at least the modern version :3
++            return null; // let's hope it's at least the modern version :3
 +        }
 +
 +        // you can't have errors in your code if you wrap the entire codebase in a try/catch block
@@ -109,11 +106,27 @@ index 0000000000000000000000000000000000000000..a7d1ae53eac94bc2dcf8bc78ef1da0d3
 +            }
 +
 +            // register the spark, newly downloaded or existing
-+            super.registerProviders(entrypointHandler, context);
++            return FILE_PROVIDER_SOURCE.prepareContext(context);
 +
 +        } catch (Throwable e) {
 +            LOGGER.error("Purpur: Failed to download and install spark plugin", e);
 +        }
++        return null;
++    }
++
++    @Override
++    public void registerProviders(final EntrypointHandler entrypointHandler, final Path context) {
++        if (context == null) {
++            return;
++        }
++
++        try {
++            FILE_PROVIDER_SOURCE.registerProviders(entrypointHandler, context);
++        } catch (IllegalArgumentException ignored) {
++            // Ignore illegal argument exceptions from jar checking
++        } catch (Exception e) {
++            LOGGER.error("Error loading our spark plugin: " + e.getMessage(), e);
++        }
 +    }
 +
 +    private static boolean hasSpark() {
diff --git a/patches/server/0259-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0249-Option-to-disable-kick-for-out-of-order-chat.patch
similarity index 75%
rename from patches/server/0259-Option-to-disable-kick-for-out-of-order-chat.patch
rename to patches/server/0249-Option-to-disable-kick-for-out-of-order-chat.patch
index 0bd304798..d9f7ab48b 100644
--- a/patches/server/0259-Option-to-disable-kick-for-out-of-order-chat.patch
+++ b/patches/server/0249-Option-to-disable-kick-for-out-of-order-chat.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Option to disable kick for out of order chat
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9e4100ed797cfbafbb9c0b658f2a19c1c9a57ffc..018a3597c7132ba1f5972fef74b6a32837a31cb3 100644
+index 222436febf0b6ea93b57b8a4c0a98998a9430873..e54be01cb1629616c2952ea99c6f28f09a592773 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2338,7 +2338,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1722,7 +1722,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ 
          do {
-             instant1 = (Instant) this.lastChatTimeStamp.get();
-             if (timestamp.isBefore(instant1)) {
+             if (!iterator.hasNext()) {
 -                return false;
 +                return !org.purpurmc.purpur.PurpurConfig.kickForOutOfOrderChat; // Purpur
              }
-         } while (!this.lastChatTimeStamp.compareAndSet(instant1, timestamp));
  
+             voxelshape1 = (VoxelShape) iterator.next();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e78e809cc7644d5007b149d5940f8cc164a76975..ed9b2f0b55229848894d9d6b401d050cb031b893 100644
+index cb8f67f0ad3531b110613c0ffb3c0cc23da23529..620f1207fc773f8602b748128557f1c73f0319fb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -456,9 +456,11 @@ public class PurpurConfig {
+@@ -461,9 +461,11 @@ public class PurpurConfig {
  
      public static boolean useUPnP = false;
      public static boolean maxJoinsPerSecond = false;
diff --git a/patches/server/0250-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0250-Add-toggle-for-enchant-level-clamping.patch
deleted file mode 100644
index 4556e3b5a..000000000
--- a/patches/server/0250-Add-toggle-for-enchant-level-clamping.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: 12emin34 <macanovic.emin@gmail.com>
-Date: Sat, 30 Apr 2022 10:32:40 +0200
-Subject: [PATCH] Add toggle for enchant level clamping
-
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index c0588e87f6f0ec3d642eacac41a3060abc08e33d..fc481f26368f4d823379921573a05ac5b91f39e6 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1207,7 +1207,7 @@ public final class ItemStack {
- 
-         ListTag nbttaglist = this.tag.getList("Enchantments", 10);
- 
--        nbttaglist.add(EnchantmentHelper.storeEnchantment(EnchantmentHelper.getEnchantmentId(enchantment), (byte) level));
-+        nbttaglist.add(EnchantmentHelper.storeEnchantment(EnchantmentHelper.getEnchantmentId(enchantment), (org.purpurmc.purpur.PurpurConfig.clampEnchantLevels) ? (byte) level : (short) level)); // Purpur
-         processEnchantOrder(this.tag); // Paper
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-index 2048899f8e4c8211e8dde0d11148d647678009fa..1eec84e217f6dc929091fa7451cd235ef3623822 100644
---- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-@@ -46,7 +46,7 @@ public class EnchantmentHelper {
-     }
- 
-     public static int getEnchantmentLevel(CompoundTag nbt) {
--        return Mth.clamp(nbt.getInt("lvl"), 0, 255);
-+        return Mth.clamp(nbt.getInt("lvl"), 0, (org.purpurmc.purpur.PurpurConfig.clampEnchantLevels) ? 255 : 32767); // Purpur
-     }
- 
-     @Nullable
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 44e8822dae170c07e48ae016826a6710b7d7e29a..4d147845402a26957c905dd600bf0657bb7bd714 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -398,6 +398,7 @@ public class PurpurConfig {
-     public static boolean allowHigherEnchantsLevels = true;
-     public static boolean allowUnsafeEnchantCommand = false;
-     public static boolean replaceIncompatibleEnchants = false;
-+    public static boolean clampEnchantLevels = true;
-     private static void enchantmentSettings() {
-         if (version < 5) {
-             boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
-@@ -421,6 +422,7 @@ public class PurpurConfig {
-         allowHigherEnchantsLevels = getBoolean("settings.enchantment.anvil.allow-higher-enchants-levels", allowHigherEnchantsLevels);
-         allowUnsafeEnchantCommand = getBoolean("settings.enchantment.allow-unsafe-enchant-command", allowUnsafeEnchants); // allowUnsafeEnchants as default for backwards compatability
-         replaceIncompatibleEnchants = getBoolean("settings.enchantment.anvil.replace-incompatible-enchants", replaceIncompatibleEnchants);
-+        clampEnchantLevels = getBoolean("settings.enchantment.clamp-levels", clampEnchantLevels);
-     }
- 
-     public static boolean endermanShortHeight = false;
diff --git a/patches/server/0260-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0250-Config-for-sculk-shrieker-can_summon-state.patch
similarity index 72%
rename from patches/server/0260-Config-for-sculk-shrieker-can_summon-state.patch
rename to patches/server/0250-Config-for-sculk-shrieker-can_summon-state.patch
index bd840ee3f..555f9bb73 100644
--- a/patches/server/0260-Config-for-sculk-shrieker-can_summon-state.patch
+++ b/patches/server/0250-Config-for-sculk-shrieker-can_summon-state.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for sculk shrieker can_summon state
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java b/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java
-index 02d01eabb9606ae8c3b76ad9fa4bb9a525e247b1..ce51fec4a874f9466f9966684c535315dbf40b9e 100644
+index b6b367492ebe2af3e63381bef935c6077f6ddb27..09f34c30d9a03751ed826b26375ac5aee778cce4 100644
 --- a/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SculkShriekerBlock.java
-@@ -130,7 +130,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo
+@@ -134,7 +134,7 @@ public class SculkShriekerBlock extends BaseEntityBlock implements SimpleWaterlo
      @Nullable
      @Override
      public BlockState getStateForPlacement(BlockPlaceContext ctx) {
@@ -18,11 +18,11 @@ index 02d01eabb9606ae8c3b76ad9fa4bb9a525e247b1..ce51fec4a874f9466f9966684c535315
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9c90c8f1c6697a98049bf044ac061bb93e1a4363..2f7a5fd20ace3f27edc79c0f4a7bb4e4a772b3f8 100644
+index 38f161e102c5202c79108ad150ff42af1a75658c..6dc3d5a420005a859560ebb85009183b446a0531 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -997,6 +997,11 @@ public class PurpurWorldConfig {
-         fixSandDuping = getBoolean("blocks.sand.fix-duping", fixSandDuping);
+@@ -1066,6 +1066,11 @@ public class PurpurWorldConfig {
+         }
      }
  
 +    public boolean sculkShriekerCanSummonDefault = false;
@@ -30,6 +30,6 @@ index 9c90c8f1c6697a98049bf044ac061bb93e1a4363..2f7a5fd20ace3f27edc79c0f4a7bb4e4
 +        sculkShriekerCanSummonDefault = getBoolean("blocks.sculk_shrieker.can-summon-default", sculkShriekerCanSummonDefault);
 +    }
 +
-     public boolean shulkerBoxAllowOversizedStacks = false;
-     private void shulkerBoxSettings() {
-         shulkerBoxAllowOversizedStacks = getBoolean("blocks.shulker_box.allow-oversized-stacks", shulkerBoxAllowOversizedStacks);
+     public boolean signAllowColors = false;
+     private void signSettings() {
+         signAllowColors = getBoolean("blocks.sign.allow-colors", signAllowColors);
diff --git a/patches/server/0261-Config-to-not-let-coral-die.patch b/patches/server/0251-Config-to-not-let-coral-die.patch
similarity index 81%
rename from patches/server/0261-Config-to-not-let-coral-die.patch
rename to patches/server/0251-Config-to-not-let-coral-die.patch
index 9a3a983e5..42fbf00c7 100644
--- a/patches/server/0261-Config-to-not-let-coral-die.patch
+++ b/patches/server/0251-Config-to-not-let-coral-die.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to not let coral die
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java b/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
-index 3d2b34c5a7c9b00c1164b4f89c2cbff81fc460eb..b5505e926e5cdb447de68e8eb8e46c97eb988e27 100644
+index ce9f189bdafec26360bfadd0f36a8bc2726e132b..d5465b48531fd4b4094874c135274abf985ee71a 100644
 --- a/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.java
-@@ -35,6 +35,7 @@ public class BaseCoralPlantTypeBlock extends Block implements SimpleWaterloggedB
+@@ -38,6 +38,7 @@ public abstract class BaseCoralPlantTypeBlock extends Block implements SimpleWat
      }
  
      protected static boolean scanForWater(BlockState state, BlockGetter world, BlockPos pos) {
@@ -17,10 +17,10 @@ index 3d2b34c5a7c9b00c1164b4f89c2cbff81fc460eb..b5505e926e5cdb447de68e8eb8e46c97
              return true;
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/block/CoralBlock.java b/src/main/java/net/minecraft/world/level/block/CoralBlock.java
-index 88faea00be60a519f56f975a5311df5e1eb3e6b8..cbb726ac367be81e27d3a86643baf7c4f0746edf 100644
+index 81fe0dea8e6e23c4a78f07fc2f9c0d68cd683f11..bff97b7d3909f2ec9e58a341b901b3741927543f 100644
 --- a/src/main/java/net/minecraft/world/level/block/CoralBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CoralBlock.java
-@@ -45,6 +45,7 @@ public class CoralBlock extends Block {
+@@ -59,6 +59,7 @@ public class CoralBlock extends Block {
      }
  
      protected boolean scanForWater(BlockGetter world, BlockPos pos) {
@@ -29,10 +29,10 @@ index 88faea00be60a519f56f975a5311df5e1eb3e6b8..cbb726ac367be81e27d3a86643baf7c4
          int i = aenumdirection.length;
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2f7a5fd20ace3f27edc79c0f4a7bb4e4a772b3f8..4351793923ea16e3c3fe7ed547c1236cae0e952a 100644
+index 6dc3d5a420005a859560ebb85009183b446a0531..9e884018d72ad9b63b8968551223451ecc09b547 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -834,6 +834,11 @@ public class PurpurWorldConfig {
+@@ -913,6 +913,11 @@ public class PurpurWorldConfig {
          composterBulkProcess = getBoolean("blocks.composter.sneak-to-bulk-process", composterBulkProcess);
      }
  
diff --git a/patches/server/0262-Add-local-difficulty-api.patch b/patches/server/0252-Add-local-difficulty-api.patch
similarity index 74%
rename from patches/server/0262-Add-local-difficulty-api.patch
rename to patches/server/0252-Add-local-difficulty-api.patch
index e6b06949e..512458afe 100644
--- a/patches/server/0262-Add-local-difficulty-api.patch
+++ b/patches/server/0252-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 0e670de77a7f9926e295e1dd63d909bed1a959ca..791e69b2c963cd034d6d35561448cdb20b1b1cde 100644
+index f2b20ed5063a293f0b464548f590d652170cd1d8..b7a02ae4eda06cab8ffd1220259a061558981dec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2289,6 +2289,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2424,6 +2424,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }
  
@@ -19,5 +19,5 @@ index 0e670de77a7f9926e295e1dd63d909bed1a959ca..791e69b2c963cd034d6d35561448cdb2
 +    // Purpur end
 +
      @Override
-     public PersistentDataContainer getPersistentDataContainer() {
-         return this.persistentDataContainer;
+     public Collection<GeneratedStructure> getStructures(int x, int z) {
+         return this.getStructures(x, z, struct -> true);
diff --git a/patches/server/0263-Add-toggle-for-RNG-manipulation.patch b/patches/server/0253-Add-toggle-for-RNG-manipulation.patch
similarity index 72%
rename from patches/server/0263-Add-toggle-for-RNG-manipulation.patch
rename to patches/server/0253-Add-toggle-for-RNG-manipulation.patch
index 5cccb4d7b..996a45aaf 100644
--- a/patches/server/0263-Add-toggle-for-RNG-manipulation.patch
+++ b/patches/server/0253-Add-toggle-for-RNG-manipulation.patch
@@ -7,36 +7,36 @@ Paper patches RNG maniplulation by using a shared (and locked) random source.
 This comes with a performance gain, but technical players may prefer the ability to manipulate RNG.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 12f0da455f174c5a0652ac87f62c159808fbf7d3..307eac4114192a7f0e6633e3df5a5e7a54ad22ba 100644
+index 2d1fc8734f440c284710c71abc6789e8185ec909..68e8f9913055219486ce19d95dcf9d7c76e08082 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -561,7 +561,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -597,7 +597,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.bb = Entity.INITIAL_AABB;
          this.stuckSpeedMultiplier = Vec3.ZERO;
          this.nextStep = 1.0F;
--        this.random = SHARED_RANDOM; // Paper
-+        this.random = world == null || world.purpurConfig.entitySharedRandom ? SHARED_RANDOM : RandomSource.create(); // Paper // Purpur
+-        this.random = SHARED_RANDOM; // Paper - Share random for entities to make them more random
++        this.random = world == null || world.purpurConfig.entitySharedRandom ? SHARED_RANDOM : RandomSource.create(); // Paper - Share random for entities to make them more random // Purpur
          this.remainingFireTicks = -this.getFireImmuneTicks();
          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 88c238e492b1081d1a64a3b6f05d7baa17e5d8c9..dd7f2beabf0edad4143ac2365ac04a22edf1f75e 100644
+index b86676ebcd6c301e5dd857d8e84e1db2c1da416b..cb950ba3ee3bdfe0ff7acdb94c7ee233d73ab22e 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 {
+@@ -42,7 +42,7 @@ public class Squid extends WaterAnimal {
  
      public Squid(EntityType<? extends Squid> type, Level world) {
          super(type, world);
--        //this.random.setSeed((long)this.getId()); // Paper - we set the random to shared, do not clobber the seed
-+        if (!world.purpurConfig.entitySharedRandom) this.random.setSeed((long) this.getId()); // Paper - we set the random to shared, do not clobber the seed // 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/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4351793923ea16e3c3fe7ed547c1236cae0e952a..07b8826509d158e60ee6c3c847f7855b7469325f 100644
+index 9e884018d72ad9b63b8968551223451ecc09b547..f50c26f02bc7c95f7b1228588aff68296290c21b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -204,9 +204,11 @@ public class PurpurWorldConfig {
+@@ -212,9 +212,11 @@ public class PurpurWorldConfig {
  
      public int entityLifeSpan = 0;
      public float entityLeftHandedChance = 0.05f;
diff --git a/patches/server/0253-Stonecutter-damage.patch b/patches/server/0253-Stonecutter-damage.patch
deleted file mode 100644
index 41ac75f17..000000000
--- a/patches/server/0253-Stonecutter-damage.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Wed, 8 Jun 2022 14:19:35 -0400
-Subject: [PATCH] Stonecutter damage
-
-
-diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-index 9e3608650c44ef5fa724c3aea86603d7bd02429c..8c2c515f1b5f56bf1d6cf0c35d4f0fa7b593d1a0 100644
---- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-+++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-@@ -102,6 +102,8 @@ public class CombatTracker {
-                 // Purpur start
-                 if (damageSource.isScissors) {
-                     return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgRunWithScissors, this.mob);
-+                } else if (damageSource.isStoneCutter) {
-+                    return damageSource.getLocalizedDeathMessage(org.purpurmc.purpur.PurpurConfig.deathMsgStonecutter, this.mob);
-                 }
-                 // Purpur end
-                 return damageSource.getLocalizedDeathMessage(this.mob);
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index 33210bc66dcc5fdf03fbf438ce8734b31c4e7975..fc1fb63ee0e28b8d1f065bfad716b465cde5a69f 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -56,6 +56,8 @@ public class DamageSource {
- 
-     public boolean isScissors; // Purpur
- 
-+    public boolean isStoneCutter; // Purpur
-+
-     public String toString() {
-         return "DamageSource (" + this.type().msgId() + ")";
-     }
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSources.java b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-index 813916852774d6482791989252ecb67b945a8f84..4a5d2e263d2bbee96bde7012d3385fa33860bc1b 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSources.java
-@@ -273,5 +273,11 @@ public class DamageSources {
-         source.isScissors = true;
-         return source;
-     }
-+
-+    public DamageSource stonecutter() {
-+        DamageSource source = new DamageSource(this.damageTypes.getHolderOrThrow(DamageTypes.MAGIC));
-+        source.isStoneCutter = true;
-+        return source;
-+    }
-     // Purpur end
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-index 0a95842c53a9d0286c57bcb42db97e468e30fb7d..0882e67c5cf876e0fc58a4ca4accb4be40418983 100644
---- a/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/StonecutterBlock.java
-@@ -92,4 +92,16 @@ public class StonecutterBlock extends Block {
-     public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) {
-         return false;
-     }
-+
-+    // Purpur start
-+    @Override
-+    public void stepOn(Level level, BlockPos pos, BlockState state, net.minecraft.world.entity.Entity entity) {
-+        if (level.purpurConfig.stonecutterDamage > 0.0F && entity instanceof net.minecraft.world.entity.LivingEntity) {
-+            org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = level.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
-+            entity.hurt(entity.damageSources().stonecutter(), level.purpurConfig.stonecutterDamage);
-+            org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null;
-+        }
-+        super.stepOn(level, pos, state, entity);
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-index d976a6df54c1e817def2d588692abe25a03ee0fa..ba57accc272958da4714896baeadb52c99383561 100644
---- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-@@ -465,7 +465,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-                             return BlockPathTypes.BLOCKED;
-                         } else {
-                         // Paper end
--                        if (blockState.is(Blocks.CACTUS) || blockState.is(Blocks.SWEET_BERRY_BUSH)) {
-+                        if (blockState.is(Blocks.CACTUS) || blockState.is(Blocks.SWEET_BERRY_BUSH) || blockState.is(Blocks.STONECUTTER)) { // Purpur
-                             return BlockPathTypes.DANGER_OTHER;
-                         }
- 
-@@ -498,7 +498,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-         } else if (!blockState.is(BlockTags.TRAPDOORS) && !blockState.is(Blocks.LILY_PAD) && !blockState.is(Blocks.BIG_DRIPLEAF)) {
-             if (blockState.is(Blocks.POWDER_SNOW)) {
-                 return BlockPathTypes.POWDER_SNOW;
--            } else if (!blockState.is(Blocks.CACTUS) && !blockState.is(Blocks.SWEET_BERRY_BUSH)) {
-+            } else if (!blockState.is(Blocks.CACTUS) && !blockState.is(Blocks.SWEET_BERRY_BUSH) && !blockState.is(Blocks.STONECUTTER)) { // Purpur
-                 if (blockState.is(Blocks.HONEY_BLOCK)) {
-                     return BlockPathTypes.STICKY_HONEY;
-                 } else if (blockState.is(Blocks.COCOA)) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 4d147845402a26957c905dd600bf0657bb7bd714..e78e809cc7644d5007b149d5940f8cc164a76975 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -209,8 +209,10 @@ public class PurpurConfig {
-     }
- 
-     public static String deathMsgRunWithScissors = "<player> slipped and fell on their shears";
-+    public static String deathMsgStonecutter = "<player> has sawed themself in half";
-     private static void deathMessages() {
-         deathMsgRunWithScissors = getString("settings.messages.death-message.run-with-scissors", deathMsgRunWithScissors);
-+        deathMsgStonecutter = getString("settings.messages.death-message.stonecutter", deathMsgStonecutter);
-     }
- 
-     public static boolean advancementOnlyBroadcastToAffectedPlayer = false;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b964bad8d599e093ad312a9dedf1a33856ce9ec1..417322e7cf09eb56acf5fc398ce2319b54c4477a 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1021,6 +1021,11 @@ public class PurpurWorldConfig {
-         spongeAbsorbsWaterFromMud = getBoolean("blocks.sponge.absorbs-water-from-mud", spongeAbsorbsWaterFromMud);
-     }
- 
-+    public float stonecutterDamage = 0.0F;
-+    private void stonecutterSettings() {
-+        stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
-+    }
-+
-     public boolean turtleEggsBreakFromExpOrbs = true;
-     public boolean turtleEggsBreakFromItems = true;
-     public boolean turtleEggsBreakFromMinecarts = true;
diff --git a/patches/server/0266-Remove-Timings.patch b/patches/server/0254-Remove-Timings.patch
similarity index 72%
rename from patches/server/0266-Remove-Timings.patch
rename to patches/server/0254-Remove-Timings.patch
index c8bc91be3..b59617ff9 100644
--- a/patches/server/0266-Remove-Timings.patch
+++ b/patches/server/0254-Remove-Timings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove Timings
 
 
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
-index abd0217cf0bff183c8e262edc173a53403797c1a..2519ad2884b6c09b312432b933c31476b369e599 100644
+index 6bc7c6f16a1649fc9e24e7cf90fca401e5bd4875..e1ffd62f4ebceecb9bc5471df3da406cffea0483 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java
-@@ -1315,9 +1315,9 @@ public final class ChunkHolderManager {
+@@ -1316,9 +1316,9 @@ public final class ChunkHolderManager {
      }
  
      public boolean processTicketUpdates() {
@@ -21,7 +21,7 @@ index abd0217cf0bff183c8e262edc173a53403797c1a..2519ad2884b6c09b312432b933c31476
  
      private static final ThreadLocal<List<ChunkProgressionTask>> CURRENT_TICKET_UPDATE_SCHEDULING = new ThreadLocal<>();
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
-index b66a7d4aab887309579154815a0d4abf9de506b0..e6f56bc5b129699bab60db9c97c7f73b6ede2351 100644
+index 56b07a3306e5735816c8d89601b519cb0db6379a..604de7aed6db44c9c84d541765e57da48883cf00 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
 @@ -1779,7 +1779,7 @@ public final class NewChunkHolder {
@@ -43,11 +43,11 @@ index b66a7d4aab887309579154815a0d4abf9de506b0..e6f56bc5b129699bab60db9c97c7f73b
          return executedUnloadTask | canSaveChunk | canSaveEntities | canSavePOI ? new SaveStat(executedUnloadTask || canSaveChunk, canSaveEntities, canSavePOI): null;
      }
 diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-index 9a49f5271ec1d9de17632bfffe8309cb1ba0d8b1..0be239c5c78432a6377cd7828cd49f61f8f0ac8f 100644
+index 57e76b53e5e314c3e6b8856010f7a84188121582..8c134a642ccaf3530022f2e675a858d726e1dda4 100644
 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
 +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
-@@ -49,7 +49,7 @@ public class PacketUtils {
-                 if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerCommonPacketListenerImpl && ((ServerCommonPacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590
+@@ -51,7 +51,7 @@ public class PacketUtils {
+                 if (listener instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players
                  if (listener.shouldHandleMessage(packet)) {
                      co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
 -                    try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings
@@ -56,11 +56,29 @@ index 9a49f5271ec1d9de17632bfffe8309cb1ba0d8b1..0be239c5c78432a6377cd7828cd49f61
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4a58629ab 100644
+index 5081a631a94920db0307341261755eac399fea1e..f3c66049ab3fe087fa0fa87c2fca36c3c8b5c572 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1390,15 +1390,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public void onServerExit() {}
+@@ -1481,7 +1481,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             return;
+         }
+ 
+-        co.aikar.timings.MinecraftTimings.midTickChunkTasks.startTiming();
++        // co.aikar.timings.MinecraftTimings.midTickChunkTasks.startTiming(); // Purpur
+         try {
+             for (;;) {
+                 boolean moreTasks = this.tickMidTickTasks();
+@@ -1508,7 +1508,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 }
+             }
+         } finally {
+-            co.aikar.timings.MinecraftTimings.midTickChunkTasks.stopTiming();
++            // co.aikar.timings.MinecraftTimings.midTickChunkTasks.stopTiming(); // Purpur
+         }
+     }
+     // Paper end - execute chunk tasks mid tick
+@@ -1583,15 +1583,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
 -        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
@@ -76,10 +94,10 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
 -        isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
 +        //isOversleep = false;MinecraftTimings.serverOversleep.stopTiming(); // Purpur
          // Paper end
-         new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
+         new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
  
-@@ -1433,9 +1433,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         // Paper end
+@@ -1628,9 +1628,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
 -        try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
@@ -88,18 +106,18 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
 -        }
 +        //} // Purpur
          // Paper end
-         // Paper start
+         // Paper start - Server Tick Events
          long endTime = System.nanoTime();
-@@ -1456,7 +1456,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.logTickTime(k - i);
+@@ -1653,7 +1653,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
 -        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
 +        //co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Purpur
      }
  
-     protected void logTickTime(long nanos) {}
-@@ -1493,9 +1493,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private void logTickMethodTime(long tickStartTime) {
+@@ -1724,9 +1724,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -111,7 +129,7 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
-@@ -1512,21 +1512,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1743,21 +1743,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
          this.profiler.push("commandFunctions");
@@ -121,7 +139,7 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
 -        MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
 +        //MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper // Purpur
          this.profiler.popPush("levels");
-         //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
+         //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
@@ -136,18 +154,18 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
 -        MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
 +        //MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper // Purpur
          // Send time updates to everyone, it will get the right time from the world the player is in.
-         // Paper start - optimize time updates
+         // Paper start - Perf: Optimize time updates
          for (final ServerLevel level : this.getAllLevels()) {
-@@ -1546,7 +1546,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1777,7 +1777,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
-         // Paper end
+         // Paper end - Perf: Optimize time updates
 -        MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
 +        //MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper // Purpur
  
-         this.isIteratingOverLevels = true; // Paper
-         Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
-@@ -1572,14 +1572,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
+         Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
+@@ -1805,14 +1805,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
@@ -162,24 +180,24 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
 -                worldserver.timings.doTick.stopTiming(); // Spigot
 +                //worldserver.timings.doTick.stopTiming(); // Spigot // Purpur
              } catch (Throwable throwable) {
-                 // Spigot Start
-                 CrashReport crashreport;
-@@ -1602,24 +1602,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.isIteratingOverLevels = false; // Paper
+                 CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
+ 
+@@ -1827,24 +1827,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
          this.profiler.popPush("connection");
--        MinecraftTimings.connectionTimer.startTiming(); // Spigot
-+        //MinecraftTimings.connectionTimer.startTiming(); // Spigot // Purpur
+-        MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
++        // MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper // Purpur
          this.getConnection().tick();
--        MinecraftTimings.connectionTimer.stopTiming(); // Spigot
-+        //MinecraftTimings.connectionTimer.stopTiming(); // Spigot // Purpur
+-        MinecraftTimings.connectionTimer.stopTiming(); // Spigot // Paper
++        // MinecraftTimings.connectionTimer.stopTiming(); // Spigot // Paper // Purpur
          this.profiler.popPush("players");
 -        MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
 +        //MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
          this.playerList.tick();
 -        MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
 +        //MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
-         if (SharedConstants.IS_RUNNING_IN_IDE) {
+         if (SharedConstants.IS_RUNNING_IN_IDE && this.tickRateManager.runsNormally()) {
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -195,51 +213,20 @@ index 219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9..2ea0db79e2a4b23455b2b2bc345621b4
  
          this.profiler.popPush("send chunks");
          iterator = this.playerList.getPlayers().iterator();
-@@ -2817,7 +2817,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             return;
-         }
- 
--        co.aikar.timings.MinecraftTimings.midTickChunkTasks.startTiming();
-+        //co.aikar.timings.MinecraftTimings.midTickChunkTasks.startTiming(); // Purpur
-         try {
-             for (;;) {
-                 boolean moreTasks = this.tickMidTickTasks();
-@@ -2844,7 +2844,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 }
-             }
-         } finally {
--            co.aikar.timings.MinecraftTimings.midTickChunkTasks.stopTiming();
-+            //co.aikar.timings.MinecraftTimings.midTickChunkTasks.stopTiming(); // Purpur
-         }
-     }
-     // Paper end - execute chunk tasks mid tick
-diff --git a/src/main/java/net/minecraft/server/ServerFunctionManager.java b/src/main/java/net/minecraft/server/ServerFunctionManager.java
-index d10abd28c522612934aada8124e5bb67a9b4e9da..a6a1b57b4327f5710e9ec5ebca35a47c11751d11 100644
---- a/src/main/java/net/minecraft/server/ServerFunctionManager.java
-+++ b/src/main/java/net/minecraft/server/ServerFunctionManager.java
-@@ -97,7 +97,7 @@ public class ServerFunctionManager {
-         } else {
-             int i;
- 
--            try (co.aikar.timings.Timing timing = function.getTiming().startTiming()) { // Paper
-+            try /*(co.aikar.timings.Timing timing = function.getTiming().startTiming())*/ { // Paper // Purpur
-                 this.context = new ServerFunctionManager.ExecutionContext(tracer);
-                 i = this.context.runTopCommand(customfunction1, source);
-             } finally {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index fdda6d2767749d0c2affbf3fba494e000bc47036..207a76f91758a8643976414a8732573d488bf1df 100644
+index 56c6800ae5696397ffba2dc2e03930195a130112..0d2d254fc2795f0ec844029bd4c05cdf6dc94207 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -522,7 +522,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -541,7 +541,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      }
  
      public void handleConsoleInputs() {
 -        MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
 +        //MinecraftTimings.serverCommandTimer.startTiming(); // Spigot // Purpur
-         // Paper start - use proper queue
+         // Paper start - Perf: use proper queue
          ConsoleInput servercommand;
          while ((servercommand = this.serverCommandQueue.poll()) != null) {
-@@ -539,7 +539,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -558,7 +558,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // CraftBukkit end
          }
  
@@ -249,10 +236,10 @@ index fdda6d2767749d0c2affbf3fba494e000bc47036..207a76f91758a8643976414a8732573d
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7eaee0d0dcbb420abb5c49ba0a465d90fe513551..75461a983b24e399fc695322f4e396250b991c9e 100644
+index dbe9df1e1973db133f7c8516256697ef7c968137..bbe4580f7fc7cb6c8eb7055c82e2af7ad2ccd59d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -468,15 +468,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -543,15 +543,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      protected void tick(BooleanSupplier shouldKeepTicking) {
          ProfilerFiller gameprofilerfiller = this.level.getProfiler();
  
@@ -272,54 +259,83 @@ index 7eaee0d0dcbb420abb5c49ba0a465d90fe513551..75461a983b24e399fc695322f4e39625
          }
  
          gameprofilerfiller.pop();
-@@ -1090,7 +1090,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1157,24 +1157,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ 
+     // Paper start - optimised tracker
+     private final void processTrackQueue() {
+-        this.level.timings.tracker1.startTiming();
++        //this.level.timings.tracker1.startTiming(); // Purpur
+         try {
+             for (TrackedEntity tracker : this.entityMap.values()) {
+                 // update tracker entry
+                 tracker.updatePlayers(tracker.entity.getPlayersInTrackRange());
+             }
+         } finally {
+-            this.level.timings.tracker1.stopTiming();
++            //this.level.timings.tracker1.stopTiming(); // Purpur
+         }
+ 
+ 
+-        this.level.timings.tracker2.startTiming();
++        //this.level.timings.tracker2.startTiming(); // Purpur
+         try {
+             for (TrackedEntity tracker : this.entityMap.values()) {
+                 tracker.serverEntity.sendChanges();
+             }
+         } finally {
+-            this.level.timings.tracker2.stopTiming();
++            //this.level.timings.tracker2.stopTiming(); // Purpur
+         }
+     }
+     // Paper end - optimised tracker
+@@ -1189,7 +1189,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
 -        level.timings.tracker1.startTiming(); // Paper
-+        //level.timings.tracker1.startTiming(); // Paper // Purpur
++        //this.level.timings.tracker1.startTiming(); // Paper // Purpur
  
          ChunkMap.TrackedEntity playerchunkmap_entitytracker;
  
-@@ -1115,17 +1115,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1214,17 +1214,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  playerchunkmap_entitytracker.serverEntity.sendChanges();
              }
          }
 -        level.timings.tracker1.stopTiming(); // Paper
-+        //level.timings.tracker1.stopTiming(); // Paper // Purpur
++        //this.level.timings.tracker1.stopTiming(); // Paper // Purpur
  
          if (!list.isEmpty()) {
              objectiterator = this.entityMap.values().iterator();
  
 -            level.timings.tracker2.startTiming(); // Paper
-+            //level.timings.tracker2.startTiming(); // Paper // Purpur
++            //this.level.timings.tracker2.startTiming(); // Paper // Purpur
              while (objectiterator.hasNext()) {
                  playerchunkmap_entitytracker = (ChunkMap.TrackedEntity) objectiterator.next();
                  playerchunkmap_entitytracker.updatePlayers(list);
              }
 -            level.timings.tracker2.stopTiming(); // Paper
-+            //level.timings.tracker2.stopTiming(); // Paper // Purpur
++            //this.level.timings.tracker2.stopTiming(); // Paper // Purpur
          }
  
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2851a71b2 100644
+index b99f50604bafecbc68835974c9ed0caa91911a40..07b428ed7837642254b1edd55fd08a7beac7e303 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -298,10 +298,10 @@ public class ServerChunkCache extends ChunkSource {
+@@ -274,10 +274,10 @@ public class ServerChunkCache extends ChunkSource {
+             if (!completablefuture.isDone()) { // Paper
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.pushChunkWait(this.level, x1, z1); // Paper - rewrite chunk system
-                 // Paper end
-                 com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x1, z1); // Paper - sync load info
+                 com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x, z); // Paper - Add debug for sync chunk loads
 -                this.level.timings.syncChunkLoad.startTiming(); // Paper
 +                //this.level.timings.syncChunkLoad.startTiming(); // Paper // Purpur
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - rewrite chunk system
 -                this.level.timings.syncChunkLoad.stopTiming(); // Paper
 +                //this.level.timings.syncChunkLoad.stopTiming(); // Paper // Purpur
              } // Paper
-             ichunkaccess = (ChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> {
-                 return ichunkaccess1;
-@@ -450,17 +450,17 @@ public class ServerChunkCache extends ChunkSource {
+             ChunkResult<ChunkAccess> chunkresult = (ChunkResult) completablefuture.join();
+             ChunkAccess ichunkaccess1 = (ChunkAccess) chunkresult.orElse(null); // CraftBukkit - decompile error
+@@ -425,17 +425,17 @@ public class ServerChunkCache extends ChunkSource {
  
      public void save(boolean flush) {
          this.runDistanceManagerUpdates();
@@ -330,7 +346,7 @@ index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2
 +        //} // Paper - Timings // Purpur
      }
  
-     // Paper start - duplicate save, but call incremental
+     // Paper start - Incremental chunk and player saving; duplicate save, but call incremental
      public void saveIncrementally() {
          this.runDistanceManagerUpdates();
 -        try (co.aikar.timings.Timing timed = level.timings.chunkSaveData.startTiming()) { // Paper - Timings
@@ -339,15 +355,18 @@ index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2
 -        } // Paper - Timings
 +        //} // Paper - Timings // Purpur
      }
-     // Paper end
+     // Paper end - Incremental chunk and player saving
  
-@@ -490,22 +490,22 @@ public class ServerChunkCache extends ChunkSource {
+@@ -472,26 +472,25 @@ public class ServerChunkCache extends ChunkSource {
      @Override
      public void tick(BooleanSupplier shouldKeepTicking, boolean tickChunks) {
          this.level.getProfiler().push("purge");
 -        this.level.timings.doChunkMap.startTiming(); // Spigot
 +        //this.level.timings.doChunkMap.startTiming(); // Spigot // Purpur
-         this.distanceManager.purgeStaleTickets();
+         if (this.level.tickRateManager().runsNormally() || !tickChunks) {
+             this.distanceManager.purgeStaleTickets();
+         }
+-
          this.runDistanceManagerUpdates();
 -        this.level.timings.doChunkMap.stopTiming(); // Spigot
 +        //this.level.timings.doChunkMap.stopTiming(); // Spigot // Purpur
@@ -359,6 +378,7 @@ index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2
              this.tickChunks();
 -            this.level.timings.chunks.stopTiming(); // Paper - timings
 +            //this.level.timings.chunks.stopTiming(); // Paper - timings // Purpur
+             this.chunkMap.tick();
          }
  
 -        this.level.timings.doChunkUnload.startTiming(); // Spigot
@@ -370,44 +390,46 @@ index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2
          this.level.getProfiler().pop();
          this.clearCache();
      }
-@@ -529,7 +529,7 @@ public class ServerChunkCache extends ChunkSource {
-             boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
- 
-             gameprofilerfiller.push("naturalSpawnCount");
--            this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
-+            //this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur
-             int l = this.distanceManager.getNaturalSpawnChunkCount();
-             // Paper start - per player mob spawning
-             NaturalSpawner.SpawnState spawnercreature_d; // moved down
-@@ -560,13 +560,13 @@ public class ServerChunkCache extends ChunkSource {
-                 // Pufferfish end
-             }
-             // Paper end
--            this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
-+            //this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings // Purpur
- 
-             //this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously
-             gameprofilerfiller.popPush("filteringLoadedChunks");
+@@ -507,13 +506,13 @@ public class ServerChunkCache extends ChunkSource {
+             gameprofilerfiller.push("pollingChunks");
+             gameprofilerfiller.push("filteringLoadedChunks");
              // Paper - optimise chunk tick iteration
-             // Paper - optimise chunk tick iteration
--            this.level.timings.chunkTicks.startTiming(); // Paper
-+            //this.level.timings.chunkTicks.startTiming(); // Paper // Purpur
+-            if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper
++            //if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper // Purpur
  
              // Paper - optimise chunk tick iteration
  
-@@ -672,17 +672,17 @@ public class ServerChunkCache extends ChunkSource {
+             if (this.level.tickRateManager().runsNormally()) {
+                 gameprofilerfiller.popPush("naturalSpawnCount");
+-                this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
++                //this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur
+                 int k = this.distanceManager.getNaturalSpawnChunkCount();
+                 // Paper start - Optional per player mob spawns
+                 int naturalSpawnChunkCount = k;
+@@ -538,7 +537,7 @@ public class ServerChunkCache extends ChunkSource {
+                     spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
+                 }
+                 // Paper end - Optional per player mob spawns
+-                this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
++                // this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings // Purpur
+ 
+                 this.lastSpawnState = spawnercreature_d;
+                 gameprofilerfiller.popPush("spawnAndTick");
+@@ -647,19 +646,19 @@ public class ServerChunkCache extends ChunkSource {
+                     }
+                 }
+                 // Paper end - optimise chunk tick iteration
+-                this.level.timings.chunkTicks.stopTiming(); // Paper
++                // this.level.timings.chunkTicks.stopTiming(); // Paper // Purpur
+ 
+                 gameprofilerfiller.popPush("customSpawners");
+                 if (flag) {
+-                    try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings
++                    //try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings // Purpur
+                     this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
+-                    } // Paper - timings
++                    //} // Paper - timings // Purpur
                  }
-             }
-             // Paper end - optimise chunk tick iteration
--            this.level.timings.chunkTicks.stopTiming(); // Paper
-+            //this.level.timings.chunkTicks.stopTiming(); // Paper // Purpur
-             gameprofilerfiller.popPush("customSpawners");
-             if (flag2) {
--                try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings
-+                //try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings // Purpur
-                 this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
--                } // Paper - timings
-+                //} // Paper - timings // Purpur
              }
  
              gameprofilerfiller.popPush("broadcast");
@@ -417,7 +439,7 @@ index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2
              // Paper start - optimise chunk tick iteration
              if (!this.chunkMap.needsChangeBroadcasting.isEmpty()) {
                  it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<ChunkHolder> copy = this.chunkMap.needsChangeBroadcasting.clone();
-@@ -696,7 +696,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -673,7 +672,7 @@ public class ServerChunkCache extends ChunkSource {
                  }
              }
              // Paper end - optimise chunk tick iteration
@@ -427,31 +449,34 @@ index 5d9a1855cdab1a25ad22ad096c68e55143efa821..71bf8555b34525f0d7781d8ee8cf67e2
              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 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a44d905e5 100644
+index ae2b9732b2795ea7faec96af4c27ccb04f772307..a84a9218838fb42c49a00c0d5f28e9e486fc7dac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -856,7 +856,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         this.updateSkyBrightness();
-         this.tickTime();
+@@ -872,7 +872,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         }
+ 
          gameprofilerfiller.popPush("tickPending");
--        timings.scheduledBlocks.startTiming(); // Paper
-+        //timings.scheduledBlocks.startTiming(); // Paper // Purpur
-         if (!this.isDebug()) {
+-        this.timings.scheduledBlocks.startTiming(); // Paper
++        //this.timings.scheduledBlocks.startTiming(); // Paper // Purpur
+         if (!this.isDebug() && flag) {
              j = this.getGameTime();
              gameprofilerfiller.push("blockTicks");
-@@ -865,20 +865,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             this.fluidTicks.tick(j, 65536, this::tickFluid);
+@@ -881,24 +881,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             this.fluidTicks.tick(j, paperConfig().environment.maxFluidTicks, this::tickFluid); // Paper - configurable max fluid ticks
              gameprofilerfiller.pop();
          }
--        timings.scheduledBlocks.stopTiming(); // Paper
-+        //timings.scheduledBlocks.stopTiming(); // Paper // Purpur
+-        this.timings.scheduledBlocks.stopTiming(); // Paper
++        //this.timings.scheduledBlocks.stopTiming(); // Paper // Purpur
  
          gameprofilerfiller.popPush("raid");
--        this.timings.raids.startTiming(); // Paper - timings
-+        //this.timings.raids.startTiming(); // Paper - timings // Purpur
-         this.raids.tick();
--        this.timings.raids.stopTiming(); // Paper - timings
-+        //this.timings.raids.stopTiming(); // Paper - timings // Purpur
+         if (flag) {
+-            this.timings.raids.startTiming(); // Paper - timings
++            // this.timings.raids.startTiming(); // Paper - timings // Purpur
+             this.raids.tick();
+-            this.timings.raids.stopTiming(); // Paper - timings
++            // this.timings.raids.stopTiming(); // Paper - timings // Purpur
+         }
+ 
          gameprofilerfiller.popPush("chunkSource");
 -        this.timings.chunkProviderTick.startTiming(); // Paper - timings
 +        //this.timings.chunkProviderTick.startTiming(); // Paper - timings // Purpur
@@ -459,53 +484,54 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
 -        this.timings.chunkProviderTick.stopTiming(); // Paper - timings
 +        //this.timings.chunkProviderTick.stopTiming(); // Paper - timings // Purpur
          gameprofilerfiller.popPush("blockEvents");
--        timings.doSounds.startTiming(); // Spigot
-+        //timings.doSounds.startTiming(); // Spigot // Purpur
-         this.runBlockEvents();
--        timings.doSounds.stopTiming(); // Spigot
-+        //timings.doSounds.stopTiming(); // Spigot // Purpur
-         this.handlingTick = false;
-         gameprofilerfiller.pop();
-         boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
-@@ -889,7 +889,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (flag) {
+-            this.timings.doSounds.startTiming(); // Spigot
++            // this.timings.doSounds.startTiming(); // Spigot // Purpur
+             this.runBlockEvents();
+-            this.timings.doSounds.stopTiming(); // Spigot
++            // this.timings.doSounds.stopTiming(); // Spigot // Purpur
+         }
  
-         if (flag || this.emptyTime++ < 300) {
+         this.handlingTick = false;
+@@ -911,7 +911,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+ 
+         if (flag1 || this.emptyTime++ < 300) {
              gameprofilerfiller.push("entities");
--            timings.tickEntities.startTiming(); // Spigot
-+            //timings.tickEntities.startTiming(); // Spigot // Purpur
-             if (this.dragonFight != null) {
+-            this.timings.tickEntities.startTiming(); // Spigot
++            //this.timings.tickEntities.startTiming(); // Spigot // Purpur
+             if (this.dragonFight != null && flag) {
                  gameprofilerfiller.push("dragonFight");
                  this.dragonFight.tick();
-@@ -897,7 +897,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -919,7 +919,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
--            timings.entityTick.startTiming(); // Spigot
-+            //timings.entityTick.startTiming(); // Spigot // Purpur
+-            this.timings.entityTick.startTiming(); // Spigot
++            //this.timings.entityTick.startTiming(); // Spigot // Purpur
              this.entityTickList.forEach((entity) -> {
-                 entity.activatedPriorityReset = false; // Pufferfish - DAB
                  if (!entity.isRemoved()) {
-@@ -938,8 +938,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+                     if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
+@@ -946,8 +946,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      }
                  }
              });
--            timings.entityTick.stopTiming(); // Spigot
--            timings.tickEntities.stopTiming(); // Spigot
-+            //timings.entityTick.stopTiming(); // Spigot // Purpur
-+            //timings.tickEntities.stopTiming(); // Spigot // Purpur
+-            this.timings.entityTick.stopTiming(); // Spigot
+-            this.timings.tickEntities.stopTiming(); // Spigot
++            //this.timings.entityTick.stopTiming(); // Spigot // Purpur
++            //this.timings.tickEntities.stopTiming(); // Spigot // Purpur
              gameprofilerfiller.pop();
              this.tickBlockEntities();
          }
-@@ -1082,7 +1082,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1089,7 +1089,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         } // Paper - Option to disable ice and snow
  
-         // Paper start - optimise random block ticking
          gameprofilerfiller.popPush("tickBlocks");
 -        timings.chunkTicksBlocks.startTiming(); // Paper
 +        //timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
          if (randomTickSpeed > 0) {
+             // Paper start - optimize random block ticking
              LevelChunkSection[] sections = chunk.getSections();
-             final int minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
-@@ -1115,7 +1115,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1123,7 +1123,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
          // Paper end - optimise random block ticking
  
@@ -514,7 +540,7 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
          gameprofilerfiller.pop();
      }
  
-@@ -1454,8 +1454,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1467,8 +1467,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Spigot end
          // Paper start- timings
          final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity);
@@ -525,7 +551,7 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
          // Paper end - timings
          entity.setOldPosAndRot();
          ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -1471,7 +1471,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1484,7 +1484,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          entity.postTick(); // CraftBukkit
          } else { entity.inactiveTick(); } // Paper - EAR 2
          this.getProfiler().pop();
@@ -534,7 +560,7 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1494,8 +1494,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1507,8 +1507,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
                  // Paper - EAR 2
                  final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
@@ -545,7 +571,7 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
                  // Paper end
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
-@@ -1525,7 +1525,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1538,7 +1538,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
@@ -554,14 +580,14 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
              }
          } else {
              passenger.stopRiding();
-@@ -1545,14 +1545,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1558,14 +1558,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
          }
  
 -        try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
 +        //try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) { // Purpur
              if (doFull) {
-                 this.saveLevelData();
+                 this.saveLevelData(true); // Paper - Write SavedData IO async
              }
  
 -            this.timings.worldSaveChunks.startTiming(); // Paper
@@ -572,25 +598,25 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
  
              // Copied from save()
              // CraftBukkit start - moved from MinecraftServer.saveChunks
-@@ -1564,7 +1564,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1577,7 +1577,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
              }
              // CraftBukkit end
 -        }
 +        //} // Purpur
      }
-     // Paper end
+     // Paper end - Incremental chunk and player saving
  
-@@ -1578,7 +1578,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1591,7 +1591,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          if (!savingDisabled) {
-             org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
+             org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit
 -            try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper
 +            //try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper // Purpur // Purpur
              if (progressListener != null) {
                  progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
              }
-@@ -1588,11 +1588,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1601,11 +1601,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  progressListener.progressStage(Component.translatable("menu.savingChunks"));
              }
  
@@ -606,10 +632,10 @@ index 3c8585976bbfcb33c26ee5fde8448805e0f97e1a..68a29b818db34ef0263704d7b6d71b9a
  
          } 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 018a3597c7132ba1f5972fef74b6a32837a31cb3..0c56b90dbcb4aaf904eeb1773a1aa82e9e018c50 100644
+index e54be01cb1629616c2952ea99c6f28f09a592773..a3e29942d3db9e5e63c839b4e32394639f60b680 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2448,7 +2448,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2537,7 +2537,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      public void handleCommand(String s) { // Paper - private -> public
          org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
@@ -618,7 +644,7 @@ index 018a3597c7132ba1f5972fef74b6a32837a31cb3..0c56b90dbcb4aaf904eeb1773a1aa82e
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
  
-@@ -2458,7 +2458,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2547,7 +2547,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.cserver.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -627,7 +653,7 @@ index 018a3597c7132ba1f5972fef74b6a32837a31cb3..0c56b90dbcb4aaf904eeb1773a1aa82e
              return;
          }
  
-@@ -2471,7 +2471,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2560,7 +2560,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -637,10 +663,10 @@ index 018a3597c7132ba1f5972fef74b6a32837a31cb3..0c56b90dbcb4aaf904eeb1773a1aa82e
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf721106b861a8c166244efc2114e22d038aa3a7..5c38df8170033dbfee267520991a3cc3285d219e 100644
+index d20a7a79e27db1092ff78910df5d45982971cc3e..b863f6fe65c796a1d3102cc3eddb5d6c5becd3ac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1249,7 +1249,7 @@ public abstract class PlayerList {
+@@ -1273,7 +1273,7 @@ public abstract class PlayerList {
  
      public void saveAll(int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -649,9 +675,9 @@ index cf721106b861a8c166244efc2114e22d038aa3a7..5c38df8170033dbfee267520991a3cc3
          int numSaved = 0;
          long now = MinecraftServer.currentTick;
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1260,7 +1260,7 @@ public abstract class PlayerList {
+@@ -1284,7 +1284,7 @@ public abstract class PlayerList {
              }
-             // Paper end
+             // Paper end - Incremental chunk and player saving
          }
 -        MinecraftTimings.savePlayers.stopTiming(); // Paper
 +        //MinecraftTimings.savePlayers.stopTiming(); // Paper // Purpur
@@ -659,10 +685,10 @@ index cf721106b861a8c166244efc2114e22d038aa3a7..5c38df8170033dbfee267520991a3cc3
      }
  
 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 57ef7fbba3028c28231abf7b7ae78aa019323536..651c156dc8a5aad04d461add02e22147af657d07 100644
+index 9379dd4056018b52c93ed4888dcdc94579bd9691..612a14806ec63b0dcf31814396282f4b7f4a527c 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
-@@ -58,9 +58,9 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
+@@ -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 + (long)i;
@@ -674,7 +700,7 @@ index 57ef7fbba3028c28231abf7b7ae78aa019323536..651c156dc8a5aad04d461add02e22147
              return true;
          } else {
              return false;
-@@ -72,13 +72,13 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
+@@ -73,13 +73,13 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
  
      @Override
      public final void tickOrStop(ServerLevel world, E entity, long time) {
@@ -687,14 +713,14 @@ index 57ef7fbba3028c28231abf7b7ae78aa019323536..651c156dc8a5aad04d461add02e22147
          }
 -        this.timing.stopTiming(); // Paper - behavior timings
 +        //this.timing.stopTiming(); // Paper - behavior timings // Purpur
- 
      }
  
+     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 fcdb9bde8e1605e30dde3e580491522d4b62cdc0..7094701d213c73ba47ace806962244c10fdf4dda 100644
+index 85b4b24361e785acf75571ff98f924c00ae80748..09a7b418ddf564c0be13297f7c216db2e7ae1578 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
-@@ -46,10 +46,10 @@ public abstract class Sensor<E extends LivingEntity> {
+@@ -53,10 +53,10 @@ public abstract class Sensor<E extends LivingEntity> {
          if (--this.timeToTick <= 0L) {
              // Paper start - configurable sensor tick rate and timings
              this.timeToTick = java.util.Objects.requireNonNullElse(world.paperConfig().tickRates.sensor.get(entity.getType(), this.configKey), this.scanRate);
@@ -705,45 +731,45 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..7094701d213c73ba47ace806962244c1
 -            this.timing.stopTiming(); // Paper - sensor timings
 +            //this.timing.stopTiming(); // Paper - sensor timings // Purpur
          }
- 
      }
+ 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b486008e2ef64648064aa365fb98bd5878f9c379..fc27f690d302559dd534e9f4ede7a7bd6422837a 100644
+index edd9762e2475aa8828930ada59eb331a8e8d3970..4d00d72d66adfb282d354e22703552b333138694 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1304,15 +1304,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1306,15 +1306,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("blockEntities");
--        timings.tileEntityPending.startTiming(); // Spigot
-+        //timings.tileEntityPending.startTiming(); // Spigot // Purpur
+-        this.timings.tileEntityPending.startTiming(); // Spigot
++        //this.timings.tileEntityPending.startTiming(); // Spigot // Purpur
          this.tickingBlockEntities = true;
          if (!this.pendingBlockEntityTickers.isEmpty()) {
              this.blockEntityTickers.addAll(this.pendingBlockEntityTickers);
              this.pendingBlockEntityTickers.clear();
          }
--        timings.tileEntityPending.stopTiming(); // Spigot
-+        //timings.tileEntityPending.stopTiming(); // Spigot // Purpur
+-        this.timings.tileEntityPending.stopTiming(); // Spigot
++        //this.timings.tileEntityPending.stopTiming(); // Spigot // Purpur
  
--        timings.tileEntityTick.startTiming(); // Spigot
-+        //timings.tileEntityTick.startTiming(); // Spigot // Purpur
+-        this.timings.tileEntityTick.startTiming(); // Spigot
++        //this.timings.tileEntityTick.startTiming(); // Spigot // Purpur
          // Spigot start
-         // Iterator iterator = this.blockEntityTickers.iterator();
-         int tilesThisCycle = 0;
-@@ -1345,7 +1345,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         // Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
+         boolean flag = this.tickRateManager().runsNormally();
+@@ -1343,7 +1343,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
-         this.blockEntityTickers.removeAll(toRemove);
+         this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
  
--        timings.tileEntityTick.stopTiming(); // Spigot
-+        //timings.tileEntityTick.stopTiming(); // Spigot // Purpur
+-        this.timings.tileEntityTick.stopTiming(); // Spigot
++        //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur
          this.tickingBlockEntities = false;
          co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
          gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 9c2d62feff1816f5729060c6192269a5b2d34153..1e3349690d00c7889a381f7c65a3b5bf3de2ac5b 100644
+index ed8032495af9ce9c23419224814b8d27e4a97c17..2812505185df691e8f08932aa0bba162a7d9db86 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -133,7 +133,7 @@ public final class NaturalSpawner {
+@@ -128,7 +128,7 @@ public final class NaturalSpawner {
  
      public static void spawnForChunk(ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnState info, boolean spawnAnimals, boolean spawnMonsters, boolean rareSpawn) {
          world.getProfiler().push("spawner");
@@ -752,7 +778,7 @@ index 9c2d62feff1816f5729060c6192269a5b2d34153..1e3349690d00c7889a381f7c65a3b5bf
          MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
          int i = aenumcreaturetype.length;
  
-@@ -186,7 +186,7 @@ public final class NaturalSpawner {
+@@ -181,7 +181,7 @@ public final class NaturalSpawner {
              }
          }
  
@@ -762,10 +788,10 @@ index 9c2d62feff1816f5729060c6192269a5b2d34153..1e3349690d00c7889a381f7c65a3b5bf
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index e2ea90469352346b43f0a86746179a6adc53d82a..ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32 100644
+index 2a8609e33716949ff1877b6d10f64a9d7a7c81e9..e8d14bf4120dd9861e4ccb8bd6c14e175343c55d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -800,7 +800,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -785,7 +785,7 @@ public class LevelChunk extends ChunkAccess {
              this.chunkHolder.getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system
  
              if (this.needsDecoration) {
@@ -774,7 +800,7 @@ index e2ea90469352346b43f0a86746179a6adc53d82a..ef2f9ee9f32d6a6ad7ec9385335fc368
                  this.needsDecoration = false;
                  java.util.Random random = new java.util.Random();
                  random.setSeed(this.level.getSeed());
-@@ -820,7 +820,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -805,7 +805,7 @@ public class LevelChunk extends ChunkAccess {
                      }
                  }
                  server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
@@ -783,7 +809,7 @@ index e2ea90469352346b43f0a86746179a6adc53d82a..ef2f9ee9f32d6a6ad7ec9385335fc368
              }
          }
      }
-@@ -1178,7 +1178,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -1161,7 +1161,7 @@ public class LevelChunk extends ChunkAccess {
                          ProfilerFiller gameprofilerfiller = LevelChunk.this.level.getProfiler();
  
                          gameprofilerfiller.push(this::getType);
@@ -792,8 +818,8 @@ index e2ea90469352346b43f0a86746179a6adc53d82a..ef2f9ee9f32d6a6ad7ec9385335fc368
                          BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
  
                          if (this.blockEntity.getType().isValid(iblockdata)) {
-@@ -1200,7 +1200,7 @@ public class LevelChunk extends ChunkAccess {
-                         // Paper end
+@@ -1188,7 +1188,7 @@ public class LevelChunk extends ChunkAccess {
+                         // Paper end - Prevent block entity and entity crashes
                          // Spigot start
                      } finally {
 -                        this.blockEntity.tickTimer.stopTiming();
@@ -802,10 +828,10 @@ index e2ea90469352346b43f0a86746179a6adc53d82a..ef2f9ee9f32d6a6ad7ec9385335fc368
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 5a47a8785bc2e251d041f80a79295c43459de3bc..a4567188e2fe3f922bb6aeb71a2845d1a1be536f 100644
+index c1e2d3a75b9d4710ab6d8b5c62af4bc136a2b668..ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -513,10 +513,10 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -515,10 +515,10 @@ public class CraftScheduler implements BukkitScheduler {
                  this.runners.remove(task.getTaskId());
              }
          }
@@ -818,7 +844,7 @@ index 5a47a8785bc2e251d041f80a79295c43459de3bc..a4567188e2fe3f922bb6aeb71a2845d1
          //this.debugHead = this.debugHead.getNextHead(currentTick); // Paper
      }
  
-@@ -559,7 +559,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -561,7 +561,7 @@ public class CraftScheduler implements BukkitScheduler {
      }
  
      void parsePending() { // Paper
@@ -827,7 +853,7 @@ index 5a47a8785bc2e251d041f80a79295c43459de3bc..a4567188e2fe3f922bb6aeb71a2845d1
          CraftTask head = this.head;
          CraftTask task = head.getNext();
          CraftTask lastTask = head;
-@@ -578,7 +578,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -580,7 +580,7 @@ public class CraftScheduler implements BukkitScheduler {
              task.setNext(null);
          }
          this.head = lastTask;
@@ -837,7 +863,7 @@ index 5a47a8785bc2e251d041f80a79295c43459de3bc..a4567188e2fe3f922bb6aeb71a2845d1
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 3f45bab0e9f7b3697e6d9d1092a1e6e579f7066f..4f1cf281c4bf68c37982d390da8779dea78dab18 100644
+index ea26d9464644b5217879b8c21b4da28e57708dcb..5835dc236b3f5291a804f7fb14a12eb466d4e0ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -96,13 +96,13 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
@@ -857,11 +883,11 @@ index 3f45bab0e9f7b3697e6d9d1092a1e6e579f7066f..4f1cf281c4bf68c37982d390da8779de
  
      long getCreatedAt() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index 7a2f46579352870cfbb32c343d7c68919758ffe3..60b8331a4327cc276b88420254495455babbe3b0 100644
+index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..d3ec817e95628f1fc8be4a29c9a0f13c7d5fd552 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -115,7 +115,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {
-     public void getScoreboardScores(ObjectiveCriteria criteria, String name, Consumer<Score> consumer) {
+     public void forAllObjectives(ObjectiveCriteria criteria, ScoreHolder holder, Consumer<ScoreAccess> consumer) {
          // Paper start - add timings for scoreboard search
          // plugins leaking scoreboards will make this very expensive, let server owners debug it easily
 -        co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.startTimingIfSync();
@@ -870,7 +896,7 @@ index 7a2f46579352870cfbb32c343d7c68919758ffe3..60b8331a4327cc276b88420254495455
          // Paper end - add timings for scoreboard search
          for (CraftScoreboard scoreboard : this.scoreboards) {
 @@ -123,7 +123,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {
-             board.forAllObjectives(criteria, name, (score) -> consumer.accept(score));
+             board.forAllObjectives(criteria, holder, (score) -> consumer.accept(score));
          }
          } finally { // Paper start - add timings for scoreboard search
 -            co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.stopTimingIfSync();
@@ -879,10 +905,10 @@ index 7a2f46579352870cfbb32c343d7c68919758ffe3..60b8331a4327cc276b88420254495455
          // Paper end - add timings for scoreboard search
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 925cd6e07efc3a42ff5787823b046726ce863104..eae9bf47521ded2a4b7972978f3bd801c685d56a 100644
+index a8fc07e06039e1418e020f7c1ad2cd36b9b94eb4..de2b469f06f6679aed1d20156052bfbef5e7c30b 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -170,7 +170,7 @@ public class ActivationRange
+@@ -168,7 +168,7 @@ public class ActivationRange
       */
      public static void activateEntities(Level world)
      {
@@ -891,7 +917,7 @@ index 925cd6e07efc3a42ff5787823b046726ce863104..eae9bf47521ded2a4b7972978f3bd801
          final int miscActivationRange = world.spigotConfig.miscActivationRange;
          final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
-@@ -250,7 +250,7 @@ public class ActivationRange
+@@ -228,7 +228,7 @@ public class ActivationRange
              }
              // Paper end
          }
diff --git a/patches/server/0267-Remove-Mojang-Profiler.patch b/patches/server/0255-Remove-Mojang-Profiler.patch
similarity index 71%
rename from patches/server/0267-Remove-Mojang-Profiler.patch
rename to patches/server/0255-Remove-Mojang-Profiler.patch
index 463e03961..9f7c152f3 100644
--- a/patches/server/0267-Remove-Mojang-Profiler.patch
+++ b/patches/server/0255-Remove-Mojang-Profiler.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove Mojang Profiler
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index af712f089e7919fa0bd3946866fd3486fab19f76..9caab6541a224dc8f729a7d720eccda7bd83ed53 100644
+index 67ec90a2a05269a5912b3c8e64d6d4162a8c6ca2..d3c42c19a051fb3a670e541fc746b55717192a91 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -152,7 +152,7 @@ public class Commands {
+@@ -166,7 +166,7 @@ public class Commands {
          DamageCommand.register(this.dispatcher, commandRegistryAccess);
          DataCommands.register(this.dispatcher);
          DataPackCommand.register(this.dispatcher);
@@ -17,8 +17,8 @@ index af712f089e7919fa0bd3946866fd3486fab19f76..9caab6541a224dc8f729a7d720eccda7
          DefaultGameModeCommands.register(this.dispatcher);
          DifficultyCommand.register(this.dispatcher);
          EffectCommands.register(this.dispatcher, commandRegistryAccess);
-@@ -323,9 +323,9 @@ public class Commands {
-     public int performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label) { // CraftBukkit
+@@ -333,9 +333,9 @@ public class Commands {
+     public void performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label) { // CraftBukkit
          CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
  
 -        commandlistenerwrapper.getServer().getProfiler().push(() -> {
@@ -26,23 +26,67 @@ index af712f089e7919fa0bd3946866fd3486fab19f76..9caab6541a224dc8f729a7d720eccda7
              return "/" + s;
 -        });
 +        });*/ // Purpur
+         ContextChain contextchain = this.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit // Paper - Add UnknownCommandEvent
  
-         byte b0;
- 
-@@ -408,7 +408,7 @@ public class Commands {
-                 b0 = 0;
+         try {
+@@ -364,7 +364,7 @@ public class Commands {
+                 Commands.LOGGER.error("'/{}' threw an exception", s, exception);
              }
          } finally {
 -            commandlistenerwrapper.getServer().getProfiler().pop();
 +            //commandlistenerwrapper.getServer().getProfiler().pop(); // Purpur
          }
  
-         return b0;
+     }
+diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+index 9f5c3ec2eae9b30bdb8dbcb328d7f701cb7aeb9d..e7cc8105fff9cb952eabfd006e0a4e4638091019 100644
+--- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
++++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
+@@ -42,7 +42,7 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
+         ChainModifiers chainModifiers = flags;
+         List<T> list = sources;
+         if (contextChain.getStage() != Stage.EXECUTE) {
+-            context.profiler().push(() -> "prepare " + this.commandInput);
++            //context.profiler().push(() -> "prepare " + this.commandInput); // Purpur
+ 
+             try {
+                 for (int i = context.forkLimit(); contextChain.getStage() != Stage.EXECUTE; contextChain = contextChain.nextStage()) {
+@@ -86,7 +86,7 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
+                     }
+                 }
+             } finally {
+-                context.profiler().pop();
++                //context.profiler().pop(); // Purpur
+             }
+         }
+ 
+diff --git a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java
+index e9775b4506909bee65a74964f0d5391a0513de1d..684f7f202305c09b1037c5d38a52a5ea7f00751b 100644
+--- a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java
++++ b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java
+@@ -23,7 +23,7 @@ public class ExecuteCommand<T extends ExecutionCommandSource<T>> implements Unbo
+ 
+     @Override
+     public void execute(T executionCommandSource, ExecutionContext<T> executionContext, Frame frame) {
+-        executionContext.profiler().push(() -> "execute " + this.commandInput);
++        //executionContext.profiler().push(() -> "execute " + this.commandInput); // Purpur
+ 
+         try {
+             executionContext.incrementCost();
+@@ -37,7 +37,7 @@ public class ExecuteCommand<T extends ExecutionCommandSource<T>> implements Unbo
+         } catch (CommandSyntaxException var9) {
+             executionCommandSource.handleError(var9, this.modifiers.isForked(), executionContext.tracer());
+         } finally {
+-            executionContext.profiler().pop();
++            //executionContext.profiler().pop(); // Purpur
+         }
+     }
+ }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651fd60e483 100644
+index f3c66049ab3fe087fa0fa87c2fca36c3c8b5c572..dfeae138e830e95ab823b6349a91160b02622208 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -338,13 +338,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -347,13 +347,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
          super("Server");
          SERVER = this; // Paper - better singleton
@@ -62,7 +106,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          this.random = RandomSource.create();
          this.port = -1;
          this.levels = Maps.newLinkedHashMap();
-@@ -923,9 +923,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -973,9 +973,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end
          // CraftBukkit end
@@ -73,10 +117,10 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
 +        }*/ // Purpur
  
          MinecraftServer.LOGGER.info("Stopping server");
-         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
-@@ -1164,18 +1164,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 }
-                 // Spigot end
+         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
+@@ -1241,20 +1241,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+                 boolean flag = i == 0L;
  
 -                if (this.debugCommandProfilerDelayStart) {
 +                /*if (this.debugCommandProfilerDelayStart) { // Purpur
@@ -86,30 +130,34 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
 +                }*/ // Purpur
  
                  //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
-                 lastTick = curTime;
-                 this.nextTickTime += 50L;
+                 lastTick = currentTime;
+                 this.nextTickTimeNanos += i;
 -                this.startMetricsRecordingTick();
 -                this.profiler.push("tick");
 +                //this.startMetricsRecordingTick(); // Purpur
 +                //this.profiler.push("tick"); // Purpur
-                 this.tickServer(this::haveTime);
+                 this.tickServer(flag ? () -> {
+                     return false;
+                 } : this::haveTime);
 -                this.profiler.popPush("nextTickWait");
 +                //this.profiler.popPush("nextTickWait"); // Purpur
                  this.mayHaveDelayedTasks = true;
-                     // Purpur start - tps catchup
-                     if (org.purpurmc.purpur.PurpurConfig.tpsCatchup) {
-@@ -1185,8 +1185,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     }
-                     // Purpur end - tps catchup
-                 this.waitUntilNextTick();
+                 this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
+                 // Purpur start
+@@ -1270,9 +1270,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     this.tickRateManager.endTickWork();
+                 }
+ 
 -                this.profiler.pop();
+-                this.logFullTickTime();
 -                this.endMetricsRecordingTick();
-+                //this.profiler.pop(); // Purpur
++                //this.profiler.pop();// Purpur
++                //this.logFullTickTime(); // Purpur
 +                //this.endMetricsRecordingTick(); // Purpur
                  this.isReady = true;
-                 JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
+                 JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
-@@ -1347,7 +1347,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1536,7 +1536,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -118,7 +166,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          super.doRunTask(ticktask);
      }
  
-@@ -1414,7 +1414,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1609,7 +1609,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
@@ -127,34 +175,34 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
          try {
              this.isSaving = true;
-@@ -1429,7 +1429,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1624,7 +1624,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
 -        this.profiler.pop();
 +        //this.profiler.pop(); // Purpur
-         // Paper end
+         // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
-@@ -1442,7 +1442,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1637,7 +1637,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
-         // Paper end
+         // Paper end - Server Tick Events
 -        this.profiler.push("tallying");
 +        //this.profiler.push("tallying"); // Purpur
-         long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
+         long j = Util.getNanos() - i;
+         int k = this.tickCount % 100;
  
-         this.averageTickTime = this.averageTickTime * 0.8F + (float) j / 1000000.0F * 0.19999999F;
-@@ -1454,7 +1454,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         tickTimes60s.add(this.tickCount, j);
-         // Paper end
-         this.logTickTime(k - i);
+@@ -1651,7 +1651,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         this.tickTimes60s.add(this.tickCount, j);
+         // Paper end - Add tick times API and /mspt command
+         this.logTickMethodTime(i);
 -        this.profiler.pop();
 +        //this.profiler.pop(); // Purpur
          org.spigotmc.WatchdogThread.tick(); // Spigot
          //co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Purpur
      }
-@@ -1511,11 +1511,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1742,11 +1742,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -165,16 +213,18 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          //MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper // Purpur
 -        this.profiler.popPush("levels");
 +        //this.profiler.popPush("levels"); // Purpur
-         //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
+         //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
  
          // CraftBukkit start
-@@ -1558,18 +1558,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
+@@ -1789,20 +1789,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             worldserver.updateLagCompensationTick(); // Paper - lag compensation
              worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
  
 -            this.profiler.push(() -> {
 +            /*this.profiler.push(() -> { // Purpur
-                 return worldserver + " " + worldserver.dimension().location();
+                 String s = String.valueOf(worldserver);
+ 
+                 return s + " " + String.valueOf(worldserver.dimension().location());
 -            });
 +            });*/ // Purpur
              /* Drop global time updates
@@ -192,7 +242,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
  
              try {
                  //worldserver.timings.doTick.startTiming(); // Spigot // Purpur
-@@ -1595,17 +1595,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1820,17 +1820,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -202,19 +252,19 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
 +            //this.profiler.pop(); // Purpur
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
-         this.isIteratingOverLevels = false; // Paper
+         this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
 -        this.profiler.popPush("connection");
 +        //this.profiler.popPush("connection"); // Purpur
-         //MinecraftTimings.connectionTimer.startTiming(); // Spigot // Purpur
+         // MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper // Purpur
          this.getConnection().tick();
-         //MinecraftTimings.connectionTimer.stopTiming(); // Spigot // Purpur
+         // MinecraftTimings.connectionTimer.stopTiming(); // Spigot // Paper // Purpur
 -        this.profiler.popPush("players");
 +        //this.profiler.popPush("players"); // Purpur
          //MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
          this.playerList.tick();
          //MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
-@@ -1613,7 +1613,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1838,7 +1838,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -223,7 +273,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
  
          //MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper // Purpur
          for (int i = 0; i < this.tickables.size(); ++i) {
-@@ -1621,7 +1621,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1846,7 +1846,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          //MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper // Purpur
  
@@ -232,7 +282,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          iterator = this.playerList.getPlayers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1631,7 +1631,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1856,7 +1856,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              entityplayer.connection.resumeFlushing();
          }
  
@@ -241,7 +291,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -1639,7 +1639,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1864,7 +1864,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void forceTimeSynchronization() {
@@ -250,7 +300,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          Iterator iterator = this.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1648,7 +1648,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1873,7 +1873,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.synchronizeTime(worldserver);
          }
  
@@ -259,16 +309,15 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
      }
  
      public boolean isNetherEnabled() {
-@@ -2300,7 +2300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2576,6 +2576,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
--        if (gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE;
-+        if (true || gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish // Purpur
++        //if (true || gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish // Purpur // Purpur - TODO: Pufferfish
          return this.profiler;
      }
  
-@@ -2540,7 +2540,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2822,7 +2823,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit end
  
      private void startMetricsRecordingTick() {
@@ -277,7 +326,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
              this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
                  this.executeBlocking(() -> {
                      this.saveDebugReport(path.resolve("server"));
-@@ -2550,40 +2550,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2832,40 +2833,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.willStartRecordingMetrics = false;
          }
  
@@ -289,7 +338,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
 +        //this.profiler.startTick(); // Purpur
      }
  
-     private void endMetricsRecordingTick() {
+     public void endMetricsRecordingTick() {
 -        this.profiler.endTick();
 -        this.metricsRecorder.endTick();
 +        //this.profiler.endTick(); // Purpur
@@ -330,7 +379,7 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
      }
  
      public Path getWorldPath(LevelResource worldSavePath) {
-@@ -2632,15 +2632,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2918,15 +2919,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public boolean isTimeProfilerRunning() {
@@ -350,13 +399,13 @@ index 2ea0db79e2a4b23455b2b2bc345621b4a58629ab..306195a8a57dc62379ffd856b214a651
          } else {
              ProfileResults methodprofilerresults = this.debugCommandProfiler.stop(Util.getNanos(), this.tickCount);
 diff --git a/src/main/java/net/minecraft/server/ServerFunctionManager.java b/src/main/java/net/minecraft/server/ServerFunctionManager.java
-index a6a1b57b4327f5710e9ec5ebca35a47c11751d11..097ac55028d66ef9ab430ff5dd103db6e3b99fc7 100644
+index a0ec6c3d122ad28d65d37f1b9f82541997b37d37..775b24a9e55528944b629fd85e1f6ebef9a9892f 100644
 --- a/src/main/java/net/minecraft/server/ServerFunctionManager.java
 +++ b/src/main/java/net/minecraft/server/ServerFunctionManager.java
-@@ -60,10 +60,10 @@ public class ServerFunctionManager {
+@@ -53,10 +53,10 @@ public class ServerFunctionManager {
      }
  
-     private void executeTagFunctions(Collection<CommandFunction> functions, ResourceLocation label) {
+     private void executeTagFunctions(Collection<CommandFunction<CommandSourceStack>> functions, ResourceLocation label) {
 -        ProfilerFiller gameprofilerfiller = this.server.getProfiler();
 +        //ProfilerFiller gameprofilerfiller = this.server.getProfiler(); // Purpur
  
@@ -366,42 +415,40 @@ index a6a1b57b4327f5710e9ec5ebca35a47c11751d11..097ac55028d66ef9ab430ff5dd103db6
          Iterator iterator = functions.iterator();
  
          while (iterator.hasNext()) {
-@@ -72,7 +72,7 @@ public class ServerFunctionManager {
-             this.execute(customfunction, this.getGameLoopSender());
+@@ -65,15 +65,15 @@ public class ServerFunctionManager {
+             this.execute(commandfunction, this.getGameLoopSender());
          }
  
 -        this.server.getProfiler().pop();
 +        //this.server.getProfiler().pop(); // Purpur
      }
  
-     public int execute(CommandFunction function, CommandSourceStack source) {
-@@ -195,10 +195,10 @@ public class ServerFunctionManager {
+     public void execute(CommandFunction<CommandSourceStack> function, CommandSourceStack source) {
+-        ProfilerFiller gameprofilerfiller = this.server.getProfiler();
++        //ProfilerFiller gameprofilerfiller = this.server.getProfiler(); // Purpur
  
-                 try {
-                     ServerFunctionManager.QueuedCommand customfunctiondata_queuedcommand = (ServerFunctionManager.QueuedCommand) this.commandQueue.removeFirst();
--                    ProfilerFiller gameprofilerfiller = ServerFunctionManager.this.server.getProfiler();
-+                    //ProfilerFiller gameprofilerfiller = ServerFunctionManager.this.server.getProfiler(); // Purpur
+-        gameprofilerfiller.push(() -> {
++        /*gameprofilerfiller.push(() -> { // Purpur
+             return "function " + String.valueOf(function.id());
+-        });
++        });*/ // Purpur
  
-                     Objects.requireNonNull(customfunctiondata_queuedcommand);
--                    gameprofilerfiller.push(customfunctiondata_queuedcommand::toString);
-+                    //gameprofilerfiller.push(customfunctiondata_queuedcommand::toString); // Purpur
-                     this.depth = customfunctiondata_queuedcommand.depth;
-                     customfunctiondata_queuedcommand.execute(ServerFunctionManager.this, this.commandQueue, i, this.tracer);
-                     if (this.abortCurrentDepth) {
-@@ -217,7 +217,7 @@ public class ServerFunctionManager {
+         try {
+             InstantiatedFunction<CommandSourceStack> instantiatedfunction = function.instantiate((CompoundTag) null, this.getDispatcher());
+@@ -86,7 +86,7 @@ public class ServerFunctionManager {
+         } catch (Exception exception) {
+             ServerFunctionManager.LOGGER.warn("Failed to execute function {}", function.id(), exception);
+         } finally {
+-            gameprofilerfiller.pop();
++            //gameprofilerfiller.pop(); // Purpur
+         }
  
-                     this.nestedCalls.clear();
-                 } finally {
--                    ServerFunctionManager.this.server.getProfiler().pop();
-+                    //ServerFunctionManager.this.server.getProfiler().pop(); // Purpur
-                 }
- 
-                 ++j;
+     }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 75461a983b24e399fc695322f4e396250b991c9e..3f4df62773dfe1045914325ce5bc13162192679c 100644
+index bbe4580f7fc7cb6c8eb7055c82e2af7ad2ccd59d..4e6fccec4f5ca14562bf5bae495ac36c14982d85 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -466,20 +466,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -541,20 +541,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      protected void tick(BooleanSupplier shouldKeepTicking) {
@@ -427,13 +474,13 @@ index 75461a983b24e399fc695322f4e396250b991c9e..3f4df62773dfe1045914325ce5bc1316
  
      public boolean hasWork() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac352c9a35ba 100644
+index 07b428ed7837642254b1edd55fd08a7beac7e303..476a04d87a61b021816d2970e86042bde32d95a2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -279,16 +279,16 @@ public class ServerChunkCache extends ChunkSource {
+@@ -259,14 +259,14 @@ public class ServerChunkCache extends ChunkSource {
                  return ifLoaded;
              }
-             // Paper end
+             // Paper end - Perf: Optimise getChunkAt calls for loaded chunks
 -            ProfilerFiller gameprofilerfiller = this.level.getProfiler();
 +            //ProfilerFiller gameprofilerfiller = this.level.getProfiler(); // Purpur
  
@@ -441,16 +488,14 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
 +            //gameprofilerfiller.incrementCounter("getChunk"); // Purpur
              long k = ChunkPos.asLong(x, z);
  
-             ChunkAccess ichunkaccess;
- 
              // Paper - rewrite chunk system - there are no correct callbacks to remove items from cache in the new chunk system
  
 -            gameprofilerfiller.incrementCounter("getChunkCacheMiss");
 +            //gameprofilerfiller.incrementCounter("getChunkCacheMiss"); // Purpur
-             CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getChunkFutureMainThread(x, z, leastStatus, create, true); // Paper
+             CompletableFuture<ChunkResult<ChunkAccess>> completablefuture = this.getChunkFutureMainThread(x, z, leastStatus, create);
              ServerChunkCache.MainThreadExecutor chunkproviderserver_b = this.mainThreadProcessor;
  
-@@ -477,24 +477,24 @@ public class ServerChunkCache extends ChunkSource {
+@@ -459,26 +459,26 @@ public class ServerChunkCache extends ChunkSource {
      // CraftBukkit start - modelled on below
      public void purgeUnload() {
          if (true) return; // Paper - tickets will be removed later, this behavior isn't really well accounted for by the chunk system
@@ -472,7 +517,9 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
 -        this.level.getProfiler().push("purge");
 +        //this.level.getProfiler().push("purge"); // Purpur
          //this.level.timings.doChunkMap.startTiming(); // Spigot // Purpur
-         this.distanceManager.purgeStaleTickets();
+         if (this.level.tickRateManager().runsNormally() || !tickChunks) {
+             this.distanceManager.purgeStaleTickets();
+         }
          this.runDistanceManagerUpdates();
          //this.level.timings.doChunkMap.stopTiming(); // Spigot // Purpur
 -        this.level.getProfiler().popPush("chunks");
@@ -480,7 +527,7 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
          if (tickChunks) {
              //this.level.timings.chunks.startTiming(); // Paper - timings // Purpur
              this.chunkMap.level.playerChunkLoader.tick(); // Paper - replace player chunk loader - this is mostly required to account for view distance changes
-@@ -503,10 +503,10 @@ public class ServerChunkCache extends ChunkSource {
+@@ -488,10 +488,10 @@ public class ServerChunkCache extends ChunkSource {
          }
  
          //this.level.timings.doChunkUnload.startTiming(); // Spigot // Purpur
@@ -493,51 +540,48 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
          this.clearCache();
      }
  
-@@ -521,14 +521,14 @@ public class ServerChunkCache extends ChunkSource {
-             this.chunkMap.tick();
-         } else {
-             LevelData worlddata = this.level.getLevelData();
+@@ -501,17 +501,17 @@ public class ServerChunkCache extends ChunkSource {
+ 
+         this.lastInhabitedUpdate = i;
+         if (!this.level.isDebug()) {
 -            ProfilerFiller gameprofilerfiller = this.level.getProfiler();
 +            //ProfilerFiller gameprofilerfiller = this.level.getProfiler(); // Purpur
  
 -            gameprofilerfiller.push("pollingChunks");
+-            gameprofilerfiller.push("filteringLoadedChunks");
 +            //gameprofilerfiller.push("pollingChunks"); // Purpur
-             this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random
-             int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
-             boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
- 
--            gameprofilerfiller.push("naturalSpawnCount");
-+            //gameprofilerfiller.push("naturalSpawnCount"); // Purpur
-             //this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur
-             int l = this.distanceManager.getNaturalSpawnChunkCount();
-             // Paper start - per player mob spawning
-@@ -563,14 +563,14 @@ public class ServerChunkCache extends ChunkSource {
-             //this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings // Purpur
- 
-             //this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously
--            gameprofilerfiller.popPush("filteringLoadedChunks");
-+            //gameprofilerfiller.popPush("filteringLoadedChunks"); // Purpur
++            //gameprofilerfiller.push("filteringLoadedChunks"); // Purpur
              // Paper - optimise chunk tick iteration
-             // Paper - optimise chunk tick iteration
-             //this.level.timings.chunkTicks.startTiming(); // Paper // Purpur
+             //if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper // Purpur
  
              // Paper - optimise chunk tick iteration
  
--            gameprofilerfiller.popPush("spawnAndTick");
-+            //gameprofilerfiller.popPush("spawnAndTick"); // Purpur
-             boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
+             if (this.level.tickRateManager().runsNormally()) {
+-                gameprofilerfiller.popPush("naturalSpawnCount");
++                //gameprofilerfiller.popPush("naturalSpawnCount"); // Purpur
+                 //this.level.timings.countNaturalMobs.startTiming(); // Paper - timings // Purpur
+                 int k = this.distanceManager.getNaturalSpawnChunkCount();
+                 // Paper start - Optional per player mob spawns
+@@ -540,7 +540,7 @@ public class ServerChunkCache extends ChunkSource {
+                 // this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings // Purpur
  
-             // Paper start - optimise chunk tick iteration
-@@ -673,14 +673,14 @@ public class ServerChunkCache extends ChunkSource {
-             }
-             // Paper end - optimise chunk tick iteration
-             //this.level.timings.chunkTicks.stopTiming(); // Paper // Purpur
--            gameprofilerfiller.popPush("customSpawners");
-+            //gameprofilerfiller.popPush("customSpawners"); // Purpur
-             if (flag2) {
-                 //try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings // Purpur
-                 this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
-                 //} // Paper - timings // Purpur
+                 this.lastSpawnState = spawnercreature_d;
+-                gameprofilerfiller.popPush("spawnAndTick");
++                //gameprofilerfiller.popPush("spawnAndTick"); // Purpur
+                 boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
+ 
+                 // Paper start - optimise chunk tick iteration
+@@ -648,7 +648,7 @@ public class ServerChunkCache extends ChunkSource {
+                 // Paper end - optimise chunk tick iteration
+                 // this.level.timings.chunkTicks.stopTiming(); // Paper // Purpur
+ 
+-                gameprofilerfiller.popPush("customSpawners");
++                //gameprofilerfiller.popPush("customSpawners"); // Purpur
+                 if (flag) {
+                     //try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings // Purpur
+                     this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies);
+@@ -656,7 +656,7 @@ public class ServerChunkCache extends ChunkSource {
+                 }
              }
  
 -            gameprofilerfiller.popPush("broadcast");
@@ -545,7 +589,7 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
              // Paper - optimise chunk tick iteration
                  //this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing // Purpur
              // Paper start - optimise chunk tick iteration
-@@ -698,8 +698,8 @@ public class ServerChunkCache extends ChunkSource {
+@@ -674,8 +674,8 @@ public class ServerChunkCache extends ChunkSource {
              // Paper end - optimise chunk tick iteration
                  //this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing // Purpur
              // Paper - optimise chunk tick iteration
@@ -553,10 +597,10 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
 -            gameprofilerfiller.pop();
 +            //gameprofilerfiller.pop(); // Purpur
 +            //gameprofilerfiller.pop(); // Purpur
-             this.chunkMap.tick();
          }
-     
-@@ -906,7 +906,7 @@ public class ServerChunkCache extends ChunkSource {
+     }
+ 
+@@ -847,7 +847,7 @@ public class ServerChunkCache extends ChunkSource {
  
          @Override
          protected void doRunTask(Runnable task) {
@@ -566,10 +610,10 @@ index 71bf8555b34525f0d7781d8ee8cf67e2851a71b2..75c21d0c31e484c651f6ac3ea046ac35
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac7cd64925 100644
+index a84a9218838fb42c49a00c0d5f28e9e486fc7dac..f72af2feb74626abbdfbfd090c15357457810240 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -823,12 +823,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -830,16 +830,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void tick(BooleanSupplier shouldKeepTicking) {
@@ -577,39 +621,46 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
 +        //ProfilerFiller gameprofilerfiller = this.getProfiler(); // Purpur
  
          this.handlingTick = true;
--        gameprofilerfiller.push("world border");
-+        //gameprofilerfiller.push("world border"); // Purpur
-         this.getWorldBorder().tick();
--        gameprofilerfiller.popPush("weather");
-+        //gameprofilerfiller.popPush("weather"); // Purpur
-         this.advanceWeatherCycle();
-         int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
-         long j;
-@@ -855,32 +855,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         TickRateManager tickratemanager = this.tickRateManager();
+         boolean flag = tickratemanager.runsNormally();
+ 
+         if (flag) {
+-            gameprofilerfiller.push("world border");
++            //gameprofilerfiller.push("world border"); // Purpur
+             this.getWorldBorder().tick();
+-            gameprofilerfiller.popPush("weather");
++            //gameprofilerfiller.popPush("weather"); // Purpur
+             this.advanceWeatherCycle();
+         }
+ 
+@@ -871,30 +871,30 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             this.tickTime();
+         }
  
-         this.updateSkyBrightness();
-         this.tickTime();
 -        gameprofilerfiller.popPush("tickPending");
 +        //gameprofilerfiller.popPush("tickPending"); // Purpur
-         //timings.scheduledBlocks.startTiming(); // Paper // Purpur
-         if (!this.isDebug()) {
+         //this.timings.scheduledBlocks.startTiming(); // Paper // Purpur
+         if (!this.isDebug() && flag) {
              j = this.getGameTime();
 -            gameprofilerfiller.push("blockTicks");
 +            //gameprofilerfiller.push("blockTicks"); // Purpur
-             this.blockTicks.tick(j, 65536, this::tickBlock);
+             this.blockTicks.tick(j, paperConfig().environment.maxBlockTicks, this::tickBlock); // Paper - configurable max block ticks
 -            gameprofilerfiller.popPush("fluidTicks");
 +            //gameprofilerfiller.popPush("fluidTicks"); // Purpur
-             this.fluidTicks.tick(j, 65536, this::tickFluid);
+             this.fluidTicks.tick(j, paperConfig().environment.maxFluidTicks, this::tickFluid); // Paper - configurable max fluid ticks
 -            gameprofilerfiller.pop();
 +            //gameprofilerfiller.pop(); // Purpur
          }
-         //timings.scheduledBlocks.stopTiming(); // Paper // Purpur
+         //this.timings.scheduledBlocks.stopTiming(); // Paper // Purpur
  
 -        gameprofilerfiller.popPush("raid");
 +        //gameprofilerfiller.popPush("raid"); // Purpur
-         //this.timings.raids.startTiming(); // Paper - timings // Purpur
-         this.raids.tick();
-         //this.timings.raids.stopTiming(); // Paper - timings // Purpur
+         if (flag) {
+             // this.timings.raids.startTiming(); // Paper - timings // Purpur
+             this.raids.tick();
+             // this.timings.raids.stopTiming(); // Paper - timings // Purpur
+         }
+ 
 -        gameprofilerfiller.popPush("chunkSource");
 +        //gameprofilerfiller.popPush("chunkSource"); // Purpur
          //this.timings.chunkProviderTick.startTiming(); // Paper - timings // Purpur
@@ -617,23 +668,26 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
          //this.timings.chunkProviderTick.stopTiming(); // Paper - timings // Purpur
 -        gameprofilerfiller.popPush("blockEvents");
 +        //gameprofilerfiller.popPush("blockEvents"); // Purpur
-         //timings.doSounds.startTiming(); // Spigot // Purpur
-         this.runBlockEvents();
-         //timings.doSounds.stopTiming(); // Spigot // Purpur
+         if (flag) {
+             // this.timings.doSounds.startTiming(); // Spigot // Purpur
+             this.runBlockEvents();
+@@ -902,7 +902,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         }
+ 
          this.handlingTick = false;
 -        gameprofilerfiller.pop();
 +        //gameprofilerfiller.pop(); // Purpur
-         boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
+         boolean flag1 = !paperConfig().unsupportedSettings.disableWorldTickingWhenEmpty || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players // Paper - restore this
  
-         if (flag) {
-@@ -888,12 +888,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (flag1) {
+@@ -910,12 +910,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
-         if (flag || this.emptyTime++ < 300) {
+         if (flag1 || this.emptyTime++ < 300) {
 -            gameprofilerfiller.push("entities");
 +            //gameprofilerfiller.push("entities"); // Purpur
-             //timings.tickEntities.startTiming(); // Spigot // Purpur
-             if (this.dragonFight != null) {
+             //this.timings.tickEntities.startTiming(); // Spigot // Purpur
+             if (this.dragonFight != null && flag) {
 -                gameprofilerfiller.push("dragonFight");
 +                //gameprofilerfiller.push("dragonFight"); // Purpur
                  this.dragonFight.tick();
@@ -642,10 +696,10 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
              }
  
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
-@@ -904,9 +904,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -925,9 +925,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
-                     } else {
+                     } else if (!tickratemanager.isEntityFrozen(entity)) {
 -                        gameprofilerfiller.push("checkDespawn");
 +                        //gameprofilerfiller.push("checkDespawn"); // Purpur
                          entity.checkDespawn();
@@ -654,27 +708,21 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
                          if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - now always true if in the ticking list
                              Entity entity1 = entity.getVehicle();
  
-@@ -918,7 +918,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -939,22 +939,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
                                  entity.stopRiding();
                              }
  
 -                            gameprofilerfiller.push("tick");
 +                            //gameprofilerfiller.push("tick"); // Purpur
-                         // Pufferfish start - copied from this.guardEntityTick
-                         try {
-                             this.tickNonPassenger(entity); // Pufferfish - changed
-@@ -933,20 +933,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                             // Paper end
-                         }
-                         // Pufferfish end
+                             this.guardEntityTick(this::tickNonPassenger, entity);
 -                            gameprofilerfiller.pop();
 +                            //gameprofilerfiller.pop(); // Purpur
                          }
                      }
                  }
              });
-             //timings.entityTick.stopTiming(); // Spigot // Purpur
-             //timings.tickEntities.stopTiming(); // Spigot // Purpur
+             //this.timings.entityTick.stopTiming(); // Spigot // Purpur
+             //this.timings.tickEntities.stopTiming(); // Spigot // Purpur
 -            gameprofilerfiller.pop();
 +            //gameprofilerfiller.pop(); // Purpur
              this.tickBlockEntities();
@@ -687,7 +735,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
      }
  
      @Override
-@@ -1028,9 +1027,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1034,9 +1033,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          boolean flag = this.isRaining();
          int j = chunkcoordintpair.getMinBlockX();
          int k = chunkcoordintpair.getMinBlockZ();
@@ -698,26 +746,26 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
 +        //gameprofilerfiller.push("thunder"); // Purpur
          final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
  
-         if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0 &&*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - disable thunder // Pufferfish - replace random with shouldDoLightning
-@@ -1069,7 +1068,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
+@@ -1075,7 +1074,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
          }
  
 -        gameprofilerfiller.popPush("iceandsnow");
 +        //gameprofilerfiller.popPush("iceandsnow"); // Purpur
  
-         if (!this.paperConfig().environment.disableIceAndSnow) { // Paper
+         if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
          for (int l = 0; l < randomTickSpeed; ++l) {
-@@ -1081,7 +1080,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         } // Paper
+@@ -1088,7 +1087,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         }
+         } // Paper - Option to disable ice and snow
  
-         // Paper start - optimise random block ticking
 -        gameprofilerfiller.popPush("tickBlocks");
 +        //gameprofilerfiller.popPush("tickBlocks"); // Purpur
          //timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
          if (randomTickSpeed > 0) {
-             LevelChunkSection[] sections = chunk.getSections();
-@@ -1116,7 +1115,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             // Paper start - optimize random block ticking
+@@ -1124,7 +1123,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Paper end - optimise random block ticking
  
          //timings.chunkTicksBlocks.stopTiming(); // Paper // Purpur
@@ -725,8 +773,8 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
 +        //gameprofilerfiller.pop(); // Purpur
      }
  
-     private void tickIceAndSnow(boolean raining, BlockPos.MutableBlockPos blockposition1, final LevelChunk chunk) { // Paper - optimise chunk ticking
-@@ -1458,19 +1457,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
+     @VisibleForTesting
+@@ -1471,19 +1470,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
          //try { // Purpur
          // Paper end - timings
          entity.setOldPosAndRot();
@@ -751,7 +799,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
          //} finally { timer.stopTiming(); } // Paper - timings // Purpur
          Iterator iterator = entity.getPassengers().iterator();
  
-@@ -1499,12 +1498,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1512,12 +1511,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  // Paper end
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
@@ -768,7 +816,7 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
                  // Paper start - EAR 2
                  if (isActive) {
                  passenger.rideTick();
-@@ -1516,7 +1515,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1529,7 +1528,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      vehicle.positionRider(passenger);
                  }
                  // Paper end - EAR 2
@@ -778,10 +826,10 @@ index 68a29b818db34ef0263704d7b6d71b9a44d905e5..f86d6d6625f2ea6c4fce02fd19ffb9ac
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c75e5a9078 100644
+index 635e6b46081ec0078b687818310e623cbbf1cc1f..ad9d42e886bc1e2529ca13990626169ab2354898 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1237,7 +1237,7 @@ public class ServerPlayer extends Player {
+@@ -1317,7 +1317,7 @@ public class ServerPlayer extends Player {
              PortalInfo shapedetectorshape = this.findDimensionEntryPoint(worldserver);
  
              if (shapedetectorshape != null) {
@@ -790,7 +838,7 @@ index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c7
                  worldserver = shapedetectorshape.world; // CraftBukkit
                  if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event
                  if (resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit
-@@ -1260,8 +1260,8 @@ public class ServerPlayer extends Player {
+@@ -1340,8 +1340,8 @@ public class ServerPlayer extends Player {
              worldserver = ((CraftWorld) exit.getWorld()).getHandle();
              // CraftBukkit end
  
@@ -801,7 +849,7 @@ index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c7
              if (true) { // CraftBukkit
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
-@@ -1279,7 +1279,7 @@ public class ServerPlayer extends Player {
+@@ -1359,7 +1359,7 @@ public class ServerPlayer extends Player {
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
                  worldserver.addDuringPortalTeleport(this);
@@ -811,34 +859,34 @@ index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c7
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 0166107f8b48393a93ac046e6af70f0ff24fbb85..fa7f85303f9fe80a2e51740c376d9daedfaa60b4 100644
+index 3a15085e0421f46800f779066d235ef21b463289..8368c5ff929df9d32cdb95cc2da0e9f7f3b85d2a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -209,7 +209,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -265,7 +265,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      }
  
      protected void keepConnectionAlive() {
 -        this.server.getProfiler().push("keepAlive");
 +        //this.server.getProfiler().push("keepAlive"); // Purpur
-         // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
+         // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings
          // This should effectively place the keepalive handling back to "as it was" before 1.12.2
          long currentTime = Util.getMillis();
-@@ -245,7 +245,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -298,7 +298,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          }
-         // Paper end
+         // Paper end - give clients a longer time to respond to pings as per pre 1.12.2 timings
  
 -        this.server.getProfiler().pop();
 +        //this.server.getProfiler().pop(); // Purpur
      }
  
-     public void suspendFlushing() {
+     private boolean checkIfClosed(long time) {
 diff --git a/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java b/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
-index 9ddbfcf80d9a381dace78a62880f85a4d767e0eb..7383c7d3820dce06108eaafd236a7c6c06a10a42 100644
+index f14113eef226e906c0d21641e74a27471254909d..0c25f3ed0a8a538edc7cadd3476100c9b3631f7a 100644
 --- a/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
 +++ b/src/main/java/net/minecraft/server/packs/resources/ResourceManagerReloadListener.java
-@@ -9,11 +9,11 @@ public interface ResourceManagerReloadListener extends PreparableReloadListener
-     @Override
-     default CompletableFuture<Void> reload(PreparableReloadListener.PreparationBarrier synchronizer, ResourceManager manager, ProfilerFiller prepareProfiler, ProfilerFiller applyProfiler, Executor prepareExecutor, Executor applyExecutor) {
+@@ -16,11 +16,11 @@ public interface ResourceManagerReloadListener extends PreparableReloadListener
+         Executor applyExecutor
+     ) {
          return synchronizer.wait(Unit.INSTANCE).thenRunAsync(() -> {
 -            applyProfiler.startTick();
 -            applyProfiler.push("listener");
@@ -853,7 +901,7 @@ index 9ddbfcf80d9a381dace78a62880f85a4d767e0eb..7383c7d3820dce06108eaafd236a7c6c
      }
  
 diff --git a/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java b/src/main/java/net/minecraft/util/profiling/ActiveProfiler.java
-index 196c7331138fee2822c76aacd136f9da040e0049..c6c30d99399c5cde2b0ec2f320d81d952b422d78 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 {
@@ -873,7 +921,7 @@ index 196c7331138fee2822c76aacd136f9da040e0049..c6c30d99399c5cde2b0ec2f320d81d95
 +            //this.pop(); // Purpur
              this.started = false;
              if (!this.path.isEmpty()) {
-                 LOGGER.error("Profiler tick ended before path was fully popped (remainder: '{}'). Mismatched push/pop?", LogUtils.defer(() -> {
+                 LOGGER.error(
 @@ -93,7 +93,7 @@ public class ActiveProfiler implements ProfileCollector {
  
      @Override
@@ -903,7 +951,7 @@ index 196c7331138fee2822c76aacd136f9da040e0049..c6c30d99399c5cde2b0ec2f320d81d95
  
      private ActiveProfiler.PathEntry getCurrentEntry() {
 diff --git a/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java b/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
-index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b477b2adc7a 100644
+index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60c6ff9818 100644
 --- a/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
 +++ b/src/main/java/net/minecraft/util/profiling/ProfilerFiller.java
 @@ -6,32 +6,44 @@ import net.minecraft.util.profiling.metrics.MetricCategory;
@@ -952,7 +1000,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
 +    @io.papermc.paper.annotation.DoNotUse // Purpur
      void incrementCounter(Supplier<String> markerGetter, int num);
  
-     static ProfilerFiller tee(final ProfilerFiller a, final ProfilerFiller b) {
+     static ProfilerFiller tee(ProfilerFiller a, ProfilerFiller b) {
 @@ -41,62 +53,62 @@ public interface ProfilerFiller {
              return b == InactiveProfiler.INSTANCE ? a : new ProfilerFiller() {
                  @Override
@@ -1037,19 +1085,19 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad4fde00d4 100644
+index 68e8f9913055219486ce19d95dcf9d7c76e08082..2c3ad553272ad651e6ca26917719e6d9fffdef68 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -809,7 +809,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -897,7 +897,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // CraftBukkit end
  
      public void baseTick() {
 -        this.level().getProfiler().push("entityBaseTick");
 +        //this.level().getProfiler().push("entityBaseTick"); // Purpur
-         if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
-         this.feetBlockState = null;
+         if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups
+         this.inBlockState = null;
          if (this.isPassenger() && this.getVehicle().isRemoved()) {
-@@ -870,7 +870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -958,7 +958,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
  
          this.firstTick = false;
@@ -1058,7 +1106,7 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
      }
  
      public void setSharedFlagOnFire(boolean onFire) {
-@@ -1089,7 +1089,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1175,7 +1175,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
              }
  
@@ -1067,16 +1115,16 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
                  movement = movement.multiply(this.stuckSpeedMultiplier);
                  this.stuckSpeedMultiplier = Vec3.ZERO;
-@@ -1098,7 +1098,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1184,7 +1184,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              // Paper start - ignore movement changes while inactive.
-             if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
+             if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
                  setDeltaMovement(Vec3.ZERO);
 -                this.level.getProfiler().pop();
 +                //this.level.getProfiler().pop(); // Purpur
                  return;
              }
              // Paper end
-@@ -1119,8 +1119,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1205,8 +1205,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
              }
  
@@ -1087,7 +1135,7 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              boolean flag = !Mth.equal(movement.x, vec3d1.x);
              boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
  
-@@ -1139,7 +1139,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1225,7 +1225,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
              this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
              if (this.isRemoved()) {
@@ -1096,7 +1144,7 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              } else {
                  if (this.horizontalCollision) {
                      Vec3 vec3d2 = this.getDeltaMovement();
-@@ -1277,7 +1277,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1363,7 +1363,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      this.setRemainingFireTicks(-this.getFireImmuneTicks());
                  }
  
@@ -1105,27 +1153,27 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              }
          }
          // Paper start - detailed watchdog information
-@@ -3125,7 +3125,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3258,7 +3258,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
  
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
 -                    this.level().getProfiler().push("portal");
 +                    //this.level().getProfiler().push("portal"); // Purpur
                      this.portalTime = i;
-                     // Paper start
+                     // Paper start - Add EntityPortalReadyEvent
                      io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
-@@ -3143,7 +3143,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3276,7 +3276,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      }
-                     } // Paper
+                     } // Paper - Add EntityPortalReadyEvent
                      // CraftBukkit end
 -                    this.level().getProfiler().pop();
 +                    //this.level().getProfiler().pop(); // Purpur
                  }
  
                  this.isInsidePortal = false;
-@@ -3618,14 +3618,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3736,14 +3736,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
-         // Paper end
+         // Paper end - Fix item duplication and teleport issues
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
 -            this.level().getProfiler().push("changeDimension");
 +            //this.level().getProfiler().push("changeDimension"); // Purpur
@@ -1140,16 +1188,16 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
  
              if (shapedetectorshape == null) {
-@@ -3664,7 +3664,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3782,7 +3782,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  this.unRide();
                  // CraftBukkit end
  
 -                this.level().getProfiler().popPush("reloading");
 +                //this.level().getProfiler().popPush("reloading"); // Purpur
-                 // Paper start - Change lead drop timing to prevent dupe
+                 // Paper start - Fix item duplication and teleport issues
                  if (this instanceof Mob) {
                      ((Mob) this).dropLeash(true, true); // Paper drop lead
-@@ -3687,10 +3687,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3809,10 +3809,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
  
                  this.removeAfterChangingDimensions();
@@ -1163,10 +1211,10 @@ index 307eac4114192a7f0e6633e3df5a5e7a54ad22ba..b4255bf0fbf5599ae86cd372e5c9f1ad
              }
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e07fa7386 100644
+index 36022a0ab50655363d26be7dba765e2261baccdf..09cbc472d89d7d8730aedb76ef584b1ff159756b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -410,7 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          super.baseTick();
@@ -1175,7 +1223,7 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
          if (this.fireImmune() || this.level().isClientSide) {
              this.clearFire();
          }
-@@ -513,7 +513,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -526,7 +526,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.yHeadRotO = this.yHeadRot;
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -1184,7 +1232,7 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
      }
  
      public boolean canSpawnSoulSpeedParticle() {
-@@ -3162,10 +3162,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3227,10 +3227,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.run += (f3 - this.run) * 0.3F;
@@ -1198,7 +1246,7 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
  
          // Paper start - stop large pitch and yaw changes from crashing the server
          this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
-@@ -3177,7 +3177,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3242,7 +3242,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
          // Paper end
  
@@ -1207,7 +1255,7 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
          this.animStep += f2;
          if (this.isFallFlying()) {
              ++this.fallFlyTicks;
-@@ -3467,19 +3467,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3465,19 +3465,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
          }
  
          this.setDeltaMovement(d0, d1, d2);
@@ -1232,7 +1280,7 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
          if (this.jumping && this.isAffectedByFluids()) {
              double d3;
  
-@@ -3506,8 +3506,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3504,8 +3504,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.noJumpDelay = 0;
          }
  
@@ -1243,7 +1291,7 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
          this.xxa *= 0.98F;
          this.zza *= 0.98F;
          this.updateFallFlying();
-@@ -3534,8 +3534,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3530,8 +3530,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.travel(vec3d1);
          }
  
@@ -1251,10 +1299,10 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
 -        this.level().getProfiler().push("freezing");
 +        //this.level().getProfiler().pop(); // Purpur
 +        //this.level().getProfiler().push("freezing"); // Purpur
-         if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
+         if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
              int i = this.getTicksFrozen();
  
-@@ -3552,15 +3552,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3548,15 +3548,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.hurt(this.damageSources().freeze(), 1.0F);
          }
  
@@ -1270,14 +1318,14 @@ index ffc25a5f8e8ec479a7454920ccf66ef1e4ce4f71..7a5f51c9585c280c51b4dbe5e6848d7e
          this.pushEntities();
 -        this.level().getProfiler().pop();
 +        //this.level().getProfiler().pop(); // Purpur
-         // Paper start
+         // Paper start - Add EntityMoveEvent
          // 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 547279a379190c2339d6335e00faf7730be6d0f0..599094f231787db475882c38721b724a2e3bf41c 100644
+index ee98efa69d67cd22eb5722cf68f3b7063e2595c8..56da8a4600688efd1987d82d4fcad1757e33f4f2 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -366,13 +366,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -376,13 +376,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
      @Override
      public void baseTick() {
          super.baseTick();
@@ -1293,7 +1341,7 @@ index 547279a379190c2339d6335e00faf7730be6d0f0..599094f231787db475882c38721b724a
          incrementTicksSinceLastInteraction(); // Purpur
      }
  
-@@ -703,7 +703,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -747,7 +747,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
      @Override
      public void aiStep() {
          super.aiStep();
@@ -1302,7 +1350,7 @@ index 547279a379190c2339d6335e00faf7730be6d0f0..599094f231787db475882c38721b724a
          if (!this.level().isClientSide && this.canPickUpLoot() && this.isAlive() && !this.dead && (this.level().purpurConfig.entitiesPickUpLootBypassMobGriefing || this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) {
              Vec3i baseblockposition = this.getPickupReach();
              List<ItemEntity> list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ()));
-@@ -723,7 +723,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -767,7 +767,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
              }
          }
  
@@ -1311,78 +1359,77 @@ index 547279a379190c2339d6335e00faf7730be6d0f0..599094f231787db475882c38721b724a
      }
  
      protected Vec3i getPickupReach() {
-@@ -937,46 +937,46 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -992,44 +992,44 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
              return;
          }
-         // Paper end
--        this.level().getProfiler().push("sensing");
-+        //this.level().getProfiler().push("sensing"); // Purpur
+         // Paper end - Allow nerfed mobs to jump and float
+-        ProfilerFiller gameprofilerfiller = this.level().getProfiler();
++        //ProfilerFiller gameprofilerfiller = this.level().getProfiler(); // Purpur
+ 
+-        gameprofilerfiller.push("sensing");
++        //gameprofilerfiller.push("sensing"); // Purpur
          this.sensing.tick();
--        this.level().getProfiler().pop();
-+        //this.level().getProfiler().pop(); // Purpur
-         int i = this.level().getServer().getTickCount() + this.getId();
+-        gameprofilerfiller.pop();
++        //gameprofilerfiller.pop(); // Purpur
+         int i = this.tickCount + this.getId();
  
          if (i % 2 != 0 && this.tickCount > 1) {
--            this.level().getProfiler().push("targetSelector");
-+            //this.level().getProfiler().push("targetSelector"); // Purpur
-             if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
+-            gameprofilerfiller.push("targetSelector");
++            //gameprofilerfiller.push("targetSelector"); // Purpur
              this.targetSelector.tickRunningGoals(false);
--            this.level().getProfiler().pop();
--            this.level().getProfiler().push("goalSelector");
-+            //this.level().getProfiler().pop(); // Purpur
-+            //this.level().getProfiler().push("goalSelector"); // Purpur
-             if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
+-            gameprofilerfiller.pop();
+-            gameprofilerfiller.push("goalSelector");
++            //gameprofilerfiller.pop(); // Purpur
++            //gameprofilerfiller.push("goalSelector"); // Purpur
              this.goalSelector.tickRunningGoals(false);
--            this.level().getProfiler().pop();
-+            //this.level().getProfiler().pop(); // Purpur
+-            gameprofilerfiller.pop();
++            //gameprofilerfiller.pop(); // Purpur
          } else {
--            this.level().getProfiler().push("targetSelector");
-+            //this.level().getProfiler().push("targetSelector");
-             if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
+-            gameprofilerfiller.push("targetSelector");
++            //gameprofilerfiller.push("targetSelector"); // Purpur
              this.targetSelector.tick();
--            this.level().getProfiler().pop();
--            this.level().getProfiler().push("goalSelector");
-+            //this.level().getProfiler().pop(); // Purpur
-+            //this.level().getProfiler().push("goalSelector"); // Purpur
-             if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
+-            gameprofilerfiller.pop();
+-            gameprofilerfiller.push("goalSelector");
++            //gameprofilerfiller.pop(); // Purpur
++            //gameprofilerfiller.push("goalSelector"); // Purpur
              this.goalSelector.tick();
--            this.level().getProfiler().pop();
-+            //this.level().getProfiler().pop(); // Purpur
+-            gameprofilerfiller.pop();
++            //gameprofilerfiller.pop(); // Purpur
          }
  
--        this.level().getProfiler().push("navigation");
-+        //this.level().getProfiler().push("navigation"); // Purpur
+-        gameprofilerfiller.push("navigation");
++        //gameprofilerfiller.push("navigation"); // Purpur
          this.navigation.tick();
--        this.level().getProfiler().pop();
--        this.level().getProfiler().push("mob tick");
-+        //this.level().getProfiler().pop(); // Purpur
-+        //this.level().getProfiler().push("mob tick"); // Purpur
+-        gameprofilerfiller.pop();
+-        gameprofilerfiller.push("mob tick");
++        //gameprofilerfiller.pop(); // Purpur
++        //gameprofilerfiller.push("mob tick"); // Purpur
          this.customServerAiStep();
--        this.level().getProfiler().pop();
--        this.level().getProfiler().push("controls");
--        this.level().getProfiler().push("move");
-+        //this.level().getProfiler().pop(); // Purpur
-+        //this.level().getProfiler().push("controls"); // Purpur
-+        //this.level().getProfiler().push("move"); // Purpur
+-        gameprofilerfiller.pop();
+-        gameprofilerfiller.push("controls");
+-        gameprofilerfiller.push("move");
++        //gameprofilerfiller.pop(); // Purpur
++        //gameprofilerfiller.push("controls"); // Purpur
++        //gameprofilerfiller.push("move"); // Purpur
          this.moveControl.tick();
--        this.level().getProfiler().popPush("look");
-+        //this.level().getProfiler().popPush("look"); // Purpur
+-        gameprofilerfiller.popPush("look");
++        //gameprofilerfiller.popPush("look"); // Purpur
          this.lookControl.tick();
--        this.level().getProfiler().popPush("jump");
-+        //this.level().getProfiler().popPush("jump"); // Purpur
+-        gameprofilerfiller.popPush("jump");
++        //gameprofilerfiller.popPush("jump"); // Purpur
          this.jumpControl.tick();
--        this.level().getProfiler().pop();
--        this.level().getProfiler().pop();
-+        //this.level().getProfiler().pop(); // Purpur
-+        //this.level().getProfiler().pop(); // Purpur
+-        gameprofilerfiller.pop();
+-        gameprofilerfiller.pop();
++        //gameprofilerfiller.pop(); // Purpur
++        //gameprofilerfiller.pop(); // Purpur
          this.sendDebugPackets();
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 1635818fc4b1788c0d397085239df6dd75b210ab..02978315bc2b828cc603ce7478408f3f82c249c2 100644
+index 74d4f653d5c7f1923c59019effd78337402f7025..b4e4670536f6dcea109c029d75d9710cb386f1d0 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -105,8 +105,8 @@ public class GoalSelector {
+@@ -87,8 +87,8 @@ public class GoalSelector {
      }
  
      public void tick() {
@@ -1391,20 +1438,20 @@ index 1635818fc4b1788c0d397085239df6dd75b210ab..02978315bc2b828cc603ce7478408f3f
 +        //ProfilerFiller profilerFiller = this.profiler.get(); // Purpur
 +        //profilerFiller.push("goalCleanup"); // Purpur
  
-         for(WrappedGoal wrappedGoal : this.availableGoals) {
-             if (wrappedGoal.isRunning() && (goalContainsAnyFlags(wrappedGoal, this.goalTypes) || !wrappedGoal.canContinueToUse())) {
-@@ -123,8 +123,8 @@ public class GoalSelector {
-             }
+         for (WrappedGoal wrappedGoal : this.availableGoals) {
+             if (wrappedGoal.isRunning() && (goalContainsAnyFlags(wrappedGoal, this.goalTypes) || !wrappedGoal.canContinueToUse())) { // Paper - Perf: optimize goal types by removing streams
+@@ -97,8 +97,8 @@ public class GoalSelector {
          }
  
+         this.lockedFlags.entrySet().removeIf(entry -> !entry.getValue().isRunning());
 -        profilerFiller.pop();
 -        profilerFiller.push("goalUpdate");
 +        //profilerFiller.pop(); // Purpur
 +        //profilerFiller.push("goalUpdate"); // Purpur
  
-         for(WrappedGoal wrappedGoal2 : this.availableGoals) {
+         for (WrappedGoal wrappedGoal2 : this.availableGoals) {
              // Paper start
-@@ -144,13 +144,13 @@ public class GoalSelector {
+@@ -118,13 +118,13 @@ public class GoalSelector {
              }
          }
  
@@ -1419,9 +1466,9 @@ index 1635818fc4b1788c0d397085239df6dd75b210ab..02978315bc2b828cc603ce7478408f3f
 +        //ProfilerFiller profilerFiller = this.profiler.get(); // Purpur
 +        //profilerFiller.push("goalTick"); // Purpur
  
-         for(WrappedGoal wrappedGoal : this.availableGoals) {
+         for (WrappedGoal wrappedGoal : this.availableGoals) {
              if (wrappedGoal.isRunning() && (tickAll || wrappedGoal.requiresUpdateEveryTick())) {
-@@ -158,7 +158,7 @@ public class GoalSelector {
+@@ -132,7 +132,7 @@ public class GoalSelector {
              }
          }
  
@@ -1431,13 +1478,13 @@ index 1635818fc4b1788c0d397085239df6dd75b210ab..02978315bc2b828cc603ce7478408f3f
  
      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 b37415d45dda8e658c8995a4519e552dc378bb41..0e36e3e672de4c806e2d534b437489a3a349a722 100644
+index 2e9991e6b3c05584002744a2ee2579b1dba218b2..544920a31b649985333f82beafa94a3392f5853e 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 {
                  }
              }
-             // Paper end
+             // Paper end - EntityPathfindEvent
 -            this.level.getProfiler().push("pathfind");
 +            //this.level.getProfiler().push("pathfind"); // Purpur
              BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
@@ -1466,16 +1513,16 @@ index 51772f03a3469b11e7166ec6f3a1b9c64a606221..02f2f46ccc48bb4d9bd08555818b0489
                  this.seen.add(i);
              } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 09f796ec491f21520e1fcc454249e4696dad3b1b..9bf06cf7b3706f8883e1a0ceac8b1aebb52ba475 100644
+index 09502b15c20f401c3b56ecedc4d3b515384d654f..bca7b7192debb3a34a08047010a2438e7b7e2a78 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -259,13 +259,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
-     private int behaviorTick = 0; // Pufferfish
+@@ -252,13 +252,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+ 
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("allayBrain");
 +        //this.level().getProfiler().push("allayBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
 -        this.level().getProfiler().pop();
 -        this.level().getProfiler().push("allayActivityUpdate");
@@ -1487,16 +1534,38 @@ index 09f796ec491f21520e1fcc454249e4696dad3b1b..9bf06cf7b3706f8883e1a0ceac8b1aeb
          super.customServerAiStep();
      }
  
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 7223528b4fb2885e0f6c0df2238cada16dbed35e..61cd0e050a2784f1d59ed3c9493e2386ef5fc3bb 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -320,12 +320,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
-     private int behaviorTick = 0; // Pufferfish
+diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index 29412208e329e9fc211b844822a2fc3328a5bc89..f8790ab5b7c1279719271ee57c00f4f2d6ce9714 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -130,12 +130,12 @@ public class Armadillo extends Animal {
+ 
      @Override
      protected void customServerAiStep() {
+-        this.level().getProfiler().push("armadilloBrain");
++        //this.level().getProfiler().push("armadilloBrain"); // Purpur
+         ((Brain<Armadillo>) this.brain).tick((ServerLevel) this.level(), this); // CraftBukkit - decompile error
+-        this.level().getProfiler().pop();
+-        this.level().getProfiler().push("armadilloActivityUpdate");
++        //this.level().getProfiler().pop(); // Purpur
++        //this.level().getProfiler().push("armadilloActivityUpdate"); // Purpur
+         ArmadilloAi.updateActivity(this);
+-        this.level().getProfiler().pop();
++        //this.level().getProfiler().pop(); // Purpur
+         if (this.isAlive() && !this.isBaby() && --this.scuteTime <= 0) {
+             this.playSound(SoundEvents.ARMADILLO_SCUTE_DROP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);
+             this.forceDrops = true; // CraftBukkit
+diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+index ea1515f189bf3bc4cfef4524fb40f0d826f68cc0..d330f79e860662bc93a1703215e66e6564d181b9 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
++++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+@@ -307,13 +307,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+ 
+     @Override
+     protected void customServerAiStep() {
+-        this.level().getProfiler().push("axolotlBrain");
 +        //this.level().getProfiler().push("axolotlBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
 -        this.level().getProfiler().pop();
 -        this.level().getProfiler().push("axolotlActivityUpdate");
@@ -1509,17 +1578,18 @@ index 7223528b4fb2885e0f6c0df2238cada16dbed35e..61cd0e050a2784f1d59ed3c9493e2386
              Optional<Integer> optional = this.getBrain().getMemory(MemoryModuleType.PLAY_DEAD_TICKS);
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index f44261137f12354640170206ca7bfb6d991dc7a0..1d84135c709a90843b1ee34fb47508e78a7ce95d 100644
+index ed67fcd2b67bfe581863cc6748692c3348f6c883..24a1663cf1cd3f888981a13907811b55bdbf6133 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -158,13 +158,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -151,14 +151,14 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
  
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("camelBrain");
 +        //this.level().getProfiler().push("camelBrain"); // Purpur
-         Brain<Camel> brain = (Brain<Camel>) this.getBrain(); // Paper - decompile fix
-         brain.tick((ServerLevel)this.level(), this);
+         Brain<Camel> behaviorcontroller = (Brain<Camel>) this.getBrain(); // CraftBukkit - decompile error
+ 
+         behaviorcontroller.tick((ServerLevel) this.level(), this);
 -        this.level().getProfiler().pop();
 -        this.level().getProfiler().push("camelActivityUpdate");
 +        //this.level().getProfiler().pop(); // Purpur
@@ -1531,16 +1601,16 @@ index f44261137f12354640170206ca7bfb6d991dc7a0..1d84135c709a90843b1ee34fb47508e7
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 3cef040c0e8869ca2ca2cb83c8f60a0f15582ae8..9417ce67cc231d5bfa6813f78ec27196eed423c8 100644
+index b0f8115b328eda1e3571051870b5310c5a7e115a..ee8c232ddaa518377bdfa54e83ffc04f7a2f2c9a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -220,13 +220,13 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
-     private int behaviorTick = 0; // Pufferfish
+@@ -237,13 +237,13 @@ public class Frog extends Animal implements VariantHolder<Holder<FrogVariant>> {
+ 
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("frogBrain");
 +        //this.level().getProfiler().push("frogBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel)this.level(), this);
 -        this.level().getProfiler().pop();
 -        this.level().getProfiler().push("frogActivityUpdate");
@@ -1553,16 +1623,16 @@ index 3cef040c0e8869ca2ca2cb83c8f60a0f15582ae8..9417ce67cc231d5bfa6813f78ec27196
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index af8438ae8c805d3276ef2d82eb39b08880fcc8a1..6b012bea26e8ef0c04571f43da67f6e108188830 100644
+index b98a34357e59168bbb22c967b86a449fc91f47f0..09c4cf772df4644413e40055fedcdf42ee8064fd 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -117,13 +117,13 @@ public class Tadpole extends AbstractFish {
-     private int behaviorTick = 0; // Pufferfish
+@@ -122,13 +122,13 @@ public class Tadpole extends AbstractFish {
+ 
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("tadpoleBrain");
 +        //this.level().getProfiler().push("tadpoleBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
 -        this.level().getProfiler().pop();
 -        this.level().getProfiler().push("tadpoleActivityUpdate");
@@ -1575,16 +1645,16 @@ index af8438ae8c805d3276ef2d82eb39b08880fcc8a1..6b012bea26e8ef0c04571f43da67f6e1
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index fba00cab2c4b234dd2e85b5f4dcd0db34183c1a2..806b207e5246db7daa03bebabd7aa574d8b0dab7 100644
+index 79c27b5717fec000ea94138ebc76dbabf5b2eeaf..4e855055abe4d300b6b126e8a9deecaab5827a33 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -226,13 +226,13 @@ public class Goat extends Animal {
-     private int behaviorTick = 0; // Pufferfish
+@@ -224,13 +224,13 @@ public class Goat extends Animal {
+ 
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("goatBrain");
 +        //this.level().getProfiler().push("goatBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
 -        this.level().getProfiler().pop();
 -        this.level().getProfiler().push("goatActivityUpdate");
@@ -1597,10 +1667,10 @@ index fba00cab2c4b234dd2e85b5f4dcd0db34183c1a2..806b207e5246db7daa03bebabd7aa574
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 42bfc59462f320e95c13075c8541c4c4c98a6879..dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad 100644
+index 0cc5b9e44dd6f1e0afdbb62ef41aa749c0c79b18..21bdcbd51d9f440e0734750b40cefa4c08cdaf5f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -517,11 +517,11 @@ public class Sniffer extends Animal {
+@@ -504,11 +504,11 @@ public class Sniffer extends Animal {
  
      @Override
      protected void customServerAiStep() {
@@ -1616,10 +1686,10 @@ index 42bfc59462f320e95c13075c8541c4c4c98a6879..dcb10e2ea1e0c7d0479adae5bc2ff57e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 15fd1af0773ba1254a429240444f48e68e29ee74..1d36459ee10da702d65b4a6d139a05fdd487556f 100644
+index 451762b3cd023b8c5828f68e2778aada9c50ab85..f9bb83f35a41e5b076ae438af613a97b8e60c0c3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-@@ -232,10 +232,10 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
+@@ -266,10 +266,10 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
  
      @Override
      protected void customServerAiStep() {
@@ -1632,34 +1702,53 @@ index 15fd1af0773ba1254a429240444f48e68e29ee74..1d36459ee10da702d65b4a6d139a05fd
          this.updateActivity();
      }
  
+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 796ce24185ab9e80864116f9523c4289fcaad243..82391c84789c27353212d3142c036cc5aedb98f9 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
+@@ -226,11 +226,11 @@ public class Breeze extends Monster {
+ 
+     @Override
+     protected void customServerAiStep() {
+-        this.level().getProfiler().push("breezeBrain");
++        //this.level().getProfiler().push("breezeBrain"); // Purpur
+         this.getBrain().tick((ServerLevel)this.level(), this);
+-        this.level().getProfiler().popPush("breezeActivityUpdate");
++        //this.level().getProfiler().popPush("breezeActivityUpdate"); // Purpur
+         BreezeAi.updateActivity(this);
+-        this.level().getProfiler().pop();
++        //this.level().getProfiler().pop(); // Purpur
+         super.customServerAiStep();
+     }
+ 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index e326e753cc6bca1bd00287d16c9796b9f3dd4d14..9d6c4f13c4a444c6c815c6c4f2114142f166b9bb 100644
+index a69a4d860cf537322cdf96bfd42e55d3fc684dd1..757d2b7bcb83f5bdcddf85a00e90288f3b82a2d6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -168,10 +168,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
-     private int behaviorTick; // Pufferfish
+@@ -192,10 +192,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+ 
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("hoglinBrain");
 +        //this.level().getProfiler().push("hoglinBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel)this.level(), this);
 -        this.level().getProfiler().pop();
 +        //this.level().getProfiler().pop(); // Purpur
          HoglinAi.updateActivity(this);
          if (this.isConverting()) {
-             ++this.timeInOverworld;
+             this.timeInOverworld++;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 9ca1618ab945ad834c5fc221ada49058f806e79c..8e829d522a6012f409161ad5a9a06721a942d7e4 100644
+index 811b622945ecf67cff1992c3cdd4fcd84f33fb68..1b5977aa14d9a7254e7692bb152cc2808d52107a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -335,10 +335,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
-     private int behaviorTick; // Pufferfish
+@@ -328,10 +328,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+ 
      @Override
      protected void customServerAiStep() {
 -        this.level().getProfiler().push("piglinBrain");
 +        //this.level().getProfiler().push("piglinBrain"); // Purpur
-         if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
+         //if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider // Purpur - TODO: Pufferfish
          this.getBrain().tick((ServerLevel) this.level(), this);
 -        this.level().getProfiler().pop();
 +        //this.level().getProfiler().pop(); // Purpur
@@ -1667,10 +1756,10 @@ index 9ca1618ab945ad834c5fc221ada49058f806e79c..8e829d522a6012f409161ad5a9a06721
          super.customServerAiStep();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index 61e8f2d030fc50840c3f80dfb6fc810797ec440f..856e6e02c9424a6c06e310262cb4f5bdd34da516 100644
+index 71d2501e88a99819ef305fa8715418aad65ec81d..407a0f27719d3944b3a005c664d80246ea1c7cf4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-@@ -117,10 +117,10 @@ public class PiglinBrute extends AbstractPiglin {
+@@ -138,10 +138,10 @@ public class PiglinBrute extends AbstractPiglin {
  
      @Override
      protected void customServerAiStep() {
@@ -1684,16 +1773,16 @@ index 61e8f2d030fc50840c3f80dfb6fc810797ec440f..856e6e02c9424a6c06e310262cb4f5bd
          PiglinBruteAi.maybePlayActivitySound(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 250af1ce7a93c2d2897f35c68fae319c9ba7d55d..5e66c2bd3807619cadee5b7081d93d21886e2806 100644
+index 9f5325444cc4f64fc88f85794fbad09ddd4f7860..0bb577ec9ba0d23a741ccf067ac35f6be68312ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -301,10 +301,10 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -299,9 +299,10 @@ public class Warden extends Monster implements VibrationSystem {
      protected void customServerAiStep() {
          ServerLevel worldserver = (ServerLevel) this.level();
  
 -        worldserver.getProfiler().push("wardenBrain");
 +        //worldserver.getProfiler().push("wardenBrain"); // Purpur
-         if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
++        //if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - TODO: Move to Ridables patch
          this.getBrain().tick(worldserver, this);
 -        this.level().getProfiler().pop();
 +        //this.level().getProfiler().pop(); // Purpur
@@ -1701,10 +1790,10 @@ index 250af1ce7a93c2d2897f35c68fae319c9ba7d55d..5e66c2bd3807619cadee5b7081d93d21
          if ((this.tickCount + this.getId()) % 120 == 0) {
              Warden.applyDarknessAround(worldserver, this.position(), this, 20);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 9682676aa68cf5927facd60ef061006579c1f893..81bb48853acb34ad2f26da43b4d81620a9bfcc4f 100644
+index dcf580d852ede8ea01f5d91944a224ec6eca73e4..4be218129188c1be8736940170a861adc10fdb7d 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -342,7 +342,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -341,7 +341,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      protected void customServerAiStep(boolean inactive) { // Purpur - not final
          // Paper end
@@ -1713,42 +1802,42 @@ index 9682676aa68cf5927facd60ef061006579c1f893..81bb48853acb34ad2f26da43b4d81620
          // Purpur start
          if (this.level().purpurConfig.villagerLobotomizeEnabled) {
              // treat as inactive if lobotomized
-@@ -355,7 +355,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -357,7 +357,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              this.getBrain().tick((ServerLevel) this.level(), this); // Paper
-         else if (this.isLobotomized && shouldRestock()) restock();
-         // Purpur end
+         }
+         // Purpur end*/ // Purpur - TODO: Pufferfish
 -        this.level().getProfiler().pop();
 +        //this.level().getProfiler().pop(); // Purpur
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
          }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 45243249a561440512ef2a620c60b02e159c80e2..b26cea981a876fd42c9ab91923d507b3c11a0425 100644
+index dc88014c4d9f172cc54e5d77b488128f9ffbc73d..6379b3b8e633d1a16532b4664e53fa5afa616ab6 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -706,7 +706,7 @@ public class Explosion {
-                 if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper
-                     BlockPos blockposition1 = blockposition.immutable();
+@@ -681,7 +681,7 @@ public class Explosion {
+         }
  
--                    this.level.getProfiler().push("explosion_blocks");
-+                    //this.level.getProfiler().push("explosion_blocks"); // Purpur
-                     if (block.dropFromExplosion(this)) {
-                         Level world = this.level;
+         if (flag1) {
+-            this.level.getProfiler().push("explosion_blocks");
++            //this.level.getProfiler().push("explosion_blocks"); // Purpur
+             List<Pair<ItemStack, BlockPos>> list = new ArrayList();
  
-@@ -728,7 +728,7 @@ public class Explosion {
- 
-                     this.level.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 3);
-                     block.wasExploded(this.level, blockposition, this);
--                    this.level.getProfiler().pop();
-+                    //this.level.getProfiler().pop(); // Purpur
-                 }
+             Util.shuffle(this.toBlow, this.level.random);
+@@ -759,7 +759,7 @@ public class Explosion {
+                 Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst());
              }
  
+-            this.level.getProfiler().pop();
++            //this.level.getProfiler().pop(); // Purpur
+         }
+ 
+         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 fc27f690d302559dd534e9f4ede7a7bd6422837a..a90288a86b022b4f9682befcb1478671e861ca41 100644
+index 4d00d72d66adfb282d354e22703552b333138694..eda2f8cc034cf46293be1be117a60cf8b663c303 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1301,9 +1301,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1303,9 +1303,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      protected void tickBlockEntities() {
@@ -1757,19 +1846,19 @@ index fc27f690d302559dd534e9f4ede7a7bd6422837a..a90288a86b022b4f9682befcb1478671
  
 -        gameprofilerfiller.push("blockEntities");
 +        //gameprofilerfiller.push("blockEntities"); // Purpur
-         //timings.tileEntityPending.startTiming(); // Spigot // Purpur
+         //this.timings.tileEntityPending.startTiming(); // Spigot // Purpur
          this.tickingBlockEntities = true;
          if (!this.pendingBlockEntityTickers.isEmpty()) {
-@@ -1348,7 +1348,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         //timings.tileEntityTick.stopTiming(); // Spigot // Purpur
+@@ -1346,7 +1346,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur
          this.tickingBlockEntities = false;
          co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
 -        gameprofilerfiller.pop();
 +        //gameprofilerfiller.pop(); // Purpur
-         spigotConfig.currentPrimedTnt = 0; // Spigot
+         this.spigotConfig.currentPrimedTnt = 0; // Spigot
      }
  
-@@ -1551,7 +1551,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1561,7 +1561,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1778,7 +1867,7 @@ index fc27f690d302559dd534e9f4ede7a7bd6422837a..a90288a86b022b4f9682befcb1478671
          List<Entity> list = Lists.newArrayList();
          ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
          return list;
-@@ -1570,7 +1570,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1580,7 +1580,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1787,20 +1876,19 @@ index fc27f690d302559dd534e9f4ede7a7bd6422837a..a90288a86b022b4f9682befcb1478671
          // Paper start - optimise this call
          //TODO use limit
          if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
-@@ -1827,7 +1827,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1835,6 +1835,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public ProfilerFiller getProfiler() {
--        if (gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish
-+        if (true || gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish // Purpur
++        //if (true || gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish // Purpur // Purpur - TODO: Pufferfish
          return (ProfilerFiller) this.profiler.get();
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 1e3349690d00c7889a381f7c65a3b5bf3de2ac5b..524301e2438ee2938b59eb2b2e9fc4e0eb727a87 100644
+index 2812505185df691e8f08932aa0bba162a7d9db86..35e94c06361795d032f995e8282f8b35c075dae7 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -132,7 +132,7 @@ public final class NaturalSpawner {
+@@ -127,7 +127,7 @@ public final class NaturalSpawner {
      }
  
      public static void spawnForChunk(ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnState info, boolean spawnAnimals, boolean spawnMonsters, boolean rareSpawn) {
@@ -1809,7 +1897,7 @@ index 1e3349690d00c7889a381f7c65a3b5bf3de2ac5b..524301e2438ee2938b59eb2b2e9fc4e0
          //world.timings.mobSpawn.startTiming(); // Spigot // Purpur
          MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
          int i = aenumcreaturetype.length;
-@@ -187,7 +187,7 @@ public final class NaturalSpawner {
+@@ -182,7 +182,7 @@ public final class NaturalSpawner {
          }
  
          //world.timings.mobSpawn.stopTiming(); // Spigot // Purpur
@@ -1817,12 +1905,12 @@ index 1e3349690d00c7889a381f7c65a3b5bf3de2ac5b..524301e2438ee2938b59eb2b2e9fc4e0
 +        //world.getProfiler().pop(); // Purpur
      }
  
-     // Paper start
+     // Paper start - Add mobcaps commands
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32..220e1dbf70e7d51ea69d964eb7e84f55aa5a32d7 100644
+index e8d14bf4120dd9861e4ccb8bd6c14e175343c55d..fd637415625fdabcac07e120e9168d09c06141d4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -457,11 +457,11 @@ public class LevelChunk extends ChunkAccess {
+@@ -443,11 +443,11 @@ public class LevelChunk extends ChunkAccess {
                  if (LightEngine.hasDifferentLightProperties(this, blockposition, iblockdata1, iblockdata)) {
                      ProfilerFiller gameprofilerfiller = this.level.getProfiler();
  
@@ -1837,7 +1925,7 @@ index ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32..220e1dbf70e7d51ea69d964eb7e84f55
                  }
  
                  boolean flag3 = iblockdata1.hasBlockEntity();
-@@ -1175,9 +1175,9 @@ public class LevelChunk extends ChunkAccess {
+@@ -1158,9 +1158,9 @@ public class LevelChunk extends ChunkAccess {
  
                  if (LevelChunk.this.isTicking(blockposition)) {
                      try {
@@ -1849,22 +1937,22 @@ index ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32..220e1dbf70e7d51ea69d964eb7e84f55
                          //this.blockEntity.tickTimer.startTiming(); // Spigot // Purpur
                          BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
  
-@@ -1189,7 +1189,7 @@ public class LevelChunk extends ChunkAccess {
-                             LevelChunk.LOGGER.warn("Block entity {} @ {} state {} invalid for ticking:", new Object[]{LogUtils.defer(this::getType), LogUtils.defer(this::getPos), iblockdata});
+@@ -1177,7 +1177,7 @@ public class LevelChunk extends ChunkAccess {
+                             // Paper end - Remove the Block Entity if it's invalid
                          }
  
 -                        gameprofilerfiller.pop();
 +                        //gameprofilerfiller.pop();
                      } catch (Throwable throwable) {
                          if (throwable instanceof ThreadDeath) throw throwable; // Paper
-                         // Paper start - Prevent tile entity and entity crashes
+                         // 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 d23481453717f715124156b5d83f6448f720d049..a8af51a25b0f99c3a64d9150fdfcd6b818aa7581 100644
+index 18bbb3f8f99849333ff4bc020c8ce758a69312a5..404080976208c30e9e95e5bee47c2a749e709a45 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 {
      @Nullable
-     // Paper start - optimize collection
+     // Paper start - Perf: remove streams and optimize collection
      private Path findPath(ProfilerFiller profiler, Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) {
 -        profiler.push("find_path");
 -        profiler.markForCharting(MetricCategory.PATH_FINDING);
@@ -1873,11 +1961,20 @@ index d23481453717f715124156b5d83f6448f720d049..a8af51a25b0f99c3a64d9150fdfcd6b8
          // Set<Target> set = positions.keySet();
          startNode.g = 0.0F;
          startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection
+@@ -122,7 +122,7 @@ public class PathFinder {
+             if (best == null || comparator.compare(path, best) < 0)
+                 best = path;
+         }
+-        profiler.pop();
++        //profiler.pop(); // Purpur
+         return best;
+         // 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 1d7c663fa0e550bd0cfb9a4b83ccd7e2968666f0..0043c0087896a6df6910b0500da37d84b287c901 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
-@@ -86,20 +86,20 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
+@@ -81,20 +81,20 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
      }
  
      public void tick(long time, int maxTicks, BiConsumer<BlockPos, T> ticker) {
diff --git a/patches/server/0268-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0256-Add-more-logger-output-for-invalid-movement-kicks.patch
similarity index 91%
rename from patches/server/0268-Add-more-logger-output-for-invalid-movement-kicks.patch
rename to patches/server/0256-Add-more-logger-output-for-invalid-movement-kicks.patch
index 720b95303..90fbc22da 100644
--- a/patches/server/0268-Add-more-logger-output-for-invalid-movement-kicks.patch
+++ b/patches/server/0256-Add-more-logger-output-for-invalid-movement-kicks.patch
@@ -5,10 +5,10 @@ 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 0c56b90dbcb4aaf904eeb1773a1aa82e9e018c50..165623f5abc237e63b236489af6375bb43daeaca 100644
+index a3e29942d3db9e5e63c839b4e32394639f60b680..478f3bba5e0768c8ab800d7cb591f07db1bc20da 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -736,6 +736,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -753,6 +753,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          if (packet.getId() == this.awaitingTeleport) {
              if (this.awaitingPositionFromClient == null) {
                  this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
@@ -16,7 +16,7 @@ index 0c56b90dbcb4aaf904eeb1773a1aa82e9e018c50..165623f5abc237e63b236489af6375bb
                  return;
              }
  
-@@ -1324,8 +1325,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1358,8 +1359,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      @Override
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
diff --git a/patches/server/0269-Add-Bee-API.patch b/patches/server/0257-Add-Bee-API.patch
similarity index 89%
rename from patches/server/0269-Add-Bee-API.patch
rename to patches/server/0257-Add-Bee-API.patch
index cfd237990..b09f65216 100644
--- a/patches/server/0269-Add-Bee-API.patch
+++ b/patches/server/0257-Add-Bee-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Bee API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 02e95af3c18b3da5a6a32a7536e903ca9c426249..38a3dcec138d9233a46e5d523bcc6d64bc7fffd0 100644
+index 221c0051c7a0e20c1b7a464df26eb63c4e997eee..539170813921de2dfcd7ef84dd7512d73cd27e68 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -807,6 +807,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -797,6 +797,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                  if (optional.isPresent()) {
                      Bee.this.savedFlowerPos = (BlockPos) optional.get();
                      Bee.this.navigation.moveTo((double) Bee.this.savedFlowerPos.getX() + 0.5D, (double) Bee.this.savedFlowerPos.getY() + 0.5D, (double) Bee.this.savedFlowerPos.getZ() + 0.5D, 1.2000000476837158D);
@@ -16,7 +16,7 @@ index 02e95af3c18b3da5a6a32a7536e903ca9c426249..38a3dcec138d9233a46e5d523bcc6d64
                      return true;
                  } else {
                      Bee.this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(Bee.this.random, 20, 60);
-@@ -863,6 +864,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -853,6 +854,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              this.pollinating = false;
              Bee.this.navigation.stop();
              Bee.this.remainingCooldownBeforeLocatingNewFlower = 200;
@@ -24,7 +24,7 @@ index 02e95af3c18b3da5a6a32a7536e903ca9c426249..38a3dcec138d9233a46e5d523bcc6d64
          }
  
          @Override
-@@ -909,6 +911,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -899,6 +901,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                              this.setWantedPos();
                          }
  
diff --git a/patches/server/0270-Debug-Marker-API.patch b/patches/server/0258-Debug-Marker-API.patch
similarity index 93%
rename from patches/server/0270-Debug-Marker-API.patch
rename to patches/server/0258-Debug-Marker-API.patch
index d25180481..7db6b893c 100644
--- a/patches/server/0270-Debug-Marker-API.patch
+++ b/patches/server/0258-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6e8cd10ec919e9c42c214a9a9c78a51794731fb6..2b3b9be41930a73886735394e12f6e3eab800fb2 100644
+index f4b611754a0b4a14c31595bc2a5e8acf8bf849bc..5285433e69cb34d0b856f3e81bf1888aa30eb6f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1548,6 +1548,42 @@ public final class CraftServer implements Server {
+@@ -1600,6 +1600,42 @@ public final class CraftServer implements Server {
      public void removeFuel(org.bukkit.Material material) {
          net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
      }
@@ -52,10 +52,10 @@ index 6e8cd10ec919e9c42c214a9a9c78a51794731fb6..2b3b9be41930a73886735394e12f6e3e
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 791e69b2c963cd034d6d35561448cdb20b1b1cde..52b48e40c3ee5f483c6cb04409459cf25abc3f0d 100644
+index b7a02ae4eda06cab8ffd1220259a061558981dec..226ff7c6048b510be2e71ecc5d5ff3581092aa5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2293,6 +2293,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2428,6 +2428,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 791e69b2c963cd034d6d35561448cdb20b1b1cde..52b48e40c3ee5f483c6cb04409459cf2
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a03f60665059f96fc546e880c29d3bb7b04ca67c..f7fd1c4d8875bb3807172c45367465c4f9962176 100644
+index cf5897f8fed0c390ee75ca3b5b1037cfe1bdc43d..db60b3d722a67a5beb6f80d0900132317d0e9476 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3335,5 +3335,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3574,5 +3574,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0271-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0259-mob-spawning-option-to-ignore-creative-players.patch
similarity index 86%
rename from patches/server/0271-mob-spawning-option-to-ignore-creative-players.patch
rename to patches/server/0259-mob-spawning-option-to-ignore-creative-players.patch
index dd1268f05..e7d688571 100644
--- a/patches/server/0271-mob-spawning-option-to-ignore-creative-players.patch
+++ b/patches/server/0259-mob-spawning-option-to-ignore-creative-players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] mob spawning option to ignore creative players
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 524301e2438ee2938b59eb2b2e9fc4e0eb727a87..a2a59dd2e515bf4dca84a442703c122fd36f05e0 100644
+index 35e94c06361795d032f995e8282f8b35c075dae7..0f90a6803851eba51e164772c984b1cd1193d882 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -258,7 +258,7 @@ public final class NaturalSpawner {
+@@ -253,7 +253,7 @@ public final class NaturalSpawner {
                              blockposition_mutableblockposition.set(l, i, i1);
                              double d0 = (double) l + 0.5D;
                              double d1 = (double) i1 + 0.5D;
@@ -18,10 +18,10 @@ index 524301e2438ee2938b59eb2b2e9fc4e0eb727a87..a2a59dd2e515bf4dca84a442703c122f
                              if (entityhuman != null) {
                                  double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 07b8826509d158e60ee6c3c847f7855b7469325f..71d2da21e1dcf5991f9161b3fcad66247a5a4991 100644
+index f50c26f02bc7c95f7b1228588aff68296290c21b..8763375984c9cbd9d4862a0130602e11a55292f5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -377,6 +377,7 @@ public class PurpurWorldConfig {
+@@ -385,6 +385,7 @@ public class PurpurWorldConfig {
      public boolean phantomSpawning;
      public boolean villagerTraderSpawning;
      public boolean villageSiegeSpawning;
@@ -29,7 +29,7 @@ index 07b8826509d158e60ee6c3c847f7855b7469325f..71d2da21e1dcf5991f9161b3fcad6624
      private void mobSpawnerSettings() {
          // values of "default" or null will default to true only if the world environment is normal (aka overworld)
          Predicate<Boolean> predicate = (bool) -> (bool != null && bool) || (bool == null && environment == World.Environment.NORMAL);
-@@ -385,6 +386,7 @@ public class PurpurWorldConfig {
+@@ -393,6 +394,7 @@ public class PurpurWorldConfig {
          phantomSpawning = getBoolean("gameplay-mechanics.mob-spawning.phantoms", predicate);
          villagerTraderSpawning = getBoolean("gameplay-mechanics.mob-spawning.wandering-traders", predicate);
          villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
diff --git a/patches/server/0272-Add-skeleton-bow-accuracy-option.patch b/patches/server/0260-Add-skeleton-bow-accuracy-option.patch
similarity index 87%
rename from patches/server/0272-Add-skeleton-bow-accuracy-option.patch
rename to patches/server/0260-Add-skeleton-bow-accuracy-option.patch
index 887b8ab1a..3f012cd02 100644
--- a/patches/server/0272-Add-skeleton-bow-accuracy-option.patch
+++ b/patches/server/0260-Add-skeleton-bow-accuracy-option.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add skeleton bow accuracy option
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index f3e1fa62d9f067c0fe8aacb88bf30b01ee0562c1..28eb98d383d6846a25c29f8cd8ff211c360a56dc 100644
+index 8515e6360c1630385884a60f652f65fdefeaf540..e80307198b051cbcd9f72b36e459276848dcb4c9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -182,7 +182,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -183,7 +183,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          double d2 = target.getZ() - this.getZ();
          double d3 = Math.sqrt(d0 * d0 + d2 * d2);
  
@@ -18,10 +18,10 @@ index f3e1fa62d9f067c0fe8aacb88bf30b01ee0562c1..28eb98d383d6846a25c29f8cd8ff211c
          org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
          if (event.isCancelled()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 71d2da21e1dcf5991f9161b3fcad66247a5a4991..86340e782bbc125ec672eea855de29f90ac127de 100644
+index 8763375984c9cbd9d4862a0130602e11a55292f5..7b028800a99d627a9efcd2a718e281ab7a67cfad 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2449,6 +2449,8 @@ public class PurpurWorldConfig {
+@@ -2511,6 +2511,8 @@ public class PurpurWorldConfig {
      public boolean skeletonAlwaysDropExp = false;
      public double skeletonHeadVisibilityPercent = 0.5D;
      public int skeletonFeedWitherRoses = 0;
@@ -30,7 +30,7 @@ index 71d2da21e1dcf5991f9161b3fcad66247a5a4991..86340e782bbc125ec672eea855de29f9
      private void skeletonSettings() {
          skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
          skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
-@@ -2463,6 +2465,18 @@ public class PurpurWorldConfig {
+@@ -2525,6 +2527,18 @@ public class PurpurWorldConfig {
          skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
          skeletonHeadVisibilityPercent = getDouble("mobs.skeleton.head-visibility-percent", skeletonHeadVisibilityPercent);
          skeletonFeedWitherRoses = getInt("mobs.skeleton.feed-wither-roses", skeletonFeedWitherRoses);
@@ -48,4 +48,4 @@ index 71d2da21e1dcf5991f9161b3fcad66247a5a4991..86340e782bbc125ec672eea855de29f9
 +        }
      }
  
-     public boolean skeletonHorseRidableInWater = true;
+     public boolean skeletonHorseRidable = false;
diff --git a/patches/server/0274-Add-death-screen-API.patch b/patches/server/0261-Add-death-screen-API.patch
similarity index 87%
rename from patches/server/0274-Add-death-screen-API.patch
rename to patches/server/0261-Add-death-screen-API.patch
index 6e4fb7e01..fa328d3ec 100644
--- a/patches/server/0274-Add-death-screen-API.patch
+++ b/patches/server/0261-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 f7fd1c4d8875bb3807172c45367465c4f9962176..b6515c469ae3ff06daf631f0d5e5f792b41f8e48 100644
+index db60b3d722a67a5beb6f80d0900132317d0e9476..88948526f9acf4bb2157484b80891902fd843b02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3373,5 +3373,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3612,5 +3612,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/0276-Implement-ram-and-rambar-commands.patch b/patches/server/0262-Implement-ram-and-rambar-commands.patch
similarity index 96%
rename from patches/server/0276-Implement-ram-and-rambar-commands.patch
rename to patches/server/0262-Implement-ram-and-rambar-commands.patch
index 8b5412ec9..ec2e7056f 100644
--- a/patches/server/0276-Implement-ram-and-rambar-commands.patch
+++ b/patches/server/0262-Implement-ram-and-rambar-commands.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement ram and rambar commands
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 9caab6541a224dc8f729a7d720eccda7bd83ed53..2fd376789bb24b14101e289733631a9a4b68fa1c 100644
+index d3c42c19a051fb3a670e541fc746b55717192a91..13dfb3e506d50c0b191baf5d05bbfc28c20be0ae 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -236,6 +236,8 @@ public class Commands {
+@@ -258,6 +258,8 @@ public class Commands {
              org.purpurmc.purpur.command.UptimeCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.TPSBarCommand.register(this.dispatcher); // Purpur
              org.purpurmc.purpur.command.CompassCommand.register(this.dispatcher); // Purpur
@@ -18,10 +18,10 @@ index 9caab6541a224dc8f729a7d720eccda7bd83ed53..2fd376789bb24b14101e289733631a9a
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 41bd87096ab195c56695c5c5e46dc3c75e5a9078..6b5bcc87e96619877737fc8200075bdb99d59230 100644
+index ad9d42e886bc1e2529ca13990626169ab2354898..d7e4a9fe9676563845d9981523bff1a7ff12282c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
+@@ -301,6 +301,7 @@ public class ServerPlayer extends Player {
      public boolean purpurClient = false; // Purpur
      private boolean tpsBar = false; // Purpur
      private boolean compassBar = false; // Purpur
@@ -29,23 +29,23 @@ index 41bd87096ab195c56695c5c5e46dc3c75e5a9078..6b5bcc87e96619877737fc8200075bdb
  
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
-@@ -564,6 +565,7 @@ public class ServerPlayer extends Player {
-             }
-         }
+@@ -613,6 +614,7 @@ public class ServerPlayer extends Player {
  
-+        if (nbt.contains("Purpur.RamBar")) { this.ramBar = nbt.getBoolean("Purpur.RamBar"); } // Purpur
          if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
          if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
++        if (nbt.contains("Purpur.RamBar")) { this.ramBar = nbt.getBoolean("Purpur.RamBar"); } // Purpur
      }
-@@ -632,6 +634,7 @@ public class ServerPlayer extends Player {
+ 
+     @Override
+@@ -689,6 +691,7 @@ public class ServerPlayer extends Player {
+             });
          }
-         this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
  
 +        nbt.putBoolean("Purpur.RamBar", this.ramBar); // Purpur
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
          nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
      }
-@@ -2811,5 +2814,13 @@ public class ServerPlayer extends Player {
+@@ -3023,5 +3026,13 @@ public class ServerPlayer extends Player {
      public void compassBar(boolean compassBar) {
          this.compassBar = compassBar;
      }
@@ -60,7 +60,7 @@ index 41bd87096ab195c56695c5c5e46dc3c75e5a9078..6b5bcc87e96619877737fc8200075bdb
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ed9b2f0b55229848894d9d6b401d050cb031b893..568bb53e91dda4804cd328a81ba12ce735c52603 100644
+index 620f1207fc773f8602b748128557f1c73f0319fb..62612451c23bb146e82f4082ca8677e5dc57a08f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -182,6 +182,8 @@ public class PurpurConfig {
diff --git a/patches/server/0278-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0263-Add-an-option-to-fix-MC-3304-projectile-looting.patch
similarity index 59%
rename from patches/server/0278-Add-an-option-to-fix-MC-3304-projectile-looting.patch
rename to patches/server/0263-Add-an-option-to-fix-MC-3304-projectile-looting.patch
index 9406782d2..6755dbff9 100644
--- a/patches/server/0278-Add-an-option-to-fix-MC-3304-projectile-looting.patch
+++ b/patches/server/0263-Add-an-option-to-fix-MC-3304-projectile-looting.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Add an option to fix MC-3304 (projectile looting)
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 9710d1cd31d263b29c80923c56134b1f8f6702b0..4063aed1a3f0bfd7351c1ec2e9684e4991cb5285 100644
+index 342eaa0e3b053e9b39dc58fa92cd18cac446a844..06f7bc4d8d6679d6625a8d392777722fc97739ba 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -72,6 +72,7 @@ public abstract class AbstractArrow extends Projectile {
-     private IntOpenHashSet piercingIgnoreEntityIds;
+@@ -77,6 +77,7 @@ public abstract class AbstractArrow extends Projectile {
      @Nullable
      private List<Entity> piercedAndKilledEntities;
+     public ItemStack pickupItemStack;
 +    public int lootingLevel; // Purpur
  
      // Spigot Start
      @Override
-@@ -612,6 +613,12 @@ public abstract class AbstractArrow extends Projectile {
+@@ -655,6 +656,12 @@ public abstract class AbstractArrow extends Projectile {
          this.knockback = punch;
      }
  
@@ -29,34 +29,16 @@ index 9710d1cd31d263b29c80923c56134b1f8f6702b0..4063aed1a3f0bfd7351c1ec2e9684e49
      public int getKnockback() {
          return this.knockback;
      }
-diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java
-index 220513d3fd5645322886522ea4f6b8c55d043b3c..d45a2f49c82d00801578c34e5f5277fc5e82be87 100644
---- a/src/main/java/net/minecraft/world/item/BowItem.java
-+++ b/src/main/java/net/minecraft/world/item/BowItem.java
-@@ -64,6 +64,13 @@ public class BowItem extends ProjectileWeaponItem implements Vanishable {
-                         if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, stack) > 0) {
-                             entityarrow.setSecondsOnFire(100);
-                         }
-+                        // Purpur start
-+                        int lootingLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MOB_LOOTING, stack);
-+
-+                        if (lootingLevel > 0) {
-+                            entityarrow.setLootingLevel(lootingLevel);
-+                        }
-+                        // Purpur end
-                         // CraftBukkit start
-                         org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityhuman, stack, itemstack1, entityarrow, entityhuman.getUsedItemHand(), f, !flag1);
-                         if (event.isCancelled()) {
-diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index 0a0f19f73a6a4e5aece7c17089dc4d31ed2a5299..2c51a73ebfd05af21b0f5d731fc9f1df77fed1a1 100644
---- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
-+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-@@ -291,6 +291,14 @@ public class CrossbowItem extends ProjectileWeaponItem implements Vanishable {
-             entityarrow.setPierceLevel((byte) i);
+diff --git a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
+index d27e83c08c45b8514207f26e48ceb1a91ded94be..8f01772a7b06b2acf96a3f922cb9b481f634680b 100644
+--- a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
++++ b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
+@@ -131,6 +131,14 @@ public abstract class ProjectileWeaponItem extends Item {
+             entityarrow.setPierceLevel((byte) k);
          }
  
 +        // Purpur start
-+        int lootingLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.MOB_LOOTING, crossbow);
++        int lootingLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.LOOTING, weaponStack);
 +
 +        if (lootingLevel > 0) {
 +            entityarrow.setLootingLevel(lootingLevel);
@@ -67,15 +49,15 @@ index 0a0f19f73a6a4e5aece7c17089dc4d31ed2a5299..2c51a73ebfd05af21b0f5d731fc9f1df
      }
  
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 6d1573161f0d8c7999f84925ba7bbf536ee9583a..c32cbe6065ecb6810f352b8a3598c21e42e60e1d 100644
+index 85dc79b9b969fa0cbf6964cb26bac139fa55710a..905a020dd7b365d51d5addadbbeb9555d03c5238 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
-@@ -82,6 +82,14 @@ public class TridentItem extends Item implements Vanishable {
+@@ -81,6 +81,14 @@ public class TridentItem extends Item implements ProjectileItem {
                                  entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
                              }
  
 +                            // Purpur start
-+                            int lootingLevel = EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.MOB_LOOTING, stack);
++                            int lootingLevel = EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.LOOTING, stack);
 +
 +                            if (lootingLevel > 0) {
 +                                entitythrowntrident.setLootingLevel(lootingLevel);
@@ -83,10 +65,10 @@ index 6d1573161f0d8c7999f84925ba7bbf536ee9583a..c32cbe6065ecb6810f352b8a3598c21e
 +                            // Purpur end
 +
                              // CraftBukkit start
-                             // Paper start
+                             // Paper start - PlayerLaunchProjectileEvent
                              com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) entitythrowntrident.getBukkitEntity());
 diff --git a/src/main/java/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java b/src/main/java/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java
-index 3fb1e558c3510243c94981211f9a0e5e0ef1895b..e5177e5ffcac360f935f2139db4554c6586b551e 100644
+index cfe953bc924f46b570e37395ac0f05ebcb82eb39..5500e7ada2dd783cc1317968a3e54696bdd73bf8 100644
 --- a/src/main/java/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java
 +++ b/src/main/java/net/minecraft/world/level/storage/loot/functions/LootingEnchantFunction.java
 @@ -57,6 +57,13 @@ public class LootingEnchantFunction extends LootItemConditionalFunction {
@@ -104,12 +86,12 @@ index 3fb1e558c3510243c94981211f9a0e5e0ef1895b..e5177e5ffcac360f935f2139db4554c6
              if (context.hasParam(LootContextParams.LOOTING_MOD)) {
                  i = context.getParamOrNull(LootContextParams.LOOTING_MOD);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 62aabfc021fa3349b0ab46744a9ec78d57f058b0..32aaa66acc35950caec1a0b0dac9413e950b37a6 100644
+index 62612451c23bb146e82f4082ca8677e5dc57a08f..3b3d5bd9e645f440e033abd3c234a017972efa59 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -568,4 +568,9 @@ public class PurpurConfig {
-     private static void fixNetworkSerializedCreativeItems() {
-         fixNetworkSerializedItemsInCreative = getBoolean("settings.fix-network-serialized-items-in-creative", fixNetworkSerializedItemsInCreative);
+@@ -497,4 +497,9 @@ public class PurpurConfig {
+         String setPattern = getString("settings.username-valid-characters", defaultPattern);
+         usernameValidCharactersPattern = java.util.regex.Pattern.compile(setPattern == null || setPattern.isBlank() ? defaultPattern : setPattern);
      }
 +
 +    public static boolean fixProjectileLootingTransfer = false;
diff --git a/patches/server/0279-Configurable-block-blast-resistance.patch b/patches/server/0264-Configurable-block-blast-resistance.patch
similarity index 87%
rename from patches/server/0279-Configurable-block-blast-resistance.patch
rename to patches/server/0264-Configurable-block-blast-resistance.patch
index bb40058aa..482d21fe3 100644
--- a/patches/server/0279-Configurable-block-blast-resistance.patch
+++ b/patches/server/0264-Configurable-block-blast-resistance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable block blast resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 443bed339884f78ecda8abdbcdc9b57ea9768cc9..e46a097dc134672720bc753ec0da0a9102737d2c 100644
+index 3c1091f2a729b7d06ba6e21c37f788edb2ad1775..031fc626d2075cbe0941fecc188406712ab9953f 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -81,7 +81,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -86,7 +86,7 @@ public abstract class BlockBehaviour implements FeatureElement {
  
      protected static final Direction[] UPDATE_SHAPE_ORDER = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
      public final boolean hasCollision;
@@ -18,10 +18,10 @@ index 443bed339884f78ecda8abdbcdc9b57ea9768cc9..e46a097dc134672720bc753ec0da0a91
      protected final SoundType soundType;
      protected final float friction;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 32aaa66acc35950caec1a0b0dac9413e950b37a6..8426be7906cd0f4df8c274aa1d113388965d8d8b 100644
+index 3b3d5bd9e645f440e033abd3c234a017972efa59..b2207e2baed339adb1594f19f9a3d4a709669935 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -573,4 +573,19 @@ public class PurpurConfig {
+@@ -502,4 +502,19 @@ public class PurpurConfig {
      private static void fixProjectileLootingTransfer() {
          fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer);
      }
diff --git a/patches/server/0265-Allow-custom-ChatDecorators.patch b/patches/server/0265-Allow-custom-ChatDecorators.patch
deleted file mode 100644
index 7ff5882b7..000000000
--- a/patches/server/0265-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 7951d617accb093e650d0ca30e2088b5a795d2a2..219f4c9ca2dfa1f55d7c5f4443dab9844ebec4b9 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2671,6 +2671,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/0280-Configurable-block-fall-damage-modifiers.patch b/patches/server/0265-Configurable-block-fall-damage-modifiers.patch
similarity index 89%
rename from patches/server/0280-Configurable-block-fall-damage-modifiers.patch
rename to patches/server/0265-Configurable-block-fall-damage-modifiers.patch
index 9d2c1cadc..541a9698e 100644
--- a/patches/server/0280-Configurable-block-fall-damage-modifiers.patch
+++ b/patches/server/0265-Configurable-block-fall-damage-modifiers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable block fall damage modifiers
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-index e8405a57fb88e63b63baaf00645c417633bdc0f2..2b66ddafaaca17f64d1e7502dfa4d7576e3e032f 100644
+index 549e3dd09a91ddf319fe0c1ec09924cbb600c1b8..a4a988ab1399702b943019e9c4e2cde3652b4e85 100644
 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
-@@ -173,7 +173,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+@@ -181,7 +181,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
  
      @Override
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
@@ -18,10 +18,10 @@ index e8405a57fb88e63b63baaf00645c417633bdc0f2..2b66ddafaaca17f64d1e7502dfa4d757
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index cee9e07a250ed61570cf9787236308f91724f02f..65504432a13df45e895cf6ca885627014444563a 100644
+index 7ffe51eedc9d086424cf450026bdc260249864c4..5ae3decf100d21f7d4a471c155eaf5e00e996580 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -94,6 +94,10 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -89,6 +89,10 @@ public class Block extends BlockBehaviour implements ItemLike {
      public static final int UPDATE_LIMIT = 512;
      protected final StateDefinition<Block, BlockState> stateDefinition;
      private BlockState defaultBlockState;
@@ -32,7 +32,7 @@ index cee9e07a250ed61570cf9787236308f91724f02f..65504432a13df45e895cf6ca88562701
      // Paper start
      public final boolean isDestroyable() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits ||
-@@ -506,7 +510,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -486,7 +490,7 @@ public class Block extends BlockBehaviour implements ItemLike {
      }
  
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
@@ -42,10 +42,10 @@ index cee9e07a250ed61570cf9787236308f91724f02f..65504432a13df45e895cf6ca88562701
  
      public void updateEntityAfterFallOn(BlockGetter world, Entity entity) {
 diff --git a/src/main/java/net/minecraft/world/level/block/HayBlock.java b/src/main/java/net/minecraft/world/level/block/HayBlock.java
-index cfbe1dae76db76cf54a4f5d72aca72d5e893859e..74cb10230d459ac9f300a9d59af504d233ac663e 100644
+index ef364aa171a48482a45bc18cfe730ec20c3f7be6..74971d90506aa253d5ee821b5390fb2551a3a393 100644
 --- a/src/main/java/net/minecraft/world/level/block/HayBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/HayBlock.java
-@@ -15,6 +15,6 @@ public class HayBlock extends RotatedPillarBlock {
+@@ -23,6 +23,6 @@ public class HayBlock extends RotatedPillarBlock {
  
      @Override
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
@@ -54,10 +54,10 @@ index cfbe1dae76db76cf54a4f5d72aca72d5e893859e..74cb10230d459ac9f300a9d59af504d2
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8426be7906cd0f4df8c274aa1d113388965d8d8b..29dd74f28c66cce2c25dc9aa916f230cdfbe2da3 100644
+index b2207e2baed339adb1594f19f9a3d4a709669935..508b094272bede66826ad0f4908f115454b7d4f2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -588,4 +588,50 @@ public class PurpurConfig {
+@@ -517,4 +517,50 @@ public class PurpurConfig {
              block.explosionResistance = blastResistance.floatValue();
          });
      }
diff --git a/patches/server/0281-Language-API.patch b/patches/server/0266-Language-API.patch
similarity index 82%
rename from patches/server/0281-Language-API.patch
rename to patches/server/0266-Language-API.patch
index d5fba8f5b..f52f1175a 100644
--- a/patches/server/0281-Language-API.patch
+++ b/patches/server/0266-Language-API.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Language API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2b3b9be41930a73886735394e12f6e3eab800fb2..3c83fc78af6ce549a821c0e030d3dea1790dca47 100644
+index 5285433e69cb34d0b856f3e81bf1888aa30eb6f3..19937ffa2c93cb75ea8dba58dd5a8214adc035fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -399,6 +399,20 @@ public final class CraftServer implements Server {
-         this.dataPackManager = new CraftDataPackManager(this.getServer().getPackRepository());
+@@ -403,6 +403,20 @@ public final class CraftServer implements Server {
+         this.serverTickManager = new CraftServerTickManager(console.tickRateManager());
  
          Bukkit.setServer(this);
 +        // Purpur start
diff --git a/patches/server/0282-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0267-Milk-Keeps-Beneficial-Effects.patch
similarity index 79%
rename from patches/server/0282-Milk-Keeps-Beneficial-Effects.patch
rename to patches/server/0267-Milk-Keeps-Beneficial-Effects.patch
index 554916528..6014c1a99 100644
--- a/patches/server/0282-Milk-Keeps-Beneficial-Effects.patch
+++ b/patches/server/0267-Milk-Keeps-Beneficial-Effects.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Milk Keeps Beneficial Effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7a5f51c9585c280c51b4dbe5e6848d7e07fa7386..aa7ef9bcd6caffa9b987ae4ae759f89358e3001d 100644
+index 09cbc472d89d7d8730aedb76ef584b1ff159756b..53ff232129443ba3242cfc57fc57026bf76d96e8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1124,6 +1124,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1154,6 +1154,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              for (flag = false; iterator.hasNext(); flag = true) {
                  // CraftBukkit start
                  MobEffectInstance effect = (MobEffectInstance) iterator.next();
-+                if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level().purpurConfig.milkClearsBeneficialEffects && effect.getEffect().isBeneficial()) continue; // Purpur
++                if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level().purpurConfig.milkClearsBeneficialEffects && effect.getEffect().value().isBeneficial()) continue; // Purpur
                  EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
                  if (event.isCancelled()) {
                      continue;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 6986fcbe67e55c4942d13b2af39bd6293bf993a9..d8a4b1aaa180fc0c837bc0d8efab781a578898a5 100644
+index 62f5e5cfe5745deced2811d14d0c7ebb2c2c6948..c1e573758539a151452b12466339ccf8b39c7d38 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -114,7 +114,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -115,7 +115,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
              return this.canDrinkPotion && this.level().isNight() && !entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
          }));
          this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, (entityvillagertrader) -> {
@@ -30,7 +30,7 @@ index 6986fcbe67e55c4942d13b2af39bd6293bf993a9..d8a4b1aaa180fc0c837bc0d8efab781a
          this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
          this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1a8a1a9bca5c2f92b87fb1a21bdff194718caa8e..1bec2760e6ae3022dbcef1bb40d7749cf3b0609e 100644
+index 7b028800a99d627a9efcd2a718e281ab7a67cfad..fabe1529ca30dabb93287dfae4cc15ea8c11f69f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -128,6 +128,7 @@ public class PurpurWorldConfig {
@@ -40,12 +40,12 @@ index 1a8a1a9bca5c2f92b87fb1a21bdff194718caa8e..1bec2760e6ae3022dbcef1bb40d7749c
 +    public boolean milkClearsBeneficialEffects = true;
      public boolean noteBlockIgnoreAbove = false;
      public boolean persistentDroppableEntityDisplayNames = true;
-     public boolean persistentTileEntityDisplayNames = false;
-@@ -154,6 +155,7 @@ public class PurpurWorldConfig {
+     public boolean persistentTileEntityLore = false;
+@@ -155,6 +156,7 @@ public class PurpurWorldConfig {
          fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
          imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
          milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
 +        milkClearsBeneficialEffects = getBoolean("gameplay-mechanics.milk-clears-beneficial-effects", milkClearsBeneficialEffects);
          noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
-         persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
-         persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
+         if (PurpurConfig.version < 35) {
+             boolean oldVal = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityLore);
diff --git a/patches/server/0283-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0268-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
similarity index 85%
rename from patches/server/0283-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
rename to patches/server/0268-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
index 399485ead..e539f8454 100644
--- a/patches/server/0283-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
+++ b/patches/server/0268-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
@@ -5,10 +5,10 @@ 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 87fb10096fc9dade33c663234b1cecc34d3d77bb..874c7b29a261b1b5ad6e86ca219ff935870aecb0 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
-@@ -119,9 +119,9 @@ public class RangedBowAttackGoal<T extends Monster & RangedAttackMob> extends Go
+@@ -116,9 +116,9 @@ public class RangedBowAttackGoal<T extends Monster & RangedAttackMob> extends Go
                  }
  
                  this.mob.lookAt(livingEntity, 30.0F, 30.0F);
diff --git a/patches/server/0284-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0269-Add-log-suppression-for-LibraryLoader.patch
similarity index 91%
rename from patches/server/0284-Add-log-suppression-for-LibraryLoader.patch
rename to patches/server/0269-Add-log-suppression-for-LibraryLoader.patch
index 6a689fce9..88afdd468 100644
--- a/patches/server/0284-Add-log-suppression-for-LibraryLoader.patch
+++ b/patches/server/0269-Add-log-suppression-for-LibraryLoader.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add log suppression for LibraryLoader
 
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 29dd74f28c66cce2c25dc9aa916f230cdfbe2da3..cf0a52a037ac255c3f9e36dbff3cedda0fd8f49e 100644
+index 508b094272bede66826ad0f4908f115454b7d4f2..16273aec24a4824557c0cfb2af2ac782a7a7ab75 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -465,11 +465,14 @@ public class PurpurConfig {
+@@ -470,11 +470,14 @@ public class PurpurConfig {
      public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
      public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
      public static boolean loggerSuppressSetBlockFarChunk = false;
diff --git a/patches/server/0285-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0270-Add-option-to-allow-creeper-to-encircle-target-when-.patch
similarity index 88%
rename from patches/server/0285-Add-option-to-allow-creeper-to-encircle-target-when-.patch
rename to patches/server/0270-Add-option-to-allow-creeper-to-encircle-target-when-.patch
index 4655518ae..9e62843de 100644
--- a/patches/server/0285-Add-option-to-allow-creeper-to-encircle-target-when-.patch
+++ b/patches/server/0270-Add-option-to-allow-creeper-to-encircle-target-when-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow creeper to encircle target when fusing.
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..7b99c3446b50939241d3e220d93e05649f72a6df 100644
+index 137ec75ee803789deb7b1ca93dd9369c9af362b9..ca95d25af3e9a0536868b0c7fd8e7d2ff1154ee3 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
 @@ -54,6 +54,14 @@ public class SwellGoal extends Goal {
@@ -24,10 +24,10 @@ index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..7b99c3446b50939241d3e220d93e0564
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1bec2760e6ae3022dbcef1bb40d7749cf3b0609e..c04befc0e4d97497087bc8961daefe814e199a84 100644
+index fabe1529ca30dabb93287dfae4cc15ea8c11f69f..6d4d76eff2372edd7ecceb619c3b6650bd779fa2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1357,6 +1357,7 @@ public class PurpurWorldConfig {
+@@ -1418,6 +1418,7 @@ public class PurpurWorldConfig {
      public boolean creeperHealthRadius = false;
      public boolean creeperAlwaysDropExp = false;
      public double creeperHeadVisibilityPercent = 0.5D;
@@ -35,7 +35,7 @@ index 1bec2760e6ae3022dbcef1bb40d7749cf3b0609e..c04befc0e4d97497087bc8961daefe81
      private void creeperSettings() {
          creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
          creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -1375,6 +1376,7 @@ public class PurpurWorldConfig {
+@@ -1436,6 +1437,7 @@ public class PurpurWorldConfig {
          creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
          creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
          creeperHeadVisibilityPercent = getDouble("mobs.creeper.head-visibility-percent", creeperHeadVisibilityPercent);
diff --git a/patches/server/0286-Fire-Immunity-API.patch b/patches/server/0271-Fire-Immunity-API.patch
similarity index 70%
rename from patches/server/0286-Fire-Immunity-API.patch
rename to patches/server/0271-Fire-Immunity-API.patch
index 8468b3ec4..2a3980e0f 100644
--- a/patches/server/0286-Fire-Immunity-API.patch
+++ b/patches/server/0271-Fire-Immunity-API.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Fire Immunity API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b4255bf0fbf5599ae86cd372e5c9f1ad4fde00d4..317c22712357232ecd506911faaf79ef2bfcc3e6 100644
+index 2c3ad553272ad651e6ca26917719e6d9fffdef68..7a27388b5155e7b2478b0daa02cb616829a5d4a2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -427,6 +427,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
-     public boolean collidingWithWorldBorder; // Paper
-     public boolean fixedPose = false; // Paper
+     public boolean fixedPose = false; // Paper - Expand Pose API
 +    public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -1779,7 +1780,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1878,7 +1879,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean fireImmune() {
@@ -25,19 +25,19 @@ index b4255bf0fbf5599ae86cd372e5c9f1ad4fde00d4..317c22712357232ecd506911faaf79ef
      }
  
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
-@@ -2453,6 +2454,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                 nbt.putBoolean("Paper.FreezeLock", true);
+@@ -2575,6 +2576,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                 nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
 +            // Purpur start
 +            if (immuneToFire != null) {
-+                nbt.putBoolean("Purpur.FireImmune", immuneToFire);
++                nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
 +            }
 +            // Purpur end
-             return nbt;
+             return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2621,6 +2627,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2722,6 +2728,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end
@@ -50,10 +50,10 @@ index b4255bf0fbf5599ae86cd372e5c9f1ad4fde00d4..317c22712357232ecd506911faaf79ef
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index eb409ecf5bf06692038e9fe84af986092a7d7837..4482e9401be4af7b16991f37d319e90602af2227 100644
+index 3c674ecd3b80501047b4593e8872034287defd2e..0ed18542fd8e2a992dc56a5f421eaa840e0af193 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -223,6 +223,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -84,6 +84,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
      }
  
@@ -71,16 +71,16 @@ index eb409ecf5bf06692038e9fe84af986092a7d7837..4482e9401be4af7b16991f37d319e906
      public boolean isInDaylight() {
          return getHandle().isSunBurnTick();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 8fcee0e426cd598ddfd7e12df4382d57d2016780..4ffb4046b63cbc140c76721f51c9a7a09e81844d 100644
+index 01e4395f1669d21c30465aa1366bd2f1ae17678f..5c1cda88080850314dac196dbe71ff12e48a8aca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-@@ -176,9 +176,14 @@ public class CraftItem extends CraftEntity implements Item {
-         return item.immuneToExplosion;
+@@ -173,9 +173,14 @@ public class CraftItem extends CraftEntity implements Item {
+         return this.getHandle().immuneToExplosion;
      }
  
 +    @Override
 +    public void setImmuneToFire(@org.jetbrains.annotations.Nullable Boolean immuneToFire) {
-+        item.immuneToFire = (immuneToFire != null && immuneToFire);
++        this.getHandle().immuneToFire = (immuneToFire != null && immuneToFire);
 +    }
 +
      @Override
diff --git a/patches/server/0287-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0272-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
similarity index 84%
rename from patches/server/0287-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
rename to patches/server/0272-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
index 2845ee4c4..5935e653e 100644
--- a/patches/server/0287-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
+++ b/patches/server/0272-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 317c22712357232ecd506911faaf79ef2bfcc3e6..0e192a128c87124956fcec552362ab763bac5e55 100644
+index 7a27388b5155e7b2478b0daa02cb616829a5d4a2..3aae4fa4176c0bf170f4532ae187e3122c142a6a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -884,6 +884,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -972,6 +972,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
-             // Paper end
+             // Paper end - Configurable nether ceiling damage
 +            if (this.level().purpurConfig.teleportOnNetherCeilingDamage && this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this instanceof ServerPlayer player) player.teleport(io.papermc.paper.util.MCUtil.toLocation(this.level, this.level.getSharedSpawnPos())); else // Purpur
              this.onBelowWorld();
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c04befc0e4d97497087bc8961daefe814e199a84..443871290764e6863509acd0847f8c4c8f8566b6 100644
+index 6d4d76eff2372edd7ecceb619c3b6650bd779fa2..7a86b8a64d79128176cf0c40133494d88a50a561 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -417,6 +417,7 @@ public class PurpurWorldConfig {
+@@ -425,6 +425,7 @@ public class PurpurWorldConfig {
      public String playerDeathExpDropEquation = "expLevel * 7";
      public int playerDeathExpDropMax = 100;
      public boolean teleportIfOutsideBorder = false;
@@ -28,7 +28,7 @@ index c04befc0e4d97497087bc8961daefe814e199a84..443871290764e6863509acd0847f8c4c
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
      public boolean creativeOnePunch = false;
-@@ -446,6 +447,7 @@ public class PurpurWorldConfig {
+@@ -452,6 +453,7 @@ public class PurpurWorldConfig {
          playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
          playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
          teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
diff --git a/patches/server/0288-Added-got-ram-event.patch b/patches/server/0273-Added-got-ram-event.patch
similarity index 86%
rename from patches/server/0288-Added-got-ram-event.patch
rename to patches/server/0273-Added-got-ram-event.patch
index b9275a0e9..9809d3a17 100644
--- a/patches/server/0288-Added-got-ram-event.patch
+++ b/patches/server/0273-Added-got-ram-event.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added got ram event
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 806b207e5246db7daa03bebabd7aa574d8b0dab7..5d7b20c30bc5e3be8511b300c318d12a1e4a49d0 100644
+index 4e855055abe4d300b6b126e8a9deecaab5827a33..6a3c68839d3b993c82fabd4e17f53e38ce9c38f7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -429,6 +429,7 @@ public class Goat extends Animal {
+@@ -427,6 +427,7 @@ public class Goat extends Animal {
  
      // Paper start - Goat ram API
      public void ram(net.minecraft.world.entity.LivingEntity entity) {
diff --git a/patches/server/0289-Log-skipped-entity-s-position.patch b/patches/server/0274-Log-skipped-entity-s-position.patch
similarity index 86%
rename from patches/server/0289-Log-skipped-entity-s-position.patch
rename to patches/server/0274-Log-skipped-entity-s-position.patch
index eca731a8b..19da920bc 100644
--- a/patches/server/0289-Log-skipped-entity-s-position.patch
+++ b/patches/server/0274-Log-skipped-entity-s-position.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Log skipped entity's position
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 5d703e322bd220665c3ce3a41e40129b238ae150..5930e45bae5aa86b3cedb811c4c9bb92099bc1b5 100644
+index 3097529a9066841a58c899ce55b3bc0cd6af7e88..8120f39a9689dae1233b243b74825e9ff110eac3 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -613,6 +613,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -625,6 +625,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
              entity.load(nbt);
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
diff --git a/patches/server/0290-End-Crystal-Cramming.patch b/patches/server/0275-End-Crystal-Cramming.patch
similarity index 82%
rename from patches/server/0290-End-Crystal-Cramming.patch
rename to patches/server/0275-End-Crystal-Cramming.patch
index fc7355718..52622f80c 100644
--- a/patches/server/0290-End-Crystal-Cramming.patch
+++ b/patches/server/0275-End-Crystal-Cramming.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] End Crystal Cramming
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-index 564d17bc460e2a04947ff9676fbf4c8b1569659c..440add62fcfa62d483409e1aecfc91591ba476c3 100644
+index 8c6ce06a1845832c8b0de654657788d2daf6b71b..15ca426701f1fc821da94a4dee577fdbc4f8ff8d 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-@@ -99,6 +99,7 @@ public class EndCrystal extends Entity {
+@@ -100,6 +100,7 @@ public class EndCrystal extends Entity {
                  }
              }
-             // Paper end
+             // Paper end - Fix invulnerable end crystals
 +            if (this.level().purpurConfig.endCrystalCramming > 0 && this.level().getEntitiesOfClass(EndCrystal.class, getBoundingBox()).size() > this.level().purpurConfig.endCrystalCramming) this.hurt(this.damageSources().cramming(), 6.0F); // Purpur
          }
  
-         // Purpur start
+     // Purpur start
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 443871290764e6863509acd0847f8c4c8f8566b6..829f3a7542460ef71bd934ff3dea0321168a9fac 100644
+index 7a86b8a64d79128176cf0c40133494d88a50a561..c89ca099f47450b78402af968ef6b8fdd82f7c75 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -877,6 +877,7 @@ public class PurpurWorldConfig {
+@@ -956,6 +956,7 @@ public class PurpurWorldConfig {
      public double basedEndCrystalExplosionPower = 6.0D;
      public boolean basedEndCrystalExplosionFire = false;
      public net.minecraft.world.level.Level.ExplosionInteraction basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
@@ -28,7 +28,7 @@ index 443871290764e6863509acd0847f8c4c8f8566b6..829f3a7542460ef71bd934ff3dea0321
      private void endCrystalSettings() {
          if (PurpurConfig.version < 31) {
              if ("DESTROY".equals(getString("blocks.end-crystal.baseless.explosion-effect", baselessEndCrystalExplosionEffect.name()))) {
-@@ -904,6 +905,7 @@ public class PurpurWorldConfig {
+@@ -983,6 +984,7 @@ public class PurpurWorldConfig {
              log(Level.SEVERE, "Unknown value for `blocks.end-crystal.base.explosion-effect`! Using default of `BLOCK`");
              basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
          }
diff --git a/patches/server/0291-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0276-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
similarity index 85%
rename from patches/server/0291-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
rename to patches/server/0276-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
index 2ff083b98..3932a3d94 100644
--- a/patches/server/0291-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
+++ b/patches/server/0276-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to allow beacon effects when covered by tinted glass
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index a5f9747be5503dd24abd98f11cfa8229448ca3bf..99ef8d7e3ee0ee9777d12ad825e728c38d886114 100644
+index 2b9cc89a2e71b523c90bbfa987b0f8352efff95a..5ad48d2003fbd83e60f6faa68532496131935828 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -174,6 +174,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -178,6 +178,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
          int j = pos.getY();
          int k = pos.getZ();
          BlockPos blockposition1;
@@ -16,7 +16,7 @@ index a5f9747be5503dd24abd98f11cfa8229448ca3bf..99ef8d7e3ee0ee9777d12ad825e728c3
  
          if (blockEntity.lastCheckY < j) {
              blockposition1 = pos;
-@@ -207,6 +208,9 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -211,6 +212,9 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
                      }
                  }
              } else {
@@ -26,20 +26,20 @@ index a5f9747be5503dd24abd98f11cfa8229448ca3bf..99ef8d7e3ee0ee9777d12ad825e728c3
                  if (tileentitybeacon_beaconcolortracker == null || iblockdata1.getLightBlock(world, blockposition1) >= 15 && !iblockdata1.is(Blocks.BEDROCK)) {
                      blockEntity.checkingBeamSections.clear();
                      blockEntity.lastCheckY = l;
-@@ -226,7 +230,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -230,7 +234,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
                  blockEntity.levels = BeaconBlockEntity.updateBase(world, i, j, k);
              }
  
 -            if (blockEntity.levels > 0 && !blockEntity.beamSections.isEmpty()) {
 +            if (blockEntity.levels > 0 && (!blockEntity.beamSections.isEmpty() || (world.purpurConfig.beaconAllowEffectsWithTintedGlass && isTintedGlass))) {
-                 BeaconBlockEntity.applyEffects(world, pos, blockEntity.levels, blockEntity.primaryPower, blockEntity.secondaryPower, blockEntity); // Paper
+                 BeaconBlockEntity.applyEffects(world, pos, blockEntity.levels, blockEntity.primaryPower, blockEntity.secondaryPower, blockEntity); // Paper - Custom beacon ranges
                  BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 829f3a7542460ef71bd934ff3dea0321168a9fac..78e8043f85f65e81db0d4192fbe93df952849490 100644
+index c89ca099f47450b78402af968ef6b8fdd82f7c75..5e92560383bed578e0f4ece60dc1758913a9fd91 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -776,11 +776,13 @@ public class PurpurWorldConfig {
+@@ -855,11 +855,13 @@ public class PurpurWorldConfig {
      public int beaconLevelTwo = 30;
      public int beaconLevelThree = 40;
      public int beaconLevelFour = 50;
diff --git a/patches/server/0292-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0277-Add-attribute-clamping-and-armor-limit-config.patch
similarity index 81%
rename from patches/server/0292-Add-attribute-clamping-and-armor-limit-config.patch
rename to patches/server/0277-Add-attribute-clamping-and-armor-limit-config.patch
index c68108985..8eba08dd9 100644
--- a/patches/server/0292-Add-attribute-clamping-and-armor-limit-config.patch
+++ b/patches/server/0277-Add-attribute-clamping-and-armor-limit-config.patch
@@ -5,16 +5,19 @@ Subject: [PATCH] Add attribute clamping and armor limit config
 
 
 diff --git a/src/main/java/net/minecraft/world/damagesource/CombatRules.java b/src/main/java/net/minecraft/world/damagesource/CombatRules.java
-index ccbfcef3e83b1bef364447657bfd08a92d615cf6..aa2331c6df4e79d4bb0add071a0b11d2a3a08b88 100644
+index ddc880ac0c8378bc1132be5deba746c1484c941c..7a8e4b9a9f2e1e5a9c38ad330c75df1f880d3e8b 100644
 --- a/src/main/java/net/minecraft/world/damagesource/CombatRules.java
 +++ b/src/main/java/net/minecraft/world/damagesource/CombatRules.java
-@@ -11,12 +11,12 @@ public class CombatRules {
+@@ -12,7 +12,7 @@ public class CombatRules {
  
-     public static float getDamageAfterAbsorb(float damage, float armor, float armorToughness) {
-         float f = 2.0F + armorToughness / 4.0F;
+     public static float getDamageAfterAbsorb(float damage, DamageSource source, float armor, float armorToughnesss) {
+         float f = 2.0F + armorToughnesss / 4.0F;
 -        float g = Mth.clamp(armor - damage / f, armor * 0.2F, 20.0F);
 +        float g = Mth.clamp(armor - damage / f, armor * 0.2F, org.purpurmc.purpur.PurpurConfig.limitArmor ? 20F : Float.MAX_VALUE); // Purpur
-         return damage * (1.0F - g / 25.0F);
+         float h = g / 25.0F;
+         float i = EnchantmentHelper.calculateArmorBreach(source.getEntity(), h);
+         float j = 1.0F - i;
+@@ -20,7 +20,7 @@ public class CombatRules {
      }
  
      public static float getDamageAfterMagicAbsorb(float damageDealt, float protection) {
@@ -36,10 +39,10 @@ index f0703302e7dbbda88de8c648d20d87c55ed9b1e0..a913ebabaa5f443afa987b972355a8f8
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index cf0a52a037ac255c3f9e36dbff3cedda0fd8f49e..f10679ef2cbd73397b64eb69516c8a46e4d35a4e 100644
+index 16273aec24a4824557c0cfb2af2ac782a7a7ab75..e7bce4121f7bc2fe0acd8860a73c58dfed73330b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -577,6 +577,16 @@ public class PurpurConfig {
+@@ -506,6 +506,16 @@ public class PurpurConfig {
          fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer);
      }
  
diff --git a/patches/server/0293-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0278-Config-to-remove-explosion-radius-clamp.patch
similarity index 59%
rename from patches/server/0293-Config-to-remove-explosion-radius-clamp.patch
rename to patches/server/0278-Config-to-remove-explosion-radius-clamp.patch
index d9f022418..f846613e7 100644
--- a/patches/server/0293-Config-to-remove-explosion-radius-clamp.patch
+++ b/patches/server/0278-Config-to-remove-explosion-radius-clamp.patch
@@ -4,23 +4,11 @@ Date: Mon, 9 Jan 2023 19:45:55 -0500
 Subject: [PATCH] Config to remove explosion radius clamp
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 82d81fd2edff9df0bb4ff116d9274887a316d0a8..823f0e36119079eb827767c08391f18d75b66610 100644
---- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -111,6 +111,7 @@ public class EnderDragon extends Mob implements Enemy {
- 
-     public EnderDragon(EntityType<? extends EnderDragon> entitytypes, Level world) {
-         super(EntityType.ENDER_DRAGON, world);
-+        this.explosionSource = new Explosion(world, this, null, null, Double.NaN, Double.NaN, Double.NaN, Float.NaN, true, Explosion.BlockInteraction.DESTROY); // Purpur - moved instantiation from field
-         this.fightOrigin = BlockPos.ZERO;
-         this.growlTime = 100;
-         this.nodes = new Node[24];
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b26cea981a876fd42c9ab91923d507b3c11a0425..b6c8f19a7d919fc56deb3518a28d725e9afbc82b 100644
+index 6379b3b8e633d1a16532b4664e53fa5afa616ab6..69d8ff6a97335b6fe4b20a8229a77f2591b0f050 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -87,7 +87,7 @@ public class Explosion {
+@@ -98,7 +98,7 @@ public class Explosion {
          this.hitPlayers = Maps.newHashMap();
          this.level = world;
          this.source = entity;
@@ -29,7 +17,7 @@ index b26cea981a876fd42c9ab91923d507b3c11a0425..b6c8f19a7d919fc56deb3518a28d725e
          this.x = x;
          this.y = y;
          this.z = z;
-@@ -403,7 +403,7 @@ public class Explosion {
+@@ -426,7 +426,7 @@ public class Explosion {
  
      public void explode() {
          // CraftBukkit start
@@ -39,10 +27,10 @@ index b26cea981a876fd42c9ab91923d507b3c11a0425..b6c8f19a7d919fc56deb3518a28d725e
          }
          // CraftBukkit end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 78e8043f85f65e81db0d4192fbe93df952849490..ba7fa9386b494c38e44717529f20c9341e26d9c2 100644
+index 5e92560383bed578e0f4ece60dc1758913a9fd91..5b658bb3d48c9fb8e080728a89fb931c7be978a6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -213,6 +213,11 @@ public class PurpurWorldConfig {
+@@ -221,6 +221,11 @@ public class PurpurWorldConfig {
          entitySharedRandom = getBoolean("settings.entity.shared-random", entitySharedRandom);
      }
  
diff --git a/patches/server/0294-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0279-bonemealable-sugarcane-cactus-and-netherwart.patch
similarity index 84%
rename from patches/server/0294-bonemealable-sugarcane-cactus-and-netherwart.patch
rename to patches/server/0279-bonemealable-sugarcane-cactus-and-netherwart.patch
index 8da96d245..78c156054 100644
--- a/patches/server/0294-bonemealable-sugarcane-cactus-and-netherwart.patch
+++ b/patches/server/0279-bonemealable-sugarcane-cactus-and-netherwart.patch
@@ -5,20 +5,20 @@ Subject: [PATCH] bonemealable sugarcane, cactus, and netherwart
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index c2ca3432a47124d02e1aaf8ffb621f9a2c7d7a62..fa6a2fbb8065b1f120750491b7e4b89542a6a891 100644
+index 9200d75b05ce535f7b7f5c1572cd8f6261c6955b..066181ed274a492762baebf05bf51ac7848878cc 100644
 --- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-@@ -22,7 +22,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
+@@ -23,7 +23,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
  
 -public class CactusBlock extends Block {
 +public class CactusBlock extends Block implements BonemealableBlock { // Purpur
  
+     public static final MapCodec<CactusBlock> CODEC = simpleCodec(CactusBlock::new);
      public static final IntegerProperty AGE = BlockStateProperties.AGE_15;
-     public static final int MAX_AGE = 15;
-@@ -129,4 +129,34 @@ public class CactusBlock extends Block {
-     public boolean isPathfindable(BlockState state, BlockGetter world, BlockPos pos, PathComputationType type) {
+@@ -134,4 +134,34 @@ public class CactusBlock extends Block {
+     protected boolean isPathfindable(BlockState state, PathComputationType type) {
          return false;
      }
 +
@@ -53,20 +53,20 @@ index c2ca3432a47124d02e1aaf8ffb621f9a2c7d7a62..fa6a2fbb8065b1f120750491b7e4b895
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
-index 74fedd3e401c6d58c03c0579f4b919114404fd78..7d15796e3637c1a865703807c98a22c01315c307 100644
+index da1c7999ca64199387054de46489d3ff4a299289..b8355ea1de26c4b6905f477fb4e110f1762447b4 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java
-@@ -14,7 +14,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty;
+@@ -16,7 +16,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  
 -public class NetherWartBlock extends BushBlock {
 +public class NetherWartBlock extends BushBlock implements BonemealableBlock { // Purpur
  
+     public static final MapCodec<NetherWartBlock> CODEC = simpleCodec(NetherWartBlock::new);
      public static final int MAX_AGE = 3;
-     public static final IntegerProperty AGE = BlockStateProperties.AGE_3;
-@@ -70,5 +70,22 @@ public class NetherWartBlock extends BushBlock {
-             super.playerDestroy(world, player, pos, state, blockEntity, itemInHand, includeDrops);
+@@ -78,5 +78,22 @@ public class NetherWartBlock extends BushBlock {
+             super.playerDestroy(world, player, pos, state, blockEntity, itemInHand, includeDrops, dropExp);
          }
      }
 +
@@ -89,19 +89,19 @@ index 74fedd3e401c6d58c03c0579f4b919114404fd78..7d15796e3637c1a865703807c98a22c0
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-index c3f500580d257e1397f2eb7c47b063a6fe6bb405..21a194fadb7d1f0a30f94caf999dabdd78847f36 100644
+index c48c622e92cedeaa46b929c7adfedec98dd5a3fb..6449b5c424443b5f0ee7e3fce803449418fbed2a 100644
 --- a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-@@ -19,7 +19,7 @@ import net.minecraft.world.level.material.FluidState;
+@@ -20,7 +20,7 @@ import net.minecraft.world.level.material.FluidState;
  import net.minecraft.world.phys.shapes.CollisionContext;
  import net.minecraft.world.phys.shapes.VoxelShape;
  
 -public class SugarCaneBlock extends Block {
 +public class SugarCaneBlock extends Block implements BonemealableBlock { // Purpur
  
+     public static final MapCodec<SugarCaneBlock> CODEC = simpleCodec(SugarCaneBlock::new);
      public static final IntegerProperty AGE = BlockStateProperties.AGE_15;
-     protected static final float AABB_OFFSET = 6.0F;
-@@ -106,4 +106,34 @@ public class SugarCaneBlock extends Block {
+@@ -113,4 +113,34 @@ public class SugarCaneBlock extends Block {
      protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
          builder.add(SugarCaneBlock.AGE);
      }
@@ -137,10 +137,10 @@ index c3f500580d257e1397f2eb7c47b063a6fe6bb405..21a194fadb7d1f0a30f94caf999dabdd
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ba7fa9386b494c38e44717529f20c9341e26d9c2..2870a23c01ab5bdb45e355b2f1fd277395ef4771 100644
+index 5b658bb3d48c9fb8e080728a89fb931c7be978a6..8c7508fc6163a73740aedbe9c4dee2d21c4fa0fa 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -830,8 +830,20 @@ public class PurpurWorldConfig {
+@@ -909,8 +909,20 @@ public class PurpurWorldConfig {
      }
  
      public boolean cactusBreaksFromSolidNeighbors = true;
diff --git a/patches/server/0295-Add-PreExplodeEvents.patch b/patches/server/0280-Add-PreExplodeEvents.patch
similarity index 72%
rename from patches/server/0295-Add-PreExplodeEvents.patch
rename to patches/server/0280-Add-PreExplodeEvents.patch
index c99e6649a..1b502ebb6 100644
--- a/patches/server/0295-Add-PreExplodeEvents.patch
+++ b/patches/server/0280-Add-PreExplodeEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PreExplodeEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b6c8f19a7d919fc56deb3518a28d725e9afbc82b..ef9b1687dd2dfda5398523140aecc678b4690642 100644
+index 69d8ff6a97335b6fe4b20a8229a77f2591b0f050..f5e84bf8817e2d53557e0909d8c9e0e0e8206a16 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -407,6 +407,23 @@ public class Explosion {
+@@ -430,6 +430,25 @@ public class Explosion {
              return;
          }
          // CraftBukkit end
@@ -22,13 +22,15 @@ index b6c8f19a7d919fc56deb3518a28d725e9afbc82b..ef9b1687dd2dfda5398523140aecc678
 +            }
 +        }else {
 +            Location location = new Location(this.level.getWorld(), this.x, this.y, this.z);
-+            if(!new org.purpurmc.purpur.event.PreBlockExplodeEvent(location.getBlock(), this.blockInteraction == Explosion.BlockInteraction.DESTROY_WITH_DECAY ? 1.0F / this.radius : 1.0F, this.damageSource.explodedBlockState).callEvent()) {
++            org.bukkit.block.Block block = location.getBlock();
++            org.bukkit.block.BlockState blockState = (this.damageSource.blockState != null) ? this.damageSource.blockState : block.getState();
++            if(!new org.purpurmc.purpur.event.PreBlockExplodeEvent(location.getBlock(), this.blockInteraction == Explosion.BlockInteraction.DESTROY_WITH_DECAY ? 1.0F / this.radius : 1.0F, blockState).callEvent()) {
 +                this.wasCanceled = true;
 +                return;
 +            }
 +        }
 +        //Purpur end
 +
-         this.level.gameEvent(this.source, GameEvent.EXPLODE, new Vec3(this.x, this.y, this.z));
+         this.level.gameEvent(this.source, (Holder) GameEvent.EXPLODE, new Vec3(this.x, this.y, this.z));
          Set<BlockPos> set = Sets.newHashSet();
          boolean flag = true;
diff --git a/patches/server/0296-Improve-output-of-plugins-command.patch b/patches/server/0281-Improve-output-of-plugins-command.patch
similarity index 100%
rename from patches/server/0296-Improve-output-of-plugins-command.patch
rename to patches/server/0281-Improve-output-of-plugins-command.patch
diff --git a/patches/server/0297-Add-mending-multiplier.patch b/patches/server/0282-Add-mending-multiplier.patch
similarity index 87%
rename from patches/server/0297-Add-mending-multiplier.patch
rename to patches/server/0282-Add-mending-multiplier.patch
index cf095aedc..ce3c80474 100644
--- a/patches/server/0297-Add-mending-multiplier.patch
+++ b/patches/server/0282-Add-mending-multiplier.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add mending multiplier
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b2233635b6acc35ea3668c36c56e57f15420ac62..724bf857bf1b89cb0947b8a82e0ce09a0bec0335 100644
+index ce608784e0e35b67dde377436aaf42c956ce0644..f5debc8ddc496cd3e2d8b253511ee5cc9a723b38 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -359,13 +359,15 @@ public class ExperienceOrb extends Entity {
+@@ -366,13 +366,15 @@ public class ExperienceOrb extends Entity {
          }
      }
  
@@ -27,7 +27,7 @@ index b2233635b6acc35ea3668c36c56e57f15420ac62..724bf857bf1b89cb0947b8a82e0ce09a
      public int getValue() {
          return this.value;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2870a23c01ab5bdb45e355b2f1fd277395ef4771..e7a794ce230c481e39436506facdb77726f96199 100644
+index 8c7508fc6163a73740aedbe9c4dee2d21c4fa0fa..03819b5d991d91c2e7f5e2eae50e1a7e4197336b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -119,6 +119,7 @@ public class PurpurWorldConfig {
@@ -38,7 +38,7 @@ index 2870a23c01ab5bdb45e355b2f1fd277395ef4771..e7a794ce230c481e39436506facdb777
      public boolean alwaysTameInCreative = false;
      public boolean boatEjectPlayersOnLand = false;
      public boolean boatsDoFallDamage = false;
-@@ -146,6 +147,7 @@ public class PurpurWorldConfig {
+@@ -147,6 +148,7 @@ public class PurpurWorldConfig {
      public int mobLastHurtByPlayerTime = 100;
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
diff --git a/patches/server/0298-Make-GUI-Great-Again.patch b/patches/server/0283-Make-GUI-Great-Again.patch
similarity index 89%
rename from patches/server/0298-Make-GUI-Great-Again.patch
rename to patches/server/0283-Make-GUI-Great-Again.patch
index 7d12c943f..758d27fe1 100644
--- a/patches/server/0298-Make-GUI-Great-Again.patch
+++ b/patches/server/0283-Make-GUI-Great-Again.patch
@@ -96,19 +96,19 @@ index 0000000000000000000000000000000000000000..15a226e3854d731f7724025ea3459c8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 813a3c0172f1152665b95104d155e5de40589b39..21da8b6b0df40b6b88a325ced5d6553ad5912d31 100644
+index 0d2d254fc2795f0ec844029bd4c05cdf6dc94207..775c5de4f5094260096cef6723dd50dfe2cb0c81 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -99,6 +99,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -110,6 +110,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                      return;
                  }
                  // Paper start - Use TerminalConsoleAppender
 +                if (DedicatedServer.this.gui == null || System.console() != null) // Purpur - has no GUI or has console (did not double-click)
                  new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
                  /*
-                 jline.console.ConsoleReader bufferedreader = reader;
+                 jline.console.ConsoleReader bufferedreader = DedicatedServer.this.reader;
 diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c7c2e9822 100644
+index 759062d219ff490a3cb19e710c4d18e3e08288e0..8f74c2ec5252b6265549589310d742337c91cb2c 100644
 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -43,6 +43,11 @@ public class MinecraftServerGui extends JComponent {
@@ -136,10 +136,10 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
          jframe.pack();
          jframe.setLocationRelativeTo((Component) null);
          jframe.setVisible(true);
--        jframe.setName("Minecraft server"); // Paper
-+        jframe.setName("Purpur Minecraft server"); // Paper // Purpur
+-        jframe.setName("Minecraft server"); // Paper - Improve ServerGUI
++        jframe.setName("Purpur Minecraft server"); // Paper - Improve ServerGUI // Purpur
  
-         // Paper start - Add logo as frame image
+         // Paper start - Improve ServerGUI
          try {
 @@ -71,7 +76,7 @@ public class MinecraftServerGui extends JComponent {
          jframe.addWindowListener(new WindowAdapter() {
@@ -150,7 +150,7 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
                      server.halt(true);
                      servergui.runFinalizers();
                  }
-@@ -125,7 +130,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -159,7 +164,7 @@ public class MinecraftServerGui extends JComponent {
  
      private JComponent buildChatPanel() {
          JPanel jpanel = new JPanel(new BorderLayout());
@@ -159,7 +159,7 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
          JScrollPane jscrollpane = new JScrollPane(jtextarea, 22, 30);
  
          jtextarea.setEditable(false);
-@@ -137,10 +142,43 @@ public class MinecraftServerGui extends JComponent {
+@@ -171,10 +176,43 @@ public class MinecraftServerGui extends JComponent {
  
              if (!s.isEmpty()) {
                  this.server.handleConsoleInput(s, this.server.createCommandSourceStack());
@@ -181,7 +181,7 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
 +                    currentCommand = jtextfield.getText();
 +                }
 +                if (historyIndex < history.size() - 1) {
-+                    jtextfield.setText(history.get(historyIndex));
++                    jtextfield.setText(history.get(++historyIndex));
 +                }
 +            }
 +        });
@@ -200,10 +200,10 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
 +            }
 +        });
 +        // Purpur end
-         jtextarea.addFocusListener(new FocusAdapter() {
+         jtextarea.addFocusListener(new FocusAdapter() { // CraftBukkit - decompile error
              public void focusGained(FocusEvent focusevent) {}
          });
-@@ -176,7 +214,7 @@ public class MinecraftServerGui extends JComponent {
+@@ -210,7 +248,7 @@ public class MinecraftServerGui extends JComponent {
      }
  
      private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper
@@ -212,7 +212,7 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> {
                  this.print(textArea, scrollPane, message);
-@@ -190,11 +228,14 @@ public class MinecraftServerGui extends JComponent {
+@@ -224,11 +262,14 @@ public class MinecraftServerGui extends JComponent {
                  flag = (double) jscrollbar.getValue() + jscrollbar.getSize().getHeight() + (double) (MinecraftServerGui.MONOSPACED.getSize() * 4) > (double) jscrollbar.getMaximum();
              }
  
@@ -227,7 +227,7 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
  
              if (flag) {
                  jscrollbar.setValue(Integer.MAX_VALUE);
-@@ -202,4 +243,16 @@ public class MinecraftServerGui extends JComponent {
+@@ -236,4 +277,16 @@ public class MinecraftServerGui extends JComponent {
  
          }
      }
@@ -246,10 +246,10 @@ index dd9f611efc95f7d06fd3011fedd5d0317b1d0a85..be7b3fe2dc84493dcde9e185717b0b7c
  }
 diff --git a/src/main/java/org/purpurmc/purpur/gui/GUIColor.java b/src/main/java/org/purpurmc/purpur/gui/GUIColor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..0f2e7e0b81620c8581949bd5f0bdb567cd93c17e
+index 0000000000000000000000000000000000000000..550222758bf0e7deff26a6e813a860b7be365e87
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/gui/GUIColor.java
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,58 @@
 +package org.purpurmc.purpur.gui;
 +
 +import net.md_5.bungee.api.ChatColor;
@@ -290,6 +290,10 @@ index 0000000000000000000000000000000000000000..0f2e7e0b81620c8581949bd5f0bdb567
 +        return color;
 +    }
 +
++    public ChatColor getChatColor() {
++        return chat;
++    }
++
 +    public String getCode() {
 +        return chat.toString();
 +    }
@@ -306,14 +310,14 @@ index 0000000000000000000000000000000000000000..0f2e7e0b81620c8581949bd5f0bdb567
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/gui/JColorTextPane.java b/src/main/java/org/purpurmc/purpur/gui/JColorTextPane.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..33e89b4c00fa8318506b36cbe49fe4e412e0a9a1
+index 0000000000000000000000000000000000000000..d75fb5e77eff27d86135ed7d605dbc250b660f7d
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/gui/JColorTextPane.java
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,83 @@
 +package org.purpurmc.purpur.gui;
 +
 +import com.google.common.collect.Sets;
-+import net.md_5.bungee.api.ChatColor;
++import javax.swing.UIManager;
 +import net.md_5.bungee.api.chat.BaseComponent;
 +import net.md_5.bungee.api.chat.TextComponent;
 +
@@ -327,11 +331,16 @@ index 0000000000000000000000000000000000000000..33e89b4c00fa8318506b36cbe49fe4e4
 +import java.util.Set;
 +
 +public class JColorTextPane extends JTextPane {
-+    private static final GUIColor DEFAULT_COLOR = GUIColor.BLACK;
++    private static final GUIColor DEFAULT_COLOR;
++    static {
++        DEFAULT_COLOR = UIManager.getSystemLookAndFeelClassName().equals("com.sun.java.swing.plaf.gtk.GTKLookAndFeel")
++            ? GUIColor.WHITE : GUIColor.BLACK;
++    }
++
 +
 +    public void append(String msg) {
 +        // TODO: update to use adventure instead
-+        BaseComponent[] components = TextComponent.fromLegacyText(DEFAULT_COLOR.getCode() + msg, ChatColor.BLACK);
++        BaseComponent[] components = TextComponent.fromLegacyText(DEFAULT_COLOR.getCode() + msg, DEFAULT_COLOR.getChatColor());
 +        for (BaseComponent component : components) {
 +            String text = component.toPlainText();
 +            if (text == null || text.isEmpty()) {
@@ -389,14 +398,14 @@ index 0000000000000000000000000000000000000000..33e89b4c00fa8318506b36cbe49fe4e4
 +    }
 +}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 675cd61221e807aadf28322b46c3daa1370241b5..0769f5c4711a3b7f59489e611ed01ad8367e5db1 100644
+index d2a75850af9c6ad2aca66a5f994f1b587d73eac4..a056aa167887abef9e6d531a9edd2cda433567d2 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,7 +2,16 @@
- <Configuration status="WARN" packages="com.mojang.util" shutdownHook="disable">
+ <Configuration status="WARN" shutdownHook="disable">
      <Appenders>
          <Queue name="ServerGuiConsole">
--            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+-            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
 +            <!-- Purpur start - copied from TerminalConsole -->
 +            <PatternLayout>
 +                <LoggerNamePatternSelector defaultPattern="%highlightGUIError{[%d{HH:mm:ss} %level]: [%logger] %stripAnsi{%msg}%n%xEx{full}}">
diff --git a/patches/server/0299-Stored-Bee-API.patch b/patches/server/0284-Stored-Bee-API.patch
similarity index 71%
rename from patches/server/0299-Stored-Bee-API.patch
rename to patches/server/0284-Stored-Bee-API.patch
index b82401931..525c836e8 100644
--- a/patches/server/0299-Stored-Bee-API.patch
+++ b/patches/server/0284-Stored-Bee-API.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Stored Bee API
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 7b82842b97ce795745cf6ee6399f618c55acbbf3..d6316aec8860ed3e579c1adb0b4578517ce0b885 100644
+index d8efb00c325448d566c59418fe22268c6eb4cfce..f7a6ab35c95ffda73f17843916ddb624ad290b42 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -130,6 +130,22 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -146,11 +146,33 @@ public class BeehiveBlockEntity extends BlockEntity {
          return list;
      }
  
 +    // Purpur start
-+    public List<Entity> releaseBee(BlockState iblockdata, BeeData data, BeehiveBlockEntity.BeeReleaseStatus tileentitybeehive_releasestatus, boolean force) {
++    public List<Entity> releaseBee(BlockState iblockdata, BeehiveBlockEntity.BeeData data, BeehiveBlockEntity.BeeReleaseStatus tileentitybeehive_releasestatus, boolean force) {
 +        List<Entity> list = Lists.newArrayList();
 +
-+        BeehiveBlockEntity.releaseBee(this.level, this.worldPosition, iblockdata, data, list, tileentitybeehive_releasestatus, this.savedFlowerPos, force);
++        BeehiveBlockEntity.releaseOccupant(this.level, this.worldPosition, iblockdata, data.occupant, list, tileentitybeehive_releasestatus, this.savedFlowerPos, force);
 +
 +        if (!list.isEmpty()) {
 +            stored.remove(data);
@@ -28,10 +28,8 @@ index 7b82842b97ce795745cf6ee6399f618c55acbbf3..d6316aec8860ed3e579c1adb0b457851
 +    }
 +    // Purpur end
 +
-     public void addOccupant(Entity entity, boolean hasNectar) {
-         this.addOccupantWithPresetTicks(entity, hasNectar, 0);
-     }
-@@ -139,6 +155,12 @@ public class BeehiveBlockEntity extends BlockEntity {
+     @VisibleForDebug
+     public int getOccupantCount() {
          return this.stored.size();
      }
  
@@ -44,20 +42,20 @@ index 7b82842b97ce795745cf6ee6399f618c55acbbf3..d6316aec8860ed3e579c1adb0b457851
      // Paper start - Add EntityBlockStorage clearEntities
      public void clearBees() {
          this.stored.clear();
-@@ -425,9 +447,9 @@ public class BeehiveBlockEntity extends BlockEntity {
-         private BeeReleaseStatus() {}
+@@ -471,9 +493,9 @@ public class BeehiveBlockEntity extends BlockEntity {
+         }
      }
  
 -    private static class BeeData {
 +    public static class BeeData { // Purpur - change from private to public
  
--        final CompoundTag entityData;
-+        public final CompoundTag entityData; // Purpur - make public
-         int ticksInHive;
-         int exitTickCounter; // Paper - separate counter for checking if bee should exit to reduce exit attempts
-         final int minOccupationTicks;
+-        private final BeehiveBlockEntity.Occupant occupant;
++        public final BeehiveBlockEntity.Occupant occupant; // Purpur - make public
+         private int exitTickCounter; // Paper - Fix bees aging inside hives; separate counter for checking if bee should exit to reduce exit attempts
+         private int ticksInHive;
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
-index 2b906fccdb0a5ecddaf487ee931d05b511f84351..7011f0c22b4ede8423ed702d5adb9674aa8a315c 100644
+index 1a2a05160ba51d9c75f1ae6ae61d944d81428722..3beb26ad2ef0fded49a8da8c5dec64f9508c1995 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
 @@ -16,8 +16,15 @@ import org.bukkit.entity.Bee;
@@ -75,7 +73,7 @@ index 2b906fccdb0a5ecddaf487ee931d05b511f84351..7011f0c22b4ede8423ed702d5adb9674
 +        // Purpur end
      }
  
-     protected CraftBeehive(CraftBeehive state) {
+     protected CraftBeehive(CraftBeehive state, Location location) {
 @@ -75,15 +82,54 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
                  bees.add((Bee) bee.getBukkitEntity());
              }
@@ -120,19 +118,20 @@ index 2b906fccdb0a5ecddaf487ee931d05b511f84351..7011f0c22b4ede8423ed702d5adb9674
      public void addEntity(Bee entity) {
          Preconditions.checkArgument(entity != null, "Entity must not be null");
  
-+        int length = getSnapshot().getStored().size();  // Purpur
-         getSnapshot().addOccupant(((CraftBee) entity).getHandle(), false);
+-        this.getSnapshot().addOccupant(((CraftBee) entity).getHandle());
++        int length = this.getSnapshot().getStored().size();  // Purpur
++        getSnapshot().addOccupant(((CraftBee) entity).getHandle());
 +
 +        // Purpur start - check if new bee was added, and if yes, add to stored bees
-+        List<BeehiveBlockEntity.BeeData> s = getSnapshot().getStored();
-+        if(length < s.size()) {
-+            storage.add(new org.purpurmc.purpur.entity.PurpurStoredBee(s.get(s.size() - 1), this));
++        List<BeehiveBlockEntity.BeeData> storedBeeData = this.getSnapshot().getStored();
++        if(length < storedBeeData.size()) {
++            storage.add(new org.purpurmc.purpur.entity.PurpurStoredBee(storedBeeData.getLast(), this));
 +        }
 +        // Purpur end
      }
  
      @Override
-@@ -95,6 +141,7 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
+@@ -100,6 +146,7 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
      @Override
      public void clearEntities() {
          getSnapshot().clearBees();
@@ -142,15 +141,18 @@ index 2b906fccdb0a5ecddaf487ee931d05b511f84351..7011f0c22b4ede8423ed702d5adb9674
  }
 diff --git a/src/main/java/org/purpurmc/purpur/entity/PurpurStoredBee.java b/src/main/java/org/purpurmc/purpur/entity/PurpurStoredBee.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8efca1d91188ac4db911a8eb0fa9ea2cc3c48e28
+index 0000000000000000000000000000000000000000..7608bf0981fa0d37031e51e57e4086cb5ec4c88b
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/entity/PurpurStoredBee.java
-@@ -0,0 +1,102 @@
+@@ -0,0 +1,106 @@
 +package org.purpurmc.purpur.entity;
 +
 +import io.papermc.paper.adventure.PaperAdventure;
 +import net.kyori.adventure.text.Component;
++import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.nbt.Tag;
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.world.item.component.CustomData;
 +import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
 +import org.bukkit.block.EntityBlockStorage;
 +import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
@@ -176,12 +178,13 @@ index 0000000000000000000000000000000000000000..8efca1d91188ac4db911a8eb0fa9ea2c
 +        this.handle = data;
 +        this.blockStorage = blockStorage;
 +
-+        this.customName = handle.entityData.contains("CustomName", Tag.TAG_STRING)
-+                ? PaperAdventure.asAdventure(net.minecraft.network.chat.Component.Serializer.fromJson(handle.entityData.getString("CustomName")))
++        CompoundTag customData = handle.occupant.entityData().copyTag();
++        this.customName = customData.contains("CustomName")
++                ? PaperAdventure.asAdventure(net.minecraft.network.chat.Component.Serializer.fromJson(customData.getString("CustomName"), MinecraftServer.getDefaultRegistryAccess()))
 +                : null;
 +
-+        if(handle.entityData.contains("BukkitValues", Tag.TAG_COMPOUND)) {
-+            this.persistentDataContainer.putAll(handle.entityData.getCompound("BukkitValues"));
++        if(customData.contains("BukkitValues", Tag.TAG_COMPOUND)) {
++            this.persistentDataContainer.putAll(customData.getCompound("BukkitValues"));
 +        }
 +    }
 +
@@ -240,11 +243,11 @@ index 0000000000000000000000000000000000000000..8efca1d91188ac4db911a8eb0fa9ea2c
 +
 +    @Override
 +    public void update() {
-+        handle.entityData.put("BukkitValues", this.persistentDataContainer.toTagCompound());
++        handle.occupant.entityData().copyTag().put("BukkitValues", this.persistentDataContainer.toTagCompound());
 +        if(customName == null) {
-+            handle.entityData.remove("CustomName");
++            handle.occupant.entityData().copyTag().remove("CustomName");
 +        } else {
-+            handle.entityData.putString("CustomName", net.minecraft.network.chat.Component.Serializer.toJson(PaperAdventure.asVanilla(customName)));
++            handle.occupant.entityData().copyTag().putString("CustomName", net.minecraft.network.chat.Component.Serializer.toJson(PaperAdventure.asVanilla(customName), MinecraftServer.getDefaultRegistryAccess()));
 +        }
 +    }
 +}
diff --git a/patches/server/0300-Shears-can-defuse-TNT.patch b/patches/server/0285-Shears-can-defuse-TNT.patch
similarity index 88%
rename from patches/server/0300-Shears-can-defuse-TNT.patch
rename to patches/server/0285-Shears-can-defuse-TNT.patch
index 2fd4164b0..5fb2d5add 100644
--- a/patches/server/0300-Shears-can-defuse-TNT.patch
+++ b/patches/server/0285-Shears-can-defuse-TNT.patch
@@ -8,13 +8,13 @@ Shears can now defuse TNT. Each world can have a configured chance for the TNT t
 By default the option is disabled to avoid breaking any possible vanilla mechanics.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..afc65b8bb7e7f7f70a25f2d869412ed325b658da 100644
+index f1f352ec0e51f5db59254841a06c176c5a876fc9..dff0e7b08b973a1b29f916e63d3e4778d6c56cdc 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -175,4 +175,29 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -193,4 +193,29 @@ public class PrimedTnt extends Entity implements TraceableEntity {
          return !level().paperConfig().fixes.preventTntFromMovingInWater && super.isPushedByFluid();
      }
-     // Paper end
+     // Paper end - Option to prevent TNT from moving in water
 +    // Purpur start - Shears can defuse TNT
 +    @Override
 +    public net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player player, net.minecraft.world.InteractionHand hand) {
@@ -28,7 +28,7 @@ index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..afc65b8bb7e7f7f70a25f2d869412ed3
 +                    new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.TNT));
 +            tntItem.setPickUpDelay(10);
 +
-+            inHand.hurtAndBreak(1, player, entity -> entity.broadcastBreakEvent(hand));
++            inHand.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
 +            level().addFreshEntity(tntItem, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CUSTOM);
 +
 +            this.playSound(net.minecraft.sounds.SoundEvents.SHEEP_SHEAR);
@@ -42,10 +42,10 @@ index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..afc65b8bb7e7f7f70a25f2d869412ed3
 +    // Purpur end - Shears can defuse TNT
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e7a794ce230c481e39436506facdb77726f96199..ec7c1b39a87f253c52de4d0f3b01e8329aaa723a 100644
+index 03819b5d991d91c2e7f5e2eae50e1a7e4197336b..bd1ae536d975b5a3c54063834fd05255f15d8dad 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -3219,4 +3219,11 @@ public class PurpurWorldConfig {
+@@ -3282,4 +3282,11 @@ public class PurpurWorldConfig {
          cauldronDripstoneWaterFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-water", cauldronDripstoneWaterFillChance);
          cauldronDripstoneLavaFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-lava", cauldronDripstoneLavaFillChance);
      }
diff --git a/patches/server/0301-Explorer-Map-API.patch b/patches/server/0286-Explorer-Map-API.patch
similarity index 63%
rename from patches/server/0301-Explorer-Map-API.patch
rename to patches/server/0286-Explorer-Map-API.patch
index f4039b193..b5f2c63e7 100644
--- a/patches/server/0301-Explorer-Map-API.patch
+++ b/patches/server/0286-Explorer-Map-API.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] Explorer Map API
 
 
 diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index c368b437597edf7e165326727ae778a69c3fcc83..fed5bfb02ab7d6c1d1d9bf993fda5b3f411b9352 100644
+index ce461b1a8d7fab87ae28e30205f6fab67f1808b6..608390ed36710a419de1542b80340dd3fcc7299c 100644
 --- a/src/main/java/net/minecraft/world/item/MapItem.java
 +++ b/src/main/java/net/minecraft/world/item/MapItem.java
-@@ -243,6 +243,7 @@ public class MapItem extends ComplexItem {
-         MapItemSavedData worldmap = MapItem.getSavedData(map, world);
- 
-         if (worldmap != null) {
-+            worldmap.isExplorerMap = true; // Purpur
-             if (world.dimension() == worldmap.dimension) {
-                 int i = 1 << worldmap.scale;
-                 int j = worldmap.centerX;
+@@ -195,6 +195,7 @@ public class MapItem extends ComplexItem {
+     public static void renderBiomePreviewMap(ServerLevel world, ItemStack map) {
+         MapItemSavedData mapItemSavedData = getSavedData(map, world);
+         if (mapItemSavedData != null) {
++            mapItemSavedData.isExplorerMap = true; // Purpur
+             if (world.dimension() == mapItemSavedData.dimension) {
+                 int i = 1 << mapItemSavedData.scale;
+                 int j = mapItemSavedData.centerX;
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index e4c4948e076cd64686dfd16ae0568fafc1437140..804c342783baccdc12e8ca49a362770e31596f6a 100644
+index cf8ae635fce7ea66d4e1ab1dc05575f035fa95ef..e26f6215ca42885cb0635a3183a8df93a924ba7f 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-@@ -67,6 +67,7 @@ public class MapItemSavedData extends SavedData {
+@@ -79,6 +79,7 @@ public class MapItemSavedData extends SavedData {
      private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
      private int trackedDecorationCount;
      private org.bukkit.craftbukkit.map.RenderData vanillaRender = new org.bukkit.craftbukkit.map.RenderData(); // Paper
@@ -29,10 +29,10 @@ index e4c4948e076cd64686dfd16ae0568fafc1437140..804c342783baccdc12e8ca49a362770e
      // CraftBukkit start
      public final CraftMapView mapView;
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-index 2d2bf5c37709b8e747fbfa2db5ce86f258e86224..f6413ab181208d729afb532dca5e96e4c938e83c 100644
+index 0cbbd915631904fe8c6effefb92895422b33eff6..aef19cfbecb4ddfc8dc71c4f3b2a011364c12dc2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
-@@ -46,4 +46,10 @@ public class CraftMapRenderer extends MapRenderer {
+@@ -47,4 +47,10 @@ public class CraftMapRenderer extends MapRenderer {
          }
      }
  
diff --git a/patches/server/0302-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0287-Option-Ocelot-Spawn-Under-Sea-Level.patch
similarity index 84%
rename from patches/server/0302-Option-Ocelot-Spawn-Under-Sea-Level.patch
rename to patches/server/0287-Option-Ocelot-Spawn-Under-Sea-Level.patch
index f0ebe5b25..5d79d6bf5 100644
--- a/patches/server/0302-Option-Ocelot-Spawn-Under-Sea-Level.patch
+++ b/patches/server/0287-Option-Ocelot-Spawn-Under-Sea-Level.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option Ocelot Spawn Under Sea Level
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index af275fc579d66bb098c08e88e4186846a1174c02..3c5f25300d1c7800144a459cc8bf598352a62a35 100644
+index 5668aca08732e317c7bccacf1cfaae7d8666bce6..07dc8a43f4e8c54a94696b84896d32f66a207ad3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -295,7 +295,7 @@ public class Ocelot extends Animal {
+@@ -293,7 +293,7 @@ public class Ocelot extends Animal {
          if (world.isUnobstructed(this) && !world.containsAnyLiquid(this.getBoundingBox())) {
              BlockPos blockposition = this.blockPosition();
  
@@ -18,10 +18,10 @@ index af275fc579d66bb098c08e88e4186846a1174c02..3c5f25300d1c7800144a459cc8bf5983
              }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ec7c1b39a87f253c52de4d0f3b01e8329aaa723a..39236dc4d7c70edff091bb1df54b2158e6dd5e2c 100644
+index bd1ae536d975b5a3c54063834fd05255f15d8dad..0f4a926937d07f76144cd1146b48bfdadaf887b5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2036,6 +2036,7 @@ public class PurpurWorldConfig {
+@@ -2097,6 +2097,7 @@ public class PurpurWorldConfig {
      public int ocelotBreedingTicks = 6000;
      public boolean ocelotTakeDamageFromWater = false;
      public boolean ocelotAlwaysDropExp = false;
@@ -29,7 +29,7 @@ index ec7c1b39a87f253c52de4d0f3b01e8329aaa723a..39236dc4d7c70edff091bb1df54b2158
      private void ocelotSettings() {
          ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
          ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
-@@ -2049,6 +2050,7 @@ public class PurpurWorldConfig {
+@@ -2110,6 +2111,7 @@ public class PurpurWorldConfig {
          ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks);
          ocelotTakeDamageFromWater = getBoolean("mobs.ocelot.takes-damage-from-water", ocelotTakeDamageFromWater);
          ocelotAlwaysDropExp = getBoolean("mobs.ocelot.always-drop-exp", ocelotAlwaysDropExp);
diff --git a/patches/server/0303-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0288-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
similarity index 58%
rename from patches/server/0303-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
rename to patches/server/0288-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
index 462263f28..8f0bc4e20 100644
--- a/patches/server/0303-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
+++ b/patches/server/0288-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
@@ -5,39 +5,23 @@ Subject: [PATCH] add an option for piglins to ignore gold-trimmed armor
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 5c13e376dd079134da465044f1057bcce66973a3..8f10ced20d7cdb7020f032c9e37d9bbb38f360d6 100644
+index e25af9af8f87e6762716749c367658bf6bda9e34..b7d5c0b0e3741fcf04c4bac21a82fc41e2eeed5d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -597,20 +597,33 @@ public class PiglinAi {
-         Iterator iterator = iterable.iterator();
- 
-         Item item;
-+        ItemStack itemstack; // Purpur
- 
-         do {
-             if (!iterator.hasNext()) {
-                 return false;
-             }
- 
--            ItemStack itemstack = (ItemStack) iterator.next();
-+            itemstack = (ItemStack) iterator.next(); // Purpur
+@@ -606,11 +606,18 @@ public class PiglinAi {
+             ItemStack itemstack = (ItemStack) iterator.next();
  
              item = itemstack.getItem();
--        } while (!(item instanceof ArmorItem) || ((ArmorItem) item).getMaterial() != ArmorMaterials.GOLD);
-+        } while (!(item instanceof ArmorItem) || ((ArmorItem) item).getMaterial() != ArmorMaterials.GOLD && (!entity.level().purpurConfig.piglinIgnoresArmorWithGoldTrim || !isWearingGoldTrim(entity, itemstack))); // Purpur
+-        } while (!(item instanceof ArmorItem) || !((ArmorItem) item).getMaterial().is(ArmorMaterials.GOLD));
++        } while (!(item instanceof ArmorItem) || !((ArmorItem) item).getMaterial().is(ArmorMaterials.GOLD) && (!entity.level().purpurConfig.piglinIgnoresArmorWithGoldTrim || !isWearingGoldTrim(item))); // Purpur
  
          return true;
      }
  
 +    // Purpur start
-+    private static boolean isWearingGoldTrim(LivingEntity entity, ItemStack itemstack) {
-+        Optional<net.minecraft.world.item.armortrim.ArmorTrim> optionalArmorTrim = net.minecraft.world.item.armortrim.ArmorTrim.getTrim(entity.level().registryAccess(), itemstack, true);
-+
-+        if (optionalArmorTrim.isEmpty()) return false;
-+
-+        net.minecraft.world.item.armortrim.ArmorTrim armorTrim = optionalArmorTrim.get();
-+
-+        return armorTrim.material().is(net.minecraft.world.item.armortrim.TrimMaterials.GOLD);
++    private static boolean isWearingGoldTrim(Item itemstack) {
++        net.minecraft.world.item.armortrim.ArmorTrim armorTrim = itemstack.components().get(net.minecraft.core.component.DataComponents.TRIM);
++        return armorTrim != null && armorTrim.material().is(net.minecraft.world.item.armortrim.TrimMaterials.GOLD);
 +    }
 +    // Purpur end
 +
@@ -45,10 +29,10 @@ index 5c13e376dd079134da465044f1057bcce66973a3..8f10ced20d7cdb7020f032c9e37d9bbb
          piglin.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET);
          piglin.getNavigation().stop();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 39236dc4d7c70edff091bb1df54b2158e6dd5e2c..cd7f347e46f4fa08e291bfdbbb01ea4f3271a877 100644
+index 0f4a926937d07f76144cd1146b48bfdadaf887b5..27eadd84aed6d109e278b0ee450fc2c302f61aba 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2205,6 +2205,7 @@ public class PurpurWorldConfig {
+@@ -2266,6 +2266,7 @@ public class PurpurWorldConfig {
      public int piglinPortalSpawnModifier = 2000;
      public boolean piglinAlwaysDropExp = false;
      public double piglinHeadVisibilityPercent = 0.5D;
@@ -56,7 +40,7 @@ index 39236dc4d7c70edff091bb1df54b2158e6dd5e2c..cd7f347e46f4fa08e291bfdbbb01ea4f
      private void piglinSettings() {
          piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
          piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
-@@ -2220,6 +2221,7 @@ public class PurpurWorldConfig {
+@@ -2281,6 +2282,7 @@ public class PurpurWorldConfig {
          piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
          piglinAlwaysDropExp = getBoolean("mobs.piglin.always-drop-exp", piglinAlwaysDropExp);
          piglinHeadVisibilityPercent = getDouble("mobs.piglin.head-visibility-percent", piglinHeadVisibilityPercent);
diff --git a/patches/server/0289-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0289-Add-option-for-always-showing-item-in-player-death-m.patch
new file mode 100644
index 000000000..84ea3ef77
--- /dev/null
+++ b/patches/server/0289-Add-option-for-always-showing-item-in-player-death-m.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MelnCat <melncatuwu@gmail.com>
+Date: Tue, 22 Aug 2023 22:18:26 -0700
+Subject: [PATCH] Add option for always showing item in player death messages
+
+
+diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+index 357a79d72a2de02a019595e457fe432bf409e516..4fb025a63628eb60509d90b680922a0220104bcb 100644
+--- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
++++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
+@@ -54,7 +54,7 @@ public class CombatTracker {
+ 
+     private Component getMessageForAssistedFall(Entity attacker, Component attackerDisplayName, String itemDeathTranslationKey, String deathTranslationKey) {
+         ItemStack itemStack = attacker instanceof LivingEntity livingEntity ? livingEntity.getMainHandItem() : ItemStack.EMPTY;
+-        return !itemStack.isEmpty() && itemStack.has(DataComponents.CUSTOM_NAME)
++        return !itemStack.isEmpty() && (org.purpurmc.purpur.PurpurConfig.playerDeathsAlwaysShowItem || itemStack.has(DataComponents.CUSTOM_NAME)) // Purpur
+             ? Component.translatable(itemDeathTranslationKey, this.mob.getDisplayName(), attackerDisplayName, itemStack.getDisplayName())
+             : Component.translatable(deathTranslationKey, this.mob.getDisplayName(), attackerDisplayName);
+     }
+diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+index 812091bf6efc067b21b9723b8241360d4b4c79e7..25e614be19b2b29b36af136b823f27f85e1650fa 100644
+--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+@@ -197,7 +197,7 @@ public class DamageSource {
+ 
+             ItemStack itemstack1 = itemstack;
+ 
+-            return !itemstack1.isEmpty() && itemstack1.has(DataComponents.CUSTOM_NAME) ? Component.translatable(s + ".item", killed.getDisplayName(), ichatbasecomponent, itemstack1.getDisplayName()) : Component.translatable(s, killed.getDisplayName(), ichatbasecomponent);
++            return !itemstack1.isEmpty() && (org.purpurmc.purpur.PurpurConfig.playerDeathsAlwaysShowItem || itemstack1.has(DataComponents.CUSTOM_NAME)) ? Component.translatable(s + ".item", killed.getDisplayName(), ichatbasecomponent, itemstack1.getDisplayName()) : Component.translatable(s, killed.getDisplayName(), ichatbasecomponent);
+         }
+     }
+ 
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index e7bce4121f7bc2fe0acd8860a73c58dfed73330b..6e0e871153e0ec85fd40ddf0581b6ed2932b9f99 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -576,4 +576,9 @@ public class PurpurConfig {
+             block.fallDistanceMultiplier = fallDistanceMultiplier.floatValue();
+         });
+     }
++
++    public static boolean playerDeathsAlwaysShowItem = false;
++    private static void playerDeathsAlwaysShowItem() {
++        playerDeathsAlwaysShowItem = getBoolean("settings.player-deaths-always-show-item", playerDeathsAlwaysShowItem);
++    }
+ }
diff --git a/patches/server/0305-place-end-crystal-on-any-block.patch b/patches/server/0290-place-end-crystal-on-any-block.patch
similarity index 85%
rename from patches/server/0305-place-end-crystal-on-any-block.patch
rename to patches/server/0290-place-end-crystal-on-any-block.patch
index 617d26409..8bf62f530 100644
--- a/patches/server/0305-place-end-crystal-on-any-block.patch
+++ b/patches/server/0290-place-end-crystal-on-any-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] place end crystal on any block
 
 
 diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-index 3688e9f8c6c6d1239095e3a87060ccca90386d0c..34254eec36d34ae343733fa1abbaaba60be41a3b 100644
+index dd1bdb4bb87a3a59c229ba76b36841d199717624..54607cea2622f259aedfe425b60e2317e4167bf9 100644
 --- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
 +++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-@@ -26,7 +26,7 @@ public class EndCrystalItem extends Item {
+@@ -27,7 +27,7 @@ public class EndCrystalItem extends Item {
          BlockPos blockposition = context.getClickedPos();
          BlockState iblockdata = world.getBlockState(blockposition);
  
@@ -18,10 +18,10 @@ index 3688e9f8c6c6d1239095e3a87060ccca90386d0c..34254eec36d34ae343733fa1abbaaba6
          } else {
              BlockPos blockposition1 = blockposition.above(); final BlockPos aboveBlockPosition = blockposition1; // Paper - OBFHELPER
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cd7f347e46f4fa08e291bfdbbb01ea4f3271a877..d4d9f748d259df8b6f4566efa21c15c470de5ba2 100644
+index 27eadd84aed6d109e278b0ee450fc2c302f61aba..81c4b22a4fb7cbc2601966b646bb20294b46313e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -899,6 +899,7 @@ public class PurpurWorldConfig {
+@@ -978,6 +978,7 @@ public class PurpurWorldConfig {
      public boolean basedEndCrystalExplosionFire = false;
      public net.minecraft.world.level.Level.ExplosionInteraction basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
      public int endCrystalCramming = 0;
@@ -29,7 +29,7 @@ index cd7f347e46f4fa08e291bfdbbb01ea4f3271a877..d4d9f748d259df8b6f4566efa21c15c4
      private void endCrystalSettings() {
          if (PurpurConfig.version < 31) {
              if ("DESTROY".equals(getString("blocks.end-crystal.baseless.explosion-effect", baselessEndCrystalExplosionEffect.name()))) {
-@@ -927,6 +928,7 @@ public class PurpurWorldConfig {
+@@ -1006,6 +1007,7 @@ public class PurpurWorldConfig {
              basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
          }
          endCrystalCramming = getInt("blocks.end-crystal.cramming-amount", endCrystalCramming);
diff --git a/patches/server/0307-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0291-Add-option-to-disable-the-copper-oxidation-proximity.patch
similarity index 81%
rename from patches/server/0307-Add-option-to-disable-the-copper-oxidation-proximity.patch
rename to patches/server/0291-Add-option-to-disable-the-copper-oxidation-proximity.patch
index 0ed6de5c5..8d565ec61 100644
--- a/patches/server/0307-Add-option-to-disable-the-copper-oxidation-proximity.patch
+++ b/patches/server/0291-Add-option-to-disable-the-copper-oxidation-proximity.patch
@@ -5,23 +5,23 @@ Subject: [PATCH] Add option to disable the copper oxidation proximity penalty
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java b/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
-index 8512b977b44a0a4d3a2521e27a60d65f7ac967be..dd270f67388c8663e0418875c88cb1e2a55d0635 100644
+index daae7fd6e0148cfba8e359d990748a0c83a3376e..0e06b1bcd906e92c083dc74d56d6d0a2a36f62a7 100644
 --- a/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ChangeOverTimeBlock.java
-@@ -65,7 +65,7 @@ public interface ChangeOverTimeBlock<T extends Enum<T>> {
+@@ -67,7 +67,7 @@ public interface ChangeOverTimeBlock<T extends Enum<T>> {
          }
  
          float f = (float) (k + 1) / (float) (k + j + 1);
 -        float f1 = f * f * this.getChanceModifier();
 +        float f1 = world.purpurConfig.disableOxidationProximityPenalty ? this.getChanceModifier() : f * f * this.getChanceModifier(); // Purpur
  
-         if (random.nextFloat() < f1) {
-             this.getNext(state).ifPresent((iblockdata2) -> {
+         return random.nextFloat() < f1 ? this.getNext(state) : Optional.empty();
+     }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d4d9f748d259df8b6f4566efa21c15c470de5ba2..64e172e6cbfb8134c2b36bce8279e1ef44085257 100644
+index 81c4b22a4fb7cbc2601966b646bb20294b46313e..43d91390274c8cc8863e0aceb20837415b915166 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -145,6 +145,7 @@ public class PurpurWorldConfig {
+@@ -146,6 +146,7 @@ public class PurpurWorldConfig {
      public boolean rainStopsAfterSleep = true;
      public boolean thunderStopsAfterSleep = true;
      public int mobLastHurtByPlayerTime = 100;
@@ -29,7 +29,7 @@ index d4d9f748d259df8b6f4566efa21c15c470de5ba2..64e172e6cbfb8134c2b36bce8279e1ef
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          mendingMultiplier = getDouble("gameplay-mechanics.mending-multiplier", mendingMultiplier);
-@@ -173,6 +174,7 @@ public class PurpurWorldConfig {
+@@ -181,6 +182,7 @@ public class PurpurWorldConfig {
          rainStopsAfterSleep = getBoolean("gameplay-mechanics.rain-stops-after-sleep", rainStopsAfterSleep);
          thunderStopsAfterSleep = getBoolean("gameplay-mechanics.thunder-stops-after-sleep", thunderStopsAfterSleep);
          mobLastHurtByPlayerTime = getInt("gameplay-mechanics.mob-last-hurt-by-player-time", mobLastHurtByPlayerTime);
diff --git a/patches/server/0292-register-minecraft-debug-commands.patch b/patches/server/0292-register-minecraft-debug-commands.patch
new file mode 100644
index 000000000..db1601242
--- /dev/null
+++ b/patches/server/0292-register-minecraft-debug-commands.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: granny <contact@granny.dev>
+Date: Sun, 18 Feb 2024 16:28:32 -0800
+Subject: [PATCH] register minecraft debug commands
+
+
+diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
+index 13dfb3e506d50c0b191baf5d05bbfc28c20be0ae..f9d0e8ee9414b3897f268ba78a1469ddf868f51a 100644
+--- a/src/main/java/net/minecraft/commands/Commands.java
++++ b/src/main/java/net/minecraft/commands/Commands.java
+@@ -222,8 +222,8 @@ public class Commands {
+             JfrCommand.register(this.dispatcher);
+         }
+ 
+-        if (SharedConstants.IS_RUNNING_IN_IDE) {
+-            TestCommand.register(this.dispatcher);
++        if (org.purpurmc.purpur.PurpurConfig.registerMinecraftDebugCommands || SharedConstants.IS_RUNNING_IN_IDE) { // Purpur
++            if (!org.purpurmc.purpur.PurpurConfig.registerMinecraftDebugCommands) TestCommand.register(this.dispatcher); // Purpur
+             ResetChunksCommand.register(this.dispatcher);
+             RaidCommand.register(this.dispatcher, commandRegistryAccess);
+             DebugPathCommand.register(this.dispatcher);
+diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+index 8925440dbc35dbc4a7d59f13511d7afeda803260..411f1f8c6be072cfc5ba88cbec38dbc4300a41d1 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -122,6 +122,7 @@ public class Main {
+             // Purpur start - load config files early
+             org.bukkit.configuration.file.YamlConfiguration purpurConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("purpur-settings"));
+             org.purpurmc.purpur.PurpurConfig.clampEnchantLevels = purpurConfiguration.getBoolean("settings.enchantment.clamp-levels");
++            org.purpurmc.purpur.PurpurConfig.registerMinecraftDebugCommands = purpurConfiguration.getBoolean("settings.register-minecraft-debug-commands");
+             // Purpur end - load config files early
+ 
+             io.papermc.paper.plugin.PluginInitializerManager.load(optionset); // Paper
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index 6e0e871153e0ec85fd40ddf0581b6ed2932b9f99..f49108ed94f7787347c5e0a721646083d6dffafc 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -581,4 +581,9 @@ public class PurpurConfig {
+     private static void playerDeathsAlwaysShowItem() {
+         playerDeathsAlwaysShowItem = getBoolean("settings.player-deaths-always-show-item", playerDeathsAlwaysShowItem);
+     }
++
++    public static boolean registerMinecraftDebugCommands = false;
++    private static void registerMinecraftDebugCommands() {
++        registerMinecraftDebugCommands = getBoolean("settings.register-minecraft-debug-commands", registerMinecraftDebugCommands);
++    }
+ }
diff --git a/patches/server/0293-Configurable-villager-search-radius.patch b/patches/server/0293-Configurable-villager-search-radius.patch
new file mode 100644
index 000000000..819b508a2
--- /dev/null
+++ b/patches/server/0293-Configurable-villager-search-radius.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Pantera <zeruskr@gmail.com>
+Date: Fri, 26 Jan 2024 15:57:24 +0900
+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 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 {
+                                     };
+                                     // Paper start - optimise POI access
+                                     java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
+-                                    io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, poiPredicate, predicate2, entity.blockPosition(), 48, 48*48, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes);
++                        io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, poiPredicate, predicate2, entity.blockPosition(), world.purpurConfig.villagerAcquirePoiSearchRadius, world.purpurConfig.villagerAcquirePoiSearchRadius*world.purpurConfig.villagerAcquirePoiSearchRadius, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes); // Purpur
+                                     Set<Pair<Holder<PoiType>, BlockPos>> set = new java.util.HashSet<>(poiposes);
+                                     // 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 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> {
+             // Paper start - optimise POI access
+             java.util.List<Pair<Holder<PoiType>, BlockPos>> poiposes = new java.util.ArrayList<>();
+             // don't ask me why it's unbounded. ask mojang.
+-            io.papermc.paper.util.PoiAccess.findAnyPoiPositions(poiManager, type -> type.is(PoiTypes.HOME), predicate, entity.blockPosition(), 48, PoiManager.Occupancy.ANY, false, Integer.MAX_VALUE, poiposes);
++            io.papermc.paper.util.PoiAccess.findAnyPoiPositions(poiManager, type -> type.is(PoiTypes.HOME), predicate, entity.blockPosition(), world.purpurConfig.villagerNearestBedSensorSearchRadius, PoiManager.Occupancy.ANY, false, Integer.MAX_VALUE, poiposes); // Purpur
+             Path path = AcquirePoi.findPathToPois(entity, new java.util.HashSet<>(poiposes));
+             // Paper end - optimise POI access
+             if (path != null && path.canReach()) {
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+index 43d91390274c8cc8863e0aceb20837415b915166..710511db0e882d9795c2a1ff31570fbb05fbb0f1 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -2896,6 +2896,8 @@ public class PurpurWorldConfig {
+     public boolean villagerDisplayTradeItem = true;
+     public int villagerSpawnIronGolemRadius = 0;
+     public int villagerSpawnIronGolemLimit = 0;
++    public int villagerAcquirePoiSearchRadius = 48;
++    public int villagerNearestBedSensorSearchRadius = 48;
+     private void villagerSettings() {
+         villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
+         villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
+@@ -2932,6 +2934,8 @@ public class PurpurWorldConfig {
+         villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);
+         villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
+         villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
++        villagerAcquirePoiSearchRadius = getInt("mobs.villager.search-radius.acquire-poi", villagerAcquirePoiSearchRadius);
++        villagerNearestBedSensorSearchRadius = getInt("mobs.villager.search-radius.nearest-bed-sensor", villagerNearestBedSensorSearchRadius);
+     }
+ 
+     public boolean vindicatorRidable = false;
diff --git a/patches/server/0294-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0294-option-to-make-ravagers-afraid-of-rabbits.patch
new file mode 100644
index 000000000..765dd9d66
--- /dev/null
+++ b/patches/server/0294-option-to-make-ravagers-afraid-of-rabbits.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: granny <granny@purpurmc.org>
+Date: Tue, 7 May 2024 04:59:57 -0700
+Subject: [PATCH] option to make ravagers afraid of rabbits
+
+https://github.com/PurpurMC/Purpur/discussions/713
+
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+index 9551bd7c9bed37cf17910e7f71b82ed20fb2d759..dbfcca8adb7afa7a3101f22c2bc48aff6abae4a2 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+@@ -111,6 +111,7 @@ public class Ravager extends Raider {
+         super.registerGoals();
+         this.goalSelector.addGoal(0, new FloatGoal(this));
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
++        if (level().purpurConfig.ravagerAvoidRabbits) this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.AvoidEntityGoal<>(this, net.minecraft.world.entity.animal.Rabbit.class, 6.0F, 1.0D, 1.2D)); // Purpur
+         this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, true));
+         this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 0.4D));
+         this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+index 710511db0e882d9795c2a1ff31570fbb05fbb0f1..d8de8710d9b8cf2ae5c434b2b0b27e76ffbbe4bf 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+@@ -2412,6 +2412,7 @@ public class PurpurWorldConfig {
+     public boolean ravagerTakeDamageFromWater = false;
+     public List<Block> ravagerGriefableBlocks = new ArrayList<>();
+     public boolean ravagerAlwaysDropExp = false;
++    public boolean ravagerAvoidRabbits = false;
+     private void ravagerSettings() {
+         ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
+         ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
+@@ -2442,6 +2443,7 @@ public class PurpurWorldConfig {
+             }
+         });
+         ravagerAlwaysDropExp = getBoolean("mobs.ravager.always-drop-exp", ravagerAlwaysDropExp);
++        ravagerAvoidRabbits = getBoolean("mobs.ravager.avoid-rabbits", ravagerAvoidRabbits);
+     }
+ 
+     public boolean salmonRidable = false;
diff --git a/patches/server/0295-config-for-startup-commands.patch b/patches/server/0295-config-for-startup-commands.patch
new file mode 100644
index 000000000..77e6c93cd
--- /dev/null
+++ b/patches/server/0295-config-for-startup-commands.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: granny <granny@purpurmc.org>
+Date: Sun, 5 May 2024 02:27:52 -0700
+Subject: [PATCH] config for startup commands
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index dfeae138e830e95ab823b6349a91160b02622208..21327a92b75a460c7beb3aa408502f37a7db31fa 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1188,6 +1188,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             }
+             // Paper end - Add onboarding message for initial server start
+ 
++            // Purpur start
++            if (!Boolean.getBoolean("Purpur.IReallyDontWantStartupCommands") && !org.purpurmc.purpur.PurpurConfig.startupCommands.isEmpty()) {
++                LOGGER.info("Purpur: Running startup commands specified in purpur.yml.");
++                for (final String startupCommand : org.purpurmc.purpur.PurpurConfig.startupCommands) {
++                    LOGGER.info("Purpur: Running the following command: \"{}\"", startupCommand);
++                    ((DedicatedServer) this).handleConsoleInput(startupCommand, this.createCommandSourceStack());
++                }
++            }
++            // Purpur end
++
+             while (this.running) {
+                 // Paper start - rewrite chunk system
+                 // guarantee that nothing can stop the server from halting if it can at least still tick
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index a343ad765c2779e9c83bc037ec9e3a24b07b0115..de70bfdbdd7740fdf20dd063a7a623a9e96cef98 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -586,4 +586,16 @@ public class PurpurConfig {
+     private static void registerMinecraftDebugCommands() {
+         registerMinecraftDebugCommands = getBoolean("settings.register-minecraft-debug-commands", registerMinecraftDebugCommands);
+     }
++
++    public static List<String> startupCommands = new ArrayList<>();
++    private static void startupCommands() {
++        startupCommands.clear();
++        getList("settings.startup-commands", new ArrayList<String>()).forEach(line -> {
++            String command = line.toString();
++            if (command.startsWith("/")) {
++                command = command.substring(1);
++            }
++            startupCommands.add(command);
++        });
++    }
+ }
diff --git a/patches/server/0304-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0304-Add-option-for-always-showing-item-in-player-death-m.patch
deleted file mode 100644
index da162e380..000000000
--- a/patches/server/0304-Add-option-for-always-showing-item-in-player-death-m.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Tue, 22 Aug 2023 22:18:26 -0700
-Subject: [PATCH] Add option for always showing item in player death messages
-
-
-diff --git a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-index 8c2c515f1b5f56bf1d6cf0c35d4f0fa7b593d1a0..6e8d9be28c5908fb12c44c0ecb0e02180601371a 100644
---- a/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-+++ b/src/main/java/net/minecraft/world/damagesource/CombatTracker.java
-@@ -59,7 +59,7 @@ public class CombatTracker {
-         }
- 
-         ItemStack itemStack = var10000;
--        return !itemStack.isEmpty() && itemStack.hasCustomHoverName() ? Component.translatable(itemDeathTranslationKey, this.mob.getDisplayName(), attackerDisplayName, itemStack.getDisplayName()) : Component.translatable(deathTranslationKey, this.mob.getDisplayName(), attackerDisplayName);
-+        return !itemStack.isEmpty() && (org.purpurmc.purpur.PurpurConfig.playerDeathsAlwaysShowItem || itemStack.hasCustomHoverName()) ? Component.translatable(itemDeathTranslationKey, this.mob.getDisplayName(), attackerDisplayName, itemStack.getDisplayName()) : Component.translatable(deathTranslationKey, this.mob.getDisplayName(), attackerDisplayName);
-     }
- 
-     private Component getFallMessage(CombatEntry damageRecord, @Nullable Entity attacker) {
-diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-index fc1fb63ee0e28b8d1f065bfad716b465cde5a69f..c8860f20956a2819da001e93938249452bf7cb49 100644
---- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
-@@ -126,7 +126,7 @@ public class DamageSource {
- 
-             ItemStack itemstack1 = itemstack;
- 
--            return !itemstack1.isEmpty() && itemstack1.hasCustomHoverName() ? Component.translatable(s + ".item", killed.getDisplayName(), ichatbasecomponent, itemstack1.getDisplayName()) : Component.translatable(s, killed.getDisplayName(), ichatbasecomponent);
-+            return !itemstack1.isEmpty() && (org.purpurmc.purpur.PurpurConfig.playerDeathsAlwaysShowItem || itemstack1.hasCustomHoverName()) ? Component.translatable(s + ".item", killed.getDisplayName(), ichatbasecomponent, itemstack1.getDisplayName()) : Component.translatable(s, killed.getDisplayName(), ichatbasecomponent);
-         }
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index f10679ef2cbd73397b64eb69516c8a46e4d35a4e..3633574e112f217b412217dd243a631dc4e9c40c 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -647,4 +647,9 @@ public class PurpurConfig {
-             block.fallDistanceMultiplier = fallDistanceMultiplier.floatValue();
-         });
-     }
-+
-+    public static boolean playerDeathsAlwaysShowItem = false;
-+    private static void playerDeathsAlwaysShowItem() {
-+        playerDeathsAlwaysShowItem = getBoolean("settings.player-deaths-always-show-item", playerDeathsAlwaysShowItem);
-+    }
- }
diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/unapplied-api/0001-Pufferfish-API-Changes.patch
similarity index 96%
rename from patches/api/0001-Pufferfish-API-Changes.patch
rename to patches/unapplied-api/0001-Pufferfish-API-Changes.patch
index 7b92d9cbd..1fbc75a41 100644
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/unapplied-api/0001-Pufferfish-API-Changes.patch
@@ -20,18 +20,18 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fb47a794893d5fef026a35a7c573becf74420aa0..0330a20576c372c29ca4d98a2bc5b01e28303ac3 100644
+index 04853c43b99951bf0d4c96ef73724625bdaf018f..9164120d299d062c62529a7ef74eac0ded367993 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -46,6 +46,7 @@ dependencies {
+@@ -51,6 +51,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
  
-     implementation("org.ow2.asm:asm:9.4")
-     implementation("org.ow2.asm:asm-commons:9.4")
-@@ -89,6 +90,13 @@ val generateApiVersioningFile by tasks.registering {
+     implementation("org.ow2.asm:asm:9.7")
+     implementation("org.ow2.asm:asm-commons:9.7")
+@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -389,7 +389,7 @@ index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be
 +	
 +}
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..9584e245144b561b4f6745b2f26a4f69a6f92891 100644
+index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad124466bf5 100644
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
 @@ -1,6 +1,7 @@
@@ -480,10 +480,10 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bac
  
              if (cloader instanceof PluginClassLoader) {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee1b8df621 100644
+index 7e4f7cb2afbc145e532285c793573ad107bc3033..12449e18180d604e9cbbc744da74a8b222a18e1f 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -50,6 +50,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
      private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
      public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper
  
@@ -492,7 +492,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
      static {
          ClassLoader.registerAsParallelCapable();
      }
-@@ -183,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -197,6 +199,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
          throw new ClassNotFoundException(name);
      }
  
@@ -500,7 +500,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
      @Override
      protected Class<?> findClass(String name) throws ClassNotFoundException {
          if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
-@@ -190,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -204,7 +207,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
          }
          Class<?> result = classes.get(name);
  
@@ -509,7 +509,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
              String path = name.replace('.', '/').concat(".class");
              JarEntry entry = jar.getJarEntry(path);
  
-@@ -237,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -251,6 +254,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
              this.setClass(name, result); // Paper
          }
  
@@ -517,7 +517,7 @@ index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee
          return result;
      }
  
-@@ -251,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -265,6 +269,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
              // Paper end
              super.close();
          } finally {
diff --git a/patches/api/0002-Fix-pufferfish-issues.patch b/patches/unapplied-api/0002-Fix-pufferfish-issues.patch
similarity index 51%
rename from patches/api/0002-Fix-pufferfish-issues.patch
rename to patches/unapplied-api/0002-Fix-pufferfish-issues.patch
index 08bd8a159..b6b893fd9 100644
--- a/patches/api/0002-Fix-pufferfish-issues.patch
+++ b/patches/unapplied-api/0002-Fix-pufferfish-issues.patch
@@ -4,8 +4,21 @@ Date: Tue, 4 Jan 2022 23:05:41 -0600
 Subject: [PATCH] Fix pufferfish issues
 
 
+diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
+index ab5fea0b03224bf249352ce340e94704ff713345..3441cdad70da1bd523c5933b1a914688718c2657 100644
+--- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
++++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
+@@ -15,7 +15,7 @@ public class SIMDChecker {
+ 	@Deprecated
+ 	public static boolean canEnable(Logger logger) {
+ 		try {
+-			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
++			if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) {
+ 				return false;
+ 			} else {
+ 				SIMDDetection.testRun = true;
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 06e96e5c98f1a7a68c8b4b5e527314c1aa774e38..49bba9a7a02b9cf3a552583315eff2b7dbe060c0 100644
+index 88f1ca89fa640a686231b8eec87e70419b2d73ef..d6b91c49a267c89d7df2ddee7ccfe64675d117be 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -47,6 +47,10 @@ public class AnnotationTest {
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/unapplied-server/0001-Pufferfish-Server-Changes.patch
similarity index 86%
rename from patches/server/0001-Pufferfish-Server-Changes.patch
rename to patches/unapplied-server/0001-Pufferfish-Server-Changes.patch
index 61f291acb..40944d98b 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/unapplied-server/0001-Pufferfish-Server-Changes.patch
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a79461457ea19339f47572c70705d655ebc55276..57739f9dd7d045d1a585a9fc1be290a1a007db6a 100644
+index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..4517548e2c892c2e94f91e7449660f9e36b8f14e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -38,9 +38,9 @@ index a79461457ea19339f47572c70705d655ebc55276..57739f9dd7d045d1a585a9fc1be290a1
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -52,12 +56,27 @@ dependencies {
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+@@ -50,6 +54,13 @@ dependencies {
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
  
 +    // Pufferfish start
 +    implementation("org.yaml:snakeyaml:1.32")
@@ -52,9 +52,10 @@ index a79461457ea19339f47572c70705d655ebc55276..57739f9dd7d045d1a585a9fc1be290a1
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
+@@ -59,6 +70,14 @@ dependencies {
  }
  
- val craftbukkitPackageVersion = "1_20_R2" // Paper
+ val craftbukkitPackageVersion = "1_20_R3" // Paper
 +
 +// Pufferfish Start
 +tasks.withType<JavaCompile> {
@@ -66,7 +67,7 @@ index a79461457ea19339f47572c70705d655ebc55276..57739f9dd7d045d1a585a9fc1be290a1
  tasks.jar {
      archiveClassifier.set("dev")
  
-@@ -70,7 +89,7 @@ tasks.jar {
+@@ -71,7 +90,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -75,20 +76,11 @@ index a79461457ea19339f47572c70705d655ebc55276..57739f9dd7d045d1a585a9fc1be290a1
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -210,7 +229,5 @@ val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
- }
- tasks.registerRunTask("runDev") {
-     description = "Spin up a non-relocated Mojang-mapped test server"
--    classpath(tasks.filterProjectDir.flatMap { it.outputJar })
--    classpath(runtimeClasspathForRunDev)
--    jvmArgs("-DPaper.isRunDev=true")
-+    classpath(sourceSets.main.map { it.runtimeClasspath })
- }
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..ff940e43ca35094bbcae6c7d471d3c4aeb7c1727 100644
+index 7620c72a4c243cbeea245203ce03a97cbfa7d922..b35a9f4c5f8960864c402ede8a51fb5ab9c4fcc0 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -242,7 +242,8 @@ public class TimingsExport extends Thread {
+@@ -240,7 +240,8 @@ public class TimingsExport extends Thread {
          parent.put("config", createObject(
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -624,10 +616,10 @@ index 0000000000000000000000000000000000000000..020368da69b9a492155f6de6297f7473
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..cc66657cb4f978aa2df3ca1be6c683759952cc7a
+index 0000000000000000000000000000000000000000..6464682e2f93659e73aca491031c8051ab000033
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -0,0 +1,294 @@
+@@ -0,0 +1,302 @@
 +package gg.pufferfish.pufferfish;
 +
 +import gg.pufferfish.pufferfish.simd.SIMDDetection;
@@ -810,6 +802,14 @@ index 0000000000000000000000000000000000000000..cc66657cb4f978aa2df3ca1be6c68375
 +				"disabling this option.",
 +				"This can be overridden per-player with the permission pufferfish.usebooks");
 +	}
++
++	public static boolean tpsCatchup;
++	private static void tpsCatchup() {
++		tpsCatchup = getBoolean("tps-catchup", true,
++				"If this setting is true, the server will run faster after a lag spike in",
++				"an attempt to maintain 20 TPS. This option (defaults to true per",
++				"spigot/paper) can cause mobs to move fast after a lag spike.");
++	}
 +	
 +	public static boolean enableSuffocationOptimization;
 +	private static void suffocationOptimization() {
@@ -1463,10 +1463,10 @@ index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f549
 +	}
 +}
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index d02546b18cb689724887b4e85e8d32a18828a4ad..91eaff58bb422ba188e6cfaa9c20b45bec211edd 100644
+index e028353e0261310afc42ca0454b723d9f1ffc131..2222625a515d9ae6c3e9c92fc4d4a5bf974af5f8 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -213,7 +213,7 @@ public final class MCUtil {
+@@ -215,7 +215,7 @@ public final class MCUtil {
      }
  
      public static long getCoordinateKey(final Entity entity) {
@@ -1475,29 +1475,54 @@ index d02546b18cb689724887b4e85e8d32a18828a4ad..91eaff58bb422ba188e6cfaa9c20b45b
      }
  
      public static long getCoordinateKey(final ChunkPos pair) {
+diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+index 0af9ed92824ccf30814eceb6a2c2e5c12661c991..67eeb39aede6908d2756e49821ca350ebe916902 100644
+--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
++++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+@@ -37,7 +37,7 @@ public class SignedMessageChain {
+                 throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.chain_broken"), false); // Paper - diff on change (if disconnects, need a new kick event cause)
+             } else if (playerPublicKey.data().hasExpired()) {
+                 throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.expiredProfileKey"), false, org.bukkit.event.player.PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY); // Paper - kick event causes
+-            } else if (body.timeStamp().isBefore(this.lastTimeStamp)) {
++            } else if (!gg.pufferfish.pufferfish.PufferfishConfig.disableOutOfOrderChat && body.timeStamp().isBefore(this.lastTimeStamp)) { // Pufferfish
+                 throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.out_of_order_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
+             } 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 97745f0bab8d82d397c6c2a5775aed92bca0a034..371049c1236c6443384c0ce184e99d5b9f8e57c2 100644
+index 2dc07e5ef249636e85ad9c78e3729e9e066a8fe8..b9e0a32f5829ca15f949effcafcbe2a975f6f690 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -308,6 +308,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     // Paper start - lag compensation
-     public static final long SERVER_INIT = System.nanoTime();
-     // Paper end - lag compensation
-+    
+@@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public volatile Thread shutdownThread; // Paper
+     public volatile boolean abnormalExit = false; // Paper
+     public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
 +    public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("MobSpawning"); // Pufferfish - optimize mob spawning
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1697,7 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1229,6 +1230,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 this.profiler.popPush("nextTickWait");
+                 this.mayHaveDelayedTasks = true;
+                 this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
++                // Pufferfish start - tps catchup
++                if (!gg.pufferfish.pufferfish.PufferfishConfig.tpsCatchup) {
++                    this.nextTickTimeNanos = currentTime + i;
++                    this.delayedTasksMaxNextTickTimeNanos = nextTickTimeNanos;
++                }
++                // Pufferfish end
+                 this.waitUntilNextTick();
+                 if (flag) {
+                     this.tickRateManager.endTickWork();
+@@ -1865,7 +1872,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Pufferfish"; // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return "Paper"; // Paper
++        return "Pufferfish"; // Pufferfish > // Paper
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
-@@ -2272,6 +2274,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2452,6 +2459,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -1506,19 +1531,19 @@ index 97745f0bab8d82d397c6c2a5775aed92bca0a034..371049c1236c6443384c0ce184e99d5b
      }
  
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index dbccbcb9b44e4efacdf53c2d161115cc20b36cff..66aeb0ea388a8c8a08cf33728921061a0c74552f 100644
+index 68d268b6fff126e8645b6deec3fb549ea2286b77..435b129c433704c24828d8fb57e14333c9423207 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -221,6 +221,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         // Paper end
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
 +        gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
 +        gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
-@@ -338,6 +340,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -339,6 +341,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
  
@@ -1527,10 +1552,10 @@ index dbccbcb9b44e4efacdf53c2d161115cc20b36cff..66aeb0ea388a8c8a08cf33728921061a
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0c2617574e21037d94ac56ad08b490f9bca5c5af..7eaee0d0dcbb420abb5c49ba0a465d90fe513551 100644
+index 12109446fc76a39faee6cda042ca48b3fd3809f4..1081e9df44bb24b2c51ebd9364c21c7b2a3a205a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -206,7 +206,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -243,7 +243,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      // Paper end
      // Paper start - optimise chunk tick iteration
      public final it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<ChunkHolder> needsChangeBroadcasting = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>();
@@ -1539,7 +1564,7 @@ index 0c2617574e21037d94ac56ad08b490f9bca5c5af..7eaee0d0dcbb420abb5c49ba0a465d90
      // Paper end - optimise chunk tick iteration
  
      public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
-@@ -1330,8 +1330,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1448,8 +1448,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  
@@ -1568,7 +1593,7 @@ index 0c2617574e21037d94ac56ad08b490f9bca5c5af..7eaee0d0dcbb420abb5c49ba0a465d90
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
  
              while (iterator.hasNext()) {
-@@ -1343,6 +1363,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1461,6 +1481,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      i = j;
                  }
              }
@@ -1579,91 +1604,71 @@ index 0c2617574e21037d94ac56ad08b490f9bca5c5af..7eaee0d0dcbb420abb5c49ba0a465d90
              return this.scaledRange(i);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 17b6925b46f8386dcfc561483693de516465ec12..5d9a1855cdab1a25ad22ad096c68e55143efa821 100644
+index 366c0c9b45a819f7f94ebe3e49b8ab7f9edf9ce7..1cf8c819c0d7776c3b33d6594ca81abe3c2a719d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -75,6 +75,9 @@ public class ServerChunkCache extends ChunkSource {
-     final it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap<LevelChunk> loadedChunkMap = new it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap<>(8192, 0.5f);
- 
+@@ -77,6 +77,9 @@ public class ServerChunkCache extends ChunkSource {
      private final LevelChunk[] lastLoadedChunks = new LevelChunk[4 * 4];
-+    
+     // Paper end
+ 
 +    public boolean firstRunSpawnCounts = true; // Pufferfish
 +    public final java.util.concurrent.atomic.AtomicBoolean _pufferfish_spawnCountsReady = new java.util.concurrent.atomic.AtomicBoolean(false); // Pufferfish - optimize countmobs
- 
-     private static int getChunkCacheKey(int x, int z) {
-         return x & 3 | ((z & 3) << 2);
-@@ -521,6 +524,7 @@ public class ServerChunkCache extends ChunkSource {
-             ProfilerFiller gameprofilerfiller = this.level.getProfiler();
- 
-             gameprofilerfiller.push("pollingChunks");
-+            this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random
-             int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
-             boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
- 
-@@ -530,28 +534,35 @@ public class ServerChunkCache extends ChunkSource {
-             // Paper start - per player mob spawning
-             NaturalSpawner.SpawnState spawnercreature_d; // moved down
-             if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
--                // re-set mob counts
--                for (ServerPlayer player : this.level.players) {
--                    // Paper start - per player mob spawning backoff
--                    for (int ii = 0; ii < ServerPlayer.MOBCATEGORY_TOTAL_ENUMS; ii++) {
--                        player.mobCounts[ii] = 0;
--
--                        int newBackoff = player.mobBackoffCounts[ii] - 1; // TODO make configurable bleed // TODO use nonlinear algorithm?
--                        if (newBackoff < 0) {
--                            newBackoff = 0;
-+                // Pufferfish start - moved down when async processing
-+                if (!gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) {
-+                    // re-set mob counts
-+                    for (ServerPlayer player : this.level.players) {
-+                        // Paper start - per player mob spawning backoff
-+                        for (int ii = 0; ii < ServerPlayer.MOBCATEGORY_TOTAL_ENUMS; ii++) {
-+                            player.mobCounts[ii] = 0;
 +
-+                            int newBackoff = player.mobBackoffCounts[ii] - 1; // TODO make configurable bleed // TODO use nonlinear algorithm?
-+                            if (newBackoff < 0) {
-+                                newBackoff = 0;
-+                            }
-+                            player.mobBackoffCounts[ii] = newBackoff;
+     public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, int simulationDistance, boolean dsync, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory) {
+         this.level = world;
+         this.mainThreadProcessor = new ServerChunkCache.MainThreadExecutor(world);
+@@ -513,6 +516,7 @@ public class ServerChunkCache extends ChunkSource {
+ 
+             // Paper - optimise chunk tick iteration
+ 
++            this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random
+             if (this.level.getServer().tickRateManager().runsNormally()) {
+                 gameprofilerfiller.popPush("naturalSpawnCount");
+                 this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
+@@ -521,6 +525,7 @@ public class ServerChunkCache extends ChunkSource {
+                 int naturalSpawnChunkCount = k;
+                 NaturalSpawner.SpawnState spawnercreature_d; // moved down
+                 if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
++                    if (!gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) { // Pufferfish - moved down when async processing
+                     // re-set mob counts
+                     for (ServerPlayer player : this.level.players) {
+                         // Paper start - per player mob spawning backoff
+@@ -535,14 +540,18 @@ public class ServerChunkCache extends ChunkSource {
                          }
--                        player.mobBackoffCounts[ii] = newBackoff;
-+                        // Paper end - per player mob spawning backoff
+                         // Paper end - per player mob spawning backoff
                      }
--                    // Paper end - per player mob spawning backoff
-+                    lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
+-                    spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
++                    lastSpawnState = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true); // Pufferfish - async mob spawning
++                    } // Pufferfish - (endif) moved down when async processing
+                 } else {
+-                    spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
++                    // Pufferfish start - async mob spawning
++                    lastSpawnState = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
++                    _pufferfish_spawnCountsReady.set(true);
++                    // Pufferfish end
                  }
--                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
-+                // Pufferfish end
-             } else {
--                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
-+                // Pufferfish start
-+                lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
-+                _pufferfish_spawnCountsReady.set(true);
-+                // Pufferfish end
-             }
-             // Paper end
-             this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
+                 // Paper end - Optional per player mob spawns
+                 this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
  
--            this.lastSpawnState = spawnercreature_d;
-+            //this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously
-             gameprofilerfiller.popPush("filteringLoadedChunks");
-             // Paper - optimise chunk tick iteration
-             // Paper - optimise chunk tick iteration
-@@ -644,8 +655,8 @@ public class ServerChunkCache extends ChunkSource {
-                 // Paper end - optimise chunk tick iteration
-                 if (tick && chunk1.chunkStatus.isOrAfter(net.minecraft.server.level.FullChunkStatus.ENTITY_TICKING)) { // Paper - optimise chunk tick iteration
-                     chunk1.incrementInhabitedTime(j);
--                    if (spawn && flag2 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration
--                        NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
-+                    if (spawn && flag2 && (!gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning || _pufferfish_spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration // Pufferfish
-+                        NaturalSpawner.spawnForChunk(this.level, chunk1, lastSpawnState, this.spawnFriendlies, this.spawnEnemies, flag1); // Pufferfish
-                     }
+-                this.lastSpawnState = spawnercreature_d;
++                // this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously
+                 gameprofilerfiller.popPush("spawnAndTick");
+                 boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
  
-                     if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - optimise chunk tick iteration
-@@ -691,6 +702,40 @@ public class ServerChunkCache extends ChunkSource {
+@@ -632,8 +641,8 @@ public class ServerChunkCache extends ChunkSource {
+                     if (tick && chunk1.chunkStatus.isOrAfter(net.minecraft.server.level.FullChunkStatus.ENTITY_TICKING)) {
+                         // Paper end - optimise chunk tick iteration
+                         chunk1.incrementInhabitedTime(j);
+-                        if (spawn && flag && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration
+-                            NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
++                        if (spawn && flag && (!gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning || _pufferfish_spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration // Pufferfish
++                            NaturalSpawner.spawnForChunk(this.level, chunk1, lastSpawnState, this.spawnFriendlies, this.spawnEnemies, flag1); // Pufferfish
+                         }
+ 
+                         if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - optimise chunk tick iteration
+@@ -680,6 +689,40 @@ public class ServerChunkCache extends ChunkSource {
+             gameprofilerfiller.pop();
              gameprofilerfiller.pop();
-             this.chunkMap.tick();
          }
 +    
 +        // Pufferfish start - optimize mob spawning
@@ -1703,10 +1708,10 @@ index 17b6925b46f8386dcfc561483693de516465ec12..5d9a1855cdab1a25ad22ad096c68e551
  
      private void getFullChunk(long pos, Consumer<LevelChunk> chunkConsumer) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 35674f92a67f93382103c2766df4b678ba5c862f..d46e61640b241d32df05240dedd2c23f138725e6 100644
+index 529ab44baaf573b97cf7e89560c548642733188f..db55ad9aaabfa1ea998754f3ac352d1698936696 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -177,7 +177,8 @@ public class ServerEntity {
+@@ -183,7 +183,8 @@ public class ServerEntity {
                      long i1 = this.positionCodec.encodeZ(vec3d);
                      boolean flag6 = k < -32768L || k > 32767L || l < -32768L || l > 32767L || i1 < -32768L || i1 > 32767L;
  
@@ -1716,7 +1721,7 @@ index 35674f92a67f93382103c2766df4b678ba5c862f..d46e61640b241d32df05240dedd2c23f
                          if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) {
                              if (flag2) {
                                  packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.onGround());
-@@ -191,6 +192,7 @@ public class ServerEntity {
+@@ -197,6 +198,7 @@ public class ServerEntity {
                              flag4 = true;
                              flag5 = true;
                          }
@@ -1725,18 +1730,18 @@ index 35674f92a67f93382103c2766df4b678ba5c862f..d46e61640b241d32df05240dedd2c23f
                          this.wasOnGround = this.entity.onGround();
                          this.teleportDelay = 0;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 17610196db7a1c6feb2cf74a02479a8691aa323f..c1b03e4c37ea85ddf283479682d0eb2eca57ee3c 100644
+index 502bdc726b7890b00ee36871d905dea44e8719e3..fbffe3dab1b7812b50df5d6bddf4fbdb2e583339 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -878,6 +878,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -894,6 +894,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
-             timings.entityTick.startTiming(); // Spigot
+             this.timings.entityTick.startTiming(); // Spigot
              this.entityTickList.forEach((entity) -> {
 +                entity.activatedPriorityReset = false; // Pufferfish - DAB
                  if (!entity.isRemoved()) {
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
-@@ -897,7 +898,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -913,7 +914,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              }
  
                              gameprofilerfiller.push("tick");
@@ -1751,14 +1756,14 @@ index 17610196db7a1c6feb2cf74a02479a8691aa323f..c1b03e4c37ea85ddf283479682d0eb2e
 +                            final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
 +                            MinecraftServer.LOGGER.error(msg, throwable);
 +                            getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, throwable)));
-+                            entity.discard();
++                            entity.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
 +                            // Paper end
 +                        }
 +                        // Pufferfish end
                              gameprofilerfiller.pop();
                          }
                      }
-@@ -962,9 +976,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -978,9 +992,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -1771,35 +1776,27 @@ index 17610196db7a1c6feb2cf74a02479a8691aa323f..c1b03e4c37ea85ddf283479682d0eb2e
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
-@@ -975,7 +991,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -991,7 +1007,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.push("thunder");
          final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
  
--        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder
-+        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0 &&*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - disable thunder // Pufferfish - replace random with shouldDoLightning
+-        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
++        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0 &&*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - Option to disable thunder // Pufferfish - replace random with shouldDoLightning
              blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
  
              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 34fcdeb0f4039f1fc6c4c8c593cc615560af1ba2..ef6d8f787cba0db53270adedd923f9a47d435852 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
-@@ -1118,6 +1118,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1135,6 +1135,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {
 +        if (!gg.pufferfish.pufferfish.PufferfishConfig.enableBooks && !this.player.getBukkitEntity().hasPermission("pufferfish.usebooks")) return; // Pufferfish
-         // Paper start
+         // Paper start - Book size limits
          if (!this.cserver.isPrimaryThread()) {
              List<String> pageList = packet.getPages();
-@@ -2273,6 +2274,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     }
- 
-     private boolean updateChatOrder(Instant timestamp) {
-+        if (gg.pufferfish.pufferfish.PufferfishConfig.disableOutOfOrderChat) return true;
-         Instant instant1;
- 
-         do {
 diff --git a/src/main/java/net/minecraft/world/CompoundContainer.java b/src/main/java/net/minecraft/world/CompoundContainer.java
 index 241fec02e6869c638d3a160819b32173a081467b..6a8f9e8f5bf108674c47018def28906e2d0a729c 100644
 --- a/src/main/java/net/minecraft/world/CompoundContainer.java
@@ -1913,10 +1910,10 @@ index d6cbe98e67fdbf8db46338a88ab1356dd63b50a3..20dd3a63b2f955b05a75eb240e33ae4c
      int LARGE_MAX_STACK_SIZE = 64;
      int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f20ae9153b7098980ce6c0e75fcbbb4da652661b..505ed0f8f933428192f5fc806ff52d84acea7f99 100644
+index 637478fd8a284e6833cf8f5fa17ccf9d73d1dd3f..1aa45e64e49ea011c2ba5e943b4e72c4f3a47176 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -305,7 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -309,7 +309,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public double yo;
      public double zo;
      private Vec3 position;
@@ -1925,20 +1922,17 @@ index f20ae9153b7098980ce6c0e75fcbbb4da652661b..505ed0f8f933428192f5fc806ff52d84
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
      private float yRot;
-@@ -433,6 +433,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         return this.originWorld;
-     }
-     // Paper end
-+    // Pufferfish start
-+    public boolean activatedPriorityReset = false; // DAB
-+    public int activatedPriority = gg.pufferfish.pufferfish.PufferfishConfig.maximumActivationPrio; // golf score
-+    public final BlockPos.MutableBlockPos cachedBlockPos = new BlockPos.MutableBlockPos(); // used where needed
-+    // Pufferfish end
-+    
-     public float getBukkitYaw() {
-         return this.yRot;
-     }
-@@ -765,6 +771,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -424,6 +424,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+     private UUID originWorld;
+     public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
+     public boolean fixedPose = false; // Paper - Expand Pose API
++    public boolean activatedPriorityReset = false; // Pufferfish - DAB
++    public int activatedPriority = gg.pufferfish.pufferfish.PufferfishConfig.maximumActivationPrio; // Pufferfish - DAB (golf score)
++    public final BlockPos.MutableBlockPos cachedBlockPos = new BlockPos.MutableBlockPos(); // Pufferfish - reduce entity allocations
+ 
+     public void setOrigin(@javax.annotation.Nonnull Location location) {
+         this.origin = location.toVector();
+@@ -820,6 +823,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void tick() {
@@ -1951,7 +1945,7 @@ index f20ae9153b7098980ce6c0e75fcbbb4da652661b..505ed0f8f933428192f5fc806ff52d84
          this.baseTick();
      }
  
-@@ -4324,16 +4336,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4421,16 +4430,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -1977,7 +1971,7 @@ index f20ae9153b7098980ce6c0e75fcbbb4da652661b..505ed0f8f933428192f5fc806ff52d84
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4341,14 +4355,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4438,14 +4449,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -2045,7 +2039,7 @@ index f20ae9153b7098980ce6c0e75fcbbb4da652661b..505ed0f8f933428192f5fc806ff52d84
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4370,9 +4431,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4467,9 +4525,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                                  // CraftBukkit end
                              }
                          }
@@ -2059,10 +2053,10 @@ index f20ae9153b7098980ce6c0e75fcbbb4da652661b..505ed0f8f933428192f5fc806ff52d84
              if (vec3d.length() > 0.0D) {
                  if (k1 > 0) {
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 73871f456a85bda1e51f54986d0e61fb629822e8..2561e74ffdf595a9b6ae13dcd738662c772db442 100644
+index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..dc11683ee4d8a6b7a1c42bcae36dc6e8105cd994 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -301,6 +301,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -305,6 +305,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
      private final boolean canSpawnFarFromPlayer;
      private final int clientTrackingRange;
      private final int updateInterval;
@@ -2072,10 +2066,10 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..2561e74ffdf595a9b6ae13dcd738662c
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b95f88d5e5b4785ee063695fd81935636a0588d1..2cdc2bd62f0cb62f75365b6b3e6d80d9a2132451 100644
+index e9bb7feb591032904516d1b9374f486d8a7d066c..366121188c5abb550ed0a5f99d25c001628685bb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
+@@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
  import org.bukkit.event.player.PlayerItemConsumeEvent;
  // CraftBukkit end
  
@@ -2092,7 +2086,7 @@ index b95f88d5e5b4785ee063695fd81935636a0588d1..2cdc2bd62f0cb62f75365b6b3e6d80d9
                      this.hurt(this.damageSources().inWall(), 1.0F);
                  } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
                      double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
-@@ -1401,6 +1400,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1418,6 +1417,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.getHealth() <= 0.0F;
      }
  
@@ -2112,7 +2106,7 @@ index b95f88d5e5b4785ee063695fd81935636a0588d1..2cdc2bd62f0cb62f75365b6b3e6d80d9
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -1999,6 +2011,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2024,6 +2036,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.lastClimbablePos;
      }
  
@@ -2134,10 +2128,10 @@ index b95f88d5e5b4785ee063695fd81935636a0588d1..2cdc2bd62f0cb62f75365b6b3e6d80d9
          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 d28c477171c1b6888a45175075017d960464b5cd..4cb836dfa7cbd2e634d4a3a567da0305aac0da4d 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
-@@ -220,14 +220,16 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -222,14 +222,16 @@ public abstract class Mob extends LivingEntity implements Targeting {
          return this.lookControl;
      }
  
@@ -2178,7 +2172,7 @@ index d28c477171c1b6888a45175075017d960464b5cd..4cb836dfa7cbd2e634d4a3a567da0305
              this.level().getProfiler().pop();
          }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 7204b973c3ad9239e82355513f6d538107102e48..3087f8359b098682a345399c85395de8a15b6eed 100644
+index b99a080ab27e24d8131fda931ca70d6d271bb01c..8d6954d05d2bf6d6c1c4953db3127b011a858cec 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 @@ -23,9 +23,11 @@ public class AttributeMap {
@@ -2189,29 +2183,27 @@ index 7204b973c3ad9239e82355513f6d538107102e48..3087f8359b098682a345399c85395de8
  
      public AttributeMap(AttributeSupplier defaultAttributes) {
          this.supplier = defaultAttributes;
-+        this.createInstance = attribute -> this.supplier.createInstance(this::onAttributeModified, attribute); // Pufferfish
++        this.createInstance = attributex -> this.supplier.createInstance(this::onAttributeModified, attributex); // Pufferfish
      }
  
      private void onAttributeModified(AttributeInstance instance) {
-@@ -45,11 +47,10 @@ public class AttributeMap {
-         }).collect(Collectors.toList());
+@@ -42,9 +44,10 @@ public class AttributeMap {
+         return this.attributes.values().stream().filter(attribute -> attribute.getAttribute().isClientSyncable()).collect(Collectors.toList());
      }
  
 +
      @Nullable
      public AttributeInstance getInstance(Attribute attribute) {
--        return this.attributes.computeIfAbsent(attribute, (attributex) -> {
--            return this.supplier.createInstance(this::onAttributeModified, attributex);
--        });
+-        return this.attributes.computeIfAbsent(attribute, attributex -> this.supplier.createInstance(this::onAttributeModified, attributex));
 +        return this.attributes.computeIfAbsent(attribute, this.createInstance); // Pufferfish - cache lambda, as for some reason java allocates it anyways
      }
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
-index 646d9a121d908a2fc3e4e302484dd5cd1bfc6804..e546ecdccde352502e26a8668eaaafe048d6e282 100644
+index 758f62416ca9c02351348ac0d41deeb4624abc0e..69130969c9a434ec2361e573c9a1ec9f462dfda2 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
-@@ -37,7 +37,11 @@ public class VillagerPanicTrigger extends Behavior<Villager> {
+@@ -36,7 +36,11 @@ public class VillagerPanicTrigger extends Behavior<Villager> {
  
      @Override
      protected void tick(ServerLevel world, Villager entity, long time) {
@@ -2223,12 +2215,12 @@ index 646d9a121d908a2fc3e4e302484dd5cd1bfc6804..e546ecdccde352502e26a8668eaaafe0
 +            // Pufferfish end
              entity.spawnGolemIfNeeded(world, time, 3);
          }
- 
+     }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index b738ee2d3801fadfd09313f05ae24593e56b0ec6..1635818fc4b1788c0d397085239df6dd75b210ab 100644
+index 38af5c7280366fd6ec077f3d914ea5f3ee77451a..d78e1f6191738d426968efc24e734f04b0fc7edb 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -53,9 +53,12 @@ public class GoalSelector {
+@@ -52,9 +52,12 @@ public class GoalSelector {
      }
  
      // Paper start
@@ -2244,27 +2236,27 @@ index b738ee2d3801fadfd09313f05ae24593e56b0ec6..1635818fc4b1788c0d397085239df6dd
      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 34f319ad09276c6f68dde449c79351de0d7d86f5..a719af0b512d9ef243d0d54f3b744b1b1a5f2772 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 {
-                 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) {
+@@ -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);
 +                        if (!this.mob.level().hasChunkAt(mutableBlockPos)) continue; // Pufferfish - if this block isn't loaded, continue
                          if (this.mob.isWithinRestriction(mutableBlockPos) && this.isValidTarget(this.mob.level(), mutableBlockPos)) {
                              this.blockPos = mutableBlockPos;
-                             setTargetPosition(mutableBlockPos.immutable()); // Paper
+                             this.mob.movingTarget = mutableBlockPos == BlockPos.ZERO ? null : mutableBlockPos.immutable(); // Paper
 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 c157309ac78e7af084d3acb6e8b2bcd469a39d5e..ac5e5676b194a2a99e5cf53eb89c1152cac963b8 100644
+index d2f0c3b26d4beedb49d86e0242d843590d469d02..28cff997a1b263784e245f692adbff2a888a2d53 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
-@@ -75,9 +75,18 @@ public class TargetingConditions {
+@@ -76,9 +76,18 @@ public class TargetingConditions {
                  }
  
-                 if (this.range > 0.0D) {
--                    double d = this.testInvisible ? targetEntity.getVisibilityPercent(baseEntity) : 1.0D;
--                    double e = Math.max((this.useFollowRange ? this.getFollowRange(baseEntity) : this.range) * d, 2.0D); // Paper
+                 if (this.range > 0.0) {
+-                    double d = this.testInvisible ? targetEntity.getVisibilityPercent(baseEntity) : 1.0;
+-                    double e = Math.max((this.useFollowRange ? this.getFollowRange(baseEntity) : this.range) * d, 2.0); // Paper - Fix MC-145656
 +                    // Pufferfish start - check range before getting visibility
 +                    // d = invisibility percent, e = follow range adjusted for invisibility, f = distance
                      double f = baseEntity.distanceToSqr(targetEntity.getX(), targetEntity.getY(), targetEntity.getZ());
@@ -2274,17 +2266,17 @@ index c157309ac78e7af084d3acb6e8b2bcd469a39d5e..ac5e5676b194a2a99e5cf53eb89c1152
 +                        return false;
 +                    }
 +
-+                    double d = this.testInvisible ? targetEntity.getVisibilityPercent(baseEntity) : 1.0D;
-+                    double e = Math.max((followRangeRaw) * d, 2.0D); // Paper
++                    double d = this.testInvisible ? targetEntity.getVisibilityPercent(baseEntity) : 1.0;
++                    double e = Math.max((followRangeRaw) * d, 2.0); // Paper - Fix MC-145656
 +                    // Pufferfish end
                      if (f > e * e) {
                          return false;
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 5beaa849a250ea005733250ad3edfa8382224667..2c91fe46355c9a201507de5577f693ed4f5fb974 100644
+index 44fa2d4f90389f5526746bd94a2450c03340bd0b..4fba7c2f6ec363846a772ef2a63e9b3fc1037de5 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -237,13 +237,22 @@ public class Bat extends AmbientCreature {
+@@ -241,13 +241,22 @@ public class Bat extends AmbientCreature {
          }
      }
  
@@ -2325,10 +2317,10 @@ index 5ad5f22e5aa26445e5eb229958e7bf356bdd460e..d241ca4d0295f9fce39c11197bd435cf
          this.level().getProfiler().pop();
          this.level().getProfiler().push("allayActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index aa850cfaa0534d57e83f37360724da2428a48a18..eb1e850f11ed1cd8d2f1f2eb1af55b7fe6352ed4 100644
+index b21e180641d17438997a80e5bcb0ec7998d24a2e..33c160994f70f71446d665e7487913437c9f9db4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -280,9 +280,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -275,9 +275,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
          return true;
      }
  
@@ -2341,11 +2333,11 @@ index aa850cfaa0534d57e83f37360724da2428a48a18..eb1e850f11ed1cd8d2f1f2eb1af55b7f
          this.level().getProfiler().pop();
          this.level().getProfiler().push("axolotlActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 5000ebc5f19dee72a86360062b822aecd60beb47..c8e3d47b3f2dc919cca8ad397095437f1da6c762 100644
+index a03fb7aa9f4528f4885db88eaf480202d5f54750..1767fd2df8cb37e9c36fa3008b5131ff4bdad12c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -164,9 +164,11 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
-         return true;
+@@ -183,9 +183,11 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+         }
      }
  
 +    private int behaviorTick = 0; // Pufferfish
@@ -2357,10 +2349,10 @@ index 5000ebc5f19dee72a86360062b822aecd60beb47..c8e3d47b3f2dc919cca8ad397095437f
          this.level().getProfiler().pop();
          this.level().getProfiler().push("frogActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..6ed4ac06c76b8d0d6e8db778cade15dbd1e3e5f5 100644
+index 958816ce2166248b542c96c10c398a52d769b4db..415afe3473d9f8a50b1edab8cfda6158e59836e6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -77,9 +77,11 @@ public class Tadpole extends AbstractFish {
+@@ -80,9 +80,11 @@ public class Tadpole extends AbstractFish {
          return SoundEvents.TADPOLE_FLOP;
      }
  
@@ -2373,7 +2365,7 @@ index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..6ed4ac06c76b8d0d6e8db778cade15db
          this.level().getProfiler().pop();
          this.level().getProfiler().push("tadpoleActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 111a244087e24f25ba8524a46a228da10cd9498a..ff12ba2b79cb2e7e0bfd0e3b58ff6cb9e770092b 100644
+index 5d247ac38fe8a61603b3d934f3000bcda773142b..2e4177cfb02616ef6fa689f6d378976e39484cfb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -191,9 +191,11 @@ public class Goat extends Animal {
@@ -2389,10 +2381,10 @@ index 111a244087e24f25ba8524a46a228da10cd9498a..ff12ba2b79cb2e7e0bfd0e3b58ff6cb9
          this.level().getProfiler().pop();
          this.level().getProfiler().push("goatActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65 100644
+index 12440ee2dccc0a697fb403765f2e1b987ccc0283..de2471cfa96a23944f229f33ffdff88b6b7756e4 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -150,6 +150,13 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -151,6 +151,13 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          this.bossEvent.setName(this.getDisplayName());
      }
  
@@ -2407,7 +2399,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..c65ab566c6241dd6a44bd11a449ef0c4
      protected SoundEvent getAmbientSound() {
          return SoundEvents.WITHER_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index b0a97679157a18a3c623ce3b2ae315789772c254..9fc3db543a0c9df502df5fb85012c6aa590e887d 100644
+index f33c03e81b7ff643741f56eea055e6af260de618..6563e625ebae47fc68e5010d36bd4b4d327c07b7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -333,11 +333,17 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -2431,11 +2423,11 @@ index b0a97679157a18a3c623ce3b2ae315789772c254..9fc3db543a0c9df502df5fb85012c6aa
          boolean flag1 = iblockdata.getFluidState().is(FluidTags.WATER);
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 4257f2282152aee09533c9a2e53018d3e49effa4..e703320717ff620a19ff76d1c10066117c9895d5 100644
+index 050ffa4a23feba29fdf4c6a175cdff4e5009027d..1299f93d4f983e6715e447add65df91ef9e9090a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -128,9 +128,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
-         return (Brain<Hoglin>) super.getBrain(); // Paper - decompile fix
+@@ -155,9 +155,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+         return (Brain<Hoglin>)super.getBrain();
      }
  
 +    private int behaviorTick; // Pufferfish
@@ -2447,7 +2439,7 @@ index 4257f2282152aee09533c9a2e53018d3e49effa4..e703320717ff620a19ff76d1c1006611
          this.level().getProfiler().pop();
          HoglinAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 6407ddef8442fce4f310ac4babf3e3de0dd5fc9a..cfdc1650783d6855e0d4f33ec68aab48dbee09f0 100644
+index a9813da7f2b248f98f22e0ad2e7842915025ec12..83d83e3f84bb6bd58761671c6cd4c8683545ff4c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -300,9 +300,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -2463,10 +2455,10 @@ index 6407ddef8442fce4f310ac4babf3e3de0dd5fc9a..cfdc1650783d6855e0d4f33ec68aab48
          this.level().getProfiler().pop();
          PiglinAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index b2bc3a832c310448046ccde37a04918aa6d63197..5e43912708f9074dee1bb351efa737a7e6796fc3 100644
+index 937f81a859953498abe73bea560c86e6560e1c33..0a151c679b0dc943598180942d6d4b3886211688 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -272,11 +272,13 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -273,11 +273,13 @@ public class Warden extends Monster implements VibrationSystem {
  
      }
  
@@ -2481,10 +2473,10 @@ index b2bc3a832c310448046ccde37a04918aa6d63197..5e43912708f9074dee1bb351efa737a7
          this.level().getProfiler().pop();
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index f555e29c7f9ea4ddb243a018bdc93d2bf1950c3c..bbcc0356b4c0470502e893cf2dc2f16936a88bc4 100644
+index 24044795d8e0f1fb15a4f2f5401f44897092f2a3..96ca567af2d8fb2ba39f995be80b935344550124 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -142,6 +142,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -143,6 +143,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return holder.is(PoiTypes.MEETING);
      });
  
@@ -2493,7 +2485,7 @@ index f555e29c7f9ea4ddb243a018bdc93d2bf1950c3c..bbcc0356b4c0470502e893cf2dc2f169
      public Villager(EntityType<? extends Villager> entityType, Level world) {
          this(entityType, world, VillagerType.PLAINS);
      }
-@@ -245,6 +247,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -246,6 +248,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      // Spigot End
  
@@ -2501,7 +2493,7 @@ index f555e29c7f9ea4ddb243a018bdc93d2bf1950c3c..bbcc0356b4c0470502e893cf2dc2f169
      @Override
      @Deprecated // Paper
      protected void customServerAiStep() {
-@@ -254,7 +257,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -255,7 +258,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      protected void customServerAiStep(final boolean inactive) {
          // Paper end
          this.level().getProfiler().push("villagerBrain");
@@ -2515,7 +2507,7 @@ index f555e29c7f9ea4ddb243a018bdc93d2bf1950c3c..bbcc0356b4c0470502e893cf2dc2f169
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
 diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-index 96d664c28738d6090f7067761c2978dd1aa0fd0e..b1c24a02b87aca7b180a6efbce177f2300db49c1 100644
+index 96c898086f35fd83f9b1ce7e3fe53d31b2fa4c31..c6a925cbd35eb33b27b90bfa8344ac7515d28b76 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
 @@ -687,6 +687,8 @@ public class Inventory implements Container, Nameable {
@@ -2547,10 +2539,10 @@ index 96d664c28738d6090f7067761c2978dd1aa0fd0e..b1c24a02b87aca7b180a6efbce177f23
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a90317100d32974e481e14476843f66997a2cf3a..cd0629581bae5f805842157af36c2d838e01bee3 100644
+index 156809090f1f83ad68e7e2477a3cfddac5757a8e..837f68825f601971f374be47952b23108bf66ba6 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -44,6 +44,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -45,6 +45,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {
          super(type, world);
      }
  
@@ -2588,10 +2580,10 @@ index a90317100d32974e481e14476843f66997a2cf3a..cd0629581bae5f805842157af36c2d83
          if (entity != null) {
              this.ownerUUID = entity.getUUID();
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 272095d7a09ab41227d741172735f66fd2798ce1..47692d6db44b58bb724c87128279bd0d3e62a398 100644
+index 756d0434472921992c9d84597d7c9c824e93614c..38c573d440946ca7ee6016ef92e9c1605031e611 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
+@@ -28,7 +28,10 @@ import org.bukkit.inventory.InventoryHolder;
  
  public abstract class AbstractMinecartContainer extends AbstractMinecart implements ContainerEntity {
  
@@ -2602,7 +2594,7 @@ index 272095d7a09ab41227d741172735f66fd2798ce1..47692d6db44b58bb724c87128279bd0d
      @Nullable
      public ResourceLocation lootTable;
      public long lootTableSeed;
-@@ -89,12 +92,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+@@ -90,12 +93,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
  
      protected AbstractMinecartContainer(EntityType<?> type, Level world) {
          super(type, world);
@@ -2623,7 +2615,7 @@ index 272095d7a09ab41227d741172735f66fd2798ce1..47692d6db44b58bb724c87128279bd0d
      }
  
      @Override
-@@ -156,6 +165,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+@@ -164,6 +173,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
      protected void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
          this.lootableData.loadNbt(nbt); // Paper
@@ -2635,7 +2627,7 @@ index 272095d7a09ab41227d741172735f66fd2798ce1..47692d6db44b58bb724c87128279bd0d
      }
  
 diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-index 5a19875cbc603acea95193d969d2e1dc1e0bfd78..3688e9f8c6c6d1239095e3a87060ccca90386d0c 100644
+index e1696f6b77df4c8fceaece64701d4db78b0a4c42..faa3f62d22266a3c32d6c95c3ffebd4aa3880739 100644
 --- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
 +++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
 @@ -55,7 +55,7 @@ public class EndCrystalItem extends Item {
@@ -2644,11 +2636,11 @@ index 5a19875cbc603acea95193d969d2e1dc1e0bfd78..3688e9f8c6c6d1239095e3a87060ccca
  
 -                        if (enderdragonbattle != null) {
 +                        if (enderdragonbattle != null && gg.pufferfish.pufferfish.PufferfishConfig.allowEndCrystalRespawn) { // Pufferfish
-                             enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - pass placed end crystal position to pre-check proximity to portal
+                             enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - Perf: Do crystal-portal proximity check before entity lookup
                          }
                      }
 diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-index 38f7d1ece27ec1a3deda21fb6a6f0e788c8ed718..252fc22844682c0f67dc02a87478e01e49b6430d 100644
+index 27b0a79f7a7c47047216aae42944bac2a2151181..a097cfc528f709c80575f35483b6878314ea2717 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 @@ -26,8 +26,13 @@ public class ShapelessRecipe extends io.papermc.paper.inventory.recipe.RecipeBoo
@@ -2695,35 +2687,35 @@ index 38f7d1ece27ec1a3deda21fb6a6f0e788c8ed718..252fc22844682c0f67dc02a87478e01e
          autorecipestackmanager.initialize(this); // Paper - better exact choice recipes
          int i = 0;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ea8a0961190e9aafda4fed6fecd85097c141040a..1e2620338f0b6fd1c160a8f8d6b659e273f2f1c9 100644
+index ca89d1593bf1b46c79a882db528cbca1359dc9d4..a82de7111915b19cdc3f065910465a5e7e843aff 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -210,6 +210,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -215,6 +215,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     // Paper end
  
      public abstract ResourceKey<LevelStem> getTypeKey();
- 
++    
 +    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
-+
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
+ 
+     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
-         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-@@ -1308,13 +1310,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1317,13 +1319,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
              MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
 -        } catch (Throwable throwable) {
 +        } catch (Throwable throwable) { // Pufferfish - diff on change ServerLevel.tick
              if (throwable instanceof ThreadDeath) throw throwable; // Paper
-             // Paper start - Prevent tile entity and entity crashes
+             // Paper start - Prevent block entity and entity crashes
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
-             getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
--            entity.discard();
-+            entity.discard(); // Pufferfish - diff on change ServerLevel.tick
-             // Paper end
+             getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, throwable))); // Paper - ServerExceptionEvent
+-            entity.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
++            entity.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD); // Pufferfish - diff on change ServerLevel.tick
+             // Paper end - Prevent block entity and entity crashes
          }
      }
-@@ -1779,6 +1781,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1797,6 +1799,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public ProfilerFiller getProfiler() {
@@ -2732,10 +2724,10 @@ index ea8a0961190e9aafda4fed6fecd85097c141040a..1e2620338f0b6fd1c160a8f8d6b659e2
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 3cdddda9c0618e95288b81b975d499c8dd30c05f..9c2d62feff1816f5729060c6192269a5b2d34153 100644
+index da7489986848316fed029b71d1bc4e1248c9c9a8..661acdf4b1f33d150b0caf179e925d3162d7be35 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -429,12 +429,12 @@ public final class NaturalSpawner {
+@@ -425,12 +425,12 @@ public final class NaturalSpawner {
          }
      }
  
@@ -2753,17 +2745,16 @@ index 3cdddda9c0618e95288b81b975d499c8dd30c05f..9c2d62feff1816f5729060c6192269a5
          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 65012a12e1430956ef55ced56773e6354ac26444..ed439b7e94646141c93a7dd3704d1cdeb5c27e16 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
-@@ -66,14 +66,20 @@ public final class Biome {
+@@ -63,13 +63,18 @@ public final class Biome {
      private final BiomeGenerationSettings generationSettings;
      private final MobSpawnSettings mobSettings;
      private final BiomeSpecialEffects specialEffects;
--    private final ThreadLocal<Long2FloatLinkedOpenHashMap> temperatureCache = ThreadLocal.withInitial(() -> {
+-    private final ThreadLocal<Long2FloatLinkedOpenHashMap> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
 +    // Pufferfish start - use our cache
-+    private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> {
-         return Util.make(() -> {
++    private final ThreadLocal<gg.airplane.structs.Long2FloatAgingCache> temperatureCache = ThreadLocal.withInitial(() -> Util.make(() -> {
 +            /*
              Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
                  protected void rehash(int i) {
@@ -2771,14 +2762,13 @@ index 65012a12e1430956ef55ced56773e6354ac26444..ed439b7e94646141c93a7dd3704d1cde
              };
              long2FloatLinkedOpenHashMap.defaultReturnValue(Float.NaN);
              return long2FloatLinkedOpenHashMap;
-+
 +             */
 +            return new gg.airplane.structs.Long2FloatAgingCache(TEMPERATURE_CACHE_SIZE);
 +            // Pufferfish end
-         });
-     });
+         }));
  
-@@ -118,17 +124,15 @@ public final class Biome {
+     Biome(Biome.ClimateSettings weather, BiomeSpecialEffects effects, BiomeGenerationSettings generationSettings, MobSpawnSettings spawnSettings) {
+@@ -112,17 +117,15 @@ public final class Biome {
      @Deprecated
      public float getTemperature(BlockPos blockPos) {
          long l = blockPos.asLong();
@@ -2802,7 +2792,7 @@ index 65012a12e1430956ef55ced56773e6354ac26444..ed439b7e94646141c93a7dd3704d1cde
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f3040b26a 100644
+index 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..3514022d898a24052c917ebf55dcef3e757d6836 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 @@ -31,7 +31,10 @@ import org.bukkit.entity.HumanEntity;
@@ -2880,10 +2870,10 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..1cfacc7dfa4a761c4a4fb28f9bb02e95bace32f4 100644
+index cdb739df2a285032d25d84f4464f202a7a3fa578..6b9cd8543a5bfc2b936ba18f66ffd60f2f792e43 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -48,7 +48,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
  
      public static final int MOVE_ITEM_SPEED = 8;
      public static final int HOPPER_CONTAINER_SIZE = 5;
@@ -2891,10 +2881,10 @@ index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..1cfacc7dfa4a761c4a4fb28f9bb02e95
      private NonNullList<ItemStack> items;
 +    private gg.airplane.structs.ItemListWithBitset optimizedItems; // Pufferfish
 +    // Pufferfish end
-     private int cooldownTime;
+     public int cooldownTime;
      private long tickedGameTime;
  
-@@ -83,14 +86,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -84,14 +87,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
  
      public HopperBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.HOPPER, pos, state);
@@ -2934,28 +2924,27 @@ index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..1cfacc7dfa4a761c4a4fb28f9bb02e95
          if (!this.tryLoadLootTable(nbt)) {
              ContainerHelper.loadAllItems(nbt, this.items);
          }
-@@ -491,6 +517,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -492,6 +518,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
      }
  
      private static boolean isFullContainer(Container inventory, Direction direction) {
 +        if (true) return inventory.isCompletelyFull(direction); // Pufferfish - use bitsets
-         // Paper start - optimize hoppers
+         // Paper start - Perf: Optimize Hoppers
          if (inventory instanceof WorldlyContainer worldlyContainer) {
              for (final int slot : worldlyContainer.getSlotsForFace(direction)) {
-@@ -513,7 +540,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -514,7 +541,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
      }
  
      private static boolean isEmptyContainer(Container inv, Direction facing) {
--        return allMatch(inv, facing, IS_EMPTY_TEST);
-+        // Paper start
+-        return allMatch(inv, facing, IS_EMPTY_TEST); // Paper - Perf: Optimize Hoppers
 +        // Pufferfish start - use bitsets
-+        //return allMatch(inv, facing, IS_EMPTY_TEST);
++        //return allMatch(inv, facing, IS_EMPTY_TEST); // Paper - Perf: Optimize Hoppers
 +        return inv.isCompletelyEmpty(facing);
 +        // Pufferfish end
      }
  
      public static boolean suckInItems(Level world, Hopper hopper) {
-@@ -713,7 +744,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -714,7 +744,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
  
          if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
              boolean flag = false;
@@ -2964,7 +2953,7 @@ index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..1cfacc7dfa4a761c4a4fb28f9bb02e95
  
              if (itemstack1.isEmpty()) {
                  // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
-@@ -908,7 +939,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -909,7 +939,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
  
      @Override
      protected void setItems(NonNullList<ItemStack> list) {
@@ -2977,13 +2966,13 @@ index 1d9b23c6e458caddc2c738164e6c079cd85d3ce9..1cfacc7dfa4a761c4a4fb28f9bb02e95
  
      public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index 081691f9710ff1115e4308f79ed49fbc38941193..765ee7f78532a363813286ef7db2a7e48605cb06 100644
+index dfd1246b735fe64c5beae83567a013861eb00822..fa64bf5ad13c278438039b663ea3134e72108411 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -96,12 +96,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+@@ -94,12 +94,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
      public boolean isEmpty() {
-         this.unpackLootTable((Player)null);
-         // Paper start
+         this.unpackLootTable(null);
+         // Paper start - Perf: Optimize Hoppers
 -        for (final ItemStack itemStack : this.getItems()) {
 -            if (!itemStack.isEmpty()) {
 -                return false;
@@ -2991,11 +2980,11 @@ index 081691f9710ff1115e4308f79ed49fbc38941193..765ee7f78532a363813286ef7db2a7e4
 -        }
 -        return true;
 +        return this.isCompletelyEmpty(null); // Pufferfish - use super
-         // Paper end
+         // Paper end - Perf: Optimize Hoppers
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 3e9758fa40bf93fe3d315cc66389193bd57bc393..b78476223637722efe12520d3c2e301603abd8a1 100644
+index 465458e8a7dbaf9afb32709a71c7b2620d1e1fd2..270a892373ecbb3982990d6201d79c8a66de4f60 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -86,6 +86,18 @@ public class LevelChunk extends ChunkAccess {
@@ -3027,7 +3016,7 @@ index 3e9758fa40bf93fe3d315cc66389193bd57bc393..b78476223637722efe12520d3c2e3016
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index f0de72afad4bb571153436399386a6a8a70582a6..45b7527341fcb6d24f35318cedb522646b5ee1c2 100644
+index 796bbef3544e06b8e7aac7e8ac5f740a2613f4bd..2422ca3ffc6ab7178cacf933b8013f85e7de4bd9 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -25,6 +25,7 @@ public class LevelChunkSection {
@@ -3054,19 +3043,19 @@ index f0de72afad4bb571153436399386a6a8a70582a6..45b7527341fcb6d24f35318cedb52264
          }
  
          this.updateBlockCallback(x, y, z, iblockdata1, state); // Paper - optimise collisions
-@@ -161,6 +164,7 @@ public class LevelChunkSection {
-                 if (fluid.isRandomlyTicking()) {
-                     this.tickingFluidCount = (short) (this.tickingFluidCount + 1);
-                 }
+@@ -162,6 +165,7 @@ public class LevelChunkSection {
+                     if (fluid.isRandomlyTicking()) {
+                         this.tickingFluidCount = (short) (this.tickingFluidCount + 1);
+                     }
 +                this.fluidStateCount++; // Pufferfish
-             }
+                 }
  
-             // Paper start - optimise collisions
+                 // Paper start - optimise collisions
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-index 4cdfc433df67afcd455422e9baf56f167dd712ae..57fcf3910f45ce371ac2e237b277b1034caaac4e 100644
+index 83a39f900551e39d5af6f17a339a386ddee4feef..0c8c534fc69172387f188af5282accfed7597ac7 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
 +++ b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
+@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
  import net.minecraft.world.entity.Entity;
  
  public class EntityTickList {
@@ -3076,7 +3065,7 @@ index 4cdfc433df67afcd455422e9baf56f167dd712ae..57fcf3910f45ce371ac2e237b277b103
      private void ensureActiveIsNotIterated() {
          // Paper - replace with better logic, do not delay removals
 diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-index e21f4c5aff3a8e97101f6efc1349fbecf326b5ea..c55f51e6db55f9fa66f53eef0e7a56af5f81d742 100644
+index 6d8ff6c06af5545634f255ed17dc1e489ece2548..6411aa4ff6bd4cabb25c426fa8f4a7eedb969c03 100644
 --- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
 +++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
 @@ -45,6 +45,8 @@ public abstract class FlowingFluid extends Fluid {
@@ -3103,7 +3092,7 @@ index e21f4c5aff3a8e97101f6efc1349fbecf326b5ea..c55f51e6db55f9fa66f53eef0e7a56af
      private final Map<FluidState, VoxelShape> shapes = Maps.newIdentityHashMap();
  
      public FlowingFluid() {}
-@@ -252,6 +262,8 @@ public abstract class FlowingFluid extends Fluid {
+@@ -251,6 +261,8 @@ public abstract class FlowingFluid extends Fluid {
              return false;
          }
          // Paper end - optimise collisions
@@ -3112,7 +3101,7 @@ index e21f4c5aff3a8e97101f6efc1349fbecf326b5ea..c55f51e6db55f9fa66f53eef0e7a56af
          Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap;
  
          if (!state.getBlock().hasDynamicShape() && !fromState.getBlock().hasDynamicShape()) {
-@@ -259,9 +271,16 @@ public abstract class FlowingFluid extends Fluid {
+@@ -258,9 +270,16 @@ public abstract class FlowingFluid extends Fluid {
          } else {
              object2bytelinkedopenhashmap = null;
          }
@@ -3129,7 +3118,7 @@ index e21f4c5aff3a8e97101f6efc1349fbecf326b5ea..c55f51e6db55f9fa66f53eef0e7a56af
          if (object2bytelinkedopenhashmap != null) {
              block_a = new Block.BlockStatePairKey(state, fromState, face);
              byte b0 = object2bytelinkedopenhashmap.getAndMoveToFirst(block_a);
-@@ -272,11 +291,22 @@ public abstract class FlowingFluid extends Fluid {
+@@ -271,11 +290,22 @@ public abstract class FlowingFluid extends Fluid {
          } else {
              block_a = null;
          }
@@ -3152,7 +3141,7 @@ index e21f4c5aff3a8e97101f6efc1349fbecf326b5ea..c55f51e6db55f9fa66f53eef0e7a56af
          if (object2bytelinkedopenhashmap != null) {
              if (object2bytelinkedopenhashmap.size() == 200) {
                  object2bytelinkedopenhashmap.removeLastByte();
-@@ -284,6 +314,11 @@ public abstract class FlowingFluid extends Fluid {
+@@ -283,6 +313,11 @@ public abstract class FlowingFluid extends Fluid {
  
              object2bytelinkedopenhashmap.putAndMoveToFirst(block_a, (byte) (flag ? 1 : 0));
          }
@@ -3165,7 +3154,7 @@ index e21f4c5aff3a8e97101f6efc1349fbecf326b5ea..c55f51e6db55f9fa66f53eef0e7a56af
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootParams.java b/src/main/java/net/minecraft/world/level/storage/loot/LootParams.java
-index e43d07ccdd36f0c9f5b8e9c74cf0d87e17eec66a..8e441f7c2b2d911a0c0111aaa231fc6adae08730 100644
+index 37a0002bbe6539648db5219bb373e0404ae48dc0..ca0571d232e102c4b177a1ea44b96f5f0f440211 100644
 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootParams.java
 +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootParams.java
 @@ -21,8 +21,10 @@ public class LootParams {
@@ -3182,10 +3171,10 @@ index e43d07ccdd36f0c9f5b8e9c74cf0d87e17eec66a..8e441f7c2b2d911a0c0111aaa231fc6a
      }
  
 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 ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7496a5f25 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
-@@ -19,47 +19,66 @@ public class EntityCollisionContext implements CollisionContext {
+@@ -17,50 +17,69 @@ public class EntityCollisionContext implements CollisionContext {
              return defaultValue;
          }
      };
@@ -3216,16 +3205,23 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
          this.entity = entity;
      }
  
-     /** @deprecated */
      @Deprecated
      protected EntityCollisionContext(Entity entity) {
--        this(entity.isDescending(), entity.getY(), entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY, entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : (fluidState) -> {
--            return false;
--        }, entity);
+-        this(
+-            entity.isDescending(),
+-            entity.getY(),
+-            entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY,
+-            entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : fluidState -> false,
+-            entity
+-        );
 +        // Pufferfish start - remove this
-+        // this(entity.isDescending(), entity.getY(), entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY, entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : (fluidState) -> {
-+        //     return false;
-+        // }, entity);
++        // this(
++        //     entity.isDescending(),
++        //     entity.getY(),
++        //     entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY,
++        //     entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : fluidState -> false,
++        //     entity
++        // );
 +        // Pufferfish end
 +        this.entity = entity;
      }
@@ -3262,16 +3258,16 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
  
      @Override
      public boolean isAbove(VoxelShape shape, BlockPos pos, boolean defaultValue) {
--        return this.entityBottom > (double)pos.getY() + shape.max(Direction.Axis.Y) - (double)1.0E-5F;
-+        return (this.entity == null ? -Double.MAX_VALUE : entity.getY()) > (double)pos.getY() + shape.max(Direction.Axis.Y) - (double)1.0E-5F; // Pufferfish
+-        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
      }
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..5a95dcc02241d6036ee520a6a7a05e8713c6081f 100644
+index c490a29bcf7410bc54959ee71375605964379ed5..18bfe2fb7efad66f5fae07a30593d640c597bf77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
+@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -3280,7 +3276,7 @@ index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..5a95dcc02241d6036ee520a6a7a05e87
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1122,6 +1122,11 @@ public final class CraftServer implements Server {
+@@ -1137,6 +1137,11 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));
@@ -3291,13 +3287,13 @@ index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..5a95dcc02241d6036ee520a6a7a05e87
 +            }
          }
      }
-     // Paper end
+     // Paper end - Wait for Async Tasks during shutdown
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
-index acfe2676b840d4edc70507aa139f7db212ed90b7..ef89684b5e8ab20744ba02a71fe0465d197f627d 100644
+index 96d772eb02f79f8c478f5e6f065e387aa7665b18..c5ce412f321b8b4f31cc042893659e213b081f29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
 @@ -45,6 +45,6 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe
-             data.set(i, toNMS(ingred.get(i), true));
+             data.set(i, this.toNMS(ingred.get(i), true));
          }
  
 -        MinecraftServer.getServer().getRecipeManager().addRecipe(new RecipeHolder<>(CraftNamespacedKey.toMinecraft(this.getKey()), new net.minecraft.world.item.crafting.ShapelessRecipe(this.getGroup(), CraftRecipe.getCategory(this.getCategory()), CraftItemStack.asNMSCopy(this.getResult()), data)));
@@ -3305,10 +3301,10 @@ index acfe2676b840d4edc70507aa139f7db212ed90b7..ef89684b5e8ab20744ba02a71fe0465d
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 806fb1064a1769d1251f2a2b04372275754d2aeb..3298aac109e08da4801a6f08aa6f7acfc5e6bf16 100644
+index 3c7a771c48cc2732cc038ca11bb93ec5f8c2d667..94681c5d807019be5caf0b5d5156c0d670f45f8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -502,7 +502,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -3331,7 +3327,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2f9e5a1adf9d67ffe18d95f2822ca3d2288fb27a..14e8e7ad8d742cdc0c50d29d6dade3e338c0463e 100644
+index 3283ed99c35ffed6805567705e0518d9f84feedc..d7c7e12c0b8f77e59d94de130972f762ed227726 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;
@@ -3345,9 +3341,9 @@ index 2f9e5a1adf9d67ffe18d95f2822ca3d2288fb27a..14e8e7ad8d742cdc0c50d29d6dade3e3
  
  public class ActivationRange
  {
-@@ -222,6 +226,25 @@ public class ActivationRange
+@@ -223,6 +227,25 @@ public class ActivationRange
                  }
-                 // Paper end - configurable marker ticking
+                 // Paper end - Configurable marker ticking
                  ActivationRange.activateEntity(entity);
 +
 +                // Pufferfish start
@@ -3371,7 +3367,7 @@ index 2f9e5a1adf9d67ffe18d95f2822ca3d2288fb27a..14e8e7ad8d742cdc0c50d29d6dade3e3
              }
              // Paper end
          }
-@@ -238,12 +261,12 @@ public class ActivationRange
+@@ -239,12 +262,12 @@ public class ActivationRange
          if ( MinecraftServer.currentTick > entity.activatedTick )
          {
              if ( entity.defaultActivationState )
@@ -3386,12 +3382,12 @@ index 2f9e5a1adf9d67ffe18d95f2822ca3d2288fb27a..14e8e7ad8d742cdc0c50d29d6dade3e3
                  entity.activatedTick = MinecraftServer.currentTick;
              }
          }
-@@ -297,7 +320,7 @@ public class ActivationRange
+@@ -298,7 +321,7 @@ public class ActivationRange
          if ( entity instanceof LivingEntity )
          {
              LivingEntity living = (LivingEntity) entity;
--            if ( living.onClimbable() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 ) // Paper
-+            if ( living.onClimableCached() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 ) // Paper // Pufferfish - use cached
+-            if ( living.onClimbable() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 || living.isFreezing()) // Paper
++            if ( living.onClimableCached() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 || living.isFreezing() ) // Paper // Pufferfish - use cached
              {
                  return 1; // Paper
              }
diff --git a/patches/server/0002-Fix-pufferfish-issues.patch b/patches/unapplied-server/0003-Fix-pufferfish-issues.patch
similarity index 57%
rename from patches/server/0002-Fix-pufferfish-issues.patch
rename to patches/unapplied-server/0003-Fix-pufferfish-issues.patch
index 6ded7b179..cae584b75 100644
--- a/patches/server/0002-Fix-pufferfish-issues.patch
+++ b/patches/unapplied-server/0003-Fix-pufferfish-issues.patch
@@ -4,24 +4,29 @@ Date: Sun, 12 Jun 2022 09:18:57 -0500
 Subject: [PATCH] Fix pufferfish issues
 
 
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 57739f9dd7d045d1a585a9fc1be290a1a007db6a..f8b27b3992f1d59bf0e95bba0961540e88345754 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -229,5 +229,7 @@ val runtimeClasspathForRunDev = sourceSets.main.flatMap { src ->
- }
- tasks.registerRunTask("runDev") {
-     description = "Spin up a non-relocated Mojang-mapped test server"
--    classpath(sourceSets.main.map { it.runtimeClasspath })
-+    classpath(tasks.filterProjectDir.flatMap { it.outputJar })
-+    classpath(runtimeClasspathForRunDev)
-+    jvmArgs("-DPaper.isRunDev=true")
- }
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index cc66657cb4f978aa2df3ca1be6c683759952cc7a..26f08b7fb16484c39135ed172c246f76c9e089c7 100644
+index 6464682e2f93659e73aca491031c8051ab000033..5a73aa17a963ae2d57e9bd5b5e3e5b0030d06216 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -224,7 +224,7 @@ public class PufferfishConfig {
+@@ -86,7 +86,7 @@ public class PufferfishConfig {
+ 		// Attempt to detect vectorization
+ 		try {
+ 			SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER);
+-			SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19;
++			SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21;
+ 		} catch (NoClassDefFoundError | Exception ignored) {
+ 			ignored.printStackTrace();
+ 		}
+@@ -94,7 +94,7 @@ public class PufferfishConfig {
+ 		if (SIMDDetection.isEnabled) {
+ 			PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");
+ 		} else if (SIMDDetection.versionLimited) {
+-			PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, Java 18, and Java 19.");
++			PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 through Java 21.");
+ 		} else {
+ 			PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");
+ 			PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
+@@ -232,7 +232,7 @@ public class PufferfishConfig {
      public static int activationDistanceMod;
  
      private static void dynamicActivationOfBrains() throws IOException {
@@ -30,7 +35,7 @@ index cc66657cb4f978aa2df3ca1be6c683759952cc7a..26f08b7fb16484c39135ed172c246f76
          startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
                  "This value determines how far away an entity has to be",
                  "from the player to start being effected by DEAR.");
-@@ -268,7 +268,7 @@ public class PufferfishConfig {
+@@ -276,7 +276,7 @@ public class PufferfishConfig {
      
      public static boolean throttleInactiveGoalSelectorTick;
  	private static void inactiveGoalSelectorThrottle() {
@@ -40,10 +45,10 @@ index cc66657cb4f978aa2df3ca1be6c683759952cc7a..26f08b7fb16484c39135ed172c246f76
  				"This can improve performance by a few percent, but has minor gameplay implications.");
  	}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c1b03e4c37ea85ddf283479682d0eb2eca57ee3c..cf2fd8eba6aa4cf15cac924577507a700f7f72b5 100644
+index fbffe3dab1b7812b50df5d6bddf4fbdb2e583339..881ba370b098a4a202fbfb9c5c3d9304719d155e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -976,7 +976,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -992,7 +992,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -52,21 +57,49 @@ index c1b03e4c37ea85ddf283479682d0eb2eca57ee3c..cf2fd8eba6aa4cf15cac924577507a70
      // Paper end
  
      private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 1aa45e64e49ea011c2ba5e943b4e72c4f3a47176..6f7b34357788faecf8368cc9a27d26585935f789 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -825,7 +825,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+     public void tick() {
+         // Pufferfish start - entity TTL
+         if (type != EntityType.PLAYER && type.ttl >= 0 && this.tickCount >= type.ttl) {
+-            discard();
++            discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD); // Purpur
+             return;
+         }
+         // Pufferfish end - entity TTL
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+index 837f68825f601971f374be47952b23108bf66ba6..2a8a8030feefae84e394460612405887e63f2ac7 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+@@ -64,7 +64,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+             if (!isLoaded) {
+                 if (Projectile.loadedThisTick > gg.pufferfish.pufferfish.PufferfishConfig.maxProjectileLoadsPerTick) {
+                     if (++this.loadedLifetime > gg.pufferfish.pufferfish.PufferfishConfig.maxProjectileLoadsPerProjectile) {
+-                        this.discard();
++                        this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD); // Purpur
+                     }
+                     return;
+                 }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1e2620338f0b6fd1c160a8f8d6b659e273f2f1c9..6c0e33323922de72dcb941a10883a07c72808b5f 100644
+index a82de7111915b19cdc3f065910465a5e7e843aff..fc32b6342b7553265f2a012f91f4dd9c0386f8f2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -210,7 +210,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -215,8 +215,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     // Paper end
  
      public abstract ResourceKey<LevelStem> getTypeKey();
- 
+-    
 -    protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
++
 +    //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI
  
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
+     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index b78476223637722efe12520d3c2e301603abd8a1..e2ea90469352346b43f0a86746179a6adc53d82a 100644
+index 270a892373ecbb3982990d6201d79c8a66de4f60..d087c8271dbdfe3dc6d805539a710d37ed6d7f21 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -122,7 +122,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0275-Make-pufferfish-config-relocatable.patch b/patches/unapplied-server/0269-Make-pufferfish-config-relocatable.patch
similarity index 85%
rename from patches/server/0275-Make-pufferfish-config-relocatable.patch
rename to patches/unapplied-server/0269-Make-pufferfish-config-relocatable.patch
index 6ae92addc..c81d41c1e 100644
--- a/patches/server/0275-Make-pufferfish-config-relocatable.patch
+++ b/patches/unapplied-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 26f08b7fb16484c39135ed172c246f76c9e089c7..9ca1494497ae53e56b1f81fda51b0b8bd02a6d03 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 {
@@ -26,22 +26,22 @@ index 26f08b7fb16484c39135ed172c246f76c9e089c7..9ca1494497ae53e56b1f81fda51b0b8b
  		if (configFile.exists()) {
  			try {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 207a76f91758a8643976414a8732573d488bf1df..813a3c0172f1152665b95104d155e5de40589b39 100644
+index 6a9bd431e9c2e1fc1e51d394eaccba864bbeac89..85b861e21d8798a883ecbd0a09cc25f87e801b7b 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -230,6 +230,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         // Paper end
+         // Purpur end
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
 +        gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur
          gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
          gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 45f63f2fedee7bcab9cd3ebc3117cecd225b89d2..67c621fdc994b392dc961f79e1e3b97c2977adc4 100644
+index 1dd676ad37c68e3fce71306d7e05cb2c377a32b4..409c0e81571e23c9d535b541c61538424259d60a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -179,6 +179,12 @@ public class Main {
+@@ -180,6 +180,12 @@ public class Main {
                      .ofType(File.class)
                      .defaultsTo(new File("purpur.yml"))
                      .describedAs("Yml file");
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7f07d28d5..0ff9678cd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 if (!file(".git").exists()) {
@@ -32,8 +32,26 @@ if (!file(".git").exists()) {
 }
 
 rootProject.name = "purpur"
-for (name in listOf("Purpur-API", "Purpur-Server")) {
+for (name in listOf("Purpur-API", "Purpur-Server", "paper-api-generator")) {
     val projName = name.lowercase(Locale.ENGLISH)
     include(projName)
     findProject(":$projName")!!.projectDir = file(name)
 }
+
+optionalInclude("test-plugin")
+
+fun optionalInclude(name: String, op: (ProjectDescriptor.() -> Unit)? = null) {
+    val settingsFile = file("$name.settings.gradle.kts")
+    if (settingsFile.exists()) {
+        apply(from = settingsFile)
+        findProject(":$name")?.let { op?.invoke(it) }
+    } else {
+        settingsFile.writeText(
+            """
+            // Uncomment to enable the '$name' project
+            // include(":$name")
+
+            """.trimIndent()
+        )
+    }
+}
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
new file mode 100644
index 000000000..4e1830aa8
--- /dev/null
+++ b/test-plugin/build.gradle.kts
@@ -0,0 +1,17 @@
+version = "1.0.0-SNAPSHOT"
+
+dependencies {
+    compileOnly(project(":purpur-api"))
+}
+
+tasks.processResources {
+    val apiVersion = rootProject.providers.gradleProperty("mcVersion").get()
+    val props = mapOf(
+        "version" to project.version,
+        "apiversion" to "\"$apiVersion\"",
+    )
+    inputs.properties(props)
+    filesMatching("paper-plugin.yml") {
+        expand(props)
+    }
+}
diff --git a/test-plugin/src/main/java/org/purpurmc/testplugin/TestPlugin.java b/test-plugin/src/main/java/org/purpurmc/testplugin/TestPlugin.java
new file mode 100644
index 000000000..39e2b3557
--- /dev/null
+++ b/test-plugin/src/main/java/org/purpurmc/testplugin/TestPlugin.java
@@ -0,0 +1,12 @@
+package org.purpurmc.testplugin;
+
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class TestPlugin extends JavaPlugin implements Listener {
+
+    @Override
+    public void onEnable() {
+        this.getServer().getPluginManager().registerEvents(this, this);
+    }
+}
diff --git a/test-plugin/src/main/java/org/purpurmc/testplugin/TestPluginBootstrap.java b/test-plugin/src/main/java/org/purpurmc/testplugin/TestPluginBootstrap.java
new file mode 100644
index 000000000..612aa3e6f
--- /dev/null
+++ b/test-plugin/src/main/java/org/purpurmc/testplugin/TestPluginBootstrap.java
@@ -0,0 +1,4 @@
+package org.purpurmc.testplugin;
+
+public class TestPluginBootstrap {
+}
diff --git a/test-plugin/src/main/java/org/purpurmc/testplugin/TestPluginLoader.java b/test-plugin/src/main/java/org/purpurmc/testplugin/TestPluginLoader.java
new file mode 100644
index 000000000..6a00427bd
--- /dev/null
+++ b/test-plugin/src/main/java/org/purpurmc/testplugin/TestPluginLoader.java
@@ -0,0 +1,4 @@
+package org.purpurmc.testplugin;
+
+public class TestPluginLoader {
+}
diff --git a/test-plugin/src/main/resources/paper-plugin.yml b/test-plugin/src/main/resources/paper-plugin.yml
new file mode 100644
index 000000000..3418d110e
--- /dev/null
+++ b/test-plugin/src/main/resources/paper-plugin.yml
@@ -0,0 +1,12 @@
+name: Purpur-Test-Plugin
+version: ${version}
+main: org.purpurmc.testplugin.TestPlugin
+description: Purpur Test Plugin
+author: PurpurMC
+api-version: ${apiversion}
+load: STARTUP
+bootstrapper: org.purpurmc.testplugin.TestPluginBootstrap
+loader: org.purpurmc.testplugin.TestPluginLoader
+defaultPerm: FALSE
+permissions:
+dependencies: