Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@fb06829 Optimise multiple block updates occurring in the same chunk
[CI-SKIP] Update README.md
2023-09-11 18:27:49 +00:00 · 2023-09-11 14:24:15 +09:00 · 2023-09-11 04:54:11 +00:00 · 2023-09-11 13:22:18 +09:00 · 2023-09-11 13:22:04 +09:00 · 2023-09-11 09:21:07 +06:00
55 changed files with 2273 additions and 304 deletions
--- a/.upstream-data
+++ b/.upstream-data
@@ -1,2 +1,2 @@
-purpurCommit = 423c2af60ca5e9d18ac0bd955d0313efc693d2a3
+purpurCommit = 39bdf3d2e045857f328bd628f785c54be951e9bd
-pufferfishCommit = a3c0a4d2f177d80283d03de52617732a7b493665
+pufferfishCommit = e32a780bcab6821e3804846a63a9153fdeee44f4
--- a/README.md
+++ b/README.md
@@ -4,14 +4,12 @@
 ### A Server Platform for Minecraft: Java Edition based on [Paper](https://github.com/PaperMC/Paper)
-[![WIP](https://img.shields.io/badge/Work%20In%20Progress-red?style=for-the-badge)](README.md)
+[![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=for-the-badge&logoColor=ffffff)](LICENSE)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Plazma/build.yml?branch=ver/1.20.1&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.20.1)
 [![Upstream Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/AlwaysUpToDate/plazma.yml?label=Upstream&logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGD0lEQVR4nO2dW4hVVRiAl5OjCFoMlpYx2WXMXjShi5FFTxFhhmFlQxlRU0kEXQiJorKIMoIiIoJegiiK8pKWZBTUg0ZpaHYhslBL8TKVTWWO00x98XP%2BicNhzt5rnb3P2WvtWd%2FjzDl7r%2FX%2F6%2FrfjjGRSCQSiUQikUgkEolEIpGIJwDHAHOA24CngTXA18Bu4BDwN3AUOAh8D3wOrAOeBLqBWUB70f0ICuBE4E7gXaCP7PwBrARuAqYU3T8vAdqB64EPgSGaxz%2F6joUyu8xoBzgOWAbsofXs0ndPNKMNoA24EThA8ezTPWZ0zAjgIt1IfWMbMM%2BUfJ1f3uQ1Po894rnSnZyAU3WEhcInwGmmDMi0BnozCGMA2KT3ADlKXgycAnQAY4HxwAnA6fouWc%2BfBzYCgxne%2BwtwgQkZ4Fq9KLlyBHgDWARMyPD%2BDr2QvamXNlf%2BAuabENGOu47AvcD9wOQmtOck4FG9NbsgfbjBhARwneNm26eCn9CCtk0EHtdZ5qKE%2BSEdM12WndVifiignbKPvOfQzsPA%2BSaA006vw%2Fq6pOD2jgHucRgw0rfpxkeAccBWBzPAHOMJMrIdBs4q4yNqArbhG2Ca8QxgBrDTov0yW8YaD9d9m013O3C88RRgmoUS%2Fm3FYcHVafKVhfB%2FAk42ngOcCfyc0I9txieApZYb7mwTCMBc4M8R%2BiGz%2FHLjC8CxlhebHhMYVDZmcXEO8wOwwPgEcJ%2BF8FebgAGmAp3GU%2FPyjxZLj5%2Fn5tBRH24aDxTdztICfGBhzp1UdDtLiYR3WJz7Hyy6naUFuCNF%2BGJ7n1p0O0uLRp8l8bYpIcAkYAXwKfAl8EzLg700pETCApPoNiUD6KpjppCTYFczXjimzt%2FPThH%2BULVHS00VfhmvGhO%2BeOvqsTc3JWgw7AagXx3i7wBnVf2%2FJ0UBn%2BnnZgLr9RniUfoYOM%2BUT%2Fj5KUGFP5IN5Dexj%2BhnniKZF9WWIt%2BppT8kJWAv%2FHyUoCM%2FyW8rgl2V0oiXU6KaPzLlFH42JejmKiM0CRHsfrIx6HscJo0LP7MSXCIFGkWU3GbKK%2FzGlaAZKM1mnSm%2F8BtTAnBGnc0zL%2BTZM8zoEH7DSpibU2rQiJu48RAqUXPNTBLZ4xT71AQleCt8AXid5vOacSFHJfgu%2FLYWHT4O17MuNFMJXgu%2FKqBMEjOy8Kve%2BNNMNO4mmQxK8F74wwBbEvoxoCmzafGtC1KUsMU0SgNKCEb4AnBZnVkwoIJ9KaW%2FK%2FQ59ZQgz77UZMFBCUEJfxjgSg09qY7iu1D%2FlxbzenPVc%2BapryD%2FcBYLJQQp%2FJoNuVOOpTXu17Q9YnadMMfO3G%2F9CZbO%2Fy2mZQJYYhF80FZE%2FORbmuS8T3OwvLzhZkX9IUmsyfySyMhIMLFF9MfSOl%2BPZAV4zCL6w9tw%2B6ChEnicFnywvuh2lhbgEdJZXHQ7SwkwXW03aXluQUd7eIlmTko0Rxp3G5%2BQ4hZVR9M%2B7cQsExhUyqWlccCrQk%2BaH3ywTr22YC5nwDkWgQnCLcYngFcTGisJbzON51AZRDJ709jqXVCBhTtvp4%2B5wTWVGr%2B1DKnxb0YDOywav8vHmUDFYPYddiw3PgK8YtmBXp9GEHCu5i%2FbsNnbUmZ6bk5Kbq5N9b%2FX2T%2Baf5t7LDdcNBrQv0zJaqS8l2ZF2vJ%2BERmUamCzOecPc8SnWZsIcIVjlax%2B4IlWJPNpoaaH9WhsixjbrjIBOjBcS5X1quUx95OSerQeaqBIrAj%2FahMiOhNclqPqTq%2FUHOTJGUf7Yr2Z267z1ch3FpmQ0T1B3HWNMqT1O18AbtdylV06osdrpn6Hlqu8RG6nwLOSoZOxXOX%2B4MtV1tiHRIihsNn7044rWlzV95LFg5p%2BOs6UFY2X8bF88RfBHDNziru5xqLKSiuQi%2BNdvqdLNQU9pSzT34JpNbu1VKU%2F9vyioJLEvVArr2SNUE5b4zdoRd%2FoRqyjjClaHV3O7r%2FnIHQJGV%2BrNe1i6IjjzGjXn6DqVlPFWq3ftkM9b0f10nZIfQ3bNX9ZkshvlVhN75wmkUgkEolEIpFIJBKJRCIRM5r5D9WH9bFOGhrhAAAAAElFTkSuQmCC&style=for-the-badge)](https://github.com/PlazmaMC/AlwaysUpToDate/actions/workflows/plazma.yml)
 [![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=for-the-badge&logoColor=ffffff)](LICENSE)
 [![Discord](https://img.shields.io/discord/1083716853928558652?color=%235865F2&label=Discord&logo=discord&style=for-the-badge&logoColor=ffffff)](https://discord.gg/MmfC52K8A8)
 [![MC Version](https://img.shields.io/badge/MC-1.20.1-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/latest-1.20.1)
 [![Discord](https://img.shields.io/discord/1083716853928558652?style=flat-square&logo=discord&logoColor=ffffff&label=DISCORD&color=5865F2&link=https%3A%2F%2Fdiscord.gg%2FMmfC52K8A8)](https://discord.gg/MmfC52K8A8)
 [![Downloads](https://img.shields.io/github/downloads/PlazmaMC/Plazma/total?label=Downloads&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAbvSURBVHhe7Z3vixVlFMf3jj9KLC0tqAgJlIoQSjOIIqggwohsCylxrYzU1BfZf7D1IvoLsiIqCwxXqQzCF722N0a+sEKo0BXXosLW1QpX3dvnzHOuuD9m5pm7M/Pc2Xs+cHhmnjnPr/Ode3Zm7o/tqRvNZjMaGxvbgH2L/at2EOuTY+pmlAEBnkug91EmMYDNVnejaAj+my7OqfSru1EkBH8Bdk6DnMYwfvO0WcdTp5y5qtFozNftNBZi97vNzqdOAizS0ofFWnY8tRGAs7+hm5nk8Q2NXbYFxgQIjAkQGBMgMCZAYEyAwJgAgTEBAmMCBMYECIwJEBgTIDAmQGBMgMCYAIExAQJjAgTGBAiMCRAYEyAwJkBgTIDAmACBMQECYwIExgQIjAkQGBMgMCZAYEyAwJgAgTEBAmMCBMYECIwJEJjSBWg2m7PHxsZWYs9gj2AL9FDHIXPDHsV6sRUydz1UT1jEauyX+Nu7CvtnKfqxOermBf5rpb0na7WZF/jPYV5vYP+45g6ZO/aEutULJr4Ou6RrmQTHvqDwFgHfUgTAV37+4EvXbDIcu4g9p+71gHnfxKTlTE8Fn88p5mqzVPArXADGvwpLDP4VDGM3aLNCKeVvAJNd12g0rtHdRPDpxXdAAqFVlcG4Ivwe5rDG1aSyEP8+3S6Usv4I36NlJhqAPSww19+E6SDBx/Z6Br/FCi0LpSMuQyUQBERE8EpH00FebYwzwJhPaVVQyhLgsJbeEJDS05EK7Jt2JvK9loVSlgC7Wew53fZGA1NKOtIzP2/aiaHdMMWnbq9YShEgiqI/KDYx8Uuuxh8JEO0KTUf6qpIzP3faYR4XKV5lTaddTY1g4RuxiywiN7Tbr4GLoaqty1C25Tpf7jlyI3PHXtau6oksAEu8IUuDdnKNHqcjytwCUKbeZKVBOwn+Rumn9rCQV2RBurZc0C6+WcNyCUA7uclq98y/gNX7zJ8IC5puOpKfpfQC3/VY96adJGRhWLvp6JRuZoLvkG7mgnYzJ+0kwQLbTkdlwpxmXtpJQs6yThJB5tI1wW8hC8baSkdFosGf2WknCRYeNB0xdveknSTk7AshgozZ9cFvIYHAKktHGvzOTDvMT94fnUdZ6aNqxqwkHTFG5WmHYeUn9yWmyQ8ZcZBPLuzD/sbkN/mPY2/R6Hp1KR3GKzUdSd8yhg5XOoy1iGHfphzEJKansb3YSnVxUPEiNuXCqZfGS9W1dBirlHSk63tJhykdiRk26EYfD/Wj2IaWo5z5F/TYlHD8MEVln5FhvELTkawPqyztMKQ8BDziRp8ajp/H7hZn+a8TmeD8rPZfCYxXSDqSPqQv7bYSGNb3weGALPQv3UkFv53af2Uw5rTSEW0rTTstJFZuBung96dc6fj+Ln+e3+8vhCiKPqTYwlxzv7NGG3kna3Oj0fjY1VSKb6wWR0zQ67f2ff2KBhE+oMj19qb6blEBKydPTCu91m8XAvkRxWZ51bqaZDT4m0IFPy+1EEDwSUcci9OOClYLaiOAQGAlHa3HzsQV45G6vrqc+S28BeDs6oj/y0KA5SMrS7HXsU+o2kW5g3KZHIudApMrVlwKjdIgE/y+1iZGBsTqgIYtFfzOyytAPvXlw21aGikQVzn7b3d7mQyLACfddibLUKxjv17UKSCAfI9gidvLZEgEOOq20+GSVT4qmOurP13KGmLl+9zsqAjwndv2YgcKz9JtYwIam9fcnheH5A+GfBvQG/y3a2NjAhIbDZMX+C8X1eRrpCdcVTb4yn80vVfHNBTich/2n4tSNvjKt0cb8ixI7h53uW6ywX8+DQ/QwSqt6nok+BQHiM3VrsaL3fg34y0CuoROUt+UmYiojW1j0/tmbqbB2mcRg+0SizgonmjsbtZuHFS8r8dzQbsjmDy3v5HdjrhbLhNZo6wVk3ftUt/1SoJ272l3PZcDRqUocpSXRVvX+vQrqWwQ+5k+4u8IxwdmCKypwZKuZVNuspaw29ZbtPQxQts7sN9lf9wZiwhbOfCO7holgABboyh6V3fHC8DBCNuPCE9qlVEgGtte7HJ2mJSzcboOO4jTXVplFAAx/YHiQc7+EVfjmHQFQ+Dl4dzjNDjmaozpQiyPU6yeGHxhyktIHE8ixMM0/EmrjDbRM/8hiamrGU/iNTwCnMAeoIOvtMrICbHbTyFpJ/GJc+pNFAKcwZ6mI7nhOqvVRgbEakRiRux6p0o7V+J946T3Cf3YC3Sc55a7ayDo5ynksU4/gf8trszAW4AWCHELxTbseYSo7EO7nQyB/5XiM2wngT8VV3qSW4AWDCp3hsvZfAyTB3N3YrdiCxGm9J+dCQHrHaWQq8QhTN7IOoR9w3p/xNq48+/p+R+4L+/7RtGOvAAAAABJRU5ErkJggg==&style=flat-square&color=green)](https://github.com/PlazmaMC/Plazma/releases/tag/latest-1.20.1)
 [![Stargazers](https://img.shields.io/github/stars/PlazmaMC/Plazma?label=stars&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/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNjtc7/hFAAABIElEQVQ4y62SzS5DURSFv6smXkAUCRU0UdKYGNTPyCsYYOYFGGi8Ao9QM0PxCh6CgQ4qfiLpBFEjdKCfySaXtDch1uScs9Ze62TvcyAD6o66zV+gjqpvalsd61XXl5GxBySx3/3t7UPqi1pTD9VXdaRbbZIyDQLTwBSwBqzGGaABnAInwCXQSJLk/tO4orb8jra6nwo/CC6NlrqMOq421Y5aVSfUXJe2cqFVo7b5NdwIuVaf1IWM2cyrD+qdOvlTLERIS53pYi6FdqMWet2wGP1tdNE2Q1vK+gfDsdbDlFfzwV3Ems8KmAXegcd4hSvgVq0Bz6GV0ob+HgF1YAA4Cn4LWA9tLusHnscTHavFFF8MrqOeZQVU1HKGXlYr/Cc+AKuOI2h/Jrf7AAAAAElFTkSuQmCC&style=flat-square&color=green)](https://github.com/PlazmaMC/Plazma/stargazers)
 [![Forks](https://img.shields.io/github/forks/PlazmaMC/Plazma?label=forks&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/n4Ax9dyyerighsAAAAGYktHRAAAAAAAAPlDu38AAAAJcEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmCBMVNCYN3/YeAAAA/UlEQVQ4y7WTQUoDQRBFf01czlJcxUyOINGjjAvFHMFzZGdygOwDwTtk6UZcqLlAxCAuMigug89FamIzdAIN+qGhq/6v6qrqbumvAJwBj8AHMAQs4DJgBHy65jSW4Bl4AaZsUAbcufumrnmquSzIcSzpTtLA7XbA1fuBa9qxCob8YgUUAdcFqoC/iSXIgLELOhG+49w4nM+2BTP7ljR3M4/MufbNzYxdN1E0Sm2ialZnsVIllZKOJF24eyLpXdKtmS1S3sYMmO3THOwJziUdbrbkZvaVcnILeAh6vweylAQ9D7z2BXCS0sJS0lrSpdtrSW+pn6sPLIFX4Er/hR9C0wl1FTBzNwAAAABJRU5ErkJggg==&style=flat-square&color=green)](https://github.com/PPlazmaMC/Plazma/network/members)
@@ -20,7 +18,7 @@
 </div>
 ## ⚠️ Warning
- Plazma may cause **<u>unexpected problems</u>**, so **don't use** it in production server!
+- Plazma may cause **<u>unexpected problems</u>**, so be sure to test it thoroughly before using it on a public server.
 ## 💬 About Plazma...
 - **Plazma** is created from the merger of **[Andromeda](https://github.com/TeamEarendel/Andromeda)** and **[Fusion](https://github.com/RuinedTechnologyUnify/Fusion)**
@@ -32,13 +30,22 @@
 - **Including [Pufferfish](https://github.com/pufferfish-gg/Pufferfish) and [Purpur](https://github.com/PurpurMC/Purpur)** - Provides multiple optimizations and customizations
 ## ⬇️ Downloads
- You can download the file from [Releases](https://github.com/PlazmaMC/Plazma/releases)
+| Version                                                      | Direct | Bundler Mojmap | Bundler Reobf | Paperclip Mojmap | Paperclip Reobf |
- Direct latest download: [Click here](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar)
+| :---:                                                        | :---:  | :---:          | :---:         | :---:            | :---:           |
- NOTE: If you don't know about Mojmap or Bundler, download `plazma-paperclip-*-reobf.jar`
+| [1.20.1](https://github.com/PlazmaMC/Plazma/tree/ver/1.20.1) | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-bundler-1.20.1-R0.1-SNAPSHOT-mojmap.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-bundler-1.20.1-R0.1-SNAPSHOT-reobf.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-paperclip-1.20.1-R0.1-SNAPSHOT-mojmap.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.20.1/plazma-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar)  |
 | [1.19.4](https://github.com/PlazmaMC/Plazma/tree/ver/1.19.4) | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.19.4/plazma-paperclip-1.19.4-R0.1-SNAPSHOT-reobf.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.19.4/plazma-bundler-1.19.4-R0.1-SNAPSHOT-mojmap.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.19.4/plazma-bundler-1.19.4-R0.1-SNAPSHOT-reobf.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.19.4/plazma-paperclip-1.19.4-R0.1-SNAPSHOT-mojmap.jar)  | [Download](https://github.com/PlazmaMC/Plazma/releases/download/latest-1.19.4/plazma-paperclip-1.19.4-R0.1-SNAPSHOT-reobf.jar)  |
 - If you don't know about Mojmap or Bundler, download **Direct**
 - Old Builds: [Releases](https://github.com/PlazmaMC/Plazma/releases)
 ## ⚖️ License
 - This project and all patches are licensed under the [MIT license](LICENSE.md) unless otherwise noted in the patch headers.
 ## 🔧 Support Status
 | Version                                                      | Support | Stability | Progress |
 | :---:                                                        | :---:   | :---:     | :---:    |
 | [1.20.1](https://github.com/PlazmaMC/Plazma/tree/ver/1.20.1) | Active  | Good      | 100%     |
 | [1.19.4](https://github.com/PlazmaMC/Plazma/tree/ver/1.19.4) | Active  | Good      | 100%     |
 ## 🌀 Sponsorship - Minecraft Development Dictionary (KOREAN)
 [![Discord](https://img.shields.io/discord/911980670123905054?color=%239c91fd&label=MDD&logo=discord&style=for-the-badge&logoColor=ffffff)](https://discord.gg/AZwXTA9Pgx) 
 - 한글로 번역&정리된 Minecraft와 서드파티 버킷들의 소식들을 빠르게 만나볼 수 있습니다.
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
 }
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.9:fat")
    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
    paperclip("io.papermc:paperclip:3.0.3")
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.plazmamc.plazma
 version = 1.20.1-R0.1-SNAPSHOT
-paperCommit = b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b
+paperCommit = fb06829845db10be0405966f874a16f135f73229
 org.gradle.caching = true
 org.gradle.parallel = true
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ b/patches/api/0001-Pufferfish-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri <kevin.raneri@gmail.com>
+From: AlphaKR93 <dev@alpha93.kr>
-Date: Tue, 9 Nov 2021 14:01:56 -0500
+Date: Mon, 11 Sep 2023 01:06:55 +0000
 Subject: [PATCH] Pufferfish API Changes
 Original: Kevin Raneri <kevin.raneri@gmail.com>
--- a/patches/api/0002-Purpur-API-Changes.patch
+++ b/patches/api/0002-Purpur-API-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@Gmail.com>
+From: AlphaKR93 <dev@alpha93.kr>
-Date: Tue, 4 Jan 2022 23:05:41 -0600
+Date: Mon, 11 Sep 2023 01:08:35 +0000
 Subject: [PATCH] Purpur API Changes
 Original: PurpurMC
--- a/patches/api/0003-Plazma-Configurations.patch
+++ b/patches/api/0003-Plazma-Configurations.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Plazma Configurations
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 916b9a9f05c0e83109bc9a4eb1692e2ed6e81eaf..ef14d669bc49b7b3694b0743b6085944647e0a29 100644
+index aaef58468a3c31f35e5067ed4263e9dd3fbddddd..0852f1a18106a81a60726756aae1d9c2ba30b111 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2030,6 +2030,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
         }
         // Paper end
--- a/patches/api/0004-Bump-Dependencies.patch
+++ b/patches/api/0004-Bump-Dependencies.patch
@@ -0,0 +1,86 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 12:43:06 +0900
 Subject: [PATCH] Bump-Dependencies
 diff --git a/build.gradle.kts b/build.gradle.kts
 index 0c557f34ed438980c6fd9d6a8bce7c1152468735..8f1fbec343461c83a6df141f7aa939e26e6e139e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -11,8 +11,8 @@ java {
 val annotationsVersion = "24.0.1"
 val bungeeCordChatVersion = "1.20-R0.1"
 val adventureVersion = "4.14.0"
 -val slf4jVersion = "1.8.0-beta4"
 -val log4jVersion = "2.17.1"
 +val slf4jVersion = "2.0.9" // Plazma - Bump Dependencies
 +val log4jVersion = "2.20.0" // Plazma - Bump Dependencies
 val apiAndDocs: Configuration by configurations.creating {
     attributes {
         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -27,16 +27,16 @@ configurations.api {
 dependencies {
     // api dependencies are listed transitively to API consumers
 -    api("com.google.guava:guava:31.1-jre")
 -    api("com.google.code.gson:gson:2.10")
 +    api("com.google.guava:guava:32.1.2-jre") // Plazma - Bump Dependencies
 +    api("com.google.code.gson:gson:2.10.1") // Plazma - Bump Dependencies
     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
 -    api("org.yaml:snakeyaml:2.0")
 +    api("org.yaml:snakeyaml:2.2") // Plazma - Bump Dependencies
     api("org.joml:joml:1.10.5")
     // Paper start
     api("com.googlecode.json-simple:json-simple:1.1.1") {
         isTransitive = false // includes junit
     }
 -    api("it.unimi.dsi:fastutil:8.5.6")
 +    api("it.unimi.dsi:fastutil:8.5.12") // Plazma - Bump Dependencies
     apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
     apiAndDocs("net.kyori:adventure-api")
     apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -46,31 +46,31 @@ 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
 +    api("io.sentry:sentry:6.28.0") // Pufferfish // Plazma - Bump Dependencies
 -    implementation("org.ow2.asm:asm:9.4")
 -    implementation("org.ow2.asm:asm-commons:9.4")
 +    implementation("org.ow2.asm:asm:9.5") // Plazma - Bump Dependencies
 +    implementation("org.ow2.asm:asm-commons:9.5") // Plazma - Bump Dependencies
     // Paper end
 -    api("org.apache.maven:maven-resolver-provider:3.8.5")
 -    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
 -    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 -    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
 +    api("org.apache.maven:maven-resolver-provider:3.9.4") // Plazma - Bump Dependencies
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15") // Plazma - Bump Dependencies
 +    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15") // Plazma - Bump Dependencies
 +    compileOnly("com.google.code.findbugs:jsr305:3.0.2") // Paper // Plazma - Bump Dependencies
     val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
     compileOnly(annotations)
     testCompileOnly(annotations)
     // Paper start - add checker
 -    val checkerQual = "org.checkerframework:checker-qual:3.21.0"
 +    val checkerQual = "org.checkerframework:checker-qual:3.38.0" // Plazma - Bump Dependencies
     compileOnlyApi(checkerQual)
     testCompileOnly(checkerQual)
     // Paper end
 -    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - add mockito
 +    testImplementation("org.mockito:mockito-core:5.5.0") // Paper - add mockito // Plazma - Bump Dependencies
 -    testImplementation("org.apache.commons:commons-lang3:3.12.0")
 -    testImplementation("junit:junit:4.13.2")
 -    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +    testImplementation("org.apache.commons:commons-lang3:3.13.0") // Plazma - Bump Dependencies
 +    testImplementation("junit:junit:4.13.2") // Plazma - Bump Dependencies
 +    testImplementation("org.hamcrest:hamcrest-library:2.2") // Plazma - Bump Dependencies
     testImplementation("org.ow2.asm:asm-tree:9.5")
 }
--- a/patches/api/0005-Publish-Packages.patch
+++ b/patches/api/0005-Publish-Packages.patch
--- a/patches/api/0006-Optimize-spigot-event-bus.patch
+++ b/patches/api/0006-Optimize-spigot-event-bus.patch
@@ -0,0 +1,79 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 15:04:25 +0900
 Subject: [PATCH] Optimize-spigot-event-bus
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
 index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..45b8ee1945202cc673905aab5c90985c01cb205e 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class Event {
     private String name;
 -    private final boolean async;
 +    private final net.kyori.adventure.util.TriState async; // Plazma - Optimize spigot event bus
     /**
      * The default constructor is defined for cleaner code. This constructor
@@ -32,9 +32,35 @@ public abstract class Event {
      *     by default from default constructor
      */
     public Event(boolean isAsync) {
 +        this(net.kyori.adventure.util.TriState.byBoolean(isAsync)); // Plazma - Optimize spigot event bus
 +    }
 +
 +    // Plazma start - Optimize spigot event bus
 +    /**
 +     * This constructor is used to explicitly declare an event as synchronous
 +     * or asynchronous or potentially unset.
 +     *
 +     * @param isAsync true indicates the event will fire asynchronously, false
 +     *                by default from default constructor, unset indicates that the event may be called on either the server thread or off the server
 +     *                thread.
 +     */
 +    public Event(@NotNull final net.kyori.adventure.util.TriState isAsync) {
         this.async = isAsync;
     }
 +    /**
 +     * Returns a tristate that, when resolving to true or false, has the exact indications defined by {@link #isAsynchronous()}.
 +     * <p>
 +     * If the tristate resolves to NOT_SET, the event may or may not have been fired off the main thread, meaning a plugin would have
 +     * to validate what thread the spigot event bus was called on.
 +     *
 +     * @return the tristate enum.
 +     */
 +    public final @NotNull net.kyori.adventure.util.TriState asynchronous() {
 +        return this.async;
 +    }
 +    // Plazma end
 +
     // Paper start
     /**
      * Calls the event and tests if cancelled.
@@ -92,7 +118,7 @@ public abstract class Event {
      * @return false by default, true if the event fires asynchronously
      */
     public final boolean isAsynchronous() {
 -        return async;
 +        return this.async == net.kyori.adventure.util.TriState.TRUE; // Plazma - Optimize spigot event bus
     }
     public enum Result {
 diff --git a/src/main/java/org/bukkit/plugin/RegisteredListener.java b/src/main/java/org/bukkit/plugin/RegisteredListener.java
 index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..0702e1692f7e671188ac18e22ca29f369b0b6352 100644
 --- a/src/main/java/org/bukkit/plugin/RegisteredListener.java
 +++ b/src/main/java/org/bukkit/plugin/RegisteredListener.java
@@ -62,8 +62,8 @@ public class RegisteredListener {
      * @throws EventException If an event handler throws an exception.
      */
     public void callEvent(@NotNull final Event event) throws EventException {
 -        if (event instanceof Cancellable) {
 -            if (((Cancellable) event).isCancelled() && isIgnoringCancelled()) {
 +        if (isIgnoringCancelled()) { // Plazma - Optimize spigot event bus
 +            if (event instanceof Cancellable cancellable && cancellable.isCancelled()) { // Plazma - Optimize spigot event bus
                 return;
             }
         }
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri <kevin.raneri@gmail.com>
+From: AlphaKR93 <dev@alpha93.kr>
-Date: Wed, 3 Feb 2021 23:02:38 -0600
+Date: Mon, 11 Sep 2023 01:06:55 +0000
 Subject: [PATCH] Pufferfish Server Changes
 Original: Kevin Raneri <kevin.raneri@gmail.com>
@@ -16,6 +16,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 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 fb98936bb8a5488db75d676c5bcb4060597fbbf8..f6cd7b910ce41a254e71bf0fcfe93c38abbb1445 100644
 --- a/build.gradle.kts
@@ -613,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..3d4bb28fe686a9ad2e4c0f75f21e6289c2ea5cf9
+index 0000000000000000000000000000000000000000..95d1a8a5b349f7849c040026bfa3469d03d92bfd
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -0,0 +1,296 @@
+@@ -0,0 +1,295 @@
 +package gg.pufferfish.pufferfish;
 +
 +import gg.pufferfish.pufferfish.simd.SIMDDetection;
@@ -901,7 +904,6 @@ index 0000000000000000000000000000000000000000..3d4bb28fe686a9ad2e4c0f75f21e6289
 +				"the ender dragon whenever a player places an end crystal.");
 +	}
 +
 +
 +    public static boolean disableMethodProfiler;
 +	public static boolean disableOutOfOrderChat;
 +	public static boolean suppressNullIdDisconnections;
@@ -2132,7 +2134,7 @@ index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..aa5cec6d56d7a8e80861aa4c9b4a74ca
     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 e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd9806741222397c3072d7 100644
+index 7763450e85146d43fcf84d380d0e7a8183d83747..0059ceabaed9c1888a6773efb906e761fd1ca252 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;
@@ -2148,11 +2150,11 @@ index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd980674122239
             if (!this.level().isClientSide) {
 -                if (this.isInWall()) {
-+                if ((!gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F))) && this.isInWall()) { // Pufferfish - optimize suffocation
+                if (shouldCheckForSuffocation() && this.isInWall()) { // Pufferfish - optimize suffocation
                     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();
-@@ -1369,6 +1368,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1369,6 +1368,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return this.getHealth() <= 0.0F;
     }
@@ -2163,12 +2165,16 @@ index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd980674122239
 +        }
 +        return true;
 +    }
 +
 +    public boolean shouldCheckForSuffocation() {
 +        return !gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F));
 +    }
 +    // Pufferfish end
 +
     @Override
     public boolean hurt(DamageSource source, float amount) {
         if (this.isInvulnerableTo(source)) {
-@@ -1965,6 +1973,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1965,6 +1977,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return this.lastClimbablePos;
     }
@@ -2189,18 +2195,6 @@ index e11d7283662834047b2ff81a2fd25a4263792deb..e9a31314424d9db911cd980674122239
     public boolean onClimbable() {
         if (this.isSpectator()) {
             return false;
@@ -3651,7 +3673,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
             Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
             // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
 -            return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
 +            // Pufferfish start
 +            //return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
 +            return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().rayTraceDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.BlockHitResult.Type.MISS;
 +            // Pufferfish end
         }
     }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
 index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..f6eb032897c6d5d16ab5c8c287e49e189c24571c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
@@ -2275,18 +2269,6 @@ index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..e283eb57c25f7de222f9d09dca851169
     }
     @Nullable
 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 d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..fe502445a77afe7e3807afae48d7bf03f370e290 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
@@ -47,6 +47,7 @@ public class AcquirePoi {
                         return false;
                     } else {
                         mutableLong.setValue(time + 20L + (long)world.getRandom().nextInt(20));
 +                        if (entity.getNavigation().isStuck()) mutableLong.add(200); // Pufferfish - wait an additional 10s to check again if they're stuck
                         PoiManager poiManager = world.getPoiManager();
                         long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> {
                             return !entry.getValue().isStillValid(time);
 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
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
@@ -2468,27 +2450,24 @@ index 247aca0b612f5079a0596350e8311c385df8ab1c..7f21d1d400c8a5615ed1a787dcb06803
         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/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+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 52196431a6538872755344859a0454a0e50c3b6e..80fc7918cb294b0d88a293bd6a920441cb55c3ad 100644
+index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -270,10 +270,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -150,6 +150,13 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-                 if (entityitem.isMergable()) {
+         this.bossEvent.setName(this.getDisplayName());
-                     // Paper Start - Fix items merging through walls
+     }
-                         if (this.level().paperConfig().fixes.fixItemsMergingThroughWalls) {
+ 
-+                            // Pufferfish start - skip the allocations
+    // Pufferfish start - optimize suffocation
-+                            /*
+    @Override
-                             net.minecraft.world.level.ClipContext rayTrace = new net.minecraft.world.level.ClipContext(this.position(), entityitem.position(),
+    public boolean shouldCheckForSuffocation() {
-                                 net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this);
+        return true;
-                             net.minecraft.world.phys.BlockHitResult rayTraceResult = this.level().clip(rayTrace);
+    }
-                             if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
+    // Pufferfish end
-+                             */
+
-+                            if (level().rayTraceDirect(this.position(), entityitem.position(), net.minecraft.world.phys.shapes.CollisionContext.of(this)) ==
+     @Override
-+                                net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
+     protected SoundEvent getAmbientSound() {
-+                            // Pufferfish end
+         return SoundEvents.WITHER_AMBIENT;
                         }
                     // Paper End
                     this.tryToMerge(entityitem);
 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 b62457313a1e30aad0c5313d608667b5d3811455..410f10ad93935d1c078447a4596023f367a8e9b7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -2777,29 +2756,8 @@ index 2e60bdc44c33d434bfd9ca5bf8f75de799c6768c..565318c2afaa1661ed9963453a6354df
         StackedContents autorecipestackmanager = new StackedContents();
         autorecipestackmanager.initialize(this); // Paper - better exact choice recipes
         int i = 0;
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
 index 0e8746759752b692668886370181aa5db1fd0bb0..58e5ce2afabf480f5dfd9adf43f8fc12666861c6 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
@@ -68,6 +68,16 @@ public interface BlockGetter extends LevelHeightAccessor {
         });
     }
 +    // Pufferfish start - broken down variant of below rayTraceBlock, used by World#rayTraceDirect
 +    default net.minecraft.world.phys.BlockHitResult.Type rayTraceBlockDirect(Vec3 vec3d, Vec3 vec3d1, BlockPos blockposition, BlockState iblockdata, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) {
 +        if (iblockdata.isAir()) return null; // Tuinity - optimise air cases
 +        VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(iblockdata, this, blockposition, voxelshapecoll);
 +        net.minecraft.world.phys.BlockHitResult movingobjectpositionblock = this.clipWithInteractionOverride(vec3d, vec3d1, blockposition, voxelshape, iblockdata);
 +
 +        return movingobjectpositionblock == null ? null : movingobjectpositionblock.getType();
 +    }
 +    // Pufferfish end
 +
     // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
             // Paper start - Prevent raytrace from loading chunks
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f39ab10c5b0b8d86b579a5b683491204c51db70b..d8d4a1ca2eb062af8b2de4ab44503983587cdd77 100644
+index 773bfdd3ed457a352b5329f280c0d10297d579ba..5c83d703211725ddc36602bb480545288d6a06d9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -273,6 +273,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -2834,99 +2792,7 @@ index f39ab10c5b0b8d86b579a5b683491204c51db70b..d8d4a1ca2eb062af8b2de4ab44503983
         this.dimension = resourcekey;
         this.isClientSide = flag;
         if (dimensionmanager.coordinateScale() != 1.0D) {
-@@ -412,6 +430,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1003,13 +1021,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return null;
     }
 +    // Pufferfish start - broken down method of raytracing for EntityLiving#hasLineOfSight, replaces IBlockAccess#rayTrace(RayTrace)
 +    public net.minecraft.world.phys.BlockHitResult.Type rayTraceDirect(net.minecraft.world.phys.Vec3 vec3d, net.minecraft.world.phys.Vec3 vec3d1, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) {
 +        // most of this code comes from IBlockAccess#a(RayTrace, BiFunction, Function), but removes the needless functions
 +        if (vec3d.equals(vec3d1)) {
 +            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
 +        }
 +
 +        double endX = Mth.lerp(-1.0E-7D, vec3d1.x, vec3d.x);
 +        double endY = Mth.lerp(-1.0E-7D, vec3d1.y, vec3d.y);
 +        double endZ = Mth.lerp(-1.0E-7D, vec3d1.z, vec3d.z);
 +
 +        double startX = Mth.lerp(-1.0E-7D, vec3d.x, vec3d1.x);
 +        double startY = Mth.lerp(-1.0E-7D, vec3d.y, vec3d1.y);
 +        double startZ = Mth.lerp(-1.0E-7D, vec3d.z, vec3d1.z);
 +
 +        int currentX = Mth.floor(startX);
 +        int currentY = Mth.floor(startY);
 +        int currentZ = Mth.floor(startZ);
 +
 +        BlockPos.MutableBlockPos currentBlock = new BlockPos.MutableBlockPos(currentX, currentY, currentZ);
 +
 +        LevelChunk chunk = this.getChunkIfLoaded(currentBlock);
 +        if (chunk == null) {
 +            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
 +        }
 +
 +        net.minecraft.world.phys.BlockHitResult.Type initialCheck = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll);
 +
 +        if (initialCheck != null) {
 +            return initialCheck;
 +        }
 +
 +        double diffX = endX - startX;
 +        double diffY = endY - startY;
 +        double diffZ = endZ - startZ;
 +
 +        int xDirection = Mth.sign(diffX);
 +        int yDirection = Mth.sign(diffY);
 +        int zDirection = Mth.sign(diffZ);
 +
 +        double normalizedX = xDirection == 0 ? Double.MAX_VALUE : (double) xDirection / diffX;
 +        double normalizedY = yDirection == 0 ? Double.MAX_VALUE : (double) yDirection / diffY;
 +        double normalizedZ = zDirection == 0 ? Double.MAX_VALUE : (double) zDirection / diffZ;
 +
 +        double normalizedXDirection = normalizedX * (xDirection > 0 ? 1.0D - Mth.frac(startX) : Mth.frac(startX));
 +        double normalizedYDirection = normalizedY * (yDirection > 0 ? 1.0D - Mth.frac(startY) : Mth.frac(startY));
 +        double normalizedZDirection = normalizedZ * (zDirection > 0 ? 1.0D - Mth.frac(startZ) : Mth.frac(startZ));
 +
 +        net.minecraft.world.phys.BlockHitResult.Type result;
 +
 +        do {
 +            if (normalizedXDirection > 1.0D && normalizedYDirection > 1.0D && normalizedZDirection > 1.0D) {
 +                return net.minecraft.world.phys.BlockHitResult.Type.MISS;
 +            }
 +
 +            if (normalizedXDirection < normalizedYDirection) {
 +                if (normalizedXDirection < normalizedZDirection) {
 +                    currentX += xDirection;
 +                    normalizedXDirection += normalizedX;
 +                } else {
 +                    currentZ += zDirection;
 +                    normalizedZDirection += normalizedZ;
 +                }
 +            } else if (normalizedYDirection < normalizedZDirection) {
 +                currentY += yDirection;
 +                normalizedYDirection += normalizedY;
 +            } else {
 +                currentZ += zDirection;
 +                normalizedZDirection += normalizedZ;
 +            }
 +
 +            currentBlock.set(currentX, currentY, currentZ);
 +            if (chunk.getPos().x != currentBlock.getX() >> 4 || chunk.getPos().z != currentBlock.getZ() >> 4) {
 +                chunk = this.getChunkIfLoaded(currentBlock);
 +                if (chunk == null) {
 +                    return net.minecraft.world.phys.BlockHitResult.Type.MISS;
 +                }
 +            }
 +            result = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll);
 +        } while (result == null);
 +
 +        return result;
 +    }
 +    // Pufferfish end
 +
     public boolean isInWorldBounds(BlockPos pos) {
         return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
     }
@@ -919,13 +1022,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         try {
             tickConsumer.accept(entity);
             MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -2942,7 +2808,7 @@ index f39ab10c5b0b8d86b579a5b683491204c51db70b..d8d4a1ca2eb062af8b2de4ab44503983
             // Paper end
         }
     }
-@@ -1380,6 +1483,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1464,6 +1482,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     public ProfilerFiller getProfiler() {
--- a/patches/server/0002-Purpur-Server-Changes.patch
+++ b/patches/server/0002-Purpur-Server-Changes.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
+From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 12 Jun 2022 09:18:57 -0500
+Date: Mon, 11 Sep 2023 01:08:34 +0000
 Subject: [PATCH] Purpur Server Changes
 Original: PurpurMC
@@ -342,7 +342,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
         setListData(vector);
     }
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 3d4bb28fe686a9ad2e4c0f75f21e6289c2ea5cf9..bff1b41501c040487583a5a279fc7800fc6aedca 100644
+index 95d1a8a5b349f7849c040026bfa3469d03d92bfd..3e36958365bc136516bafbaad0c168f7956406f1 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 {
@@ -4794,7 +4794,7 @@ index 759713f7c646aaf1a918c87a2834a1d405385dad..43cdda0cb26c5d5cc9025199eb71673d
     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 e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3e197d810 100644
+index 0059ceabaed9c1888a6773efb906e761fd1ca252..f1bae6fa9bde0b65ca592d64e9bbb0f6326e3956 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 {
@@ -4880,15 +4880,6 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         if (this.fireImmune() || this.level().isClientSide) {
             this.clearFire();
         }
@@ -413,7 +419,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             boolean flag = this instanceof net.minecraft.world.entity.player.Player;
             if (!this.level().isClientSide) {
 -                if ((!gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F))) && this.isInWall()) { // Pufferfish - optimize suffocation
 +                if (shouldCheckForSuffocation() && this.isInWall()) { // Pufferfish - optimize suffocation // Purpur
                     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();
@@ -422,6 +428,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                         double d1 = this.level().getWorldBorder().getDamagePerBlock();
@@ -4986,19 +4977,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
                 EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
                 if (event.isCancelled()) {
                     continue;
-@@ -1376,6 +1412,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1471,13 +1507,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
         return true;
     }
     // Pufferfish end
 +    // Purpur start
 +    public boolean shouldCheckForSuffocation() {
 +        return (!gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F)));
 +    }
 +    // Purpur end
     @Override
     public boolean hurt(DamageSource source, float amount) {
@@ -1467,13 +1508,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;
@@ -5014,7 +4993,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
                         LivingEntity entityliving2 = entitywolf.getOwner();
                         if (entityliving2 instanceof net.minecraft.world.entity.player.Player) {
-@@ -1584,6 +1625,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1588,6 +1624,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 }
             }
@@ -5033,7 +5012,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
             org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
             EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
             event.setCancelled(itemstack == null);
-@@ -1750,7 +1803,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1754,7 +1802,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             boolean flag = false;
             if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -5042,7 +5021,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
                     BlockPos blockposition = this.blockPosition();
                     BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
-@@ -1796,6 +1849,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1800,6 +1848,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.dropEquipment(); // CraftBukkit - from below
         if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -5050,7 +5029,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
             this.dropFromLootTable(source, flag);
             // Paper start
             final boolean prev = this.clearEquipmentSlots;
-@@ -1804,6 +1858,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1808,6 +1857,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             // Paper end
             this.dropCustomDeathLoot(source, i, flag);
             this.clearEquipmentSlots = prev; // Paper
@@ -5058,7 +5037,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         }
         // 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, () -> {
-@@ -2050,7 +2105,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2054,7 +2104,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);
@@ -5067,7 +5046,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         }
     }
-@@ -2273,6 +2328,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2277,6 +2327,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 }
             }
@@ -5088,7 +5067,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
             if (f > 0 || !human) {
                 if (human) {
                     // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
-@@ -2489,7 +2558,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2493,7 +2557,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     @Override
     protected void onBelowWorld() {
@@ -5097,7 +5076,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
     }
     protected void updateSwingTime() {
-@@ -2686,7 +2755,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2690,7 +2754,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
     }
     protected long lastJumpTime = 0L; // Paper
@@ -5106,7 +5085,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         Vec3 vec3d = this.getDeltaMovement();
         // Paper start
         long time = System.nanoTime();
-@@ -2838,6 +2907,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2842,6 +2906,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                     if (f3 > 0.0F) {
                         this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);
@@ -5114,7 +5093,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
                         this.hurt(this.damageSources().flyIntoWall(), f3);
                     }
                 }
-@@ -3059,10 +3129,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3063,10 +3128,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
         }
         this.run += (f3 - this.run) * 0.3F;
@@ -5128,7 +5107,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         // Paper start - stop large pitch and yaw changes from crashing the server
         this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
-@@ -3074,7 +3144,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3078,7 +3143,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
         this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
         // Paper end
@@ -5137,7 +5116,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         this.animStep += f2;
         if (this.isFallFlying()) {
             ++this.fallFlyTicks;
-@@ -3363,19 +3433,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3367,19 +3432,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
         }
         this.setDeltaMovement(d4, d5, d6);
@@ -5162,7 +5141,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         if (this.jumping && this.isAffectedByFluids()) {
             double d7;
-@@ -3402,8 +3472,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3406,8 +3471,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.noJumpDelay = 0;
         }
@@ -5173,7 +5152,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         this.xxa *= 0.98F;
         this.zza *= 0.98F;
         this.updateFallFlying();
-@@ -3430,8 +3500,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3434,8 +3499,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.travel(vec3d1);
         }
@@ -5184,7 +5163,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
         if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
             int i = this.getTicksFrozen();
-@@ -3448,18 +3518,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3452,18 +3517,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.hurt(this.damageSources().freeze(), 1.0F);
         }
@@ -5210,7 +5189,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
                 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());
                 io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3469,12 +3541,48 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3473,12 +3540,48 @@ 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());
                 }
             }
@@ -5259,7 +5238,7 @@ index e9a31314424d9db911cd9806741222397c3072d7..4cd04661b39a7055f5767a3dff88f9a3
     }
     public boolean isSensitiveToWater() {
-@@ -3495,7 +3603,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3499,7 +3602,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
                     int j = i / 10;
                     if (j % 2 == 0) {
@@ -10760,7 +10739,7 @@ index a24ae93efcdb2da5782d342c7697a1bb253400c7..ec595b74a6376adb65840035cdaa7502
     }
 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..4952a7daa1aad68e3ba53123093cd879e0d544b5 100644
+index c65ab566c6241dd6a44bd11a449ef0c4b2f6dc65..c94a1b75593ad01e7f79fdc84818ea8ec269e124 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,20 +84,59 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -10954,21 +10933,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
     }
-@@ -150,6 +291,13 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -263,6 +404,16 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
         this.bossEvent.setName(this.getDisplayName());
     }
 +    // Purpur start - optimize suffocation
 +    @Override
 +    public boolean shouldCheckForSuffocation() {
 +        return true;
 +    }
 +    // Purpur end
 +
     @Override
     protected SoundEvent getAmbientSound() {
         return SoundEvents.WITHER_AMBIENT;
@@ -256,6 +404,16 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     @Override
     protected void customServerAiStep() {
@@ -10985,7 +10950,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
         int i;
         if (this.getInvulnerableTicks() > 0) {
-@@ -272,7 +430,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -279,7 +430,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                 }
                 // CraftBukkit end
@@ -10994,7 +10959,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
                     // CraftBukkit start - Use relative location for far away sounds
                     // this.level().globalLevelEvent(1023, new BlockPosition(this), 0);
                     int viewDistance = ((ServerLevel) this.level()).getCraftServer().getViewDistance() * 16;
-@@ -296,7 +454,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -303,7 +454,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
             this.setInvulnerableTicks(i);
             if (this.tickCount % 10 == 0) {
@@ -11003,7 +10968,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
             }
         } else {
-@@ -356,7 +514,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -363,7 +514,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
             if (this.destroyBlocksTick > 0) {
                 --this.destroyBlocksTick;
@@ -11012,7 +10977,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
                     i = Mth.floor(this.getY());
                     j = Mth.floor(this.getX());
                     int i1 = Mth.floor(this.getZ());
-@@ -389,8 +547,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -396,8 +547,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                 }
             }
@@ -11025,7 +10990,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
             }
             this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
-@@ -576,11 +736,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -583,11 +736,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     }
     public int getAlternativeTarget(int headIndex) {
@@ -11039,7 +11004,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..4952a7daa1aad68e3ba53123093cd879
     }
     @Override
-@@ -595,6 +755,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -602,6 +755,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
     @Override
     protected boolean canRide(Entity entity) {
@@ -11178,7 +11143,7 @@ index 18eaccb39a4c81338a8cbebe3de03934913ac2a4..7ad5583f05b608d5a34a33fb77c5bf91
             }
             // Paper end - fix sand duping
 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 80fc7918cb294b0d88a293bd6a920441cb55c3ad..d045877bfb0f364a43c8448cad21cc39d0565964 100644
+index d39f31e7cf315c7cdc1daab28164380e44dd8341..f5f7f384329fdc96fce794c3cf5439d2ab8ecc8b 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 {
@@ -11194,7 +11159,7 @@ index 80fc7918cb294b0d88a293bd6a920441cb55c3ad..d045877bfb0f364a43c8448cad21cc39
     public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
         super(type, world);
-@@ -358,6 +364,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -352,6 +358,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
             return false;
         } else if (!this.getItem().getItem().canBeHurtBy(source)) {
             return false;
@@ -11210,7 +11175,7 @@ index 80fc7918cb294b0d88a293bd6a920441cb55c3ad..d045877bfb0f364a43c8448cad21cc39
         } else if (this.level().isClientSide) {
             return true;
         } else {
-@@ -555,6 +570,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -549,6 +564,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
         // com.google.common.base.Preconditions.checkArgument(!stack.isEmpty(), "Cannot drop air"); // CraftBukkit // Paper - Remove check
         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
@@ -16136,7 +16101,7 @@ index b16d9e2eaa589f19c563ee70b1a56d67dbcdecb0..71beab673f04cd051c46ea37f8c84731
     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/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 706b354ac9a1a6a4a1e61b2a109180d1dd22bbbd..9ca261c9f21279558961649cb4849ac379d67573 100644
+index 71b7a091e56dd68da280d13318a393170967b042..9614a0b5b32d88a5b212e33af649ca1aa2a22dfd 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 {
@@ -17591,7 +17556,7 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..4932374ab9a3d8582fb0ef024d817ad8
             }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0cb805b6d 100644
+index 5c83d703211725ddc36602bb480545288d6a06d9..80ab17142c34d576409e5fb353ff31db9673b2c0 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 {
@@ -17670,7 +17635,7 @@ index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0
         this.generator = gen;
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
-@@ -967,18 +1013,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -966,18 +1012,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     protected void tickBlockEntities() {
@@ -17694,7 +17659,7 @@ index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0
         // Spigot start
         // Iterator iterator = this.blockEntityTickers.iterator();
         int tilesThisCycle = 0;
-@@ -1011,10 +1057,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1010,10 +1056,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         }
         this.blockEntityTickers.removeAll(toRemove);
@@ -17707,7 +17672,7 @@ index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0
         spigotConfig.currentPrimedTnt = 0; // Spigot
     }
-@@ -1207,7 +1253,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1206,7 +1252,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     @Override
     public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -17716,7 +17681,7 @@ index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0
         List<Entity> list = Lists.newArrayList();
         ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
         return list;
-@@ -1226,7 +1272,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1225,7 +1271,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) {
@@ -17725,7 +17690,7 @@ index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0
         // Paper start - optimise this call
         //TODO use limit
         if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
-@@ -1483,7 +1529,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1482,7 +1528,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
     }
     public ProfilerFiller getProfiler() {
@@ -17734,7 +17699,7 @@ index d8d4a1ca2eb062af8b2de4ab44503983587cdd77..bdb32964524cb2a4398b8d3bedfb03b0
         return (ProfilerFiller) this.profiler.get();
     }
-@@ -1574,4 +1620,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1573,4 +1619,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         return null;
     }
     // Paper end
@@ -20938,7 +20903,7 @@ index 5e83fabb20bc2b0668cbf48530053ca1bb9092f3..4ffb4046b63cbc140c76721f51c9a7a0
 +    // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index f0ce29d21fe9af803ce4e41b8c037b2ec5d1b124..99dd93c066d4acc177de7f03ae45e491b535f4d1 100644
+index b25f5931f836fd4d8695120f0bcb7c52deff8583..b473f89c59c0fc080fadd0d4db320895e917fd41 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 {
@@ -20977,7 +20942,7 @@ index f0ce29d21fe9af803ce4e41b8c037b2ec5d1b124..99dd93c066d4acc177de7f03ae45e491
         }
         return effects;
     }
-@@ -907,7 +907,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -912,7 +912,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
             return EntityCategory.WATER;
         }
@@ -20986,7 +20951,7 @@ index f0ce29d21fe9af803ce4e41b8c037b2ec5d1b124..99dd93c066d4acc177de7f03ae45e491
     }
     @Override
-@@ -1094,4 +1094,32 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1099,4 +1099,32 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         getHandle().knockback(strength, directionX, directionZ);
     };
     // Paper end
--- a/patches/server/0004-Rebrand.patch
+++ b/patches/server/0004-Rebrand.patch
@@ -153,7 +153,7 @@ index b5b6657e52e4f7a630229bd3ba433438af293e22..c468733f44ccb3ff4ba3c20921a4ec52
         stringbuilder.append("// ");
         stringbuilder.append(CrashReport.getErrorComment());
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index dae36c6452ccd57a436dd918547b64d59957ab0a..903da36aeec8e8c7d1f3101d1e93f87412a7eed5 100644
+index dae36c6452ccd57a436dd918547b64d59957ab0a..a8bf67cf0c579c407befe17d735440f1128d98c4 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
@@ -112,6 +112,18 @@ public class Main {
@@ -169,7 +169,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..903da36aeec8e8c7d1f3101d1e93f874
 +                    \033[38;2;236;61;151m┃\033[38;2;236;61;157m \033[38;2;237;62;163m┃\033[38;2;237;62;169m \033[38;2;238;62;175m \033[38;2;238;63;181m \033[38;2;239;63;187m \033[38;2;239;63;193m \033[38;2;239;64;200m┃\033[38;2;240;64;206m \033[38;2;240;64;212m┗\033[38;2;241;65;218m━\033[38;2;241;65;224m━\033[38;2;242;65;230m━\033[38;2;242;66;236m━\033[38;2;242;66;242m┓\033[38;2;237;66;243m┃\033[38;2;232;67;243m \033[38;2;227;67;244m┃\033[38;2;221;67;244m \033[38;2;216;68;244m \033[38;2;211;68;245m┃\033[38;2;205;69;245m \033[38;2;200;69;246m┃\033[38;2;195;69;246m┏\033[38;2;189;70;246m┛\033[38;2;184;70;247m \033[38;2;179;70;247m \033[38;2;173;71;247m┗\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┓\033[38;2;152;72;249m┃\033[38;2;147;73;249m \033[38;2;141;73;250m┃\033[38;2;136;74;250m \033[38;2;131;74;250m┗\033[38;2;125;74;251m━\033[38;2;120;75;251m┛\033[38;2;115;75;251m \033[38;2;109;76;252m┃\033[38;2;104;76;252m \033[38;2;99;77;252m┃\033[38;2;94;77;253m┃\033[38;2;88;77;253m \033[38;2;83;78;253m┃\033[38;2;78;79;254m \033[38;2;79;85;254m \033[38;2;79;91;254m┃\033[38;2;80;97;255m \033[38;2;80;103;255m┃
 +                    \033[38;2;236;61;151m┗\033[38;2;236;61;157m━\033[38;2;237;62;163m┛\033[38;2;237;62;169m \033[38;2;238;62;175m \033[38;2;238;63;181m \033[38;2;239;63;187m \033[38;2;239;63;193m \033[38;2;239;64;200m┗\033[38;2;240;64;206m━\033[38;2;240;64;212m━\033[38;2;241;65;218m━\033[38;2;241;65;224m━\033[38;2;242;65;230m━\033[38;2;242;66;236m━\033[38;2;242;66;242m┛\033[38;2;237;66;243m┗\033[38;2;232;67;243m━\033[38;2;227;67;244m┛\033[38;2;221;67;244m \033[38;2;216;68;244m \033[38;2;211;68;245m┗\033[38;2;205;69;245m━\033[38;2;200;69;246m┛\033[38;2;195;69;246m┗\033[38;2;189;70;246m━\033[38;2;184;70;247m━\033[38;2;179;70;247m━\033[38;2;173;71;247m━\033[38;2;168;71;248m━\033[38;2;163;72;248m━\033[38;2;157;72;249m┛\033[38;2;152;72;249m┗\033[38;2;147;73;249m━\033[38;2;141;73;250m┛\033[38;2;136;74;250m \033[38;2;131;74;250m \033[38;2;125;74;251m \033[38;2;120;75;251m \033[38;2;115;75;251m \033[38;2;109;76;252m┗\033[38;2;104;76;252m━\033[38;2;99;77;252m┛\033[38;2;94;77;253m┗\033[38;2;88;77;253m━\033[38;2;83;78;253m┛\033[38;2;78;79;254m \033[38;2;79;85;254m \033[38;2;79;91;254m┗\033[38;2;80;97;255m━\033[38;2;80;103;255m┛
 +                    """);
-+            LOGGER.warn("Warning! Plazma may cause unexpected problems, so DO NOT USE it on a production server!");
+            LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
 +            // Plazma end
 +
             Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit
@@ -220,10 +220,10 @@ index be7b3fe2dc84493dcde9e185717b0b7c7c2e9822..cfdaa744ff40c8a171ca9b36b305b326
                     servergui.runFinalizers();
                 }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..9fb140b3b6a0c621466b85a6ec7df765a4e823b0 100644
+index 80ab17142c34d576409e5fb353ff31db9673b2c0..32bd43692b701b49776c10d9c4332bb41322b9fa 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1035,7 +1035,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1034,7 +1034,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
             // Spigot start
             if (tickingblockentity == null) {
@@ -259,10 +259,10 @@ index b08d4a2a74392b1d59b1eeeab3108103d83ad96c..8833a66f43e9a4ac486fa67db9e81470
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 99dd93c066d4acc177de7f03ae45e491b535f4d1..9d7965a33db1ce4c294fb06e77d16054d580fd54 100644
+index b473f89c59c0fc080fadd0d4db320895e917fd41..cdf28d1b5da2f602b020142d5bfc37922e315718 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -907,7 +907,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -912,7 +912,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
             return EntityCategory.WATER;
         }
--- a/patches/server/0006-Bump-Dependencies.patch
+++ b/patches/server/0006-Bump-Dependencies.patch
@@ -0,0 +1,92 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 13:31:43 +0900
 Subject: [PATCH] Bump-Dependencies
 diff --git a/build.gradle.kts b/build.gradle.kts
 index d8b27e3f2fa1ede41125ec27e129b1e1ad42caa7..2c59ed16ea909b6535df3d1d40d83b065c03d041 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     }
     // Purpur end
     // Paper start
 -    implementation("org.jline:jline-terminal-jansi:3.21.0")
 +    implementation("org.jline:jline-terminal-jansi:3.23.0") // Plazma - Bump Dependencies
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
     implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
     implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
@@ -30,48 +30,48 @@ dependencies {
           all its classes to check if they are plugins.
           Scanning takes about 1-2 seconds so adding this speeds up the server start.
      */
 -    implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation
 -    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
 +    implementation("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - implementation
 +    log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.20.0") // Paper - Needed to generate meta for our Log4j plugins
     runtimeOnly(log4jPlugins.output)
     alsoShade(log4jPlugins.output)
 -    implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
 +    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
     // Paper end
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
 -    implementation("org.ow2.asm:asm:9.4")
 -    implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation
 -    testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.20.0") // Paper - remove exclusion
 +    implementation("org.ow2.asm:asm:9.5")
 +    implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
 +    testImplementation("org.mockito:mockito-core:5.5.0") // Paper - switch to mockito
     implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
     implementation("commons-lang:commons-lang:2.6")
 -    implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
 -    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
 +    implementation("net.fabricmc:mapping-io:0.4.2") // Paper - needed to read mappings for stacktrace deobfuscation
 +    runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
     runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
     // Paper start - Use Velocity cipher
 -    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
 +    implementation("com.velocitypowered:velocity-native:3.2.0-SNAPSHOT") {
         isTransitive = false
     }
     // Paper end
 -    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 +    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.4")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.15")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.15")
     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
     // Pufferfish start
 -    implementation("org.yaml:snakeyaml:1.32")
 +    implementation("org.yaml:snakeyaml:2.2")
     implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
         exclude(group="org.yaml", module="snakeyaml")
     }
     // Pufferfish end
 -    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
 +    testImplementation("io.github.classgraph:classgraph:4.8.162") // Paper - mob goal test
     testImplementation("junit:junit:4.13.2")
 -    testImplementation("org.hamcrest:hamcrest-library:1.3")
 +    testImplementation("org.hamcrest:hamcrest-library:2.2")
 -    implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
 +    implementation("io.netty:netty-all:4.1.97.Final"); // Paper - Bump netty
 }
 val craftbukkitPackageVersion = "1_20_R1" // Paper
@@ -225,3 +225,6 @@ tasks.registerRunTask("runDev") {
     description = "Spin up a non-relocated Mojang-mapped test server"
     classpath(sourceSets.main.map { it.runtimeClasspath })
 }
 +repositories {
 +    mavenCentral()
 +}
--- a/patches/server/0007-Plazma-Configurations.patch
+++ b/patches/server/0007-Plazma-Configurations.patch
@@ -642,7 +642,7 @@ index 0000000000000000000000000000000000000000..857ddc62dd9affbbebcd7cde8a6d675d
 +}
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b1104778995a3734f3b6df71d59172e546e152a2
+index 0000000000000000000000000000000000000000..481392f3ed3b746172dbf319a583ca5751bc0b35
 --- /dev/null
 +++ b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
@@ -0,0 +1,304 @@
@@ -699,7 +699,7 @@ index 0000000000000000000000000000000000000000..b1104778995a3734f3b6df71d59172e5
 +
 +    private static final Logger LOGGER = LogUtils.getLogger();
 +    static final String GLOBAL_CONFIGURATION_FILE_NAME= "plazma-global.yml";
-+    static final String LEVEL_DEFAULT_CONFIGURATION_FILE_NAME = "plazma-level-dafaults.yml";
+    static final String LEVEL_DEFAULT_CONFIGURATION_FILE_NAME = "plazma-level-defaults.yml";
 +    static final String LEVEL_CONFIGURATION_FILE_NAME = "plazma-configuration.yml";
 +
 +    private static final String HEADER_START = """
--- a/patches/server/0008-Add-more-metrics.patch
+++ b/patches/server/0008-Add-more-metrics.patch
--- a/patches/server/0009-Optimize-Default-Configurations.patch
+++ b/patches/server/0009-Optimize-Default-Configurations.patch
--- a/patches/server/0010-ChunkSending-Configuration.patch
+++ b/patches/server/0010-ChunkSending-Configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ChunkSending Configuration
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 857ddc62dd9affbbebcd7cde8a6d675dbb5f68ae..8ba1c5b6731d43c02b415e4d79a20c1de0c03ad5 100644
+index 857ddc62dd9affbbebcd7cde8a6d675dbb5f68ae..7df971a1bd47862918f4c7342eae19226c4c9fbe 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -22,4 +22,12 @@ public class LevelConfigurations extends ConfigurationPart {
@@ -16,7 +16,7 @@ index 857ddc62dd9affbbebcd7cde8a6d675dbb5f68ae..8ba1c5b6731d43c02b415e4d79a20c1d
 +    public ChunkSending chunkSending;
 +    public class ChunkSending extends ConfigurationPart {
 +
-+        public boolean enabled = true;
+        public boolean enabled = DO_OPTIMIZE;
 +        public int maxChunksPerTick = 5;
 +
 +    }
--- a/patches/server/0011-Implement-ChunkSending.patch
+++ b/patches/server/0011-Implement-ChunkSending.patch
@@ -7,10 +7,10 @@ Original: someaddons/chunksending
 Copyright (C) 2023 someaddons
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index e2202389a2c4133a183cca59c4e909fc419379ab..ccb7ff8832d3673a46d0a285f09d57d12bc0203a 100644
+index e2202389a2c4133a183cca59c4e909fc419379ab..b3e731c122b315d28ae51d32b798f818e270c7ff 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -398,9 +398,11 @@ public class ChunkHolder {
+@@ -398,9 +398,12 @@ public class ChunkHolder {
     // Paper end - rewrite chunk system
     private void broadcast(List<ServerPlayer> players, Packet<?> packet) {
@@ -18,9 +18,10 @@ index e2202389a2c4133a183cca59c4e909fc419379ab..ccb7ff8832d3673a46d0a285f09d57d1
 -            entityplayer.connection.send(packet);
 -        });
 +        // Plazma start
-+        for (ServerPlayer player : players)
+        for (ServerPlayer player : players) {
-+            if (this.chunkMap.level.plazmaLevelConfiguration().chunkSending.enabled && !player.attachToPending(pos, packet))
+            if (this.chunkMap.level.plazmaLevelConfiguration().chunkSending.enabled && player.attachToPending(pos, packet)) continue;
-+                player.connection.send(packet);
+            player.connection.send(packet);
 +        }
 +        // Plazma end
     }
--- a/patches/server/0012-Console-Log-Configuration.patch
+++ b/patches/server/0012-Console-Log-Configuration.patch
--- a/patches/server/0013-Console-log-tweaks.patch
+++ b/patches/server/0013-Console-log-tweaks.patch
@@ -8,7 +8,7 @@ Original by Irochi <me@irochi.moe>
 Licensed under the GPL 3.0
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 49601ffa5a1a67e8572078fa9bd7780b096b6e67..5435897c040868e4d3c3c39db2fd42977e747de0 100644
+index e6f14bb0825e3b6987ebb2ec782c8316e3b7c094..191bebab12c94756e9f98cfacbf06eb9a7c2f2f9 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -180,16 +180,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/patches/server/0014-Player-configuration-section.patch
+++ b/patches/server/0014-Player-configuration-section.patch
--- a/patches/server/0015-Add-option-to-allow-any-usernames.patch
+++ b/patches/server/0015-Add-option-to-allow-any-usernames.patch
--- a/patches/server/0016-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch
+++ b/patches/server/0016-Add-permission-to-bypass-reducedDebugInfo-gamerule.patch
--- a/patches/server/0017-Add-missing-purpur-configuration-options.patch
+++ b/patches/server/0017-Add-missing-purpur-configuration-options.patch
--- a/patches/server/0018-Structure-Configuration.patch
+++ b/patches/server/0018-Structure-Configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Structure Configuration
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 8ba1c5b6731d43c02b415e4d79a20c1de0c03ad5..4ee9f3ca88e89a8dcbfe6c807036386ef679da0a 100644
+index 7df971a1bd47862918f4c7342eae19226c4c9fbe..b1a75e865e61f9cdfb6a6a57cbab3db1f2a709d3 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -30,4 +30,21 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0019-Configurable-nether-portal-size.patch
+++ b/patches/server/0019-Configurable-nether-portal-size.patch
@@ -36,7 +36,7 @@ index e7554ec800f321e4e34c926c53f2375a8c3aa979..677f546cee0ebda24a6e77cb5fedd410
     // CraftBukkit start - return boolean
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 4ee9f3ca88e89a8dcbfe6c807036386ef679da0a..1cf5344d3ade76f6c24c7ea68d98b02e0dc62001 100644
+index b1a75e865e61f9cdfb6a6a57cbab3db1f2a709d3..3ca0f64bf5dcf104a84db91f22fae75790468052 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -40,7 +40,43 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0020-Misc-configuration.patch
+++ b/patches/server/0020-Misc-configuration.patch
@@ -22,7 +22,7 @@ index 4f54ae58bd20481f02aaec3f8406996a5e01b24f..61477d98f10ce7d0ec29d51de8c7a3b4
     }
 }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 1cf5344d3ade76f6c24c7ea68d98b02e0dc62001..9416ce600d46fad167befe8d42f9a1a7d891a37f 100644
+index 3ca0f64bf5dcf104a84db91f22fae75790468052..843cf772c18d2e9386bf5a7b1731a86c349d6b98 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -82,5 +82,12 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0021-Reduce-create-random-instance.patch
+++ b/patches/server/0021-Reduce-create-random-instance.patch
@@ -18,7 +18,7 @@ index f5bc3497831877e0c2b7dc1cbd8abe3a67d7695b..d157758282cc79d58134c056c52a43a2
             double d1 = (double) (center.y - maxRange);
             double d2 = (double) (center.x + maxRange);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ae04c5f4fd340c6bce0be29d4288dad37f260c7d..4a67650da636da5a6d5b5dfaaa86077d0cc9269c 100644
+index f39b3f1b5b37d1939766952a985684279cb2bf2d..69d22bc9f0087dc419b840c6626746e12f621012 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -447,7 +447,7 @@ public class ServerPlayer extends Player {
@@ -162,7 +162,7 @@ index 61477d98f10ce7d0ec29d51de8c7a3b42026dd2d..3e0d0d21dc73b2a5d033d8bcd43b0886
     }
 }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 9416ce600d46fad167befe8d42f9a1a7d891a37f..2836447cf43e145d1fc1d24f6d054be49e9a14d9 100644
+index 843cf772c18d2e9386bf5a7b1731a86c349d6b98..14987ceec693397602b5c8e1fe460a6fc212a0ee 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -87,7 +87,7 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0022-Entity-Configuration.patch
+++ b/patches/server/0022-Entity-Configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Configuration
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 2836447cf43e145d1fc1d24f6d054be49e9a14d9..f560db0cd544c96264ebad8af3ed3dd8379bab1b 100644
+index 14987ceec693397602b5c8e1fe460a6fc212a0ee..5dcabaf3fa198a05afc25753f6d062fe7d86972e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -90,4 +90,21 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0023-Various-Optimizations.patch
+++ b/patches/server/0023-Various-Optimizations.patch
@@ -94,7 +94,7 @@ index 3e0d0d21dc73b2a5d033d8bcd43b08866e0d6923..e91b404fca2823748c2ed343cbd83301
     }
 }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index f560db0cd544c96264ebad8af3ed3dd8379bab1b..80ee8293d73ecdb1a942ca88f1aa00813d600849 100644
+index 5dcabaf3fa198a05afc25753f6d062fe7d86972e..504913e8e05869f8f0b88f0faaf684d39eb14ea7 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -100,7 +100,7 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0024-Add-configuration-to-disable-moved-to-quickly-check-.patch
+++ b/patches/server/0024-Add-configuration-to-disable-moved-to-quickly-check-.patch
@@ -19,7 +19,7 @@ index 9cc3ab8cd3f7ab7f8fbf4d9d14f25ea0bd757eec..09183dbac0e8ca2cc2c8da57b105b80e
                                     // Paper start - Add fail move event
                                     io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 80ee8293d73ecdb1a942ca88f1aa00813d600849..e6c22ab535ab8fecaadbf06d4982440fd5863f17 100644
+index 504913e8e05869f8f0b88f0faaf684d39eb14ea7..61c06213b4ceb8e38e9aa41c3517f152d0d669ad 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -88,6 +88,7 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0025-Apply-faster-random.patch
+++ b/patches/server/0025-Apply-faster-random.patch
--- a/patches/server/0026-Do-not-send-useless-entity-packets.patch
+++ b/patches/server/0026-Do-not-send-useless-entity-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not send useless entity packets
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 1a4658db86e89d57b0a52923773a0983ff60989c..f39e7fb4aabf319785f134ecc0c81e4a1830712e 100644
+index fb11b020d52988360562db23d8568e5ef37e21c8..80ab684a33876d62186dcf86f555e46db1594b09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -203,6 +203,7 @@ public class ServerEntity {
--- a/patches/server/0027-No-Chat-Reports-Configuration.patch
+++ b/patches/server/0027-No-Chat-Reports-Configuration.patch
--- a/patches/server/0028-Implement-No-Chat-Reports.patch
+++ b/patches/server/0028-Implement-No-Chat-Reports.patch
--- a/patches/server/0029-FixMySpawnR-Configuration.patch
+++ b/patches/server/0029-FixMySpawnR-Configuration.patch
--- a/patches/server/0030-Implement-FixMySpawnR.patch
+++ b/patches/server/0030-Implement-FixMySpawnR.patch
--- a/patches/server/0031-Implement-MemoryLeakFix.patch
+++ b/patches/server/0031-Implement-MemoryLeakFix.patch
--- a/patches/server/0032-Reduce-Sensor-Work.patch
+++ b/patches/server/0032-Reduce-Sensor-Work.patch
@@ -7,7 +7,7 @@ Original: Bloom-host/Petal
 Copyright (C) 2023 peaches94
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0b08cf7b26731ffd6f3909342f4e3a92fe0c813e..5c3df4d7b12bd942780ff74e6353a07d489de74f 100644
+index 4cd04661b39a7055f5767a3dff88f9a3e197d810..ea7e40d91c314f4a58b80c978f6d7f290825856d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1037,20 +1037,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0033-Configurable-Sensor-Tick.patch
+++ b/patches/server/0033-Configurable-Sensor-Tick.patch
@@ -24,7 +24,7 @@ index 19d9d3a9f634631e2ec5a6fa7f2cd9dd18f62f89..ba20f60588b980f49423307ff20fc24c
             //this.level().getProfiler().push("targetSelector"); // Purpur
             if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index e6c22ab535ab8fecaadbf06d4982440fd5863f17..185e2627596314d979188468f838d008442f2d2e 100644
+index 61c06213b4ceb8e38e9aa41c3517f152d0d669ad..8dadc3fd21d507bf88f7f75935f7477375f21344 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -107,5 +107,12 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0034-Optimize-VarInts.patch
+++ b/patches/server/0034-Optimize-VarInts.patch
@@ -6,10 +6,16 @@ Subject: [PATCH] Optimize VarInts
 https://github.com/PaperMC/Paper/pull/8418
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index c0bd2997fe3ebbfe926de832a36d209cc875f3e2..6108f3aa438b96e817c3a2e582c2c817f096e2eb 100644
+index c0bd2997fe3ebbfe926de832a36d209cc875f3e2..8bb552410207b39a3b4160a5df51410455107fcf 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -104,7 +104,20 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -99,12 +99,26 @@ public class FriendlyByteBuf extends ByteBuf {
     private static final Gson GSON = new Gson();
     public static boolean hasItemSerializeEvent = false; // Purpur
 +    public static boolean optimizeVarInts = false; // Plazma
     public FriendlyByteBuf(ByteBuf parent) {
         this.source = parent;
     }
@@ -24,18 +30,18 @@ index c0bd2997fe3ebbfe926de832a36d209cc875f3e2..6108f3aa438b96e817c3a2e582c2c817
 +    // Plazma end
     public static int getVarIntSize(int value) {
 +        // Plazma start - Optimize VarInts
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.optimizeVarInts)
+        if (optimizeVarInts)
 +            return VARINT_EXACT_BYTE_LENGTHS[Integer.numberOfLeadingZeros(value)];
 +        // Plazma end
         for (int j = 1; j < 5; ++j) {
             if ((value & -1 << j * 7) == 0) {
                 return j;
-@@ -620,6 +633,25 @@ public class FriendlyByteBuf extends ByteBuf {
+@@ -620,6 +634,25 @@ public class FriendlyByteBuf extends ByteBuf {
     }
     public FriendlyByteBuf writeVarInt(int value) {
 +        // Plazma start - Optimize VarInts
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.optimizeVarInts) {
+        if (optimizeVarInts) {
 +            // Peel the one and two byte count cases explicitly as they are the most common VarInt sizes
 +            // that the proxy will write, to improve inlining.
 +            if ((value & (0xFFFFFFFF << 7)) == 0) {
@@ -57,14 +63,25 @@ index c0bd2997fe3ebbfe926de832a36d209cc875f3e2..6108f3aa438b96e817c3a2e582c2c817
             this.writeByte(value & 127 | 128);
             value >>>= 7;
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index b2c9ac1947e6c9ad0e693cfeaf6f2f4bfd521aa0..c1ff5d20dd3b74062837fd30a7b3966e16bdf54c 100644
+index b2c9ac1947e6c9ad0e693cfeaf6f2f4bfd521aa0..525fe30b6abba295709fca3d10f9b24679112571 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -43,6 +43,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -38,11 +38,17 @@ public class GlobalConfiguration extends ConfigurationPart {
     }
     public Misc misc;
 -    public class Misc extends ConfigurationPart {
 +    public class Misc extends ConfigurationPart.Post {
         public boolean reduceCreateRandomInstance = DO_OPTIMIZE;
         public boolean doNotTriggerLootTableRefreshForNonPlayerInteraction = DO_OPTIMIZE;
         public boolean doNotSendUselessEntityPackets = DO_OPTIMIZE;
 +        public boolean optimizeVarInts = DO_OPTIMIZE;
 +
 +        @Override
 +        public void postProcess() {
 +            net.minecraft.network.FriendlyByteBuf.optimizeVarInts = optimizeVarInts;
 +        }
     }
--- a/patches/server/0035-Variable-entity-wakeup-duration.patch
+++ b/patches/server/0035-Variable-entity-wakeup-duration.patch
@@ -7,7 +7,7 @@ Original: GaleMC/Gale
 Copyright (C) 2023 Martijn Muijsers
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 185e2627596314d979188468f838d008442f2d2e..238e10a35a9e4b300b11c838cda39b8799f16fe2 100644
+index 8dadc3fd21d507bf88f7f75935f7477375f21344..6db3defbf2634ae37af12246c17f852e6786d0ba 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -114,5 +114,20 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0036-More-optimise-state-lookup.patch
+++ b/patches/server/0036-More-optimise-state-lookup.patch
--- a/patches/server/0037-Suppress-Error-From-DirtyAttributes.patch
+++ b/patches/server/0037-Suppress-Error-From-DirtyAttributes.patch
@@ -29,7 +29,7 @@ index 80ab684a33876d62186dcf86f555e46db1594b09..21b18d85563ffd5f93234455dca4dc30
     }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
-index 238e10a35a9e4b300b11c838cda39b8799f16fe2..a1b55bb5431d1712fc06da0cf06857a986efeea0 100644
+index 6db3defbf2634ae37af12246c17f852e6786d0ba..7d5bfd3a5aa5135596f3f1ae7c504a51b02798ef 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -89,6 +89,7 @@ public class LevelConfigurations extends ConfigurationPart {
--- a/patches/server/0038-Implement-FerriteCore.patch
+++ b/patches/server/0038-Implement-FerriteCore.patch
--- a/patches/server/0039-Skip-event-if-no-listeners.patch
+++ b/patches/server/0039-Skip-event-if-no-listeners.patch
--- a/patches/server/0040-Optimize-spigot-event-bus.patch
+++ b/patches/server/0040-Optimize-spigot-event-bus.patch
@@ -0,0 +1,33 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 14:55:37 +0900
 Subject: [PATCH] Optimize-spigot-event-bus
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 index 32305a34bcebd53aa523102a6da59bc2eb765055..6feb88b90831ec7106c9d777bdfa68fa185f1b89 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
@@ -41,12 +41,17 @@ class PaperEventManager {
         RegisteredListener[] listeners = handlers.getRegisteredListeners();
         if (listeners.length == 0) return;
         // Plazma end
 -        if (event.isAsynchronous() && this.server.isPrimaryThread()) {
 -            throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
 -        } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) {
 -            throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
 +        // Plazma start - Optimize spigot event bus
 +        if (event.asynchronous() != net.kyori.adventure.util.TriState.NOT_SET) {
 +            final boolean isAsync = event.isAsynchronous();
 +            final boolean onPrimaryThread = this.server.isPrimaryThread();
 +            if (isAsync && onPrimaryThread) {
 +                throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
 +            } else if (!isAsync && !onPrimaryThread && !this.server.isStopping()) {
 +                throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
 +            }
         }
 -
 +        // Plazma end
         for (RegisteredListener registration : listeners) {
             if (!registration.getPlugin().isEnabled()) {
                 continue;
--- a/patches/server/0041-Reduce-allocations.patch
+++ b/patches/server/0041-Reduce-allocations.patch
--- a/patches/server/0042-CarpetFixes-Configuration.patch
+++ b/patches/server/0042-CarpetFixes-Configuration.patch
@@ -0,0 +1,40 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 15:40:34 +0900
 Subject: [PATCH] CarpetFixes-Configuration
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 index 525fe30b6abba295709fca3d10f9b24679112571..49d5292697fdc6f23874557dd2db9d1fcda750f3 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
@@ -76,4 +76,12 @@ public class GlobalConfiguration extends ConfigurationPart {
         public int timerTimeOut = 0;
     }
 +
 +    public CarpetFixes carpetFixes;
 +
 +    public class CarpetFixes extends ConfigurationPart {
 +
 +        public boolean enabled = DO_OPTIMIZE;
 +
 +    }
 }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 index 7d5bfd3a5aa5135596f3f1ae7c504a51b02798ef..b0deec445b5ea3cd3e4802eca04e99818b539bd8 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -131,4 +131,12 @@ public class LevelConfigurations extends ConfigurationPart {
         }
     }
 +
 +    public CarpetFixes carpetFixes;
 +
 +    public class CarpetFixes extends ConfigurationPart {
 +
 +        public boolean enabled = DO_OPTIMIZE;
 +
 +    }
 }
--- a/patches/server/0043-CarpetFixes-Optimizations-BiomeManager.patch
+++ b/patches/server/0043-CarpetFixes-Optimizations-BiomeManager.patch
@@ -0,0 +1,179 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 15:53:37 +0900
 Subject: [PATCH] CarpetFixes-Optimizations-BiomeManager
 Original: fxmorin/carpet-fixes
 Copyright (C) 2023 fxmorin
 Optimized getBiome call: Reduce the number of calls to the mess of
 LinearCongruentialGenerator#next(long, long) which is pretty heavy on performance.
 We are able to do this by skipping around 370 of 512 possible calls to getBiome() by predicting the outcome
 before doing the seed mixing. This seems to be around 25% - 75% faster depending on the use case.
 We can predict much faster than the seed mixing.
 diff --git a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
 index 5695c5116c8a338b2e41aafcb2dc9f2146856970..b2291854b9803fe01d40e8a1d76d6ff358cea114 100644
 --- a/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
 +++ b/src/main/java/net/minecraft/world/level/biome/BiomeManager.java
@@ -12,6 +12,7 @@ public class BiomeManager {
     private static final int ZOOM_BITS = 2;
     private static final int ZOOM = 4;
     private static final int ZOOM_MASK = 3;
 +    private static final double maxOffset = 0.4500000001D; // Plazma - CarpetFixes
     private final BiomeManager.NoiseBiomeSource noiseBiomeSource;
     private final long biomeZoomSeed;
@@ -29,39 +30,104 @@ public class BiomeManager {
     }
     public Holder<Biome> getBiome(BlockPos pos) {
 -        int i = pos.getX() - 2;
 -        int j = pos.getY() - 2;
 -        int k = pos.getZ() - 2;
 -        int l = i >> 2;
 -        int m = j >> 2;
 -        int n = k >> 2;
 -        double d = (double)(i & 3) / 4.0D;
 -        double e = (double)(j & 3) / 4.0D;
 -        double f = (double)(k & 3) / 4.0D;
 -        int o = 0;
 -        double g = Double.POSITIVE_INFINITY;
 -
 -        for(int p = 0; p < 8; ++p) {
 -            boolean bl = (p & 4) == 0;
 -            boolean bl2 = (p & 2) == 0;
 -            boolean bl3 = (p & 1) == 0;
 -            int q = bl ? l : l + 1;
 -            int r = bl2 ? m : m + 1;
 -            int s = bl3 ? n : n + 1;
 -            double h = bl ? d : d - 1.0D;
 -            double t = bl2 ? e : e - 1.0D;
 -            double u = bl3 ? f : f - 1.0D;
 -            double v = getFiddledDistance(this.biomeZoomSeed, q, r, s, h, t, u);
 -            if (g > v) {
 -                o = p;
 -                g = v;
 +        // Plazma start - CarpetFixes - Optimized getBiome call
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().carpetFixes.optimizedBiomeAccess()) {
 +            int xMinus2 = pos.getX() - 2;
 +            int yMinus2 = pos.getY() - 2;
 +            int zMinus2 = pos.getZ() - 2;
 +            int x = xMinus2 >> 2; // BlockPos to BiomePos
 +            int y = yMinus2 >> 2;
 +            int z = zMinus2 >> 2;
 +            double quartX = (double) (xMinus2 & 3) / 4.0D; // quartLocal divided by 4
 +            double quartY = (double) (yMinus2 & 3) / 4.0D; // 0/4, 1/4, 2/4, 3/4
 +            double quartZ = (double) (zMinus2 & 3) / 4.0D; // [0, 0.25, 0.5, 0.75]
 +            int smallestX = 0;
 +            double smallestDist = Double.POSITIVE_INFINITY;
 +            for (int biomeX = 0; biomeX < 8; ++biomeX) {
 +                boolean everyOtherQuad = (biomeX & 4) == 0; // 1 1 1 1 0 0 0 0
 +                boolean everyOtherPair = (biomeX & 2) == 0; // 1 1 0 0 1 1 0 0
 +                boolean everyOther = (biomeX & 1) == 0; // 1 0 1 0 1 0 1 0
 +                double quartXX = everyOtherQuad ? quartX : quartX - 1.0D; //[-1.0,-0.75,-0.5,-0.25,0.0,0.25,0.5,0.75]
 +                double quartYY = everyOtherPair ? quartY : quartY - 1.0D;
 +                double quartZZ = everyOther ? quartZ : quartZ - 1.0D;
 +
 +                //This code block is new
 +                double maxQuartYY = 0.0D, maxQuartZZ = 0.0D;
 +                if (biomeX != 0) {
 +                    maxQuartYY = Mth.square(Math.max(quartYY + maxOffset, Math.abs(quartYY - maxOffset)));
 +                    maxQuartZZ = Mth.square(Math.max(quartZZ + maxOffset, Math.abs(quartZZ - maxOffset)));
 +                    double maxQuartXX = Mth.square(Math.max(quartXX + maxOffset, Math.abs(quartXX - maxOffset)));
 +                    if (smallestDist < maxQuartXX + maxQuartYY + maxQuartZZ) continue;
 +                }
 +
 +                int xx = everyOtherQuad ? x : x + 1;
 +                int yy = everyOtherPair ? y : y + 1;
 +                int zz = everyOther ? z : z + 1;
 +
 +                //I transferred the code from method_38106 to here, so I could call continue halfway through
 +                long seed = LinearCongruentialGenerator.next(this.biomeZoomSeed, xx);
 +                seed = LinearCongruentialGenerator.next(seed, yy);
 +                seed = LinearCongruentialGenerator.next(seed, zz);
 +                seed = LinearCongruentialGenerator.next(seed, xx);
 +                seed = LinearCongruentialGenerator.next(seed, yy);
 +                seed = LinearCongruentialGenerator.next(seed, zz);
 +                double offsetX = getFiddle(seed);
 +                double sqrX = Mth.square(quartXX + offsetX);
 +                if (biomeX != 0 && smallestDist < sqrX + maxQuartYY + maxQuartZZ) continue; //skip the rest of the loop
 +                seed = LinearCongruentialGenerator.next(seed, this.biomeZoomSeed);
 +                double offsetY = getFiddle(seed);
 +                double sqrY = Mth.square(quartYY + offsetY);
 +                if (biomeX != 0 && smallestDist < sqrX + sqrY + maxQuartZZ) continue; // skip the rest of the loop
 +                seed = LinearCongruentialGenerator.next(seed, this.biomeZoomSeed);
 +                double offsetZ = getFiddle(seed);
 +                double biomeDist = sqrX + sqrY + Mth.square(quartZZ + offsetZ);
 +
 +                if (smallestDist > biomeDist) {
 +                    smallestX = biomeX;
 +                    smallestDist = biomeDist;
 +                }
             }
 -        }
 +            return this.noiseBiomeSource.getNoiseBiome(
 +                    (smallestX & 4) == 0 ? x : x + 1,
 +                    (smallestX & 2) == 0 ? y : y + 1,
 +                    (smallestX & 1) == 0 ? z : z + 1
 +            );
 +        } else {
 +                int i = pos.getX() - 2;
 +                int j = pos.getY() - 2;
 +                int k = pos.getZ() - 2;
 +                int l = i >> 2;
 +                int m = j >> 2;
 +                int n = k >> 2;
 +                double d = (double) (i & 3) / 4.0D;
 +                double e = (double) (j & 3) / 4.0D;
 +                double f = (double) (k & 3) / 4.0D;
 +                int o = 0;
 +                double g = Double.POSITIVE_INFINITY;
 +
 +                for (int p = 0; p < 8; ++p) {
 +                    boolean bl = (p & 4) == 0;
 +                    boolean bl2 = (p & 2) == 0;
 +                    boolean bl3 = (p & 1) == 0;
 +                    int q = bl ? l : l + 1;
 +                    int r = bl2 ? m : m + 1;
 +                    int s = bl3 ? n : n + 1;
 +                    double h = bl ? d : d - 1.0D;
 +                    double t = bl2 ? e : e - 1.0D;
 +                    double u = bl3 ? f : f - 1.0D;
 +                    double v = getFiddledDistance(this.biomeZoomSeed, q, r, s, h, t, u);
 +                    if (g > v) {
 +                        o = p;
 +                        g = v;
 +                    }
 +                }
 -        int w = (o & 4) == 0 ? l : l + 1;
 -        int x = (o & 2) == 0 ? m : m + 1;
 -        int y = (o & 1) == 0 ? n : n + 1;
 -        return this.noiseBiomeSource.getNoiseBiome(w, x, y);
 +                int w = (o & 4) == 0 ? l : l + 1;
 +                int x = (o & 2) == 0 ? m : m + 1;
 +                int y = (o & 1) == 0 ? n : n + 1;
 +                return this.noiseBiomeSource.getNoiseBiome(w, x, y);
 +            }
 +        // Plazma end
     }
     public Holder<Biome> getNoiseBiomeAtPosition(double x, double y, double z) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 index 49d5292697fdc6f23874557dd2db9d1fcda750f3..d329f77ab19ac781506c26909591fa4ae9dabb1e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
@@ -82,6 +82,11 @@ public class GlobalConfiguration extends ConfigurationPart {
     public class CarpetFixes extends ConfigurationPart {
         public boolean enabled = DO_OPTIMIZE;
 +        boolean optimizedBiomeAccess = true;
 +
 +        public boolean optimizedBiomeAccess() {
 +            return enabled && optimizedBiomeAccess;
 +        }
     }
 }
--- a/patches/server/0044-CarpetFixes-Optimizations-RecipeManager.patch
+++ b/patches/server/0044-CarpetFixes-Optimizations-RecipeManager.patch
@@ -0,0 +1,106 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 16:23:56 +0900
 Subject: [PATCH] CarpetFixes-Optimizations-RecipeManager
 Original: fxmorin/carpet-fixes
 Copyright (C) 2023 fxmorin
 RecipeManager optimization.
 Optimized by taking out streams & doing extra early checks to quickly remove unrelated recipes
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 index 9ffb6999171f602f0b113dac40e0130410cad870..49b5fece692cd5da99ed21d7fd0864cea1609495 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
@@ -103,13 +103,38 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
     }
     public <C extends Container, T extends Recipe<C>> Optional<T> getRecipeFor(RecipeType<T> type, C inventory, Level world) {
 -        // CraftBukkit start
 -        Optional<T> recipe = this.byType(type).values().stream().filter((irecipe) -> {
 -            return irecipe.matches(inventory, world);
 -        }).findFirst();
 -        inventory.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found
 -        // CraftBukkit end
 -        return recipe;
 +        // Plazma start - CarpetFixes - Optimized RecipeManager
 +        if (world.plazmaLevelConfiguration().carpetFixes.optimizedRecipeManager() && type == RecipeType.CRAFTING) {
 +            int slots = 0;
 +            int count;
 +            //compare size to quickly remove recipes that are not even close. Plus remove streams
 +            for (int slot = 0; slot < inventory.getContainerSize(); slot++)
 +                if (!inventory.getItem(slot).isEmpty()) slots++;
 +            for (Recipe<C> recipe : this.byType(type).values()) {
 +                count = 0;
 +                if (recipe instanceof CustomRecipe) {
 +                    if (recipe.matches(inventory, world)) {
 +                        return (Optional<T>) Optional.of(recipe);
 +                    }
 +                } else {
 +                    for (Ingredient ingredient : recipe.getIngredients())
 +                        if (ingredient != Ingredient.EMPTY) count++;
 +                    if (count == slots && recipe.matches(inventory, world)) {
 +                        return (Optional<T>) Optional.of(recipe);
 +                    }
 +                }
 +            }
 +            return Optional.empty();
 +        } else {
 +            // CraftBukkit start
 +            Optional<T> recipe = this.byType(type).values().stream().filter((irecipe) -> {
 +                return irecipe.matches(inventory, world);
 +            }).findFirst();
 +            inventory.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found
 +            // CraftBukkit end
 +            return recipe;
 +        }
 +        // Plazma end
     }
     public <C extends Container, T extends Recipe<C>> Optional<Pair<ResourceLocation, T>> getRecipeFor(RecipeType<T> type, C inventory, Level world, @Nullable ResourceLocation id) {
@@ -134,7 +159,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
     }
     public <C extends Container, T extends Recipe<C>> List<T> getAllRecipesFor(RecipeType<T> type) {
 -        return List.copyOf(this.byType(type).values());
 +        return org.plazmamc.plazma.configurations.GlobalConfiguration.get().carpetFixes.optimizedRecipeManager() ? (List<T>) new java.util.ArrayList<>(this.byType(type).values()) : List.copyOf(this.byType(type).values()); // Plazma start - CarpetFixes - Optimized RecipeManager
     }
     public <C extends Container, T extends Recipe<C>> List<T> getRecipesFor(RecipeType<T> type, C inventory, Level world) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 index d329f77ab19ac781506c26909591fa4ae9dabb1e..36511f71fcf3a8a5da746dd087003861a4f0a8f4 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
@@ -83,10 +83,15 @@ public class GlobalConfiguration extends ConfigurationPart {
         public boolean enabled = DO_OPTIMIZE;
         boolean optimizedBiomeAccess = true;
 +        boolean optimizedRecipeManager = true;
         public boolean optimizedBiomeAccess() {
             return enabled && optimizedBiomeAccess;
         }
 +        public boolean optimizedRecipeManager() {
 +            return enabled && optimizedRecipeManager;
 +        }
 +
     }
 }
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 index b0deec445b5ea3cd3e4802eca04e99818b539bd8..e089a881600b61060bae1135b89703f6c0b5c7e8 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -137,6 +137,11 @@ public class LevelConfigurations extends ConfigurationPart {
     public class CarpetFixes extends ConfigurationPart {
         public boolean enabled = DO_OPTIMIZE;
 +        boolean optimizedRecipeManager = true;
 +
 +        public boolean optimizedRecipeManager() {
 +            return enabled && optimizedRecipeManager;
 +        }
     }
 }
--- a/patches/server/0045-CarpetFixes-Optimizations-Sheep.patch
+++ b/patches/server/0045-CarpetFixes-Optimizations-Sheep.patch
@@ -0,0 +1,131 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Wed, 6 Sep 2023 16:35:34 +0900
 Subject: [PATCH] CarpetFixes-Optimizations-Sheep
 Original: fxmorin/carpet-fixes
 Copyright (C) 2023 fxmorin
 The game determines the child sheep's color by getting a wool block from the parents, putting them in a crafting
 recipe, getting the output wool and getting the color from that.
 I don't know in what world we would consider a data-driven method with that much overhead as a smart idea. Instead,
 we used a prebaked list of all the possible colors and combinations, however this means that you can't use a
 datapack to change it.
 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 54de1f782e45cb3e3b1442aeb56b6e8547b065c0..3a7b1d85f06f9abdac427aa736b6d4c79fdbbd14 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
@@ -432,19 +432,27 @@ public class Sheep extends Animal implements Shearable {
     }
     private DyeColor getOffspringColor(Animal firstParent, Animal secondParent) {
 +        // Plazma start - CarpetFixes - Optimized sheep child color
         DyeColor enumcolor = ((Sheep) firstParent).getColor();
         DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
 -        CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
 -        Optional<Item> optional = this.level().getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inventorycrafting, this.level()).map((recipecrafting) -> { // CraftBukkit - decompile error
 -            return recipecrafting.assemble(inventorycrafting, this.level().registryAccess());
 -        }).map(ItemStack::getItem);
 -
 -        Objects.requireNonNull(DyeItem.class);
 -        optional = optional.filter(DyeItem.class::isInstance);
 -        Objects.requireNonNull(DyeItem.class);
 -        return (DyeColor) optional.map(DyeItem.class::cast).map(DyeItem::getDyeColor).orElseGet(() -> {
 -            return this.level().random.nextBoolean() ? enumcolor : enumcolor1;
 -        });
 +        if (this.level().plazmaLevelConfiguration().carpetFixes.optimizedSheepChildColor()) {
 +            DyeColor col = org.plazmamc.plazma.util.CarpetFixesUtils.properDyeMixin(enumcolor, enumcolor1);
 +            if (col == null) col = this.level().random.nextBoolean() ? enumcolor : enumcolor1;
 +            return col;
 +        } else {
 +            CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
 +            Optional<Item> optional = this.level().getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inventorycrafting, this.level()).map((recipecrafting) -> { // CraftBukkit - decompile error
 +                return recipecrafting.assemble(inventorycrafting, this.level().registryAccess());
 +            }).map(ItemStack::getItem);
 +
 +            Objects.requireNonNull(DyeItem.class);
 +            optional = optional.filter(DyeItem.class::isInstance);
 +            Objects.requireNonNull(DyeItem.class);
 +            return (DyeColor) optional.map(DyeItem.class::cast).map(DyeItem::getDyeColor).orElseGet(() -> {
 +                return this.level().random.nextBoolean() ? enumcolor : enumcolor1;
 +            });
 +        }
 +        // Plazma end
     }
     private static CraftingContainer makeContainer(DyeColor firstColor, DyeColor secondColor) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 index e089a881600b61060bae1135b89703f6c0b5c7e8..29d451f55dabc15478e9c32d2c37bd0ea2d9bebc 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java
@@ -138,10 +138,15 @@ public class LevelConfigurations extends ConfigurationPart {
         public boolean enabled = DO_OPTIMIZE;
         boolean optimizedRecipeManager = true;
 +        boolean optimizedSheepChildColor = false;
         public boolean optimizedRecipeManager() {
             return enabled && optimizedRecipeManager;
         }
 +        public boolean optimizedSheepChildColor() {
 +            return enabled && optimizedSheepChildColor;
 +        }
 +
     }
 }
 diff --git a/src/main/java/org/plazmamc/plazma/util/CarpetFixesUtils.java b/src/main/java/org/plazmamc/plazma/util/CarpetFixesUtils.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..aae3cf170bca4b3e6cdd0a964967dfafe2759f65
 --- /dev/null
 +++ b/src/main/java/org/plazmamc/plazma/util/CarpetFixesUtils.java
@@ -0,0 +1,48 @@
 +package org.plazmamc.plazma.util;
 +
 +import net.minecraft.world.item.DyeColor;
 +
 +public class CarpetFixesUtils {
 +
 +    //If I was actually implementing this, the color values would have been binary in order for fast calculations.
 +    //Never do this in a production build, although this is better than using the RecipeManager xD
 +    public static DyeColor properDyeMixin(DyeColor col1, DyeColor col2) {
 +        if (col1.equals(col2)) return col1;
 +        switch(col1) {
 +            case WHITE -> {
 +                switch(col2) {
 +                    case BLUE -> {return DyeColor.LIGHT_BLUE;}
 +                    case GRAY -> {return DyeColor.LIGHT_GRAY;}
 +                    case BLACK -> {return DyeColor.GRAY;}
 +                    case GREEN -> {return DyeColor.LIME;}
 +                    case RED -> {return DyeColor.PINK;}
 +                }
 +            }
 +            case BLUE -> {
 +                switch(col2) {
 +                    case WHITE -> {return DyeColor.LIGHT_BLUE;}
 +                    case GREEN -> {return DyeColor.CYAN;}
 +                    case RED -> {return DyeColor.PURPLE;}
 +                }
 +            }
 +            case RED -> {
 +                switch(col2) {
 +                    case YELLOW -> {return DyeColor.ORANGE;}
 +                    case WHITE -> {return DyeColor.PINK;}
 +                    case BLUE -> {return DyeColor.PURPLE;}
 +                }
 +            }case GREEN -> {
 +                switch(col2) {
 +                    case BLUE -> {return DyeColor.CYAN;}
 +                    case WHITE -> {return DyeColor.LIME;}
 +                }
 +            }
 +            case YELLOW -> {if (col2.equals(DyeColor.RED)) return DyeColor.ORANGE;}
 +            case PURPLE -> {if (col2.equals(DyeColor.PINK)) return DyeColor.MAGENTA;}
 +            case PINK -> {if (col2.equals(DyeColor.PURPLE)) return DyeColor.MAGENTA;}
 +            case GRAY -> {if (col2.equals(DyeColor.WHITE)) return DyeColor.LIGHT_GRAY;}
 +            case BLACK -> {if (col2.equals(DyeColor.WHITE)) return DyeColor.GRAY;}
 +        }
 +        return null;
 +    }
 +}
--- a/patches/server/0046-Async-PathProcessing.patch
+++ b/patches/server/0046-Async-PathProcessing.patch
`@@ -1,2 +1,2 @@`
	`purpurCommit = 423c2af60ca5e9d18ac0bd955d0313efc693d2a3`	`purpurCommit = 39bdf3d2e045857f328bd628f785c54be951e9bd`
	`pufferfishCommit = a3c0a4d2f177d80283d03de52617732a7b493665`	`pufferfishCommit = e32a780bcab6821e3804846a63a9153fdeee44f4`