Fix load player on online mode (#79)

* Fix build, again

* real fix

.github/workflows/gradle.yml

@@ -4,10 +4,8 @@ on:
   push:
     branches: [ "ver/*", "dev/*", "feat/**/*" ]
     paths:
-      - "*.kt"
-      - "*.kts"
-      - "*.toml"
       - "gradle-wrapper.*"
+      - "*.gradle.*"
   workflow_dispatch:
 
 jobs:

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release Plazma (1.20.4)
+name: Release Plazma (1.20.2)
 
 on:
   push:
@@ -9,7 +9,8 @@ on:
 
 env:
   ORG_NAME: PlazmaMC
-  MC_VERSION: 1.20.4
+  MC_VERSION: 1.20.2
+  MAIN_BRANCH: ver/1.20.1
 
 jobs:
   release:
@@ -22,32 +23,17 @@ jobs:
     if: "!startsWith(github.event.commits[0].message, '[CI-Skip]')"
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Setup Variables
-        id: setup
-        env:
-          BRANCH: ${{ github.ref_name }}
-        run: echo "branch=${BRANCH##*/}" >> $GITHUB_OUTPUT
-    
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Checkout javadocs
         uses: actions/checkout@v4
-        continue-on-error: true
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
+        if: github.ref_name == env.MAIN_BRANCH
         with:
           repository: PlazmaMC/Javadocs
           path: javadoc
-          ref: ${{ steps.setup.outputs.branch }}
-          token: ${{ secrets.GH_PAT }}
-
-      - name: Checkout javadocs
-        uses: actions/checkout@v4
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
-        with:
-          repository: PlazmaMC/Javadocs
-          path: jdmain
-          token: ${{ secrets.GH_PAT }}
+          ref: main
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -76,32 +62,29 @@ jobs:
         run: ./gradlew createMojmapPaperclipJar --stacktrace
 
       - name: Update Javadoc
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
         continue-on-error: true
+        if: github.ref_name == env.MAIN_BRANCH
         run: |
-          if [ ! -d "javadoc" ]; then
-            mkdir javadoc
-            cd javadoc
-            git init && git branch -m ${{ steps.setup.outputs.branch }}
-            git remote add origin https://github.com/PlazmaMC/Javadocs
-          fi
-          
           (cd Plazma-API/build/docs/javadoc && tar c .) | (cd javadoc && tar xf -)
           cd javadoc
           git add . && git commit -m "Update Javadocs"
-          git push -f
-
-          cd ../jdmain
-          git submodule update
-          git add . && git commit -m "Update Javadocs"
           git push
 
       - name: Publish Packages
-        if: startsWith(github.ref_name, 'ver/') || startsWith(github.ref_name, 'dev/')
+        if: github.ref_name == env.MAIN_BRANCH
         run: |
           export GITHUB_USERNAME=${{ env.ORG_NAME }}
           export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
           ./gradlew publish --stacktrace
+
+      - name: Upload Artifacts
+        if: "!startsWith(github.ref_name, 'ver/')"
+        uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: |
+            build/libs
+            Plazma-API/build/docs/javadoc
       
       - name: Get Release Number
         if: startsWith(github.ref_name, 'ver/')

.gitignore

@@ -55,5 +55,4 @@ build-data/
 *-API
 *-MojangAPI
 *-Server
-paper-api-generator
-compare.txt
+*.jar

README.md

@@ -5,8 +5,8 @@
 ### A Server Platform for Minecraft: Java Edition based on [Paper](https://github.com/PaperMC/Paper)
 
 [![Discord](https://img.shields.io/discord/1083716853928558652?style=for-the-badge&logo=discord&logoColor=ffffff&label=DISCORD&color=5865F2&link=https%3A%2F%2Fdiscord.gg%2FMmfC52K8A8)](https://discord.gg/MmfC52K8A8)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Plazma/build.yml?branch=ver/1.20.4&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.20.4)
-[![MC Version](https://img.shields.io/badge/MC-1.20.4-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/build/1.20.4/latest)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/PlazmaMC/Plazma/build.yml?branch=ver/1.20.2&logo=GoogleAnalytics&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/actions/workflows/build.yml?query=branch:ver/1.20.2)
+[![MC Version](https://img.shields.io/badge/MC-1.20.2-6047ff?&logo=Webpack&style=for-the-badge&logoColor=ffffff)](https://github.com/PlazmaMC/Plazma/releases/build/1.20.2/latest)
 
 [![License](https://img.shields.io/github/license/PlazmaMC/Plazma?logo=github&style=flat-square&logoColor=ffffff)](LICENSE)
 [![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)
@@ -19,8 +19,8 @@
 [main]: https://github.com/PlazmaMC/Plazma
 
 > [!IMPORTANT]
-This is the branch for Plazma 1.20.4. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
-이곳은 플라즈마의 1.20.4용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 분기][main]** 를 확인해주세요.
+This is the branch for Plazma 1.20.2. If you want to know more about Plazma, please check the **[main branch][main]**.<br>
+이곳은 플라즈마의 1.20.2용 분기입니다. 플라즈마에 대해 자세히 알고 싶다면 **[main 브랜치][main]** 를 확인해주세요.
 
 ## ⬇️ Downloads
 > [!NOTE]
@@ -28,10 +28,10 @@ If you don't know about Mojmap or Bundler, download **Reobf Paperclip**<br>
 Mojmap 또는 Bundler에 대해 잘 알지 못한다면, **Reobf Paperclip**을 사용하세요
 
 <!--- LINKS --->
-[paperReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar
-[paperMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-paperclip-1.20.4-R0.1-SNAPSHOT-mojmap.jar
-[bundlerReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-bundler-1.20.4-R0.1-SNAPSHOT-reobf.jar
-[bundlerMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.4/latest/plazma-bundler-1.20.4-R0.1-SNAPSHOT-mojmap.jar
+[paperReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-paperclip-1.20.2-R0.1-SNAPSHOT-reobf.jar
+[paperMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-paperclip-1.20.2-R0.1-SNAPSHOT-mojmap.jar
+[bundlerReobf]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-bundler-1.20.2-R0.1-SNAPSHOT-reobf.jar
+[bundlerMojmap]: https://github.com/PlazmaMC/Plazma/releases/download/build/1.20.2/latest/plazma-bundler-1.20.2-R0.1-SNAPSHOT-mojmap.jar
 
 | **Reobf Paperclip (Default)** |    Mojmap Paperclip     |      Reobf Bundler       |      Mojmap Bundler       |
 |:-----------------------------:|:-----------------------:|:------------------------:|:-------------------------:|

build.gradle.kts

@@ -1,5 +1,6 @@
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.api.tasks.testing.logging.TestLogEvent
+import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
+
+group = "org.plazmamc.plazma"
 
 plugins {
     java
@@ -18,7 +19,7 @@ repositories {
     mavenCentral()
     maven("https://papermc.io/repo/repository/maven-public/") {
         content {
-            onlyForConfigurations(configurations.paperclip.name)
+            onlyForConfigurations(PAPERCLIP_CONFIG)
         }
     }
 }
@@ -39,7 +40,7 @@ allprojects {
         repositories {
             maven {
                 name = "githubPackage"
-                url = uri("https://maven.pkg.github.com/PlazmaMC/PlazmaBukkit")
+                url = uri("https://maven.pkg.github.com/PlazmaMC/Plazma")
 
                 credentials {
                     username = System.getenv("GITHUB_USERNAME")
@@ -55,11 +56,13 @@ allprojects {
 }
 
 subprojects {
+    apply(plugin = "java")
+    
     tasks {
         withType<JavaCompile>().configureEach {
             options.compilerArgs.addAll(listOf("--add-modules=jdk.incubator.vector", "-Xmaxwarns", "1"))
             options.encoding = Charsets.UTF_8.name()
-            options.release = 17
+            options.release.set(17)
         }
     
         withType<Javadoc> {
@@ -71,26 +74,30 @@ subprojects {
         }
     
         withType<Test> {
-            testLogging {
-                showStackTraces = true
-                exceptionFormat = TestExceptionFormat.FULL
-                events(TestLogEvent.STANDARD_OUT)
-            }
+            minHeapSize = "2g"
+            maxHeapSize = "2g"
         }
     }
 
     repositories {
         mavenCentral()
-        maven("https://jitpack.io")
+        maven("https://oss.sonatype.org/content/groups/public/")
         maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://ci.emc.gs/nexus/content/groups/aikar/")
+        maven("https://repo.aikar.co/content/groups/aikar")
+        maven("https://repo.md-5.net/content/repositories/releases/")
+        maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+        maven("https://jitpack.io")
+        maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }
+
 }
 
 paperweight {
-    serverProject = project(":plazma-server")
+    serverProject.set(project(":plazma-server"))
 
-    remapRepo = "https://repo.papermc.io/repository/maven-public/"
-    decompileRepo = "https://repo.papermc.io/repository/maven-public/"
+    remapRepo.set("https://maven.fabricmc.net/")
+    decompileRepo.set("https://files.minecraftforge.net/maven/")
 
     usePaperUpstream(providers.gradleProperty("paperCommit")) {
         withPaperPatcher {
@@ -100,20 +107,6 @@ paperweight {
             serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
             serverOutputDir.set(layout.projectDirectory.dir("Plazma-Server"))
         }
-
-        patchTasks.register("generatedApi") {
-            isBareDirectory = true
-            upstreamDirPath = "paper-api-generator/generated"
-            patchDir = layout.projectDirectory.dir("patches/generated-api")
-            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
-        }
-
-        patchTasks.register("mojangApi") {
-            isBareDirectory = true
-            upstreamDirPath = "Paper-MojangAPI"
-            patchDir = layout.projectDirectory.dir("patches/mojang-api")
-            outputDir = layout.projectDirectory.dir("Plazma-MojangAPI")
-        }
     }
 }
 
@@ -127,29 +120,12 @@ alwaysUpToDate {
 }
 
 tasks {
-    applyPatches {
-        dependsOn("applyGeneratedApiPatches")
-    }
-
-    rebuildPatches {
-        dependsOn("rebuildGeneratedApiPatches")
-    }
-
     generateDevelopmentBundle {
         apiCoordinates.set("org.plazmamc.plazma:plazma-api")
         mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
         libraryRepositories.addAll(
                 "https://repo.maven.apache.org/maven2/",
-                "https://maven.pkg.github.com/PlazmaMC/Plazma",
                 "https://papermc.io/repo/repository/maven-public/"
         )
     }
 }
-
-publishing {
-    publications.create<MavenPublication>("devBundle") {
-        artifact(tasks.generateDevelopmentBundle) {
-            artifactId = "dev-bundle"
-        }
-    }
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt

@@ -2,10 +2,7 @@ package org.plazmamc.alwaysuptodate
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.plazmamc.alwaysuptodate.tasks.CheckPaperCommitTask
-import org.plazmamc.alwaysuptodate.tasks.CheckPurpurCommitTask
-import org.plazmamc.alwaysuptodate.tasks.PaperUpdateTask
-import org.plazmamc.alwaysuptodate.tasks.PurpurUpdateTask
+import org.plazmamc.alwaysuptodate.tasks.*
 
 class AlwaysUpToDate : Plugin<Project> {
 
@@ -13,8 +10,6 @@ class AlwaysUpToDate : Plugin<Project> {
         target.extensions.create("alwaysUpToDate", AlwaysUpToDateExtension::class.java)
         target.tasks.register("updatePaper", PaperUpdateTask::class.java)
         target.tasks.register("updatePurpur", PurpurUpdateTask::class.java)
-        target.tasks.register("checkPaperCommit", CheckPaperCommitTask::class.java)
-        target.tasks.register("checkPurpurCommit", CheckPurpurCommitTask::class.java)
     }
 
 }

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/CheckUpstreamCommitTasks.kt

@@ -1,64 +0,0 @@
-package org.plazmamc.alwaysuptodate.tasks
-
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.fromJson
-import io.papermc.paperweight.util.gson
-import org.gradle.api.Project
-import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.get
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
-import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
-import org.plazmamc.alwaysuptodate.utils.pathIO
-import paper.libs.com.google.gson.JsonObject
-import java.net.URI
-
-abstract class CheckPaperCommitTask : Task() {
-
-    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
-
-    @TaskAction
-    fun check() {
-        println(project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "paperCommit"))
-    }
-
-}
-
-abstract class CheckPurpurCommitTask : Task() {
-
-    private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
-
-    @TaskAction
-    fun check() {
-        println(project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit"))
-    }
-
-}
-
-fun Project.getLatest(repository: String, branch: String) : String {
-    val regex = "[a-z0-9]{40}\trefs/heads/$branch".toRegex()
-
-    return Git(project.pathIO)("ls-remote", repository).readText()?.lines()
-        ?.filterNot { regex.matches(it) }?.first()?.split("\t")?.first()
-        ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
-}
-
-fun Project.checkCommit(repository: String, branch: String, propertyName: String) : Boolean {
-    val latestCommit = project.getLatest(repository, branch)
-    val currentCommit = project.properties[propertyName] as String
-
-    return currentCommit == latestCommit
-}
-
-fun Project.createCompareComment(repository: String, branch: String, before: String, clear: Boolean = false) {
-    val builder = StringBuilder()
-    val rawRepo = URI.create(repository).path.substring(1)
-
-    if (!clear) builder.append(project.file("compare.txt").readText())
-    builder.append("\n\n[${rawRepo.split("/").last()} Changes]")
-
-    gson.fromJson<JsonObject>(URI.create("https://api.github.com/repos/$rawRepo/compare/$before...$branch").toURL().readText())["commits"].asJsonArray.forEach {
-        val commit = it.asJsonObject
-        builder.append("$rawRepo@${commit["sha"].asString.subSequence(0, 7)}: ${commit["commit"].asJsonObject["message"].asString.split("\n")[0]}\n")
-    }
-    project.file("compare.txt").writeText(builder.toString())
-}

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PaperUpdateTask.kt

@@ -5,40 +5,40 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.get
 import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
 import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
+import org.plazmamc.alwaysuptodate.utils.pathIO
 import java.io.File
 
 abstract class PaperUpdateTask : Task() {
 
     private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
+    private val regex = "[a-z0-9]{40}\trefs/heads/${property.paperBranch}".toRegex()
+    private val git = Git(project.pathIO)
 
     override fun init() {
-        outputs.upToDateWhen {
-            project.checkCommit(
-                property.paperRepository.get(),
-                property.paperBranch.get(),
-                "purpurCommit"
-            )
-        }
+        outputs.upToDateWhen { check() }
+    }
+
+    private fun check(): Boolean {
+        val latestCommit = git("ls-remote", property.paperRepository.get()).readText()?.lines()
+            ?.filterNot { regex.matches(it) }?.first()?.split("\t")?.first()
+            ?: throw AlwaysUpToDateException("Failed to get latest Paper commit")
+        val currentCommit = project.properties["paperCommit"] as String
+
+        return currentCommit == latestCommit
     }
 
     @TaskAction
     fun update() {
-        if (project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "purpurCommit")) return
-        project.createCompareComment(
-            property.paperRepository.get(),
-            property.paperBranch.get(),
-            project.properties["paperCommit"] as String,
-            true
-        )
+        if (check()) return
         updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), project.file("gradle.properties"))
     }
 
 }
 
-fun updatePaperCommit(repo: String, branch: String, properties: File, regexRule: String = "paperCommit = ") {
+fun updatePaperCommit(repo: String, branch: String, properties: File) {
     val latestCommit = Git(properties.parentFile.toPath())("ls-remote", repo).readText()?.lines()
         ?.filterNot { "[a-z0-9]{40}\trefs/heads/$branch".toRegex().matches(it) }?.first()?.split("\t")?.first()
         ?: throw AlwaysUpToDateException("Failed to get latest Paper commit")
 
-    properties.writeText(properties.readText().replace("$regexRule.*".toRegex(), "$regexRule$latestCommit"))
+    properties.writeText(properties.readText().replace("paperCommit = .*".toRegex(), "paperCommit = $latestCommit"))
 }

buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt

@@ -1,8 +1,6 @@
 package org.plazmamc.alwaysuptodate.tasks
 
-import io.papermc.paperweight.util.Git
-import io.papermc.paperweight.util.cache
-import io.papermc.paperweight.util.path
+import io.papermc.paperweight.util.*
 import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.get
 import org.plazmamc.alwaysuptodate.AlwaysUpToDateException
@@ -10,6 +8,7 @@ import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension
 import org.plazmamc.alwaysuptodate.utils.Gradle
 import org.plazmamc.alwaysuptodate.utils.addCommit
 import org.plazmamc.alwaysuptodate.utils.clone
+import org.plazmamc.alwaysuptodate.utils.pathIO
 import java.nio.file.Path
 import kotlin.io.path.createDirectories
 import kotlin.io.path.exists
@@ -58,26 +57,24 @@ abstract class PurpurUpdateTask : Task() {
     """.trimIndent()
 
     override fun init() {
-        outputs.upToDateWhen {
-            project.checkCommit(
-                property.purpurRepository.get(),
-                property.purpurBranch.get(),
-                "purpurCommit"
-            )
-        }
+        outputs.upToDateWhen { check() }
+    }
+
+    private fun check(): Boolean {
+        val regex = "[a-z0-9]{40}\trefs/heads/${property.purpurBranch}".toRegex()
+        val latestCommit = Git(project.pathIO)("ls-remote", property.purpurRepository.get()).readText()?.lines()
+            ?.filterNot { regex.matches(it) }?.first()?.split("\t")?.first()
+            ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
+        val currentCommit = project.properties["purpurCommit"] as String
+
+        return currentCommit == latestCommit
     }
 
     @TaskAction
     fun update() {
-        if (project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit")) return
+        if (check()) return
         Git.checkForGit()
 
-        project.createCompareComment(
-            property.purpurRepository.get(),
-            property.purpurBranch.get(),
-            project.properties["purpurCommit"] as String,
-            true
-        )
         val dir = project.layout.cache.resolve("AlwaysUpToDate/UpdatePurpur")
         if (dir.exists()) dir.toFile().deleteRecursively()
 
@@ -87,25 +84,9 @@ abstract class PurpurUpdateTask : Task() {
         val pufferfish = git.clone("Pufferfish", property.pufferfishRepository.get(), property.pufferfishBranch.get(), dir)
         val purpur = git.clone("Purpur", property.purpurRepository.get(), property.purpurBranch.get(), dir)
 
-        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), pufferfish.resolve("gradle.properties").toFile(), "paperRef=")
+        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), pufferfish.resolve("gradle.properties").toFile())
         updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), purpur.resolve("gradle.properties").toFile())
-
-        if (!project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "paperCommit")) {
-            project.createCompareComment(
-                property.paperRepository.get(),
-                property.paperBranch.get(),
-                project.properties["paperCommit"] as String
-            )
-            updatePaperCommit(
-                property.paperRepository.get(),
-                property.paperBranch.get(),
-                project.file("gradle.properties")
-            )
-        }
-
-        val latestCommit = git("ls-remote", property.purpurRepository.get()).readText()?.lines()
-            ?.filterNot { "[a-z0-9]{40}\trefs/heads/${property.purpurBranch.get()}".toRegex().matches(it) }?.first()?.split("\t")?.first()
-            ?: throw AlwaysUpToDateException("Failed to get latest Purpur commit")
+        updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), project.file("gradle.properties"))
 
         val purpurGradle = Gradle(purpur)
         val purpurPatches = purpur.resolve("patches").also {
@@ -157,8 +138,6 @@ abstract class PurpurUpdateTask : Task() {
                 copyPatch(this, target, "0002-Purpur-API-Changes.patch")
             }
         }
-
-        project.file("gradle.properties").writeText(project.file("gradle.properties").readText().replace("purpurCommit = .*".toRegex(), "purpurCommit = $latestCommit"))
     }
 
     private fun copySource(dir: Path) {
@@ -176,4 +155,15 @@ abstract class PurpurUpdateTask : Task() {
         }
     }
 
+    abstract class PurpurBuildTask : Task() {
+
+        private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
+
+        @TaskAction
+        fun build() {
+
+        }
+
+    }
+
 }

gradle.properties

@@ -1,10 +1,10 @@
-version = 1.20.4-R0.1-SNAPSHOT
-mcVersion = 1.20.4
+version = 1.20.2-R0.1-SNAPSHOT
+mcVersion = 1.20.2
 
-paperCommit = 850b736e1442587230bbba241f99eb0cee193cd9
-purpurCommit = d80fbedf5d8a8830aa895595114ec1979fc0a3f7
+paperCommit = 931781c220b98dde0159c9a3c8dce06c3b2b1e13
+purpurCommit = c46cb7ef66675e00a48e20c40febed7ff914f35d
+pufferfishCommit = bc89152d4cd4bb0f9644da2fe10774df4cc25661
 
-group = org.plazmamc.plazma
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 shadow = "8.1.1"
-paperweight = "1.5.11"
+paperweight = "1.5.10"
 paperclip = "3.0.3"
 decompiler = "2.0.627.2"
 remapper = "0.10.0"

libs/api.versions.toml

@@ -5,8 +5,8 @@ guava = "32.1.2-jre"
 sentry = "5.4.0"
 fastutil = "8.5.6"
 findbugs = "1.3.9"
-slf4j-api = "2.0.9"
-bungeechat = "1.20-R0.2"
+slf4j-api = "1.8.0-beta4"
+bungeechat = "1.20-R0.1-deprecated+build.14"
 json-simple = "1.1.1"
 annotations = "24.0.1"
 checkerqual = "3.21.0"

libs/common.versions.toml

@@ -5,11 +5,11 @@ mockito = "5.5.0"
 jupiter = "5.10.0"
 hamcrest = "2.2"
 snakeyaml = "2.2"
-adventure = "4.15.0"
+adventure = "4.14.0"
 commons-lang2 = "2.6"
 commons-lang3 = "3.12.0"
-maven-provider = "3.9.6"
-maven-resolver = "1.9.18"
+maven-provider = "3.8.5"
+maven-resolver = "1.7.3"
 
 [libraries]
 mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
@@ -40,6 +40,6 @@ adventure-serializer-legacy = { group = "net.kyori", name = "adventure-text-seri
 
 [bundles]
 asm = [ "asm-head", "asm-commons" ]
-test = [ "jupiter", "hamcrest", "mockito", "asm-tree" ]
+test = [ "jupiter", "hamcrest", "mockito" ]
 maven = [ "maven-connector", "maven-transport" ]
 adventure = [ "adventure-api", "adventure-slf4j", "adventure-minimessage", "adventure-serializer-gson", "adventure-serializer-plain", "adventure-serializer-legacy" ]

libs/server.versions.toml

@@ -2,9 +2,8 @@
 ansi = "1.0.3"
 jansi = "3.21.0"
 rhino = "1.7.14"
-mysql = "8.2.0"
+mysql = "8.1.0"
 sqlite = "3.42.0.1"
-pioneer = "2.2.0"
 haproxy = "4.1.97.Final"
 velocity = "3.1.2-SNAPSHOT"
 disruptor = "3.4.4"
@@ -19,7 +18,6 @@ ansi = { group = "net.kyori", name = "ansi", version.ref = "ansi" }
 mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" }
 jansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jansi" }
 sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" }
-pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "pioneer" }
 haproxy = { group = "io.netty", name = "netty-codec-haproxy", version.ref = "haproxy" }
 velocity = { group = "com.velocitypowered", name = "velocity-native", version.ref = "velocity" }
 disruptor = { group = "com.lmax", name = "disruptor", version.ref = "disruptor" }
@@ -35,4 +33,3 @@ terminal-appender = { group = "net.minecrell", name = "terminalconsoleappender",
 [bundles]
 runtime = [ "sqlite", "mysql", "disruptor" ]
 implementation = [ "jansi", "terminal-appender", "ansi", "haproxy", "configurate", "mappingio", "rhino-engine", "rhino-runtime" ]
-test = [ "classgraph", "pioneer" ]

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,10 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Tue, 9 Nov 2021 14:01:56 -0500
+Date: Sun, 26 Nov 2023 23:32:01 +0000
 Subject: [PATCH] Pufferfish API Changes
 
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
+Original: Kevin Raneri <kevin.raneri@gmail.com>
+Copyright (C) 2023 Pufferfish Studios LLC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bf01892c248b988531d21d9fb0f74d0adf2205ac..80833c13a2d19e31d6f648e7ef5b3456025e767e 100644
+index e827ee211e3c65dc68ac5867fd8476639df63645..b9c75a190dbd7a90ac5ef0fbc6e6fe34806acc4e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -51,6 +51,7 @@ dependencies {
+@@ -47,6 +47,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
  
-     implementation("org.ow2.asm:asm:9.5")
-     implementation("org.ow2.asm:asm-commons:9.5")
-@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
+     implementation("org.ow2.asm:asm:9.4")
+     implementation("org.ow2.asm:asm-commons:9.4")
+@@ -106,6 +107,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
  
@@ -480,7 +480,7 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bac
  
              if (cloader instanceof PluginClassLoader) {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 7e4f7cb2afbc145e532285c793573ad107bc3033..12449e18180d604e9cbbc744da74a8b222a18e1f 100644
+index f9b57b872780aa6b9b959494874b57c7a8ff0c53..90953bfc81168068a281be4d2d3942d5e7dd69ff 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -50,6 +50,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm

patches/api/0002-Purpur-API-Changes.patch

@@ -1,10 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <contact@granny.dev>
-Date: Sun, 3 Mar 2024 00:58:34 +0000
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Sun, 26 Nov 2023 23:37:25 +0000
 Subject: [PATCH] Purpur API Changes
 
-PurpurMC
-Copyright (C) 2024 PurpurMC
+Original: PurpurMC
+Copyright (C) 2023 PurpurMC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 28a3ee2f2df6f93a894793abc03d357a9010a399..0588b113b02a05e946dd92fce489662bc01a41eb 100644
+index b9c75a190dbd7a90ac5ef0fbc6e6fe34806acc4e..41d7b75e904b94073dfcd12b776a7759a963b66f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -129,6 +129,8 @@ tasks.jar {
+@@ -126,6 +126,8 @@ tasks.jar {
  }
  
  tasks.withType<Javadoc> {
@@ -168,6 +168,29 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9
              return StringUtil.copyPartialMatches(args[0], TIMINGS_SUBCOMMANDS,
                  new ArrayList<String>(TIMINGS_SUBCOMMANDS.size()));
          }
+diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..b347224c223569297ee67ac630a710fdf28748ea 100644
+--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
++++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+@@ -198,6 +198,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+     GoalKey<Mob> CLIMB_ON_TOP_OF_POWDER_SNOW = GoalKey.of(Mob.class, NamespacedKey.minecraft("climb_on_top_of_powder_snow"));
+     GoalKey<Wolf> WOLF_PANIC = GoalKey.of(Wolf.class, NamespacedKey.minecraft("wolf_panic"));
+ 
++    // Purpur start
++    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
++    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
++    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
++    GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
++    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
++    GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
++    GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
++    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
++    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
++    // Purpur end
++
+     /**
+      * @deprecated removed in 1.20.2
+      */
 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
 index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48cc50fad5b 100644
 --- a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
@@ -186,10 +209,10 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
  
          @Override
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..d218cd30fc0733a83e3e0ba3279eb21561b0b08e 100644
+index 4863d9f21f0a0f11974be85360edc587ffd7eab3..8ea42a1f07df756bf504609d2bbff578f20bb808 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2862,4 +2862,127 @@ public final class Bukkit {
+@@ -2832,4 +2832,127 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -408,10 +431,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..687d11619379aead7f665d4a5f8f8bcc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index f9af60356da4668cec8b24e73f5747ab82e35a91..b304ad1307cdd6785653b1eab9781e070fb14c5a 100644
+index 7ca70b269e15e818e61a9329e2775789abb4bc73..aa9ca3e33903747a455ad0949387684ce4b917af 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -11557,4 +11557,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -11054,4 +11054,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public boolean isEnabledByFeature(@NotNull World world) {
          return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
      }
@@ -453,13 +476,13 @@ index f9af60356da4668cec8b24e73f5747ab82e35a91..b304ad1307cdd6785653b1eab9781e07
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a91925ffcd3fd 100644
+index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a322acadecc 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -545,4 +545,106 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -522,4 +522,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
-     public Location getLocation();
+     public Location getLastDeathLocation();
 +
 +    // Purpur start - OfflinePlayer API
 +    /**
@@ -527,6 +550,14 @@ index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a9192
 +    public float getWalkSpeed();
 +
 +    /**
++     * Gets the entity's current position
++     *
++     * @return a new copy of Location containing the position of this offline player
++     */
++    @Nullable
++    public Location getLocation();
++
++    /**
 +     * Sets OfflinePlayer's location. If player is online, it falls back to the Player#teleport implementation.
 +     *
 +     * @param destination
@@ -564,10 +595,10 @@ index abb5109ed08a3a651c2c27d4d17a3d49eb06da1e..98308b759907e03b168f7e06704a9192
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b4f8281d3797ec825a7671f38077cd65d5a1d76e..be0e4c789a02d67160287c39cf6bdf8ef2229afc 100644
+index f1fa97d12f97baf97beb92ca0719cf3cf906b225..dd99f53e3d559685a4b3a454a9e607c310fc6aff 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2214,6 +2214,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2190,6 +2190,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
@@ -586,7 +617,7 @@ index b4f8281d3797ec825a7671f38077cd65d5a1d76e..be0e4c789a02d67160287c39cf6bdf8e
          /**
           * Sends the component to the player
           *
-@@ -2497,4 +2509,105 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2473,4 +2485,105 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API
@@ -693,10 +724,10 @@ index b4f8281d3797ec825a7671f38077cd65d5a1d76e..be0e4c789a02d67160287c39cf6bdf8e
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c5fe36050eeaff80cfb989fe2f38370215af6fe5..565ce4b0c5eb300953aaefa786b9f8938c771f2a 100644
+index 567a36a4887da8994c9170e2885aa8cc357efa0c..405d60bd2c99ba741d2614b16f4bda5da48a0387 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4213,6 +4213,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4235,6 +4235,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
@@ -946,10 +977,10 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
      // Paper start
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d9929d9311e4b2b0ae13a8f6f13563257263f298..a36fc32dd83339b6939cb4046538ec6285042397 100644
+index 9e3cb75536ae260dc898ab9dafbc1d98398782bc..ed9627dff9a33524da546c46e1d1be71ae1d1e0c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1104,4 +1104,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1063,4 +1063,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name
@@ -1031,7 +1062,7 @@ index 655e37cb3a09610a3f3df805d6dcad17d722da62..09fd716c8fc9ea34a1cbf87bcbe22df0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e641149ea5960 100644
+index 58017fce436cdbda255f7172fbdadb726d4b113c..05600fc8bf2a61aca8094029bc4c208a710da952 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
 @@ -153,4 +153,62 @@ public interface Item extends Entity, io.papermc.paper.entity.Frictional { // Pa
@@ -1098,10 +1129,10 @@ index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e6411
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e67455efc84f1e06d3396291d104ce65fee4591b..744b869c028324d5de30d2d64ab080b050fa3c47 100644
+index a599ed2795ba1baf2cbb465d1c7145580c27e1ea..298acbfb93663e40e627f6a47d51fd87a1551feb 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1310,4 +1310,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1243,4 +1243,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end
@@ -1169,10 +1200,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 254a02ddb5dc867c9dd6c2086791f7ab94247fd3..6dc63bfe85d83a7cff369f06c57ebe0aa04c63a3 100644
+index 47fcfa2a3358766dfda2efc9bbcf5b50e3f2f7c1..eea83040ff15ea7c9bf97a45f5557294b309b4c8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3687,4 +3687,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3366,4 +3366,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
@@ -1390,20 +1421,6 @@ index 84db38388bf7a58e66d6cd29620b4fe64b0a897e..82ebd99549ce9f9e6427a50cef424e90
 +    public void setRabid(boolean rabid);
 +    // Purpur end
  }
-diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644
---- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
-@@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
-         WORLD_BORDER,
-         /**
-          * Damage caused when an entity contacts a block such as a Cactus,
--         * Dripstone (Stalagmite) or Berry Bush.
-+         * Dripstone (Stalagmite) or Berry Bush. (Stonecutters too if you
-+         * have the Stonecutter damage Purpur feature enabled)
-          * <p>
-          * Damage: variable
-          */
 diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
 index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d94108275629 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
@@ -1422,10 +1439,10 @@ index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d941
           * When a player gets bad omen after killing a patrol captain.
           */
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index daa1306a7324d946d66ad5a674bbc84371d8d4d6..f3b2d7b6fda051211add2b3215f120fb6911aeed 100644
+index cbce826add9dc2b3187c7bea00c27b785d7517df..3a98de6407d9a6307f89c207be1f09e639385ebe 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -165,7 +165,7 @@ public enum InventoryType {
+@@ -151,7 +151,7 @@ public enum InventoryType {
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
@@ -1454,10 +1471,10 @@ index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index f680545b6b59bf8d2ad154b0472dda4cba42a162..58a62ba0635f9158bf18043da89aba7521e0e2e1 100644
+index 0217f98a74140bbae454d467de27c12b6060ca75..fba5b867ea9de36b45ef25c2a93fc436701bb3d9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
-@@ -353,4 +353,14 @@ public interface ItemFactory {
+@@ -355,4 +355,14 @@ public interface ItemFactory {
       */
      @NotNull ItemStack enchantWithLevels(@NotNull ItemStack itemStack, @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, boolean allowTreasure, @NotNull java.util.Random random);
      // Paper end - enchantWithLevels API
@@ -1473,7 +1490,7 @@ index f680545b6b59bf8d2ad154b0472dda4cba42a162..58a62ba0635f9158bf18043da89aba75
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 245a730a54c4b241a9a67eccceefafd2763bd238..54dd0bd043a37f6519fc8a318856a4825d389669 100644
+index 36e3fbc727cd748aa138f52976154ba32954cd87..9ecfc504df089a74add168cd5a8376d7d6b8ea0e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -1495,10 +1512,10 @@ index 245a730a54c4b241a9a67eccceefafd2763bd238..54dd0bd043a37f6519fc8a318856a482
  
  /**
   * Represents a stack of items.
-@@ -1033,4 +1045,635 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-         return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
+@@ -1005,4 +1017,635 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+         return type.isAir() || amount <= 0;
      }
-     // Paper end - expose itemstack tooltip lines
+     // Paper end
 +
 +    // Purpur start
 +    /**
@@ -2132,7 +2149,7 @@ index 245a730a54c4b241a9a67eccceefafd2763bd238..54dd0bd043a37f6519fc8a318856a482
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
-index db8bcc66bdc4bedfffb4705db6338eda4c0ad29a..feda3ddfaaf37b6ee218a0e0b1fbc199899bd364 100644
+index 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d48ecd051 100644
 --- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
 +++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
 @@ -10,6 +10,7 @@ import java.util.function.Predicate;
@@ -2229,10 +2246,10 @@ index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c
      /**
       * This class was not meant to be constructed explicitly
 diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-index 653135352c104a6ddeb74a1b6d4916c6952d6271..46b0d02aa759b3735e6ac811523d459cf263aa8b 100644
+index e4b6f278a811acbb0070e311c5c3bdaff7b00474..ee83ecb054099cb85168a9499dfe967a0a9ec796 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-@@ -66,6 +66,7 @@ public class LibraryLoader
+@@ -65,6 +65,7 @@ public class LibraryLoader
              @Override
              public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
              {
@@ -2240,7 +2257,7 @@ index 653135352c104a6ddeb74a1b6d4916c6952d6271..46b0d02aa759b3735e6ac811523d459c
                  logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
              }
          } );
-@@ -81,6 +82,7 @@ public class LibraryLoader
+@@ -80,6 +81,7 @@ public class LibraryLoader
          {
              return null;
          }
@@ -2248,7 +2265,7 @@ index 653135352c104a6ddeb74a1b6d4916c6952d6271..46b0d02aa759b3735e6ac811523d459c
          logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
          {
              java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
-@@ -119,6 +121,7 @@ public class LibraryLoader
+@@ -118,6 +120,7 @@ public class LibraryLoader
              }
  
              jarFiles.add( url );
@@ -2257,10 +2274,10 @@ index 653135352c104a6ddeb74a1b6d4916c6952d6271..46b0d02aa759b3735e6ac811523d459c
              {
                  java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), file // Paper - use configured log prefix
 diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java
-index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5b582290c 100644
+index 037af5fd6d71a526c0e6620f2db0cd6df9625261..939ed1931492854c5854cab06730cf235eba7e89 100644
 --- a/src/main/java/org/bukkit/potion/PotionEffect.java
 +++ b/src/main/java/org/bukkit/potion/PotionEffect.java
-@@ -33,6 +33,7 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -32,12 +32,14 @@ public class PotionEffect implements ConfigurationSerializable {
      private static final String AMBIENT = "ambient";
      private static final String PARTICLES = "has-particles";
      private static final String ICON = "has-icon";
@@ -2268,46 +2285,34 @@ index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5
      private final int amplifier;
      private final int duration;
      private final PotionEffectType type;
-@@ -40,6 +41,7 @@ public class PotionEffect implements ConfigurationSerializable {
+     private final boolean ambient;
      private final boolean particles;
      private final boolean icon;
-     private final PotionEffect hiddenEffect; // Paper
 +    @Nullable private final NamespacedKey key; // Purpur
  
      /**
       * Creates a potion effect.
-@@ -50,11 +52,12 @@ public class PotionEffect implements ConfigurationSerializable {
-      * @param ambient the ambient status, see {@link PotionEffect#isAmbient()}
-      * @param particles the particle status, see {@link PotionEffect#hasParticles()}
-      * @param icon the icon status, see {@link PotionEffect#hasIcon()}
-+     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
-      * @param hiddenEffect the hidden PotionEffect
-      * @hidden Internal-- hidden effects are only shown internally
-      */
-     @org.jetbrains.annotations.ApiStatus.Internal // Paper
--    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable PotionEffect hiddenEffect) { // Paper
-+    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable PotionEffect hiddenEffect, @Nullable NamespacedKey key) { // Paper // Purpur
-         Preconditions.checkArgument(type != null, "effect type cannot be null");
-         this.type = type;
-         this.duration = duration;
-@@ -62,6 +65,7 @@ public class PotionEffect implements ConfigurationSerializable {
-         this.ambient = ambient;
-         this.particles = particles;
-         this.icon = icon;
-+        this.key = key; // Purpur
-         // Paper start
-         this.hiddenEffect = hiddenEffect;
-     }
-@@ -77,10 +81,27 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -50,6 +52,36 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param icon the icon status, see {@link PotionEffect#hasIcon()}
       */
      public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon) {
--        this(type, duration, amplifier, ambient, particles, icon, null);
-+        this(type, duration, amplifier, ambient, particles, icon, null, null); // Purpur
-         // Paper end
-     }
- 
-+    // Purpur start
++        // Purpur start
++        this(type, duration, amplifier, ambient, particles, icon, null);
++    }
++
++    /**
++     * Create a potion effect.
++     * @param duration measured in ticks, see {@link
++     *     PotionEffect#getDuration()}
++     * @param amplifier the amplifier, see {@link PotionEffect#getAmplifier()}
++     * @param ambient the ambient status, see {@link PotionEffect#isAmbient()}
++     * @param particles the particle status, see {@link PotionEffect#hasParticles()}
++     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
++     */
++    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, @Nullable NamespacedKey key) {
++        this(type, duration, amplifier, ambient, particles, particles, key);
++    }
++
 +    /**
 +     * Creates a potion effect.
 +     * @param type effect type
@@ -2320,19 +2325,24 @@ index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5
 +     * @param key the namespacedKey, see {@link PotionEffect#getKey()}
 +     */
 +    public PotionEffect(@NotNull PotionEffectType type, int duration, int amplifier, boolean ambient, boolean particles, boolean icon, @Nullable NamespacedKey key) {
-+        this(type, duration, amplifier, ambient, particles, icon, null, key);
-+    }
-+    // Purpur end
-+
++        // Purpur end
+         Preconditions.checkArgument(type != null, "effect type cannot be null");
+         this.type = type;
+         this.duration = duration;
+@@ -57,6 +89,7 @@ public class PotionEffect implements ConfigurationSerializable {
+         this.ambient = ambient;
+         this.particles = particles;
+         this.icon = icon;
++        this.key = key; // Purpur - add key
+     }
+ 
      /**
-      * Creates a potion effect with no defined color.
-      *
-@@ -126,33 +147,33 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -104,36 +137,43 @@ public class PotionEffect implements ConfigurationSerializable {
       * @param map the map to deserialize from
       */
      public PotionEffect(@NotNull Map<String, Object> map) {
--        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), (PotionEffect) map.get(HIDDEN_EFFECT)); // Paper
-+        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), (PotionEffect) map.get(HIDDEN_EFFECT), getKey(map)); // Paper // Purpur - getKey
+-        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)));
++        this(getEffectType(map), getInt(map, DURATION), getInt(map, AMPLIFIER), getBool(map, AMBIENT, false), getBool(map, PARTICLES, true), getBool(map, ICON, getBool(map, PARTICLES, true)), getKey(map)); // Purpur - getKey
      }
  
      // Paper start
@@ -2366,10 +2376,6 @@ index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5
 -        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon);
 +        return new PotionEffect(this.type, duration, amplifier, ambient, particles, icon, key); // Purpur - add key
      }
- 
-     /**
-@@ -169,6 +190,13 @@ public class PotionEffect implements ConfigurationSerializable {
-     }
      // Paper end
  
 +    // Purpur start
@@ -2382,7 +2388,7 @@ index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5
      @NotNull
      private static PotionEffectType getEffectType(@NotNull Map<?, ?> map) {
          PotionEffectType effect;
-@@ -201,6 +229,17 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -166,17 +206,33 @@ public class PotionEffect implements ConfigurationSerializable {
          return def;
      }
  
@@ -2400,28 +2406,35 @@ index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5
      @Override
      @NotNull
      public Map<String, Object> serialize() {
-@@ -215,6 +254,11 @@ public class PotionEffect implements ConfigurationSerializable {
-         if (this.hiddenEffect != null) {
-             builder.put(HIDDEN_EFFECT, this.hiddenEffect);
-         }
-+        // Purpur start
-+        if (key != null) {
+-        return ImmutableMap.<String, Object>builder()
++        // Purpur start - add key, don't serialize if null.
++        ImmutableMap.Builder<String, Object> builder = ImmutableMap.<String, Object>builder()
+             .put(TYPE, type.getKey().toString())
+             .put(DURATION, duration)
+             .put(AMPLIFIER, amplifier)
+             .put(AMBIENT, ambient)
+             .put(PARTICLES, particles)
+-            .put(ICON, icon)
+-            .build();
++            .put(ICON, icon);
++        if(key != null) {
 +            builder.put(KEY, key.toString());
 +        }
++        return builder.build();
 +        // Purpur end
-         return builder.build();
-         // Paper end
-     }
-@@ -243,7 +287,7 @@ public class PotionEffect implements ConfigurationSerializable {
-             return false;
-         }
-         PotionEffect that = (PotionEffect) obj;
--        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && java.util.Objects.equals(this.hiddenEffect, that.hiddenEffect); // Paper
-+        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && java.util.Objects.equals(this.hiddenEffect, that.hiddenEffect) && this.key == that.key; // Paper // Purpur - add key
      }
  
      /**
-@@ -339,6 +383,24 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -200,7 +256,7 @@ public class PotionEffect implements ConfigurationSerializable {
+             return false;
+         }
+         PotionEffect that = (PotionEffect) obj;
+-        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon;
++        return this.type.equals(that.type) && this.ambient == that.ambient && this.amplifier == that.amplifier && this.duration == that.duration && this.particles == that.particles && this.icon == that.icon && this.key == that.key; // Purpur - add key
+     }
+ 
+     /**
+@@ -296,6 +352,24 @@ public class PotionEffect implements ConfigurationSerializable {
          return icon;
      }
  
@@ -2446,12 +2459,12 @@ index c8ab330ef171795d08fa201cf8320703c7f1c66b..93e2ea220dc03c122f82af65d5e9fda5
      @Override
      public int hashCode() {
          int hash = 1;
-@@ -354,6 +416,6 @@ public class PotionEffect implements ConfigurationSerializable {
+@@ -310,6 +384,6 @@ public class PotionEffect implements ConfigurationSerializable {
  
      @Override
      public String toString() {
--        return "PotionEffect{" + "amplifier=" + amplifier + ", duration=" + duration + ", type=" + type + ", ambient=" + ambient + ", particles=" + particles + ", icon=" + icon + ", hiddenEffect=" + hiddenEffect + '}'; // Paper
-+        return "PotionEffect{" + "amplifier=" + amplifier + ", duration=" + duration + ", type=" + type + ", ambient=" + ambient + ", particles=" + particles + ", icon=" + icon + ", hiddenEffect=" + hiddenEffect + ", key=" + key + '}'; // Paper // Purpur - add key
+-        return type.getName() + (ambient ? ":(" : ":") + duration + "t-x" + amplifier + (ambient ? ")" : "");
++        return type.getName() + (ambient ? ":(" : ":") + duration + "t-x" + amplifier + (ambient ? ")" : "") + (hasKey() ? "(" + key + ")" : ""); // Purpur - add key if not null
      }
  }
 diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java

patches/api/0003-Build-system-changes.patch

@@ -1,86 +1,84 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
 Date: Sun, 14 Jan 2024 19:50:29 +0900
-Subject: [PATCH] Use Gradle Version Catalogs
+Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0588b113b02a05e946dd92fce489662bc01a41eb..83f574f2314f11425eb9c4b11e8873c048f404ca 100644
+index 41d7b75e904b94073dfcd12b776a7759a963b66f..c37b8a63b050dcc2ad2b33955017df48120c4393 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,11 +9,13 @@ java {
      withJavadocJar()
  }
  
-+/* // Plazma - Use Gradle Version Catalogs
++/* // Plazma - Use libs.versions.toml
  val annotationsVersion = "24.0.1"
- val bungeeCordChatVersion = "1.20-R0.2"
- val adventureVersion = "4.15.0"
- val slf4jVersion = "2.0.9"
+ val bungeeCordChatVersion = "1.20-R0.1"
+ val adventureVersion = "4.14.0"
+ val slf4jVersion = "1.8.0-beta4"
  val log4jVersion = "2.17.1"
-+ */ // Plazma - Use Gradle Version Catalogs
++ */ // Plazma - Use libs.versions.toml
  val apiAndDocs: Configuration by configurations.creating {
      attributes {
          attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-@@ -27,6 +29,7 @@ configurations.api {
- }
+@@ -28,15 +30,39 @@ configurations.api {
  
  dependencies {
-+    /* // Plazma - Use Gradle Version Catalogs
      // api dependencies are listed transitively to API consumers
++    /* // Plazma - Use libs.versions.toml
      api("com.google.guava:guava:32.1.2-jre")
      api("com.google.code.gson:gson:2.10.1")
-@@ -39,8 +42,34 @@ dependencies {
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper
+     api("org.yaml:snakeyaml:2.2")
      api("org.joml:joml:1.10.5")
++     */ // Plazma - Use libs.versions.toml
      // Paper start
-     api("com.googlecode.json-simple:json-simple:1.1.1") {
-+    // Plazma start - Use Gradle Version Catalogs
-+     */
-+    implementation(common.bundles.asm)
-+
-+    api(api.bundles.api)
-+    api(common.snakeyaml)
-+    api(common.log4j.api)
-+    api(common.maven.provider)
-+    api(api.jsonsimple) {
+-    api("com.googlecode.json-simple:json-simple:1.1.1") {
++    api(api.jsonsimple) { // Plazma - Use libs.versions.toml
          isTransitive = false // includes junit
      }
-+
-+    apiAndDocs(common.bundles.adventure)
-+    apiAndDocs(platform(common.adventure.bom))
++    // Plazma start
++    implementation(common.bundles.asm)
 +
 +    compileOnly(api.findbugs)
-+    compileOnly(api.annotations)
 +    compileOnly(common.bundles.maven)
 +
++    compileOnly(api.annotations)
 +    compileOnlyApi(api.checkerqual)
++    testCompileOnly(api.bundles.annotations)
 +
 +    testImplementation(common.asm.tree)
 +    testImplementation(common.bundles.test)
 +    testImplementation(common.commons.lang3)
 +
-+    testCompileOnly(api.bundles.annotations)
++    api(api.bundles.api)
++    api(common.snakeyaml)
++    api(common.log4j.api)
++    api(common.maven.provider)
++    apiAndDocs(platform(common.adventure.bom))
++    apiAndDocs(common.bundles.adventure)
 +    /*
-+    // Plazma end - Use Gradle Version Catalogs
++    // Plazma end
      api("it.unimi.dsi:fastutil:8.5.6")
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
-@@ -76,6 +105,7 @@ dependencies {
+@@ -73,6 +99,7 @@ dependencies {
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.5.0")
      testImplementation("org.ow2.asm:asm-tree:9.5")
-+     */ // Plazma - Use Gradle Version Catalogs
++     */ // Plazma - Use libs.versions.toml
  }
  
  // Paper start
-@@ -136,25 +166,27 @@ tasks.withType<Javadoc> {
+@@ -133,25 +160,27 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
 -        "https://guava.dev/releases/32.1.2-jre/api/docs/",
 -        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
 -        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
-+        // Plazma start - Use Gradle Version Catalogs
++        // Plazma start - Use libs.versions.toml
 +        "https://guava.dev/releases/${api.guava.orNull?.version}/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/${common.snakeyaml.orNull?.version}/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations/${api.annotations.orNull?.version}/", // Paper - we don't want Java 5 annotations
@@ -110,8 +108,8 @@ index 0588b113b02a05e946dd92fce489662bc01a41eb..83f574f2314f11425eb9c4b11e8873c0
 +        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/${common.log4j.api.orNull?.version}/",
          // Paper end
 -        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
-+        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.maven.connector.orNull?.version}", // Paper
-+        // Plazma end - Use Gradle Version Catalogs
++        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.maven.transport.orNull?.version}", // Paper
++        // Plazma end
      )
      options.tags("apiNote:a:API Note:")
  

patches/api/0004-Plazma-Configurations.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Plazma Configurations
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index be0e4c789a02d67160287c39cf6bdf8ef2229afc..2b3786560d8fb93b9899ebc1e0a7c96a808268d0 100644
+index dd99f53e3d559685a4b3a454a9e607c310fc6aff..3a3713573ba37530449f9254c0a7205530c9737a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2226,6 +2226,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2202,6 +2202,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Purpur end
  
-+        // Plazma start - Plazma Configuration API
++        // Plazma start
 +        @NotNull
 +        public org.bukkit.configuration.file.YamlConfiguration getPlazmaConfig() {
 +            throw new UnsupportedOperationException("Not supported yet.");

patches/api/0005-Optimize-spigot-event-bus.patch

@@ -5,7 +5,7 @@ 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..f1b3559bf9d2023ca59330c65e6e34714759dd9d 100644
+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;
@@ -48,7 +48,7 @@ index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..f1b3559bf9d2023ca59330c65e6e3471
 +    public final @NotNull net.kyori.adventure.util.TriState asynchronous() {
 +        return this.async;
 +    }
-+    // Plazma end - Optimize Spigot event bus
++    // Plazma end
 +
      // Paper start
      /**

patches/api/0006-Implement-No-Chat-Reports.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement No Chat Reports
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-index f7f864a2b46129e4d61bc87f3e23c343417aa094..eb3cc41388a210f000bf637bfae135081bee51e9 100644
+index 2eb13c049fa917d41fa9ad17fdec9ec4c33701a8..5d50f83a76affc74f989870ca1bc8d7a75f3b2ba 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-@@ -216,6 +216,8 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
+@@ -215,6 +215,8 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
           * Fallback cause
           */
          UNKNOWN,

patches/api/0007-Always-allow-Java-17-on-SIMD.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alpha <dev@alpha93.kr>
-Date: Sun, 25 Feb 2024 14:14:18 +0900
-Subject: [PATCH] Always allow Java 17+ on SIMD
-
-
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-index ab5fea0b03224bf249352ce340e94704ff713345..8dd1bad95e488f52ebbe23c15fd5db3d32aaebd1 100644
---- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -15,7 +15,7 @@ public class SIMDChecker {
- 	@Deprecated
- 	public static boolean canEnable(Logger logger) {
- 		try {
--			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
-+			if (SIMDDetection.getJavaVersion() < 17) { // Plazma - Always allow Java 17+
- 				return false;
- 			} else {
- 				SIMDDetection.testRun = true;

patches/generated-api/0001-Purpur-Generated-API-Changes.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <contact@granny.dev>
-Date: Thu, 18 Jan 2024 21:01:12 +0900
-Subject: [PATCH] Purpur Generated API Changes
-
-PurpurMC
-Copyright (C) 2024 PurpurMC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 069f2668f5229b0368b796e65eef1648fba0a097..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644
---- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -442,6 +442,18 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
- 
-     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
- 
-+    // Purpur start
-+    GoalKey<Mob> MOB_HAS_RIDER = GoalKey.of(Mob.class, NamespacedKey.minecraft("has_rider"));
-+    GoalKey<AbstractHorse> HORSE_HAS_RIDER = GoalKey.of(AbstractHorse.class, NamespacedKey.minecraft("horse_has_rider"));
-+    GoalKey<Llama> LLAMA_HAS_RIDER = GoalKey.of(Llama.class, NamespacedKey.minecraft("llama_has_rider"));
-+    GoalKey<Phantom> FIND_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal"));
-+    GoalKey<Phantom> ORBIT_CRYSTAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal"));
-+    GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
-+    GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
-+    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
-+    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
-+    // Purpur end
-+
-     /**
-      * Removed in 1.20.2
-      */

patches/mojang-api/0001-Rebrand.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alpha <dev@alpha93.kr>
-Date: Tue, 27 Feb 2024 18:36:43 +0900
-Subject: [PATCH] Rebrand
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index a278ee93d7001e8dc7fd2f5409c2f528c637cb2f..a00cf1659f1fd9dff3ff34561d78732645b51dfb 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -9,7 +9,7 @@ java {
- }
- 
- dependencies {
--    implementation(project(":paper-api"))
-+    implementation(project(":plazma-api")) // Plazma - Rebrand
-     api("com.mojang:brigadier:1.0.18")
- 
-     compileOnly("it.unimi.dsi:fastutil:8.5.6")

patches/placeholder/server/0007-Development-Build.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Fri, 26 Jan 2024 15:34:53 +0900
-Subject: [PATCH] Development Build
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index b04d3eea789f77b2435cb0192635f1be1bab597d..a58ce2c893d8c755ab3027207d512542d2d57c36 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -24,7 +24,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-     private static int distance = -2; public int distance() { return distance; }
-     // Purpur end
-     private static @Nullable String mcVer;
--    private static final boolean DEVELOPMENT = false; // Plazma
-+    private static final boolean DEVELOPMENT = true; // Plazma
- 
-     @Override
-     public long getCacheTime() {

patches/server/0003-Build-system-changes.patch

@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 14 Jan 2024 19:51:19 +0900
+Subject: [PATCH] Build system changes
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index f083d422678f5fd21825439944af888fbdc9bf3c..e30b51ed329f0c66a2329da45996ef0fc0db8ffb 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -19,6 +19,7 @@ dependencies {
+         exclude("io.papermc.paper", "paper-api")
+     }
+     // Purpur end
++    /* // Plazma - Use libs.versions.toml
+     // Paper start
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+@@ -46,9 +47,32 @@ dependencies {
+     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
+     // Paper start - Use Velocity cipher
+-    implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
++    // Plazma start - Use libs.versions.toml
++     */
++    implementation(common.snakeyaml)
++    implementation(common.bundles.asm)
++    implementation(common.commons.lang2)
++    implementation(common.adventure.serializer.ansi)
++    implementation(common.log4j.core)
++    implementation(common.log4j.iostreams)
++    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
++    runtimeOnly(log4jPlugins.output)
++    alsoShade(log4jPlugins.output)
++
++    implementation(server.ansi)
++    implementation(server.bundles.implementation)
++    implementation(server.velocity) {
++    // Plazma end
+         isTransitive = false
+     }
++
++    runtimeOnly(common.bundles.maven)
++    runtimeOnly(common.maven.provider)
++    runtimeOnly(server.bundles.runtime)
++
++    testImplementation(common.bundles.test)
++    testImplementation(server.classgraph)
++    /* // Plazma - Use libs.versions.toml
+     // Paper end
+ 
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+@@ -57,19 +81,22 @@ dependencies {
+ 
+     // Pufferfish start
+     implementation("org.yaml:snakeyaml:1.32")
+-    implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
++     */ // Plazma - Use libs.versions.toml
++    implementation(server.simpleyaml) { // Plazma - Use libs.versions.toml
+         exclude(group="org.yaml", module="snakeyaml")
+     }
+     // Pufferfish end
+ 
+-    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
+-    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
++    //implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur // Plazma - Use libs.versions.toml
++    //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur // Plazma - Use libs.versions.toml
+     implementation("dev.omega24:upnp4j:1.0") // Purpur
+ 
++    /* // Plazma - Use libs.versions.toml
+     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
+     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+     testImplementation("org.hamcrest:hamcrest:2.2")
+     testImplementation("org.mockito:mockito-core:5.5.0")
++     */ // Plazma - Use libs.versions.toml
+ }
+ 
+ val craftbukkitPackageVersion = "1_20_R2" // Paper

patches/server/0003-Use-Gradle-Version-Catalogs.patch

@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 14 Jan 2024 19:51:19 +0900
-Subject: [PATCH] Use Gradle Version Catalogs
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 32366253c04c493135f2b22d1940f83669104723..be06b9b282c53bc135963447e19185d9ff41d19a 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -19,21 +19,37 @@ dependencies {
-         exclude("io.papermc.paper", "paper-api")
-     }
-     // Purpur end
-+    // Plazma start - Use Gradle version catalogs
-+    /*
-     // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     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
--    /*
--          Required to add the missing Log4j2Plugins.dat file from log4j-core
--          which has been removed by Mojang. Without it, log4j has to classload
--          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
-+     */
-+    log4jPlugins.annotationProcessorConfigurationName(common.log4j.core)
-+
-+    implementation(common.log4j.core)
-+    implementation(common.log4j.iostreams)
-+    implementation(common.snakeyaml)
-+    implementation(common.bundles.asm)
-+    implementation(common.commons.lang2)
-+    implementation(common.adventure.serializer.ansi)
-+    implementation(server.ansi)
-+    implementation(server.bundles.implementation)
-+
-+    runtimeOnly(common.bundles.maven)
-+    runtimeOnly(common.maven.provider)
-+    runtimeOnly(server.bundles.runtime)
-     runtimeOnly(log4jPlugins.output)
-+
-     alsoShade(log4jPlugins.output)
-+
-+    testImplementation(common.bundles.test)
-+    testImplementation(server.bundles.test)
-+    /*
-     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
-@@ -46,10 +62,13 @@ dependencies {
-     runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-     // Paper start - Use Velocity cipher
-     implementation("com.velocitypowered:velocity-native:3.1.2-SNAPSHOT") {
-+     */
-+    implementation(server.velocity) {
-         isTransitive = false
-     }
-     // Paper end - Use Velocity cipher
- 
-+     /*
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
-@@ -57,20 +76,25 @@ dependencies {
-     // Pufferfish start
-     implementation("org.yaml:snakeyaml:1.32")
-     implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
-+     */
-+    implementation(server.simpleyaml) {
-         exclude(group="org.yaml", module="snakeyaml")
-     }
-     // Pufferfish end
- 
--    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
--    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
-+    //implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
-+    //implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
-     implementation("dev.omega24:upnp4j:1.0") // Purpur
- 
-+    /*
-     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-     testImplementation("org.hamcrest:hamcrest:2.2")
-     testImplementation("org.mockito:mockito-core:5.5.0")
-     testImplementation("org.ow2.asm:asm-tree:9.5")
-     testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
-+     */
-+    // Plazma end - Use Gradle Version Catalogs
- }
- 
- val craftbukkitPackageVersion = "1_20_R3" // Paper

patches/server/0005-Rebrand.patch

@@ -1,41 +1,33 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
+From: AlphaKR93 <alphakr93@outlook.com>
 Date: Wed, 21 Dec 2022 19:31:24 +0900
 Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index be06b9b282c53bc135963447e19185d9ff41d19a..97b12b0b00bdf37ab122f8b8ea8b42ac65e30bce 100644
+index e30b51ed329f0c66a2329da45996ef0fc0db8ffb..d91928799014596de519d1a1b3f1bb0a80ac925c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,12 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- val alsoShade: Configuration by configurations.creating
+@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
  
  dependencies {
--    // Purpur start
+     // Purpur start
 -    implementation(project(":purpur-api"))
--    implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
--        exclude("io.papermc.paper", "paper-api")
--    }
--    // Purpur end
-+    // Plazma start - Branding
 +    implementation(project(":plazma-api"))
-+    implementation(project(":plazma-mojangapi"))
-+    // Plazma end - Branding
-     // Plazma start - Use Gradle version catalogs
-     /*
-     // Paper start
-@@ -118,7 +116,7 @@ tasks.jar {
+     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
+         exclude("io.papermc.paper", "paper-api")
+     }
+@@ -120,7 +120,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
 -            "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
-+            "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur // Plazma - Setup Gradle Project
++            "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074891ac800 100644
+index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..7d80d2cf5d607d6051e99e4b08bc1b76098a79da 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,7 @@ public class Metrics {
@@ -43,7 +35,7 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
 -                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur
-+                Metrics metrics = new Metrics("Plazma", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma - Branding
++                Metrics metrics = new Metrics("Plazma", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Purpur // Plazma
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
@@ -52,48 +44,44 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..0b3d87d2d43148e6370e7a03e0bb6074
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
                  metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
 -                metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
-+                metrics.addCustomChart(new Metrics.SimplePie("plazma_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma // Plazma - Branding
++                metrics.addCustomChart(new Metrics.SimplePie("plazma_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be1bab597d 100644
+index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fec95437c1ad602f64c4d4d02c276199f27babbd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,10 +20,11 @@ import java.util.stream.StreamSupport;
+@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
  public class PaperVersionFetcher implements VersionFetcher {
      private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
      // Purpur start
 -    private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
-+    private static final String DOWNLOAD_PAGE = "https://github.com/PlazmaMC/Plazma/releases"; // Plazma // Plazma - Branding
++    private static final String DOWNLOAD_PAGE = "https://github.com/PlazmaMC/Plazma/releases"; // Plazma
      private static int distance = -2; public int distance() { return distance; }
      // Purpur end
      private static @Nullable String mcVer;
-+    private static final boolean DEVELOPMENT = false; // Plazma
- 
-     @Override
-     public long getCacheTime() {
-@@ -33,8 +34,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -33,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
      public Component getVersionMessage(@Nonnull String serverVersion) {
 -        String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
 -        final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Purpur
-+        String[] parts = serverVersion.substring("git-Plazma-".length()).split("[-\\s]"); // Purpur // Plazma // Plazma - Branding
-+        final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Branding
++        String[] parts = serverVersion.substring("git-Plazma-".length()).split("[-\\s]"); // Purpur // Plazma
++        final Component updateMessage = getUpdateStatusMessage("PlazmaMC/Plazma", "ver/" + getMinecraftVersion(), parts[0]); // Purpur // Plazma
          final Component history = getHistory();
  
          return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
-@@ -47,7 +48,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -47,7 +47,7 @@ public class PaperVersionFetcher implements VersionFetcher {
                  String result = matcher.group();
                  mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
              } else {
 -                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Purpur!"); // Purpur
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Plazma!"); // Purpur // Plazma // Plazma - Branding
++                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Plazma!"); // Purpur // Plazma
                  org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
-@@ -57,6 +58,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -57,6 +57,7 @@ public class PaperVersionFetcher implements VersionFetcher {
      }
  
      private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
@@ -101,7 +89,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be
          //int distance; // Purpur - use field
          try {
              int jenkinsBuild = Integer.parseInt(versionInfo);
-@@ -65,6 +67,11 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -65,6 +66,11 @@ public class PaperVersionFetcher implements VersionFetcher {
              versionInfo = versionInfo.replace("\"", "");
              distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
          }
@@ -109,11 +97,11 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be
 +         */
 +        versionInfo = versionInfo.replace("\"", ""); // Plazma
 +        distance = fetchDistanceFromGitHub(repo, branch, versionInfo); // Plazma
-+        // Plazma end - Disable CI Checking
++        // Plazma end
  
          switch (distance) {
              case -1:
-@@ -83,6 +90,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -83,6 +89,7 @@ public class PaperVersionFetcher implements VersionFetcher {
          }
      }
  
@@ -121,7 +109,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be
      private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
          if (siteApiVersion == null) { return -1; }
          try {
-@@ -102,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -102,6 +109,7 @@ public class PaperVersionFetcher implements VersionFetcher {
              return -1;
          }
      }
@@ -130,7 +118,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..b04d3eea789f77b2435cb0192635f1be
      // Contributed by Techcable <Techcable@outlook.com> in GH-65
      private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) {
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index 3cb56595822799926a8141e60a42f5d1edfc6de5..3e32c28e1d4c157a2f00dbc6d6e9d71cb3b8f6b7 100644
+index 3cb56595822799926a8141e60a42f5d1edfc6de5..19d1d136fc28d6c114f6bc44c6450d2df51c3cb9 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -138,37 +126,37 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..3e32c28e1d4c157a2f00dbc6d6e9d71c
      protected LineReader buildReader(LineReaderBuilder builder) {
          builder
 -                .appName("Purpur") // Purpur
-+                .appName("Plazma") // Purpur // Plazma - Branding
++                .appName("Plazma") // Purpur // Plazma
                  .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index f91ea723a1c85f6cf8c4f6dd7f182b948c2f2e81..c5a3f9c2daf3da135cccecb757353534e1688821 100644
+index ed3527612315e6e0649182ce4e1ae2834b0918a9..ae02c029f0169d30a34d4a4e65ea6cb4fa498111 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -37,7 +37,7 @@ public class CrashReport {
+@@ -35,7 +35,7 @@ public class CrashReport {
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
          this.title = message;
          this.exception = cause;
 -        this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
-+        this.systemReport.setDetail("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Branding
++        this.systemReport.setDetail("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma
      }
  
      public String getTitle() {
-@@ -127,7 +127,7 @@ public class CrashReport {
+@@ -125,7 +125,7 @@ public class CrashReport {
          stringbuilder.append("---- Minecraft Crash Report ----\n");
          // Purpur start
          stringbuilder.append("// ");
 -        stringbuilder.append("// DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!");
-+        stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO PLAZMA INSTEAD!"); // Plazma - Branding
++        stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO PLAZMA INSTEAD!"); // Plazma
          // Purpur end
          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 b4a009a1108758110181af3321a91b3ec9cf74dc..3e1079e9af85c62684ce19a7afaac5adc2167cb6 100644
+index ec268189b19b6fa5c4521f96ce211a531db35ec5..ce45a93fe835fd1ea4411c78df430aaa903c83c3 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -105,6 +105,18 @@ public class Main {
+@@ -108,6 +108,18 @@ public class Main {
              */ // CraftBukkit end
  
          try {
@@ -179,42 +167,42 @@ index b4a009a1108758110181af3321a91b3ec9cf74dc..3e1079e9af85c62684ce19a7afaac5ad
 +                    \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┃
 +                    \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┛\033[0m
++                    \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┛
 +                    """);
-+            if (!org.plazmamc.plazma.Options.iKnowWhatIAmDoing)
++            if (org.plazmamc.plazma.Options.iKnowWhatIAmDoing)
 +                LOGGER.warn("Warning! Plazma may cause unexpected problems, so be sure to test it thoroughly before using it on a public server.");
 +            // Plazma end
              // Paper start
              if (Boolean.getBoolean("Paper.isRunDev")) {
                  net.minecraft.server.packs.VanillaPackResourcesBuilder.developmentConfig = builder -> {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b1dd8d66a524254a270a725f5f7a46f28e13b749..c7d748675b51ea69f31d87c74e4125a48a62ef48 100644
+index b61c4d1ebb9c15a7ecd7bec5eb864851c053fb7e..b4d5bca6e3a39186a988098fb5d4cae97a776e79 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -913,7 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
 -            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
-+            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PLAZMA)"); // Purpur // Plazma - Branding
++            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PLAZMA)"); // Purpur // Plazma
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
                  try {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index ae75edfaa9e4c72f11fbb7ffc66294be47c206cc..a66dcea06424518290576c7647ae0717040586f9 100644
+index cda4544ae96a4fcb5c6c4483df67a59f1b53fd27..fe82a20efb2b130a568bc06aec5b86d3082062a3 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -57,7 +57,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -58,7 +58,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
      public final boolean onlineMode = this.get("online-mode", true);
      public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
      public final String serverIp = this.get("server-ip", "");
 -    public final String serverName = this.get("server-name", "Unknown Server"); // Purpur
-+    public final String serverName = this.get("server-name", "A Plazma Server"); // Purpur // Plazma - Branding
++    public final String serverName = this.get("server-name", "Plazma Server"); // Purpur // Plazma
      public final boolean spawnAnimals = this.get("spawn-animals", true);
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 7f07ffab0835d45d4d170fe171d7fa996d5913d9..a2b7441d1f5998f2b05903d07b587b42cc6ff987 100644
+index be7b3fe2dc84493dcde9e185717b0b7c7c2e9822..cfdaa744ff40c8a171ca9b36b305b326fc57c32c 100644
 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -56,7 +56,7 @@ public class MinecraftServerGui extends JComponent {
@@ -222,7 +210,7 @@ index 7f07ffab0835d45d4d170fe171d7fa996d5913d9..a2b7441d1f5998f2b05903d07b587b42
          }
  
 -        final JFrame jframe = new JFrame("Purpur Minecraft server"); // Purpur
-+        final JFrame jframe = new JFrame("Plazma Minecraft server"); // Purpur // Plazma - Branding
++        final JFrame jframe = new JFrame("Plazma Minecraft server"); // Purpur // Plazma
          final MinecraftServerGui servergui = new MinecraftServerGui(server);
  
          jframe.setDefaultCloseOperation(2);
@@ -230,22 +218,35 @@ index 7f07ffab0835d45d4d170fe171d7fa996d5913d9..a2b7441d1f5998f2b05903d07b587b42
          jframe.pack();
          jframe.setLocationRelativeTo((Component) null);
          jframe.setVisible(true);
--        jframe.setName("Purpur Minecraft server"); // Paper - Improve ServerGUI // Purpur
-+        jframe.setName("Plazma Minecraft server"); // Paper - Improve ServerGUI // Purpur // Plazma - Branding
+-        jframe.setName("Purpur Minecraft server"); // Paper // Purpur
++        jframe.setName("Plazma Minecraft server"); // Paper // Purpur // Plazma
  
-         // Paper start - Improve ServerGUI
+         // Paper start - Add logo as frame image
          try {
 @@ -76,7 +76,7 @@ public class MinecraftServerGui extends JComponent {
          jframe.addWindowListener(new WindowAdapter() {
              public void windowClosing(WindowEvent windowevent) {
                  if (!servergui.isClosing.getAndSet(true)) {
 -                    jframe.setTitle("Purpur Minecraft server - shutting down!"); // Purpur
-+                    jframe.setTitle("Plazma Minecraft server - shutting down!"); // Purpur // Plazma - Branding
++                    jframe.setTitle("Plazma Minecraft server - shutting down!"); // Purpur // Plazma
                      server.halt(true);
                      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 25540a7f5631acd856726cdb44bace9be7dab401..36a1ac09bec7b4139d1cd44e6ecda72fc30fa8c4 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -1323,7 +1323,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(this.tileTickPosition);
+             // Spigot start
+             if (tickingblockentity == null) {
+-                this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
++                this.getCraftServer().getLogger().severe("Plazma has detected a null entity and has removed it, preventing a crash"); // Plazma
+                 tilesThisCycle--;
+                 continue;
+             }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index fe312b1aef579cb4bf81bdd967cf72ff880d7505..97628761958289612ada0374f56e7d8f6af21512 100644
+index db571f658f636cdda1dcdbaffa0c4da67fae11ad..0ba8a251bf1f5a7a6f27823686bf0d636feba769 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -153,7 +153,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -253,25 +254,25 @@ index fe312b1aef579cb4bf81bdd967cf72ff880d7505..97628761958289612ada0374f56e7d8f
      // Paper start
      private static void printOversizedLog(String msg, Path file, int x, int z) {
 -        org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
-+        org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PLAZMA - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Plazma - Branding
++        org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PLAZMA - You may ask for help on Discord, but do not file an issue. These error messages can not be removed."); // Plazma
      }
  
-     private static CompoundTag readOversizedChunk(RegionFile regionfile, ChunkPos chunkCoordinate) throws IOException {
+     private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0a5867b01c1ebf21d9add1d4a2843d15b8e1acb7..694dc50e8446754b56b8e214b04c773ab01f06fc 100644
+index a8a887236c68567816badc0620833755c84a4b03..09c292e22788fdf48b639265f24595e14aceba7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
+@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
 -    private final String serverName = "Purpur"; // Paper // Pufferfish // Purpur
-+    private final String serverName = "Plazma"; // Paper // Pufferfish // Purpur // Plazma - Branding
++    private final String serverName = "Plazma"; // Paper // Pufferfish // Purpur // Plazma
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 146f229b8e8888e2c0256c007c71c675c27e71a5..0f3ef5b27f72ba558765798d5f91d60bf5623029 100644
+index d41f9c4a3c992b5dadacb4fcb1107235fff79fa8..49d0cd1275c6bf5165e4880dc322bc93ad3848f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -141,7 +141,7 @@ public class Main {
@@ -279,7 +280,7 @@ index 146f229b8e8888e2c0256c007c71c675c27e71a5..0f3ef5b27f72ba558765798d5f91d60b
                  this.acceptsAll(Main.asList("noconsole"), "Disables the console");
  
 -                this.acceptsAll(Main.asList("v", "version"), "Show the CraftBukkit Version");
-+                this.acceptsAll(Main.asList("v", "version"), "Show the Plazma Version"); // Plazma - Branding
++                this.acceptsAll(Main.asList("v", "version"), "Show the Plazma Version"); // Plazma - Rebranding
  
                  this.acceptsAll(Main.asList("demo"), "Demo mode");
  
@@ -288,38 +289,38 @@ index 146f229b8e8888e2c0256c007c71c675c27e71a5..0f3ef5b27f72ba558765798d5f91d60b
                          .withRequiredArg()
                          .ofType(String.class)
 -                        .defaultsTo("Unknown Server")
-+                        .defaultsTo("Plazma Server") // Plazma - Branding
++                        .defaultsTo("Plazma Server") // Plazma - Rebranding
                          .describedAs("Name");
                  // Paper end
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e3f724a19ab2f9821d84f9b03acf7c925c88f455..aeb862f55965d2a6dc138aa72f0aa9c9d8c8c79c 100644
+index 9c94fd78cbd0d3ef0c4dd3678262126b6ed2847b..653ba98a1b69f25b781f8794c7d2ae8c5445cfa6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -953,7 +953,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -912,7 +912,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              return EntityCategory.WATER;
          }
  
 -        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Purpur."); // Purpur
-+        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Plazma."); // Purpur // Plazma - Branding
++        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Plazma."); // Purpur // Plazma
      }
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..6bab5f9e40987d1a8ca9c17118d2a14135df5dff 100644
+index 7902c649a54fccbb13531c01e052df87ec4a424a..e8f50fdd7791fa8acc6eccdef40349845696b357 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
                  this.parsePending();
              } else {
                  // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
 -                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
-+                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Plazma"); // Paper // Purpur // Plazma - Branding
++                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Plazma"); // Paper // Purpur // Plazma
                  // We don't need to parse pending
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..73b4818998098b08abcbee4d29915492aa09b5ef 100644
+index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..0e695ea608c4e4770f5491d54ad47616d4e857c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -8,22 +8,25 @@ import java.util.logging.Logger;
@@ -330,7 +331,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..73b4818998098b08abcbee4d29915492
 -        String result = "Unknown-Version";
 -
 -        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Pufferfish // Purpur
-+    // Plazma start - Branding & Improve Versioning
++    // Plazma start
 +    public static String version = "Unknown-Version";
 +    static {
 +        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.plazmamc.plazma/plazma-api/pom.properties");
@@ -353,7 +354,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..73b4818998098b08abcbee4d29915492
 +    public static String getBukkitVersion() {
 +        return version;
      }
-+    // Plazma end - Branding & Improve Versioning
++    // Plazma end
  }
 diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
 new file mode 100644
@@ -369,7 +370,7 @@ index 0000000000000000000000000000000000000000..a858b7ddef7f6877c0b92f4150e0dd37
 +
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index efe25d3894f3ad000257c72d9a5e06ef22446d41..a937993f318ef5703420f57fe65c5d990ce2c4dd 100644
+index 3633574e112f217b412217dd243a631dc4e9c40c..d0d31002562e728fa1a6c9bc81baa4534f11d365 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -231,7 +231,7 @@ public class PurpurConfig {
@@ -377,12 +378,12 @@ index efe25d3894f3ad000257c72d9a5e06ef22446d41..a937993f318ef5703420f57fe65c5d99
      }
  
 -    public static String serverModName = "Purpur";
-+    public static String serverModName = "Plazma"; // Plazma - Branding
++    public static String serverModName = "Plazma"; // Plazma
      private static void serverModName() {
          serverModName = getString("settings.server-mod-name", serverModName);
      }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index f7296691cb4af7814de1520347b307ff209082e4..090eb94fe8088d0ae98bfbe8bbd32a3cac2015d0 100644
+index 5fc8cc40ab627eba0b2110c73d31af213a935733..969ac1b2f824af361beec4afa00b15f13f6868ce 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -390,40 +391,40 @@ index f7296691cb4af7814de1520347b307ff209082e4..090eb94fe8088d0ae98bfbe8bbd32a3c
                  // Paper end
                  log.log( Level.SEVERE, "------------------------------" );
 -                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Plazma bug." ); // Paper // Purpur // Plazma - Branding
++                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Plazma bug." ); // Paper // Purpur // Plazma
                  log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
                  log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
                  log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
                  log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
 -                log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a Plazma bug, please report this to https://github.com/PlazmaMC/Plazma/issues" ); // Purpur // Plazma - Branding
++                log.log( Level.SEVERE, "If you are unsure or still think this is a Plazma bug, please report this to https://github.com/PlazmaMC/Plazma/issues" ); // Purpur // Plazma
                  log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
 -                log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
-+                log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Branding
++                log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -184,12 +184,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -185,12 +185,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                  // Paper end
                  } else
                  {
 -                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Branding
++                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma
                      log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
                  }
                  // Paper end - Different message for short timeout
                  log.log( Level.SEVERE, "------------------------------" );
 -                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Plazma!):" ); // Paper // Purpur // Plazma - Branding
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
++                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Plazma!):" ); // Paper // Purpur // Plazma
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
                  this.dumpTickingInfo(); // Paper - log detailed tick information
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-@@ -205,7 +205,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -206,7 +206,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      WatchdogThread.dumpThread( thread, log );
                  }
                  } else {
 -                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Branding
++                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma
                  }
  
                  log.log( Level.SEVERE, "------------------------------" );

patches/server/0006-Rebrand-Logo.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
+From: AlphaKR93 <alphakr93@gmail.com>
 Date: Fri, 10 Mar 2023 22:08:56 +0900
 Subject: [PATCH] Rebrand Logo
 

patches/server/0008-Setup-basic-configuration-sections.patch

@@ -5,18 +5,10 @@ Subject: [PATCH] Setup basic configuration sections
 
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b 100644
+index 69c4d9cb0532621018f6cd99916c409fc150ab7e..5875aae8d7d0146ef9903d8b4bc2b673a615fd98 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations;
- import io.papermc.paper.configuration.Configuration;
- import io.papermc.paper.configuration.ConfigurationPart;
- import org.jetbrains.annotations.NotNull;
-+import org.spongepowered.configurate.objectmapping.meta.PostProcess;
- import org.spongepowered.configurate.objectmapping.meta.Setting;
- 
- @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
-@@ -23,4 +24,43 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -23,4 +23,23 @@ public class GlobalConfiguration extends ConfigurationPart {
      @Setting(Configuration.VERSION_FIELD)
      int version = VERSION;
  
@@ -33,26 +25,6 @@ index 69c4d9cb0532621018f6cd99916c409fc150ab7e..f8dc4f4e2cbc8034e5e274e5b7245d4e
 +
 +    }
 +
-+    public Entity entity;
-+    public class Entity extends ConfigurationPart {
-+
-+
-+        @PostProcess
-+        public void post() {
-+        }
-+
-+    }
-+
-+    public World world;
-+    public class World extends ConfigurationPart {
-+
-+
-+        @PostProcess
-+        public void post() {
-+        }
-+
-+    }
-+
 +    public Miscellaneous misc;
 +    public class Miscellaneous extends ConfigurationPart {
 +

patches/server/0009-Always-agree-EULA-on-development-mode.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Always agree EULA on development mode
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 3e1079e9af85c62684ce19a7afaac5adc2167cb6..60382055ccb199e32fb201fddfe34f05bf919195 100644
+index ce45a93fe835fd1ea4411c78df430aaa903c83c3..9b8bdffbbfe45c6712d0f4da3643424fa94fc69e 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -179,6 +179,7 @@ public class Main {
+@@ -178,6 +178,7 @@ public class Main {
  
              // Spigot Start
              boolean eulaAgreed = Boolean.getBoolean( "com.mojang.eula.agree" );
-+            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.isRunDev"); // Plazma - Always agree EULA on development mode
++            eulaAgreed = eulaAgreed || Boolean.getBoolean("Paper.isRunDev"); // Plazma
              if ( eulaAgreed )
              {
                  System.err.println( "You have used the Spigot command line EULA agreement flag." );

patches/server/0010-Add-more-metrics.patch

@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 5 Nov 2023 10:26:26 +0900
+Subject: [PATCH] Add more metrics
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
+index 7d80d2cf5d607d6051e99e4b08bc1b76098a79da..f006c867ad0765e0f52a629729ab131acec5c2fc 100644
+--- a/src/main/java/com/destroystokyo/paper/Metrics.java
++++ b/src/main/java/com/destroystokyo/paper/Metrics.java
+@@ -636,16 +636,52 @@ public class Metrics {
+                     return map;
+                 }));
+ 
++                // Plazma start
++                metrics.addCustomChart(new DrilldownPie("datapacks", () -> {
++                    int datapacks = Bukkit.getDatapackManager().getEnabledPacks().size();
++                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(datapacks), 1);
++
++                    if (datapacks == 0) return Collections.singletonMap("0", entry);
++                    else if (datapacks <= 5) return Collections.singletonMap("1-5", entry);
++                    else if (datapacks <= 10) return Collections.singletonMap("6-10", entry);
++                    else if (datapacks <= 25) return Collections.singletonMap("11-25", entry);
++                    else if (datapacks <= 50) return Collections.singletonMap("26-50", entry);
++                    else return Collections.singletonMap("50+", entry);
++                }));
++
++                List<Plugin> plugins = Arrays.stream(Bukkit.getPluginManager().getPlugins()).toList();
++
++                metrics.addCustomChart(new DrilldownPie("plugins", () -> {
++                    int pluginCount = (int) plugins.stream().filter(Plugin::isEnabled).count();
++                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(pluginCount), 1);
++
++                    if (pluginCount == 0) return Collections.singletonMap("0", entry);
++                    else if (pluginCount <= 5) return Collections.singletonMap("1-5", entry);
++                    else if (pluginCount <= 10) return Collections.singletonMap("6-10", entry);
++                    else if (pluginCount <= 25) return Collections.singletonMap("11-25", entry);
++                    else if (pluginCount <= 50) return Collections.singletonMap("26-50", entry);
++                    else return Collections.singletonMap("50+", entry);
++                }));
++
++                metrics.addCustomChart(new DrilldownPie("disabled_plugins", () -> {
++                    int disabled = (int) plugins.stream().filter(java.util.function.Predicate.not(Plugin::isEnabled)).count();
++                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(disabled), 1);
++
++                    if (disabled == 0) return Collections.singletonMap("0 \uD83D\uDE0E", entry); // :sunglasses:
++                    else if (disabled <= 5) return Collections.singletonMap("1-5", entry);
++                    else if (disabled <= 10) return Collections.singletonMap("6-10", entry);
++                    else if (disabled <= 25) return Collections.singletonMap("11-25", entry);
++                    else if (disabled <= 50) return Collections.singletonMap("26-50", entry);
++                    else if (disabled <= 100) return Collections.singletonMap("50-100 \uD83D\uDE2D", entry); // :cry:
++                    else return Collections.singletonMap("101+ \uD83D\uDC80", entry); // :skull:
++                }));
++                // Plazma end
++
+                 metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
+                     Map<String, Map<String, Integer>> map = new HashMap<>();
+ 
+                     // count legacy plugins
+-                    int legacy = 0;
+-                    for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+-                        if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
+-                            legacy++;
+-                        }
+-                    }
++                    int legacy = (int) plugins.stream().filter(p -> CraftMagicNumbers.isLegacy(p.getDescription())).count(); // Plazma
+ 
+                     // insert real value as lower dimension
+                     Map<String, Integer> entry = new HashMap<>();

patches/server/0010-Port-SparklyPaper-patches.patch

@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Thu, 25 Jan 2024 17:13:09 +0900
-Subject: [PATCH] Port SparklyPaper patches
-
-SparklyPower
-Copyright (C) 2024 SparklyPower
-
-Based on commit: 29212936a832106c4d68e2a2017acbea2fdd3cc4
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 04b98e23eed926d8473cc2464e04a5b9f18f1140..cf098d4a3111771c13766285c5ec5f1fc1f539a4 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -74,6 +74,7 @@ public class ServerEntity {
-     private List<SynchedEntityData.DataValue<?>> trackedDataValues;
-     // CraftBukkit start
-     public final Set<ServerPlayerConnection> trackedPlayers; // Purpur - private -> public
-+    public static boolean skipSqrWhenNoDeltaChanges = false; // Plazma - SparklyPaper port; Skip distanceToSqr if the delta movement hasn't changed
- 
-     public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
-         this.trackedPlayers = trackedPlayers;
-@@ -210,12 +211,14 @@ public class ServerEntity {
- 
-                 if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-                     Vec3 vec3d1 = this.entity.getDeltaMovement();
-+                    if (!skipSqrWhenNoDeltaChanges && vec3d1 != this.ap) { // Plazma - SparklyPaper port; Skip distanceToSqr if the delta movement hasn't changed
-                     double d0 = vec3d1.distanceToSqr(this.ap);
- 
-                     if (d0 > 1.0E-7D || d0 > 0.0D && vec3d1.lengthSqr() == 0.0D) {
-                         this.ap = vec3d1;
-                         this.broadcast.accept(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.ap));
-                     }
-+                    } // Plazma - SparklyPaper port; Skip distanceToSqr if the delta movement hasn't changed
-                 }
- 
-                 if (packet1 != null) {
-diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index f890738d3bb9fb5e70a9d323c6cec97f9948f9cf..52e72277c661b67a54bc5ce584efb04134599dd3 100644
---- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-+++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-@@ -243,7 +243,7 @@ public class ServerStatsCounter extends StatsCounter {
- 
-     public void sendStats(ServerPlayer player) {
-         Object2IntMap<Stat<?>> object2intmap = new Object2IntOpenHashMap();
--        Iterator iterator = this.getDirty().iterator();
-+        Iterator<Stat<?>> iterator = this.dirty.iterator(); // Plazma - SparklyPaper port; Skip dirty stats copy when requesting player stats
- 
-         while (iterator.hasNext()) {
-             Stat<?> statistic = (Stat) iterator.next();
-@@ -251,6 +251,7 @@ public class ServerStatsCounter extends StatsCounter {
-             object2intmap.put(statistic, this.getValue(statistic));
-         }
- 
-+        this.dirty.clear(); // Plazma - SparklyPaper port; Skip dirty stats copy when requesting player stats
-         player.connection.send(new ClientboundAwardStatsPacket(object2intmap));
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index 8d3c1897044f9a2bbe1911e1a72dc9a00fb246df..a68112a1d1904edfc84acb6c209e13f0836d97e0 100644
---- a/src/main/java/net/minecraft/world/item/MapItem.java
-+++ b/src/main/java/net/minecraft/world/item/MapItem.java
-@@ -313,12 +313,14 @@ public class MapItem extends ComplexItem {
-         }
-     }
- 
-+    public static boolean skipTickWhenCraftNotPresent = false; // Plazma - SparklyPaper port; Skip map item ticking if the craft map renderer is not present
-     @Override
-     public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) {
-         if (!world.isClientSide) {
-             MapItemSavedData worldmap = MapItem.getSavedData(stack, world);
- 
-             if (worldmap != null) {
-+                if (skipTickWhenCraftNotPresent && worldmap.mapView.getRenderers().stream().noneMatch(mapRenderer -> mapRenderer.getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class)) return; // Plazma - SparklyPaper port; Skip map item ticking if the craft map renderer is not present
-                 if (entity instanceof Player) {
-                     Player entityhuman = (Player) entity;
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
-index 8149b9c51b78eb5c689b7218a2ca3aab60e73bcf..b9a303f6280a2f6ad3616da152922a4f4a504281 100644
---- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
-+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapColorCache.java
-@@ -145,7 +145,7 @@ public class CraftMapColorCache implements MapPalette.MapColorCache {
-     }
- 
-     @Override
--    public boolean isCached() {
-+    public synchronized boolean isCached() { // Plazma - Fix concurrency issues when using "imageToBytes" in multiple threads
-         return this.cached || (!this.running.get() && this.initCache().isDone());
-     }
- 
-diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index f8dc4f4e2cbc8034e5e274e5b7245d4e2b4bf38b..2adaa7c6433ac3f54c9d75ee3c14772b4c538418 100644
---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -40,9 +40,11 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Entity entity;
-     public class Entity extends ConfigurationPart {
- 
-+        boolean skipSqrWhenNoDeltaChanges = OPTIMIZE;
- 
-         @PostProcess
-         public void post() {
-+            net.minecraft.server.level.ServerEntity.skipSqrWhenNoDeltaChanges = this.skipSqrWhenNoDeltaChanges;
-         }
- 
-     }
-@@ -50,9 +52,11 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public World world;
-     public class World extends ConfigurationPart {
- 
-+        boolean skipTickWhenCraftNotPresent = OPTIMIZE;
- 
-         @PostProcess
-         public void post() {
-+            net.minecraft.world.item.MapItem.skipTickWhenCraftNotPresent = this.skipTickWhenCraftNotPresent;
-         }
- 
-     }

patches/server/0011-Optimize-default-configurations.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] Optimize default configurations
 - YouHaveTrouble/minecraft-exploits-and-how-to-fix-them
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc6484bfd979 100644
+index 9ca1494497ae53e56b1f81fda51b0b8bd02a6d03..97b1366d25537d68469e95ac101b1b8cf9fdc997 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -64,7 +64,7 @@ public class PufferfishConfig {
@@ -17,11 +17,11 @@ index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc64
  		setComment("info",
  				"Pufferfish Configuration",
 -				"Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host",
-+				//"Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host", // Plazma - Sponsorblock
++				//"Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host", // Plazma - Nope
  				"Join our Discord for support: https://discord.gg/reZw4vQV9H",
  				"Download new builds at https://ci.pufferfish.host/job/Pufferfish");
  		
-@@ -219,7 +219,7 @@ public class PufferfishConfig {
+@@ -211,7 +211,7 @@ public class PufferfishConfig {
      public static int maxProjectileLoadsPerTick;
      public static int maxProjectileLoadsPerProjectile;
      private static void projectileLoading() {
@@ -30,7 +30,7 @@ index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc64
          maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
  
          setComment("projectile", "Optimizes projectile settings");
-@@ -233,7 +233,7 @@ public class PufferfishConfig {
+@@ -225,7 +225,7 @@ public class PufferfishConfig {
      public static int activationDistanceMod;
  
      private static void dynamicActivationOfBrains() throws IOException {
@@ -39,7 +39,7 @@ index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc64
          startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
                  "This value determines how far away an entity has to be",
                  "from the player to start being effected by DEAR.");
-@@ -241,7 +241,7 @@ public class PufferfishConfig {
+@@ -233,7 +233,7 @@ public class PufferfishConfig {
          maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
                  "This value defines how often in ticks, the furthest entity",
                  "will get their pathfinders and behaviors ticked. 20 = 1s");
@@ -48,7 +48,7 @@ index 3fea9b69f4cfc94e7f01d4e3ca4ce7506a8e5d5c..5a88d2e4c7a533e420cef33830a0cc64
                  "This value defines how much distance modifies an entity's",
                  "tick frequency. freq = (distanceToPlayer^2) / (2^value)",
                  "If you want further away entities to tick less often, use 7.",
-@@ -261,8 +261,18 @@ public class PufferfishConfig {
+@@ -253,8 +253,18 @@ public class PufferfishConfig {
  	public static Map<String, Integer> projectileTimeouts;
  	private static void projectileTimeouts() {
  		// Set some defaults
@@ -125,7 +125,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..85e56d726eb7780811e0a990e1ef7d3e
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb54f8d6d7 100644
+index 071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d..79e2a6806311c402e481c5b29cbd3ced85101f6e 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 @@ -96,12 +96,32 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -313,7 +313,7 @@ index 385ca2c1022e0985550a5cc2bbff953f1aa33f5c..121ee93d65bcaa26bdc3e57750107cdb
          public int wetFarmland = 1;
          public int dryFarmland = 1;
          public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
-@@ -532,9 +596,9 @@ public class WorldConfiguration extends ConfigurationPart {
+@@ -525,9 +589,9 @@ public class WorldConfiguration extends ConfigurationPart {
  
      public class Misc extends ConfigurationPart {
          public int lightQueueSize = 20;
@@ -338,10 +338,10 @@ index 24763d3d270c29c95e0b3e85111145234f660a62..80ddc627e02e3c749e6b074afa93d357
      }
  
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 60382055ccb199e32fb201fddfe34f05bf919195..d83bd5774f49af33119ea5224a2300d435898095 100644
+index 9b8bdffbbfe45c6712d0f4da3643424fa94fc69e..84eca01450db5b737c676cab2439d041141c323d 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -164,7 +164,7 @@ public class Main {
+@@ -163,7 +163,7 @@ public class Main {
                  File configFile = (File) optionset.valueOf("bukkit-settings");
                  YamlConfiguration configuration = YamlConfiguration.loadConfiguration(configFile);
                  configuration.options().copyDefaults(true);
@@ -351,10 +351,10 @@ index 60382055ccb199e32fb201fddfe34f05bf919195..d83bd5774f49af33119ea5224a2300d4
  
                  File commandFile = (File) optionset.valueOf("commands-settings");
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index a66dcea06424518290576c7647ae0717040586f9..41d5d15dfa2affdee68501efb2447a209c38992d 100644
+index fe82a20efb2b130a568bc06aec5b86d3082062a3..8dddcacec38bf2d5d79ce7fc0f26a2cced5d271d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -130,14 +130,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -131,14 +131,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
          this.spawnMonsters = this.get("spawn-monsters", true);
          this.useNativeTransport = this.get("use-native-transport", true);
          this.enableCommandBlock = this.get("enable-command-block", false);
@@ -373,20 +373,20 @@ index a66dcea06424518290576c7647ae0717040586f9..41d5d15dfa2affdee68501efb2447a20
          this.maxPlayers = this.get("max-players", 20);
          this.networkCompressionThreshold = this.get("network-compression-threshold", 256);
          this.broadcastRconToOps = this.get("broadcast-rcon-to-ops", true);
-@@ -145,7 +145,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+@@ -146,7 +146,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
          this.maxWorldSize = this.get("max-world-size", (integer) -> {
              return Mth.clamp(integer, 1, 29999984);
          }, 29999984);
--        this.syncChunkWrites = this.get("sync-chunk-writes", true) && Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - Hide sync chunk writes behind flag
-+        this.syncChunkWrites = this.get("sync-chunk-writes", false) && Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - Hide sync chunk writes behind flag // Plazma - Show disabled by default
+-        this.syncChunkWrites = this.get("sync-chunk-writes", true) && Boolean.getBoolean("Paper.enable-sync-chunk-writes"); // Paper - hide behind flag
++        this.syncChunkWrites = this.get("sync-chunk-writes", Boolean.getBoolean("Paper.enable-sync-chunk-writes")); // Paper - hide behind flag // Plazma - Optimize default configurations
          this.enableJmxMonitoring = this.get("enable-jmx-monitoring", false);
          this.enableStatus = this.get("enable-status", true);
          this.hideOnlinePlayers = this.get("hide-online-players", false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 30729e47d546b9bf18f15024516c2ebcb3b722e5..2d3f8bb3954d552d4bbcc9ec7286845a8d76da8a 100644
+index 6537ae98dc4086f2b6668810425f80c19ef57734..da483bdf81efa62b36b6a10dacc7821b43dd18b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -426,7 +426,7 @@ public final class CraftServer implements Server {
+@@ -433,7 +433,7 @@ public final class CraftServer implements Server {
  
          this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
          this.configuration.options().copyDefaults(true);
@@ -407,7 +407,7 @@ index a858b7ddef7f6877c0b92f4150e0dd37bea121aa..eab5ea835a524482f8cc043c7be190a8
  
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71 100644
+index d0d31002562e728fa1a6c9bc81baa4534f11d365..f9f7664e4a6a4e24dcb3b8da0a807a984a698429 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -49,6 +49,7 @@ public class PurpurConfig {
@@ -427,7 +427,7 @@ index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecb
      private static void useAlternateKeepAlive() {
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
-@@ -486,7 +487,7 @@ public class PurpurConfig {
+@@ -481,7 +482,7 @@ public class PurpurConfig {
      }
  
      public static boolean useUPnP = false;
@@ -437,7 +437,7 @@ index a937993f318ef5703420f57fe65c5d990ce2c4dd..65b9e4fc073d0e97c6f90587d20e3ecb
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e17dc3db4 100644
+index b9d1117885a8dd15f207e55ce5e402d8cefe0226..9cb79d203b6ec345d719cd488d2cce8f877fe2bd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -425,7 +425,7 @@ public class PurpurWorldConfig {
@@ -449,7 +449,7 @@ index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e
      public boolean teleportOnNetherCeilingDamage = false;
      public boolean totemOfUndyingWorksInInventory = false;
      public boolean playerFixStuckPortal = false;
-@@ -3133,7 +3133,7 @@ public class PurpurWorldConfig {
+@@ -3070,7 +3070,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
@@ -459,7 +459,7 @@ index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..213559bdf83c5a07b4f7c0e32f425c2e
      public boolean zombieTakeDamageFromWater = false;
      public boolean zombieAlwaysDropExp = false;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..7d1ae99e83dc6511838092c3ab6e0fd5f39faabc 100644
+index f9b8e2bc039f1a37e47f84909c8785f3ef530284..576e82d2cf933b307b7374b60d864e98be4afcb2 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -150,14 +150,14 @@ public class SpigotWorldConfig

patches/server/0012-Add-more-metrics.patch

@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: AlphaKR93 <dev@alpha93.kr>
-Date: Sun, 5 Nov 2023 10:26:26 +0900
-Subject: [PATCH] Add more metrics
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 0b3d87d2d43148e6370e7a03e0bb6074891ac800..8783c81af1d09e6682256dee0dd546de0be418cd 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -636,38 +636,59 @@ public class Metrics {
-                     return map;
-                 }));
- 
--                metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
--                    Map<String, Map<String, Integer>> map = new HashMap<>();
-+                // Plazma start - Add more metrics information
-+                metrics.addCustomChart(new DrilldownPie("datapacks", () -> {
-+                    int datapacks = Bukkit.getDatapackManager().getEnabledPacks().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(datapacks), 1);
-+
-+                    if (datapacks == 0) return Collections.singletonMap("0", entry);
-+                    else if (datapacks <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (datapacks <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (datapacks <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (datapacks <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (datapacks <= 100) return Collections.singletonMap("51+", entry);
-+                    else return Collections.singletonMap("101+ \uD83D\uDE2E", entry);
-+                }));
- 
--                    // count legacy plugins
--                    int legacy = 0;
--                    for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
--                        if (CraftMagicNumbers.isLegacy(plugin.getDescription())) {
--                            legacy++;
--                        }
--                    }
-+                metrics.addCustomChart(new DrilldownPie("plugins", () -> {
-+                    int pluginCount = Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(Plugin::isEnabled).toList().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(pluginCount), 1);
-+
-+                    if (pluginCount == 0) return Collections.singletonMap("0", entry);
-+                    else if (pluginCount <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (pluginCount <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (pluginCount <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (pluginCount <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (pluginCount <= 100) return Collections.singletonMap("51-100", entry);
-+                    else return Collections.singletonMap("101+ \uD83D\uDE2E", entry);
-+                }));
- 
--                    // insert real value as lower dimension
--                    Map<String, Integer> entry = new HashMap<>();
--                    entry.put(String.valueOf(legacy), 1);
--
--                    // create buckets as higher dimension
--                    if (legacy == 0) {
--                        map.put("0 \uD83D\uDE0E", entry); // :sunglasses:
--                    } else if (legacy <= 5) {
--                        map.put("1-5", entry);
--                    } else if (legacy <= 10) {
--                        map.put("6-10", entry);
--                    } else if (legacy <= 25) {
--                        map.put("11-25", entry);
--                    } else if (legacy <= 50) {
--                        map.put("26-50", entry);
--                    } else {
--                        map.put("50+ \uD83D\uDE2D", entry); // :cry:
--                    }
-+                metrics.addCustomChart(new DrilldownPie("disabled_plugins", () -> {
-+                    int disabled = Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(it -> !it.isEnabled()).toList().size();
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(disabled), 1);
-+
-+                    if (disabled == 0) return Collections.singletonMap("0 \uD83D\uDE0E", entry); // :sunglasses:
-+                    else if (disabled <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (disabled <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (disabled <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (disabled <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (disabled <= 100) return Collections.singletonMap("51-100 \uD83D\uDE2D", entry); // :cry:
-+                    else return Collections.singletonMap("101+ \uD83D\uDC80", entry); // :skull:
-+                }));
- 
--                    return map;
-+                metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> {
-+                    int legacy = (int) Arrays.stream(Bukkit.getPluginManager().getPlugins()).filter(p -> CraftMagicNumbers.isLegacy(p.getDescription())).count(); // Plazma
-+                    Map<String, Integer> entry = Collections.singletonMap(String.valueOf(legacy), 1);
-+
-+                    if (legacy == 0) return Collections.singletonMap("0 \uD83D\uDE0E", entry); // :sunglasses:
-+                    else if (legacy <= 5) return Collections.singletonMap("1-5", entry);
-+                    else if (legacy <= 10) return Collections.singletonMap("6-10", entry);
-+                    else if (legacy <= 25) return Collections.singletonMap("11-25", entry);
-+                    else if (legacy <= 50) return Collections.singletonMap("26-50", entry);
-+                    else if (legacy <= 100) return Collections.singletonMap("51-100 \uD83D\uDE2D", entry); // :cry:
-+                    else return Collections.singletonMap("101+ \uD83D\uDC80", entry); // :skull:
-                 }));
-+                // Plazma end - Add more metrics information
-             }
- 
-         }

patches/server/0012-Tweak-console-logging.patch

@@ -4,8 +4,21 @@ Date: Sun, 5 Nov 2023 10:40:49 +0900
 Subject: [PATCH] Tweak console logging
 
 
+diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
+index e4fd372a1d585887287253a02531cd192929377b..6624fb97404c3032d60167e3fb108dcfcd066784 100644
+--- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
++++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
+@@ -355,7 +355,7 @@ public final class ChatProcessor {
+ 
+         private void sendToServer(final ChatType.Bound chatType, final @Nullable Function<Audience, net.minecraft.network.chat.Component> msgFunction) {
+             final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console));
+-            ChatProcessor.this.server.logChatMessage(toConsoleMessage.decoratedContent(), chatType, ChatProcessor.this.server.getPlayerList().verifyChatTrusted(toConsoleMessage) ? null : "Not Secure");
++            ChatProcessor.this.server.logChatMessage(toConsoleMessage.decoratedContent(), chatType, (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.notSecurePrefix || ChatProcessor.this.server.getPlayerList().verifyChatTrusted(toConsoleMessage)) ? null : "Not Secure"); // Plazma - Tweak console logging
+         }
+     }
+ 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e20b104c57 100644
+index 00fbcb941fe393197619762722eb51d62fb073c2..770b959d9e51ef0645415d5a0d7d79b7031abd66 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
@@ -20,16 +33,24 @@ index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e2
 -            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
 -            DedicatedServer.LOGGER.warn("****************************");
 -        }
--        // Paper end - detect running as root
+-        // Paper end
 -
          DedicatedServer.LOGGER.info("Loading properties");
          DedicatedServerProperties dedicatedserverproperties = this.settings.getProperties();
  
-@@ -212,6 +202,17 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         this.plazmaConfigurations.initializeGlobalConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
-         this.plazmaConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); // Plazma - Configurable Plazma
-         // Paper end - initialize global and world-defaults configuration
-+        // Plazma - Tweak console logging; Moved down
+@@ -319,6 +309,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
+         String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
+         // Paper end
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.offlineWarnings) // Plazma - Tweak console logging
+         if (!this.usesAuthentication()) {
+             DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
+             DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
+@@ -335,6 +326,17 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+             DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
+         }
+ 
++        // Plazma - Moved down - Tweak console logging
 +        // Paper start - detect running as root
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.rootUserWarnings && io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
 +            DedicatedServer.LOGGER.warn("****************************");
@@ -38,33 +59,16 @@ index b7709cbb1a78eb1daac2112cb9fbf5d379aaa662..2a73508dd8a59c6af8b65ab2db97b6e2
 +            DedicatedServer.LOGGER.warn("FOR MORE INFORMATION, SEE https://madelinemiller.dev/blog/root-minecraft-server/");
 +            DedicatedServer.LOGGER.warn("****************************");
 +        }
-+        // Paper end - detect running as root
-+        // Plazma end - Tweak console logging
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
-         if (this.convertOldUsers()) {
-             this.getProfileCache().save(false); // Paper
-@@ -320,6 +321,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
-         String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
-         // Paper end - Add Velocity IP Forwarding Support
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().consoleLogs.offlineWarnings && !(io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.onlineMode)) // Plazma - Tweak console logging
-         if (!this.usesAuthentication()) {
-             DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
-             DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-@@ -333,7 +335,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-                 DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
-             }
-             // Spigot end
--            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
-+            DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file or set \"console-logs.offline-warnings\" to \"false\" in the config/plazma-global.yml file."); // Plazma - Tweak console logging
-         }
- 
++        // Paper end
++        // Plazma end
  
+         if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
+             return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ac1e0c66f167218306504db6037cc1d6509072a0..ef4b1fb1532e1939d9a7e5337edc80b334b78318 100644
+index 182acaad79e14e5e120094916a0d295a4584de7a..e8de78f8b7c90a719e10c483991f45a7886256be 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1468,6 +1468,7 @@ public abstract class PlayerList {
+@@ -1462,6 +1462,7 @@ public abstract class PlayerList {
      public void broadcastChatMessage(PlayerChatMessage message, Predicate<ServerPlayer> shouldSendFiltered, @Nullable ServerPlayer sender, ChatType.Bound params, @Nullable Function<net.kyori.adventure.audience.Audience, Component> unsignedFunction) {
          // Paper end
          boolean flag = this.verifyChatTrusted(message);
@@ -73,10 +77,10 @@ index ac1e0c66f167218306504db6037cc1d6509072a0..ef4b1fb1532e1939d9a7e5337edc80b3
          this.server.logChatMessage((unsignedFunction == null ? message.decoratedContent() : unsignedFunction.apply(this.server.console)), params, flag ? null : "Not Secure"); // Paper
          OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 2adaa7c6433ac3f54c9d75ee3c14772b4c538418..294fdbba44191427a841f8ac82b18ed8d706f53e 100644
+index 5875aae8d7d0146ef9903d8b4bc2b673a615fd98..51413e828500792cc493b836bb1460a394ff4f75 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -67,4 +67,13 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -42,4 +42,13 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
  

patches/server/0013-Add-option-to-allow-any-usernames.patch

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AlphaKR93 <dev@alpha93.kr>
+Date: Sun, 5 Nov 2023 10:49:05 +0900
+Subject: [PATCH] Add option to allow any usernames
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+index 3dcccca8ede9b203c24ba29b2020a583297b895c..dd707019fb9b2c46d706311862fea91b84793ff9 100644
+--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+@@ -160,6 +160,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+     @Override
+     public void handleHello(ServerboundHelloPacket packet) {
+         Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]);
++        if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.allowAnyUsername) // Plazma - Add option to allow any usernames
+         Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]);
+         // Paper start - validate usernames
+         if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation) {
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index 51413e828500792cc493b836bb1460a394ff4f75..c85f1a01c951f85c2347eba18a896e87c4c8b368 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -26,6 +26,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+     public Player player;
+     public class Player extends ConfigurationPart {
+ 
++        public boolean allowAnyUsername = false;
+ 
+     }
+ 

patches/server/0014-Add-missing-purpur-configuration-options.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing purpur configuration options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index c783ce59ea766e6c46a3313628b961f27e01ee8b..8adcffc1e6434e06ca52d119a7326a1272897307 100644
+index c783ce59ea766e6c46a3313628b961f27e01ee8b..3f36eedeae4b94ca684c57f4ec8d2d1ab5c51aae 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -150,6 +150,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -13,7 +13,7 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..8adcffc1e6434e06ca52d119a7326a12
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
 +
-+    // Plazma start - Add missing purpur configuration options
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.allayTakeDamageFromWater;
@@ -28,12 +28,12 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..8adcffc1e6434e06ca52d119a7326a12
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.allayMaxHealth);
 +    }
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
      // Purpur end
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 41773acc8e8e27daa1fe43726939b2d95da92c30..7574da6cb1844305f965f9725c7d8cb91c92cbd7 100644
+index cd9129bb5049c13f08c58b8581d511b59a5bb1b5..bcc3458afac5ece9637df63b9d02c445aa0a4ef9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -95,6 +95,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -41,7 +41,7 @@ index 41773acc8e8e27daa1fe43726939b2d95da92c30..7574da6cb1844305f965f9725c7d8cb9
          return this.level().purpurConfig.camelBreedingTicks;
      }
 +
-+    // Plazma start - Add missing purpur configuration options
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.camelTakeDamageFromWater;
@@ -51,12 +51,12 @@ index 41773acc8e8e27daa1fe43726939b2d95da92c30..7574da6cb1844305f965f9725c7d8cb9
 +    public boolean isAlwaysExperienceDropper() {
 +        return level().purpurConfig.camelAlwaysDropExp;
 +    }
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
      // Purpur end
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index d6340d0a1308bafd3ba176562bf08dcadec02b34..e079f0994c81561510e5d223d2203e349daf07e1 100644
+index 9417ce67cc231d5bfa6813f78ec27196eed423c8..4e471e4a259a64c44da5ab450f0137691428ff6a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -136,6 +136,23 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -64,7 +64,7 @@ index d6340d0a1308bafd3ba176562bf08dcadec02b34..e079f0994c81561510e5d223d2203e34
          return (getRider() != null && isControllable()) ? level().purpurConfig.frogRidableJumpHeight * this.getBlockJumpFactor() : super.getJumpPower();
      }
 +
-+    // Plazma start - Add missing purpur configuration options
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.frogTakeDamageFromWater;
@@ -79,20 +79,20 @@ index d6340d0a1308bafd3ba176562bf08dcadec02b34..e079f0994c81561510e5d223d2203e34
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.frogMaxHealth);
 +    }
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
      // Purpur end
  
      public int getPurpurBreedTime() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..630eaae555403db79f4e16880ca443904b9254ab 100644
+index 6b012bea26e8ef0c04571f43da67f6e108188830..7c816b879d47a1b8a480f4237d1ff0e11df4c98e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -90,6 +90,23 @@ public class Tadpole extends AbstractFish {
+@@ -87,6 +87,23 @@ public class Tadpole extends AbstractFish {
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
 +
-+    // Plazma start - Add missing purpur configuration options
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.tadpoleTakeDamageFromWater;
@@ -107,12 +107,12 @@ index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..630eaae555403db79f4e16880ca44390
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.tadpoleMaxHealth);
 +    }
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
      // Purpur end
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..24e351b40745d15e065f4c3cd904596c6daf4cfb 100644
+index dcb10e2ea1e0c7d0479adae5bc2ff57ece172aad..795c93352dfa69fad0e034a8377eceb6dc1e81da 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -106,6 +106,18 @@ public class Sniffer extends Animal {
@@ -120,7 +120,7 @@ index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..24e351b40745d15e065f4c3cd904596c
          return level().purpurConfig.snifferControllable;
      }
 +
-+    // Plazma start - Add missing purpur configuration options
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.snifferTakeDamageFromWater;
@@ -130,20 +130,20 @@ index 5e7d76dcdc170b809ab82f6e2259c9b4d3d741be..24e351b40745d15e065f4c3cd904596c
 +    public boolean isAlwaysExperienceDropper() {
 +        return level().purpurConfig.snifferAlwaysDropExp;
 +    }
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
      // Purpur end
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index bf7ef72a7d92db8f11789a69583270644de0dac7..1f476a4fd148ac9a4c9ad5d12de46a16e4116239 100644
+index 5e66c2bd3807619cadee5b7081d93d21886e2806..66d47c1613532189e761c0f48d893652c17fe240 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -147,6 +147,23 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -146,6 +146,23 @@ public class Warden extends Monster implements VibrationSystem {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
      }
 +
-+    // Plazma start - Add missing purpur configuration options
++    // Plazma start
 +    @Override
 +    public boolean isSensitiveToWater() {
 +        return level().purpurConfig.wardenTakeDamageFromWater;
@@ -158,41 +158,41 @@ index bf7ef72a7d92db8f11789a69583270644de0dac7..1f476a4fd148ac9a4c9ad5d12de46a16
 +    public void initAttributes() {
 +        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(level().purpurConfig.wardenMaxHealth);
 +    }
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
      // Purpur end
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-index 58af87b8faf4f8d6bdb111c49a429466acface68..22cc678f9bd39acc27ba2d2e7981f9e8026440d4 100644
+index d70c1206df96b03c031399049a65e6a765d80347..e885d2f21cfbf1fd1c61b29e34f3f51a9decfe88 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
-@@ -43,7 +43,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -41,7 +41,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      public ChestBoat(EntityType<? extends Boat> type, Level world) {
          super(type, world);
 -        this.itemStacks = NonNullList.withSize(27, ItemStack.EMPTY);
-+        this.itemStacks = NonNullList.withSize(org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9, ItemStack.EMPTY); // Plazma - Add missing purpur configuration options
++        this.itemStacks = NonNullList.withSize(org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9, ItemStack.EMPTY); // Plazma
      }
  
      public ChestBoat(Level world, double d0, double d1, double d2) {
-@@ -170,7 +170,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
+@@ -160,7 +160,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
  
      @Override
      public int getContainerSize() {
 -        return 27;
-+        return org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9; // Plazma - Add missing purpur configuration options
++        return org.purpurmc.purpur.PurpurConfig.chestBoatRows * 9; // Plazma
      }
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71..fc48ff9270e32c3b3dbf7ffd310cab7c33d459c0 100644
+index f9f7664e4a6a4e24dcb3b8da0a807a984a698429..22e74b716d29ecfe75bd49234bef861cd97cb79e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -329,6 +329,7 @@ public class PurpurConfig {
      }
  
      public static int barrelRows = 3;
-+    public static int chestBoatRows = 3; // Plazma - Add missing purpur configuration options
++    public static int chestBoatRows = 3; // Plazma
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
      public static boolean cryingObsidianValidForPortalFrame = false;
@@ -200,15 +200,15 @@ index 65b9e4fc073d0e97c6f90587d20e3ecbdaaf2c71..fc48ff9270e32c3b3dbf7ffd310cab7c
              case 1 -> 9;
              default -> 27;
          });
-+        chestBoatRows = getInt("settings.blocks.chest_boat.rows", chestBoatRows); // Plazma - Add missing purpur configuration options
++        chestBoatRows = getInt("settings.blocks.chest_boat.rows", chestBoatRows); // Plazma
          enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc39db4b695 100644
+index 9cb79d203b6ec345d719cd488d2cce8f877fe2bd..fc30f2dcf7227f7cd087b2e5b8d3dc73e18405c6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1180,7 +1180,15 @@ public class PurpurWorldConfig {
+@@ -1115,7 +1115,15 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = true;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -220,11 +220,11 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
 +        allayMaxHealth = getDouble("mobs.allay.max-health", allayMaxHealth);
 +        allayTakeDamageFromWater = getBoolean("mobs.allay.take-damage-from-water", allayTakeDamageFromWater);
 +        allayAlwaysDropExp = getBoolean("mobs.allay.always-drop-exp", allayAlwaysDropExp);
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
          allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
          allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
          allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
-@@ -1299,7 +1307,15 @@ public class PurpurWorldConfig {
+@@ -1234,7 +1242,15 @@ public class PurpurWorldConfig {
      public double camelMovementSpeedMin = 0.09D;
      public double camelMovementSpeedMax = 0.09D;
      public int camelBreedingTicks = 6000;
@@ -236,11 +236,11 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
 +        //camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
 +        camelTakeDamageFromWater = getBoolean("mobs.camel.takes-damage-from-water", camelTakeDamageFromWater);
 +        camelAlwaysDropExp = getBoolean("mobs.camel.always-drop-exp", camelAlwaysDropExp);
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
          camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
          camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
          camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
-@@ -1727,7 +1743,15 @@ public class PurpurWorldConfig {
+@@ -1662,7 +1678,15 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -252,11 +252,11 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
 +        frogMaxHealth = getDouble("mobs.frog.attributes.max_health", frogMaxHealth);
 +        frogTakeDamageFromWater = getBoolean("mobs.frog.takes-damage-from-water", frogTakeDamageFromWater);
 +        frogAlwaysDropExp = getBoolean("mobs.frog.always-drop-exp", frogAlwaysDropExp);
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
          frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
          frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
          frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
-@@ -2678,7 +2702,13 @@ public class PurpurWorldConfig {
+@@ -2617,7 +2641,13 @@ public class PurpurWorldConfig {
      public boolean snifferControllable = true;
      public double snifferMaxHealth = 14.0D;
      public int snifferBreedingTicks = 6000;
@@ -266,11 +266,11 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
      private void snifferSettings() {
 +        snifferTakeDamageFromWater = getBoolean("mobs.sniffer.takes-damage-from-water", snifferTakeDamageFromWater);
 +        snifferAlwaysDropExp = getBoolean("mobs.sniffer.always-drop-exp", snifferAlwaysDropExp);
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
          snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
          snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
          snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
-@@ -2777,7 +2807,15 @@ public class PurpurWorldConfig {
+@@ -2716,7 +2746,15 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = true;
      public boolean tadpoleControllable = true;
@@ -282,11 +282,11 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
 +        tadpoleMaxHealth = getDouble("mobs.tadpole.attributes.max_health", tadpoleMaxHealth);
 +        tadpoleTakeDamageFromWater = getBoolean("mobs.tadpole.takes-damage-from-water", tadpoleTakeDamageFromWater);
 +        tadpoleAlwaysDropExp = getBoolean("mobs.tadpole.always-drop-exp", tadpoleAlwaysDropExp);
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
          tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
          tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
          tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
-@@ -2989,7 +3027,15 @@ public class PurpurWorldConfig {
+@@ -2926,7 +2964,15 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = true;
      public boolean wardenControllable = true;
@@ -298,7 +298,7 @@ index 213559bdf83c5a07b4f7c0e32f425c2e17dc3db4..c7d8f22ecaf22232aef015da5a330dc3
 +        wardenMaxHealth = getDouble("mobs.warden.attributes.max_health", wardenMaxHealth);
 +        wardenTakeDamageFromWater = getBoolean("mobs.warden.takes-damage-from-water", wardenTakeDamageFromWater);
 +        wardenAlwaysDropExp = getBoolean("mobs.warden.always-drop-exp", wardenAlwaysDropExp);
-+    // Plazma end - Add missing purpur configuration options
++    // Plazma end
          wardenRidable = getBoolean("mobs.warden.ridable", wardenRidable);
          wardenRidableInWater = getBoolean("mobs.warden.ridable-in-water", wardenRidableInWater);
          wardenControllable = getBoolean("mobs.warden.controllable", wardenControllable);

patches/server/0015-Add-some-missing-Pufferfish-configurations.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add some missing Pufferfish configurations
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 61d4a78bde54dd90fc7a207f88709be25593c9f4..ef09fae1a46f4b37adfad059b0accb80845c8b7c 100644
+index bcc3458afac5ece9637df63b9d02c445aa0a4ef9..0ee7a663988bbcc37d72da690fa9372ca1d14425 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -168,10 +168,12 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -22,7 +22,7 @@ index 61d4a78bde54dd90fc7a207f88709be25593c9f4..ef09fae1a46f4b37adfad059b0accb80
          //this.level().getProfiler().pop(); // Purpur
          //this.level().getProfiler().push("camelActivityUpdate"); // Purpur
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 24e351b40745d15e065f4c3cd904596c6daf4cfb..aa60c4a251de2877a9b4ea72899f07194ce15ed7 100644
+index 795c93352dfa69fad0e034a8377eceb6dc1e81da..e743b4891c1e56f82d40f798e456a701b0efbc73 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -527,9 +527,11 @@ public class Sniffer extends Animal {
@@ -38,15 +38,15 @@ index 24e351b40745d15e065f4c3cd904596c6daf4cfb..aa60c4a251de2877a9b4ea72899f0719
          //this.level().getProfiler().popPush("snifferActivityUpdate"); // Purpur
          SnifferAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 1f476a4fd148ac9a4c9ad5d12de46a16e4116239..707fd662c7f17986fffcabe774de176741456227 100644
+index 66d47c1613532189e761c0f48d893652c17fe240..8a5d8f9ad1bd94ca53c1ffd1872275c07a52f0b7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -320,7 +320,7 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -319,7 +319,7 @@ public class Warden extends Monster implements VibrationSystem {
          ServerLevel worldserver = (ServerLevel) this.level();
  
          //worldserver.getProfiler().push("wardenBrain"); // Purpur
 -        if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Plazma - Add missing pufferfish configurations
++        if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Plazma
          this.getBrain().tick(worldserver, this);
          //this.level().getProfiler().pop(); // Purpur
          super.customServerAiStep();

patches/server/0017-Add-option-to-change-nether-portal-size.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to change nether portal size
 
 
 diff --git a/src/main/java/net/minecraft/world/level/portal/PortalShape.java b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-index 46910a3bdacc9df1835e16b300f9e107744d2660..9b372b494b831c374bab478267309544b4b31748 100644
+index e7554ec800f321e4e34c926c53f2375a8c3aa979..fc3c0ea41563995b1b115271cda4e9ca76245c4e 100644
 --- a/src/main/java/net/minecraft/world/level/portal/PortalShape.java
 +++ b/src/main/java/net/minecraft/world/level/portal/PortalShape.java
-@@ -99,7 +99,7 @@ public class PortalShape {
+@@ -100,7 +100,7 @@ public class PortalShape {
      private int calculateWidth() {
          int i = this.getDistanceUntilEdgeAboveFrame(this.bottomLeft, this.rightDir);
  
@@ -17,7 +17,7 @@ index 46910a3bdacc9df1835e16b300f9e107744d2660..9b372b494b831c374bab478267309544
      }
  
      private int getDistanceUntilEdgeAboveFrame(BlockPos pos, Direction direction) {
-@@ -132,7 +132,7 @@ public class PortalShape {
+@@ -133,7 +133,7 @@ public class PortalShape {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
          int i = this.getDistanceUntilTop(blockposition_mutableblockposition);
  
@@ -26,7 +26,7 @@ index 46910a3bdacc9df1835e16b300f9e107744d2660..9b372b494b831c374bab478267309544
      }
  
      private boolean hasTopFrame(BlockPos.MutableBlockPos pos, int height) {
-@@ -186,7 +186,7 @@ public class PortalShape {
+@@ -187,7 +187,7 @@ public class PortalShape {
      }
  
      public boolean isValid() {

patches/server/0018-Reduce-create-random-instance.patch

@@ -5,22 +5,23 @@ Subject: [PATCH] Reduce create random instance
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c153becedc7c8573dc1d8a736581db2a31a8d4f5..fcc197256be00621bb3875c20849fe083a453c5c 100644
+index 6ca87960654becdc7fd7d9b8465a140c0db2b8b9..cda99102949ae9d722c347e0dd610dfff625b5b8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -228,7 +228,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private ServerStatus status;
      @Nullable
      private ServerStatus.Favicon statusIcon;
-     private final RandomSource random;
-+    public RandomSource random() { return this.random; } // Plazma - expose random
+-    private final RandomSource random;
++    private final RandomSource random; public RandomSource random() { return this.random; } // Plazma - expose random
      public final DataFixer fixerUpper;
      private String localIp;
      private int port;
 diff --git a/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java b/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-index b47a8a082170bcb630c4354be7c77a4cac71d105..7fe6b99e146e7374cd29534f1e89046edd340a82 100644
+index f5bc3497831877e0c2b7dc1cbd8abe3a67d7695b..e27867a95d49531507de63be09604d476a0e43e5 100644
 --- a/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
 +++ b/src/main/java/net/minecraft/server/commands/SpreadPlayersCommand.java
-@@ -66,7 +66,7 @@ public class SpreadPlayersCommand {
+@@ -65,7 +65,7 @@ public class SpreadPlayersCommand {
          if (maxY < j) {
              throw SpreadPlayersCommand.ERROR_INVALID_MAX_HEIGHT.create(maxY, j);
          } else {
@@ -30,10 +31,10 @@ index b47a8a082170bcb630c4354be7c77a4cac71d105..7fe6b99e146e7374cd29534f1e89046e
              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 36b7686fdfeaab13cb1be9610ddc76fc70f6f6e5..10b990ea1c86fcaf7fd6afb8998d144bb5463e3a 100644
+index 7b72be8dcaf3fc5c7151c847faa2dfc75ef9eeb7..9a818c8f1450d31d29fd72cda45a14eec9034615 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -456,7 +456,7 @@ public class ServerPlayer extends Player {
+@@ -449,7 +449,7 @@ public class ServerPlayer extends Player {
              long l = k * k;
              int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
              int j1 = this.getCoprime(i1);
@@ -42,7 +43,7 @@ index 36b7686fdfeaab13cb1be9610ddc76fc70f6f6e5..10b990ea1c86fcaf7fd6afb8998d144b
  
              for (int l1 = 0; l1 < i1; ++l1) {
                  int i2 = (k1 + j1 * l1) % i1;
-@@ -493,7 +493,7 @@ public class ServerPlayer extends Player {
+@@ -486,7 +486,7 @@ public class ServerPlayer extends Player {
              long l = k * k;
              int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
              int j1 = this.getCoprime(i1);
@@ -52,10 +53,10 @@ index 36b7686fdfeaab13cb1be9610ddc76fc70f6f6e5..10b990ea1c86fcaf7fd6afb8998d144b
              for (int l1 = 0; l1 < i1; ++l1) {
                  int i2 = (k1 + j1 * l1) % i1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 8b62f992ec61d0a66a3856b4928ee2d705548291..01069a21857f9f3b7905861ee38c3891903af3b8 100644
+index dd707019fb9b2c46d706311862fea91b84793ff9..05ef30ecdb68d1d254246431e7d5cecf9a38427e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -71,7 +71,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -70,7 +70,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
          this.serverId = "";
          this.server = server;
          this.connection = connection;
@@ -78,16 +79,16 @@ index 1ef089dbf83de35d875c00efdf468c397be56978..832c3fa9f6f6706c48d5744e15d3c748
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
-index 9d01471da0571c92a60cd57ebd22a5f0b5648fb4..ec6c295f276f91ac7cc70f8fbfc04ba1148003b4 100644
+index fe3ab3d388f0481fb0db06b7f730f868dbf8e8a5..57d4eec19146f2ec36c8f99a4c77f2a20aa7cd09 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java
 @@ -15,7 +15,7 @@ import net.minecraft.util.RandomSource;
  
  public class ShufflingList<U> implements Iterable<U> {
-     protected final List<ShufflingList.WeightedEntry<U>> entries;
+     public final List<ShufflingList.WeightedEntry<U>> entries; // Paper - public
 -    private final RandomSource random = RandomSource.create();
-+    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - Reduce create random instance
-     private final boolean isUnsafe; // Paper - Fix Concurrency issue in ShufflingList during worldgen
++    private final RandomSource random = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma
+     private final boolean isUnsafe; // Paper
  
      public ShufflingList() {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
@@ -104,7 +105,7 @@ index 7094701d213c73ba47ace806962244c10fdf4dda..590c26307374edd65a2e22de18d12f34
      protected static final int TARGETING_RANGE = 16;
      private static final TargetingConditions TARGET_CONDITIONS = TargetingConditions.forNonCombat().range(16.0D);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
-index 1017c294b48bf0bbf733e1f41d580d1e6c927834..31cea7c1b73fdf3e47849ebbed28120be164e712 100644
+index ece82743df21f0b776382821ad75dee96d0a0748..44db438185d1ffb1adea09ba5f1cf4515a113700 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
 @@ -32,7 +32,7 @@ public class AngerManagement {
@@ -117,7 +118,7 @@ index 1017c294b48bf0bbf733e1f41d580d1e6c927834..31cea7c1b73fdf3e47849ebbed28120b
      private static final Codec<Pair<UUID, Integer>> SUSPECT_ANGER_PAIR = RecordCodecBuilder.create((instance) -> {
          return instance.group(UUIDUtil.CODEC.fieldOf("uuid").forGetter(Pair::getFirst), ExtraCodecs.NON_NEGATIVE_INT.fieldOf("anger").forGetter(Pair::getSecond)).apply(instance, Pair::of);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 752b38d45d59d8b3cd492246e5aa4f378a78734d..38b534e4613641046ed3cd048f52dff0888acda2 100644
+index a5443f92786427c42092aec8350e7ab37704db7a..0383c9e75a12c5832cf69daf14b8037365c43cfb 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 @@ -32,7 +32,7 @@ public class WanderingTraderSpawner implements CustomSpawner {
@@ -130,10 +131,10 @@ index 752b38d45d59d8b3cd492246e5aa4f378a78734d..38b534e4613641046ed3cd048f52dff0
      private int tickDelay;
      private int spawnDelay;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 91497f5e6c07fcf1b05eca6846c51e1a15ed3bc0..1317d8289898798a9d86a4c995a4a1a317631bf7 100644
+index a2093158e57d5f43c4afa66386481b82b3c4c3c4..2b75115caf82b9c4ccdd813b98af569e80ac2629 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -87,7 +87,7 @@ public class FishingHook extends Projectile {
+@@ -86,7 +86,7 @@ public class FishingHook extends Projectile {
  
      private FishingHook(EntityType<? extends FishingHook> type, Level world, int luckOfTheSeaLevel, int lureLevel) {
          super(type, world);
@@ -165,7 +166,7 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..689a4ee7b3f136b14e8e56709cac7d2d
          this.level = world;
          this.id = nbt.getInt("Id");
 diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
-index 849b6a30d412d10f1e2e6e88f2d8d990e4a720e4..5534c8c65588724f2c6f178caacc2ddabad9a9e3 100644
+index d604b7ec46f08993647979ed220a84842e3fe325..b0b6580a08b15dbfc542ee1fd9e5b6737f8af004 100644
 --- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
 @@ -97,7 +97,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
@@ -178,23 +179,23 @@ index 849b6a30d412d10f1e2e6e88f2d8d990e4a720e4..5534c8c65588724f2c6f178caacc2dda
          this.costs = new int[3];
          this.enchantClue = new int[]{-1, -1, -1};
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 059e545fd04b7919fb0cc86797b636e3cda61027..8c90c4ff41b2a12cb6ba70d0bc80755ba8246872 100644
+index ef9b1687dd2dfda5398523140aecc678b4690642..130a41387a2546b31019ad918849b2c283ed09d9 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -92,7 +92,7 @@ public class Explosion {
+@@ -82,7 +82,7 @@ public class Explosion {
      }
  
-     public Explosion(Level world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.BlockInteraction destructionType, ParticleOptions particle, ParticleOptions emitterParticle, SoundEvent soundEvent) {
+     public Explosion(Level world, @Nullable Entity entity, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator behavior, double x, double y, double z, float power, boolean createFire, Explosion.BlockInteraction destructionType) {
 -        this.random = RandomSource.create();
 +        this.random = world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create(); // Plazma - Reduce create random instace
          this.toBlow = new ObjectArrayList();
          this.hitPlayers = Maps.newHashMap();
          this.level = world;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4eb8cab1f7f2d3d2dcba15bb0bd64b60c027882a..11c864f3947b93f0ebeae8c6fd006a5891162b44 100644
+index 412dd103bad498c3c93b7a3ab98f834944d514eb..7a7f417c2a0af73a35297274b8ddd6ac581901ae 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -122,16 +122,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -124,16 +124,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Thread thread;
      private final boolean isDebug;
      private int skyDarken;
@@ -213,11 +214,24 @@ index 4eb8cab1f7f2d3d2dcba15bb0bd64b60c027882a..11c864f3947b93f0ebeae8c6fd006a58
      private final ResourceKey<DimensionType> dimensionTypeId;
      private final Holder<DimensionType> dimensionTypeRegistration;
      public final WritableLevelData levelData;
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
+index b7370e64fd0d50e8725d7d5afc30af2e8bc8455d..9ec2a60c8240f7a3e4cd7944d070156dbf55ac2c 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
+@@ -22,7 +22,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
+     public float rot;
+     public float oRot;
+     public float tRot;
+-    private static final RandomSource RANDOM = RandomSource.create();
++    private static final RandomSource RANDOM = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - Reduce create random instace
+     private Component name;
+     private int lapis = 0; // Purpur
+ 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 1b150b9fc444a248f6c01572447c7bb8eecfc76e..9579f730c8de447bed6634d0e2af85547949698b 100644
+index 7291e4056b8e46ab59b71818388ac55fbb12993f..b847f59c5d3e0d7ccb22eaa5d9068082db5ba9a4 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -369,7 +369,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
+@@ -368,7 +368,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
      }
  
      private static void spawnGatewayPortal(ServerLevel world, BlockPos pos, EndGatewayConfiguration config) {
@@ -227,33 +241,33 @@ index 1b150b9fc444a248f6c01572447c7bb8eecfc76e..9579f730c8de447bed6634d0e2af8554
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-index 798e22fb4d685b5845ebf687e8004e94f13a9751..189f425565c9c38b29031ae26de667422eb3b6bb 100644
+index f8cd23fb6ea7909b8f30bd21d3f2c7bcc483ef21..3a4044271e23faf4c5271237aba700103f6df830 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
-@@ -224,7 +224,7 @@ public class ChunkGeneratorStructureState {
+@@ -221,7 +221,7 @@ public class ChunkGeneratorStructureState {
              List<CompletableFuture<ChunkPos>> list = new ArrayList(j);
              int k = placement.spread();
              HolderSet<Biome> holderset = placement.preferredBiomes();
 -            RandomSource randomsource = RandomSource.create();
 +            RandomSource randomsource = org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.reduceRandom ? net.minecraft.server.MinecraftServer.getServer().random() : RandomSource.create(); // Plazma - Reduce create random instace
  
-             // Paper start - Add missing structure set seed configs
+             // Paper start
              if (this.conf.strongholdSeed != null && structureSetEntry.is(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS)) {
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java b/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
-index 7bbe93966fa00b7001da53bf2f22f4d942b7cc22..6c5eececc83571b0f60e7f672ed185e1d262e99c 100644
+index 18fce94f0d4b9d28e3afec61c7578f672973a71f..c98d65c146213bdf530916b8ec371e0b0b8f23e7 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
-@@ -81,7 +81,7 @@ public enum DragonRespawnAnimation {
-                         world.explode((Entity) null, (double) ((float) worldgenender_spike.getCenterX() + 0.5F), (double) worldgenender_spike.getHeight(), (double) ((float) worldgenender_spike.getCenterZ() + 0.5F), 5.0F, Level.ExplosionInteraction.BLOCK);
-                         SpikeConfiguration worldgenfeatureendspikeconfiguration = new SpikeConfiguration(true, ImmutableList.of(worldgenender_spike), new BlockPos(0, 128, 0));
+@@ -62,7 +62,7 @@ public enum DragonRespawnAnimation {
  
--                        Feature.END_SPIKE.place(worldgenfeatureendspikeconfiguration, world, world.getChunkSource().getGenerator(), RandomSource.create(), new BlockPos(worldgenender_spike.getCenterX(), 45, worldgenender_spike.getCenterZ()));
-+                        Feature.END_SPIKE.place(worldgenfeatureendspikeconfiguration, world, world.getChunkSource().getGenerator(), (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()), new BlockPos(worldgenender_spike.getCenterX(), 45, worldgenender_spike.getCenterZ())); // Plazma - Reduce create random instance
+                         world.explode((Entity)null, (double)((float)endSpike.getCenterX() + 0.5F), (double)endSpike.getHeight(), (double)((float)endSpike.getCenterZ() + 0.5F), 5.0F, Level.ExplosionInteraction.BLOCK);
+                         SpikeConfiguration spikeConfiguration = new SpikeConfiguration(true, ImmutableList.of(endSpike), new BlockPos(0, 128, 0));
+-                        Feature.END_SPIKE.place(spikeConfiguration, world, world.getChunkSource().getGenerator(), RandomSource.create(), new BlockPos(endSpike.getCenterX(), 45, endSpike.getCenterZ()));
++                        Feature.END_SPIKE.place(spikeConfiguration, world, world.getChunkSource().getGenerator(), (world.plazmaConfig().misc.reduceRandom ? world.getRandom() : RandomSource.create()), new BlockPos(endSpike.getCenterX(), 45, endSpike.getCenterZ())); // Plazma - Reduce create random instance
                      }
-                 } else if (flag1) {
-                     fight.setRespawnStage(SUMMONING_DRAGON); // CraftBukkit - decompile error
+                 } else if (bl) {
+                     fight.setRespawnStage(SUMMONING_DRAGON);
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index d4f903c402765c6e8e1db99e148613748f530726..c8d76fdee94a0ffb76fcb476ca386acf154dda28 100644
+index c1ff2e15bc5da1a642872ac0fdcdc457e8abb063..c8b29f79725bb9ccec5b48476e242609a452402c 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -472,7 +472,7 @@ public class EndDragonFight {
@@ -261,21 +275,21 @@ index d4f903c402765c6e8e1db99e148613748f530726..c8d76fdee94a0ffb76fcb476ca386acf
              return iregistry.getHolder(EndFeatures.END_GATEWAY_DELAYED);
          }).ifPresent((holder_c) -> {
 -            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), pos);
-+            holder_c.value().place(this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaConfig().misc.reduceRandom ? this.level.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instace
++            ((ConfiguredFeature) holder_c.value()).place(this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaConfig().misc.reduceRandom ? this.level.getRandom() : RandomSource.create()), pos); // Plazma - Reduce create random instace
          });
      }
  
 @@ -490,7 +490,7 @@ public class EndDragonFight {
              this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
          }
-         // Paper end - Prevent "softlocked" exit portal generation
+         // Paper end
 -        if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation)) {
 +        if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), (this.level.plazmaConfig().misc.reduceRandom ? this.level.getRandom() : RandomSource.create()), this.portalLocation)) { // Plazma - Reduce create random instace
              int i = Mth.positiveCeilDiv(4, 16);
  
              this.level.getChunkSource().chunkMap.waitForLightBeforeSending(new ChunkPos(this.portalLocation), i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..d300668899c3382a42e6a25dd084fb814b56f6bc 100644
+index c13cdbaf7abdf120a3969f8e887b4c3b78989c9c..5bb9bfbad85a115bf32955c2abc89edc2e7a6e43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -14,11 +14,12 @@ import org.bukkit.inventory.meta.FireworkMeta;
@@ -290,13 +304,13 @@ index 1309fabd357eb9b8f90f882ec7ff3de9e60f187d..d300668899c3382a42e6a25dd084fb81
          super(server, entity);
 +        this.random = this.getHandle().level().plazmaConfig().misc.reduceRandom ? this.getHandle().level().getRandom() : net.minecraft.util.RandomSource.create(); // Plazma - Reduce create random instance
  
- //        Paper start - Expose firework item directly
+ //        Paper Start - Expose firework item directly
  //        ItemStack item = this.getHandle().getEntityData().get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM);
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 294fdbba44191427a841f8ac82b18ed8d706f53e..be9e364a02eb872940443e3ba3349c3ccad3cb0f 100644
+index c85f1a01c951f85c2347eba18a896e87c4c8b368..d88208cb454d1042440803c817d99c5dcb775330 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -64,6 +64,8 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -40,6 +40,8 @@ public class GlobalConfiguration extends ConfigurationPart {
      public Miscellaneous misc;
      public class Miscellaneous extends ConfigurationPart {
  

patches/server/0019-Apply-various-optimizations.patch

@@ -7,27 +7,26 @@ Subject: [PATCH] Apply various optimizations
 Akarin - Swaps the predicate order of collision
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2092ede561d14ace1c003ced051cd4967bb41beb..0cf2180519457817a5985cf34e5564cd0ec1b1a2 100644
+index a13e6d41584a55e3e17d55d568b23f48082750ef..23eb620351ee08cac97e0408f1fc6cee33f036d0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2154,8 +2154,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2139,8 +2139,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {
-+        if (entity.noPhysics || this.noPhysics) return; // Plazma - Swaps the predicate order of collision
++        if (entity.noPhysics || this.noPhysics) return; // Plazma
          if (!this.isPassengerOfSameVehicle(entity)) {
 -            if (!entity.noPhysics && !this.noPhysics) {
-+            //if (!entity.noPhysics && !this.noPhysics) { // Plazma - Swaps the predicate order of collision
-                 if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant
++            //if (!entity.noPhysics && !this.noPhysics) { // Plazma - moved up
+                 if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
                  double d0 = entity.getX() - this.getX();
                  double d1 = entity.getZ() - this.getZ();
-@@ -2183,8 +2184,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-                         entity.push(d0, 0.0D, d1);
+@@ -2169,7 +2170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                      }
                  }
--
+ 
 -            }
-+            //} // Plazma - Swaps the predicate order of collision
++            //} // Plazma
          }
      }
  

patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Avoid double I/O operation on load player file
 
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 63e187c65cb855031f286aad0d25ac4694f7a331..3dca62446fbb7c92f5f2908b36926bbe5e905dbb 100644
+index 36af81f0957d17e170d229059c66f4eb4539dfeb..bf9a4571b05c9e2bacb6b26c7b24d33c6b4830f1 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -60,7 +60,8 @@ public class PlayerDataStorage {
+@@ -56,7 +56,8 @@ public class PlayerDataStorage {
              File file = new File(this.playerDir, player.getStringUUID() + ".dat");
              // Spigot Start
              boolean usingWrongFile = false;
@@ -18,12 +18,12 @@ index 63e187c65cb855031f286aad0d25ac4694f7a331..3dca62446fbb7c92f5f2908b36926bbe
              {
                  file = new File( this.playerDir, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + player.getScoreboardName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
-@@ -71,7 +72,7 @@ public class PlayerDataStorage {
+@@ -67,7 +68,7 @@ public class PlayerDataStorage {
              }
              // Spigot End
  
 -            if (file.exists() && file.isFile()) {
 +            if (isNormalFile) { // Plazma - Avoid double I/O operation
-                 nbttagcompound = NbtIo.readCompressed(file.toPath(), NbtAccounter.unlimitedHeap());
+                 nbttagcompound = NbtIo.readCompressed(file);
              }
              // Spigot Start

patches/server/0021-Don-t-refresh-LootTable-for-non-player-interaction.patch

@@ -1,26 +1,26 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
 Date: Sun, 5 Nov 2023 12:03:06 +0900
-Subject: [PATCH] Do not refresh LootTable for non player interaction
+Subject: [PATCH] Don't refresh LootTable for non player interaction
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index b41635dd0569ff7df909df492d3e850aef7214be..afc567b789ee003e1b10059db2864a423c682669 100644
+index 02364a148b347e3669275553004391e31d77c0b5..cd2d3707c8e4a313ad15958b2f926be6e05bcd4d 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -68,6 +68,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+@@ -70,6 +70,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+     }
  
-     @Override
-     public void unpackLootTable(@org.jetbrains.annotations.Nullable final Player player) {
-+        if (player == null && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.refreshLootTableForNonPlayerInteraction) return; // Plazma - Do not refresh LootTable for non player interaction
-         // Copied from super with changes, always check the original method
-         net.minecraft.world.level.Level level = this.getLevel();
-         BlockPos blockPos = this.getBlockPos();
+     public void unpackLootTable(@Nullable Player player) {
++        if (player == null && org.plazmamc.plazma.configurations.GlobalConfiguration.get().misc.refreshLootTableForNonPlayerInteraction) return; // Plazma
+         if (this.level != null && this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper - don't unpack loot table if not in world
+             LootTable lootTable = this.level.getServer().getLootData().getLootTable(this.lootTable);
+             if (player instanceof ServerPlayer) {
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index be9e364a02eb872940443e3ba3349c3ccad3cb0f..472069754c6e297474578ff237ae8d02c827b61c 100644
+index d88208cb454d1042440803c817d99c5dcb775330..c687f448761a591900ae5ebad9c8dfca572e9b31 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -66,6 +66,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -42,6 +42,7 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          public boolean reduceRandom = OPTIMIZE;
          public boolean ignoreThreadSafeRandom = false;

patches/server/0022-Don-t-load-chunks-to-spawn-phantom.patch

@@ -1,18 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
 Date: Sun, 5 Nov 2023 12:07:06 +0900
-Subject: [PATCH] Do not load chunks to spawn phantom
+Subject: [PATCH] Don't load chunks to spawn phantom
 
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 0847aef56d8608cb1403485f231f30b2527f35ab..fee30f686a5d1ee50a00c2073efd5b0a80e85179 100644
+index f74c5eda91a3d521763ec7bc33f23e0c62458cc2..49a8a81c586908278d1e3cbd51dea307540f28ec 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -71,6 +71,7 @@ public class PhantomSpawner implements CustomSpawner {
  
-                                     if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
+                                     if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
                                          BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
-+                                        if (!world.plazmaConfig().entity.phantom.loadChunksToSpawn && !world.hasChunkAt(blockposition1)) continue; // Plazma - Do not load chunks to spawn phantom
++                                        if (!world.plazmaConfig().entity.phantom.loadChunksToSpawn && !world.hasChunkAt(blockposition1)) continue; // Plazma
                                          BlockState iblockdata = world.getBlockState(blockposition1);
                                          FluidState fluid = world.getFluidState(blockposition1);
  

patches/server/0023-Add-option-to-disable-moved-to-quickly-check-for-spe.patch

@@ -6,25 +6,25 @@ Subject: [PATCH] Add option to disable moved to quickly check for specific
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ae5a2152cde8922deeb8d1d8a85bf39518ccd759..d4672d73df93c597a19e98e5d9b7dfa377b3f200 100644
+index a7e82f95db5c6c054175192f019072006a3ef31f..21def42f813f00c9fbc9c920b9ba61efc5928ef6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1472,6 +1472,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                 }
-                                 // Paper end - Prevent moving into unloaded chunks
- 
-+                                if (!this.player.getBukkitEntity().hasPermission("plazma.bypass-moved-to-quickly-check") || !(org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.checkSpectatorMovedToQuickly && this.player.isSpectator())) // Plazma - Options to bypass moved to quickly check
-                                 if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
-                                     float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
+@@ -1439,6 +1439,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                             if (!this.player.isChangingDimension() && (!this.player.level().getGameRules().getBoolean(GameRules.RULE_DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isFallFlying())) {
+                                 float f2 = this.player.isFallFlying() ? 300.0F : 100.0F;
  
++                                if (!this.player.getBukkitEntity().hasPermission("plazma.bypass-moved-to-quickly-check") || !(org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.checkSpectatorMovedToQuickly && this.player.isSpectator())) // Plazma
+                                 if (d10 - d9 > Math.max(f2, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
+                                 // CraftBukkit end
+                                     // Paper start - Add fail move event
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 472069754c6e297474578ff237ae8d02c827b61c..e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac 100644
+index c687f448761a591900ae5ebad9c8dfca572e9b31..f3cf7634a5fd470e7fb295ae1f88e14f0c4a0d1d 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -27,6 +27,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public Player player;
      public class Player extends ConfigurationPart {
  
+         public boolean allowAnyUsername = false;
 +        public boolean checkSpectatorMovedToQuickly = !OPTIMIZE;
  
      }

patches/server/0024-Implement-No-Chat-Reports.patch

@@ -3,31 +3,31 @@ From: AlphaKR93 <dev@alpha93.kr>
 Date: Thu, 28 Sep 2023 11:47:50 +0900
 Subject: [PATCH] Implement No Chat Reports
 
-Implemented: 644bb6bb4a8012c75900c643d9863fe92c799e1d
+Implemented: 62fbdef42dfbfec551d8324b7084c4ccf248bab7
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index bdcfd80f937c34956911373905d66424bbff8e1d..6c575aeeef323c8eb0837eb9d9eea8fcff21da17 100644
+index 40f51062624161892c780ddae05e22859e2cd021..b0b515b8ebeffe25a760d7d6faa87cbc1a585b2d 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-@@ -145,9 +145,13 @@ public class FriendlyByteBuf extends ByteBuf {
-         // Paper end - Adventure; add max length parameter
+@@ -139,9 +139,13 @@ public class FriendlyByteBuf extends ByteBuf {
+     public <T> void writeJsonWithCodec(Codec<T> codec, T value) {
          DataResult<JsonElement> dataresult = codec.encodeStart(JsonOps.INSTANCE, value);
  
 -        this.writeUtf(FriendlyByteBuf.GSON.toJson((JsonElement) Util.getOrThrow(dataresult, (s) -> {
 -            return new EncoderException("Failed to encode: " + s + " " + value);
--        })), maxLength); // Paper - Adventure; add max length parameter
+-        })));
 +        // Plazma start - Implement No Chat Reports
 +        JsonElement element = Util.getOrThrow(dataresult, s -> new EncoderException("Failed to encode: " + s + " " + value));
 +        if (codec == net.minecraft.network.protocol.status.ServerStatus.CODEC
 +                && org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.queryData())
 +            element.getAsJsonObject().addProperty("preventsChatReports", true);
-+        this.writeUtf(GSON.toJson(element), maxLength);
-+        // Plazma end - Implement No Chat Reports
++        this.writeUtf(GSON.toJson(element));
++        // Plazma end
      }
  
      public <T> void writeId(IdMap<T> registry, T value) {
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
-index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..4fe3de84fbbd16ecfe0b27922d5bfeaa9c89f61b 100644
+index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..4f0d6ac849dda74c9180fa03d97d389cc4554b46 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatCommandPacket.java
 @@ -24,4 +24,13 @@ public record ServerboundChatCommandPacket(String command, Instant timeStamp, lo
@@ -42,10 +42,10 @@ index b8c1f3b9afddc87d56541c8af63cffecfcdd2653..4fe3de84fbbd16ecfe0b27922d5bfeaa
 +            return ArgumentSignatures.EMPTY;
 +        return this.argumentSignatures;
 +    }
-+    // Plazma end - Implement No Chat Reports
++    // Plazma end
  }
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
-index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..bd69821b153b692b508505264899bdfda4805f0f 100644
+index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..b32e17ef1d7d65f2e3cf4fb5471d8182b3ba892f 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
 @@ -25,4 +25,12 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
@@ -59,10 +59,10 @@ index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..bd69821b153b692b508505264899bdfd
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return null;
 +        return this.signature;
 +    }
-+    // Plazma end - Implement No Chat Reports
++    // Plazma end
  }
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
-index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..587d89d67afe9108b5e810463fb3cb21f1b8accf 100644
+index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..4d9f73add791cef03cc7aeaf1598a73c2195809a 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
 @@ -16,6 +16,15 @@ public record ServerboundChatSessionUpdatePacket(RemoteChatSession.Data chatSess
@@ -77,63 +77,45 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..587d89d67afe9108b5e810463fb3cb21
 +            );
 +            return;
 +        }
-+        // Plazma end - Implement No Chat Reports
++        // Plazma end
          listener.handleChatSessionUpdate(this);
      }
  }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2a73508dd8a59c6af8b65ab2db97b6e20b104c57..eb6bcea28df735efe53ed62080bb726f7314c280 100644
+index 770b959d9e51ef0645415d5a0d7d79b7031abd66..f902505c850b9ea68733bd40e62b02b40a235e42 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -682,6 +682,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -681,6 +681,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  
      @Override
      public boolean enforceSecureProfile() {
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return false; // Plazma - Implement No Chat Reports
          DedicatedServerProperties dedicatedserverproperties = this.getProperties();
- 
-         // Paper start - Add setting for proxy online mode status
+         // Paper start - fix secure profile with proxy online mode
+         return dedicatedserverproperties.enforceSecureProfile
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 02e65b0bd212d46855baee48fab35dc95a88b43f..59c96512dcdac551e9919c3893e1340f86e3e861 100644
+index b19c59a87d4136da583a0b687f6b27fef3456f09..b54372c32845d2bc340951c0ea88d480efc1dd6a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -271,10 +271,31 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     }
- 
-     public void send(Packet<?> packet) {
-+        // Plazma start - Implement No Chat Reports
-+        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToSystemMessage()
-+            && this instanceof ServerGamePacketListenerImpl impl
-+            && packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket p) {
-+            impl.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(
-+                p.chatType().resolve(impl.player.level().registryAccess())
-+                    .orElseThrow().decorate(p.unsignedContent() != null ? p.unsignedContent() : Component.literal(p.body().content())),
-+                false
-+            ));
-+            return;
-+        }
-+        // Plazma end - Implement No Chat Reports
-         this.send(packet, (PacketSendListener) null);
+@@ -262,6 +262,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
      }
  
      public void send(Packet<?> packet, @Nullable PacketSendListener callbacks) {
 +        // Plazma start - Implement No Chat Reports
 +        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.convertToSystemMessage()
-+                && callbacks != null
-+                && this instanceof ServerGamePacketListenerImpl impl
 +                && packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket p) {
-+            impl.send(p);
++            this.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(null, Component.Serializer.toJson(p.chatType().resolve(this.player.level().registryAccess()).get().decorate(p.unsignedContent() != null ? p.unsignedContent() : Component.literal(p.body().content()))), false), null);
 +            return;
 +        }
-+        // Plazma end - Implement No Chat Reports
++        // Plazma end
          // CraftBukkit start
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ef4b1fb1532e1939d9a7e5337edc80b334b78318..f3b081abd82036c928655923c44a62a0e9889031 100644
+index e8de78f8b7c90a719e10c483991f45a7886256be..0ff64fc50768a4bed9c871fed1089753912b89d2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1499,6 +1499,7 @@ public abstract class PlayerList {
+@@ -1493,6 +1493,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
@@ -142,10 +124,10 @@ index ef4b1fb1532e1939d9a7e5337edc80b334b78318..f3b081abd82036c928655923c44a62a0
      }
  
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index e1c4551a83f8ce996ebed3e2ba7bf50cd532d6ac..62d891f05b90b323f0282fe26665965a10c317e6 100644
+index f3cf7634a5fd470e7fb295ae1f88e14f0c4a0d1d..5dafbe4ca74071e25ce79128ca08c7bfebb778d5 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-@@ -80,4 +80,22 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -56,4 +56,22 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
  

patches/server/0025-Ignore-useless-entity-packets.patch

@@ -3,27 +3,25 @@ From: AlphaKR93 <dev@alpha93.kr>
 Date: Wed, 27 Sep 2023 22:35:19 +0900
 Subject: [PATCH] Ignore useless entity packets
 
-[REFERENCE]
-- PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index cf098d4a3111771c13766285c5ec5f1fc1f539a4..433e9a06db191f8a0ff6c23d1ac6122606e67959 100644
+index c6ef510d335b8baea58c4491853414a52a06b66b..e2dcdc9f317a4ab1a9b30e482607dc041abb7035 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -207,6 +207,8 @@ public class ServerEntity {
+@@ -200,6 +200,8 @@ public class ServerEntity {
                          flag4 = true;
                          flag5 = true;
                      }
 +
-+                    if (this.level.plazmaConfig().entity.ignoreUselessPackets && isUselessPacket(packet1)) packet1 = null; // Plazma - Ignore useless entity packets
++                    if (this.level.plazmaConfig().entity.ignoreUselessPackets && isUselessPacket(packet1)) packet1 = null; // Plazma
                  }
  
                  if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -281,6 +283,19 @@ public class ServerEntity {
+@@ -272,6 +274,19 @@ public class ServerEntity {
          });
      }
  
-+    // Plazma start - Ignore useless entity packets
++    // Plazma start
 +    private boolean isUselessPacket(@Nullable Packet<?> packet) {
 +        if (!(packet instanceof ClientboundMoveEntityPacket p)) return false;
 +        if (p instanceof ClientboundMoveEntityPacket.Pos)
@@ -34,7 +32,7 @@ index cf098d4a3111771c13766285c5ec5f1fc1f539a4..433e9a06db191f8a0ff6c23d1ac61226
 +            return p.getXa() == 0 && p.getYa() == 0 && p.getZa() == 0 && p.getxRot() == 0 && p.getyRot() == 0;
 +        return false;
 +    }
-+    // Plazma end - Ignore useless entity packets
++    // Plazma end
 +
      public void removePairing(ServerPlayer player) {
          this.entity.stopSeenByPlayer(player);

patches/server/0026-Improve-biome-temperature-cache.patch

@@ -3,11 +3,9 @@ From: AlphaKR93 <dev@alpha93.kr>
 Date: Mon, 6 Nov 2023 10:39:01 +0900
 Subject: [PATCH] Improve biome temperature cache
 
-[REFERENCE]
-- FxMorin/MemoryLeakFix
 
 diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index efca73d4de33028cf9df944f36e51b7b50f7a4c5..a4aee46177a771c492d46e6996fb2c6e5eed3921 100644
+index ed439b7e94646141c93a7dd3704d1cdeb5c27e16..642fd0e06f9ab53b4ef2cafe1dc3321a3fd7ee9e 100644
 --- a/src/main/java/net/minecraft/world/level/biome/Biome.java
 +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
 @@ -67,7 +67,7 @@ public final class Biome {

patches/server/0027-Configurable-entity-sensor-tick.patch

@@ -5,15 +5,14 @@ Subject: [PATCH] Configurable entity sensor tick
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 546b14cc2cf0c4145a059142aa33ad113d7479bf..0c1e3cb455d2a184ab9f0084d10bd7cde83f9027 100644
+index aeae6117b398b84d5c8ecaa175a72867416ff166..c9df97eebe3635009737be83a28f36d291fcce79 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -938,10 +938,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -936,10 +936,10 @@ public abstract class Mob extends LivingEntity implements Targeting {
          }
-         // Paper end - Allow nerfed mobs to jump and float
+         // Paper end
          //this.level().getProfiler().push("sensing"); // Purpur
 -        this.sensing.tick();
-+        //this.sensing.tick(); // Plazma - Moved down
          //this.level().getProfiler().pop(); // Purpur
          int i = this.level().getServer().getTickCount() + this.getId();
  

patches/server/0028-Configurable-cave-lava-sea-level.patch

@@ -6,14 +6,14 @@ Subject: [PATCH] Configurable cave lava sea level
 This patch also fix MC-237017.
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 98c7f695093acbcf9382a5f07a7a89e373709763..a85b1ebb4236f131b9be0104c4aa56f22e661441 100644
+index 58609a0911c4e32b6f80f050cd3d23f70ad75b1b..2db6c1b9530b4b082ef6f6ec17c542ba8ad7fa5f 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 @@ -72,6 +72,15 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
      }
  
      private static Aquifer.FluidPicker createFluidPicker(NoiseGeneratorSettings settings) {
-+        // Plazma start - Configurable cave lava sea level
++        // Plazma start
 +        if (true) {
 +            org.plazmamc.plazma.configurations.GlobalConfiguration config = org.plazmamc.plazma.configurations.GlobalConfiguration.get();
 +            return (x, y, z) -> new Aquifer.FluidStatus(
@@ -21,12 +21,12 @@ index 98c7f695093acbcf9382a5f07a7a89e373709763..a85b1ebb4236f131b9be0104c4aa56f2
 +                    config.worldgen.caveLavaSeaLevel.customSeaLevel(settings)
 +            );
 +        }
-+        // Plazma end - Configurable cave lava sea level
++        // Plazma end
          Aquifer.FluidStatus aquifer_b = new Aquifer.FluidStatus(-54, Blocks.LAVA.defaultBlockState());
          int i = settings.seaLevel();
          Aquifer.FluidStatus aquifer_b1 = new Aquifer.FluidStatus(i, settings.defaultFluid());
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index 3e1d646ead7105f4955d47cb224f23ee4d9e3e69..7408401e7e9bd80c1e179c5eca994294f4c01950 100644
+index 5dafbe4ca74071e25ce79128ca08c7bfebb778d5..3cfb9357d0c61e84488c2c60f073fa12df942b8e 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -35,6 +35,25 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -45,7 +45,7 @@ index 3e1d646ead7105f4955d47cb224f23ee4d9e3e69..7408401e7e9bd80c1e179c5eca994294
 +                return net.minecraft.core.registries.BuiltInRegistries.BLOCK
 +                        .getOptional(new net.minecraft.resources.ResourceLocation(this.customSeaBlock))
 +                        .orElseGet(() -> {
-+                            PlazmaConfigurations.LOGGER.warn("Invalid custom sea level block: {}, defaulting to lava", this.customSeaBlock);
++                            PlazmaConfigurations.LOGGER.warn("Invalid custom sea level block: " + this.customSeaBlock, ", defaulting to lava");
 +                            return net.minecraft.world.level.block.Blocks.LAVA;
 +                        })
 +                        .defaultBlockState();

patches/server/0029-Variable-entity-wakeup-duration.patch

@@ -30,7 +30,7 @@ index b036b54d551c892cc48d0a6816382bce5e38efd4..459cba838468b95547b2a515c497fcbb
  
      public Structure structure;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 2e9aed328e576abbe216fdb2071c13421e6645b8..cb6ad8ffef606a4074fa2ef4a5f92438124e8f11 100644
+index 0b03dae85e6008283e68b07fa438daccf0e4f5fa..5b981300a8addb85fce32b814dfe70cb2bc4beb3 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -68,29 +68,36 @@ public class ActivationRange
@@ -42,35 +42,35 @@ index 2e9aed328e576abbe216fdb2071c13421e6645b8..cb6ad8ffef606a4074fa2ef4a5f92438
 +        if (deviation == 0) return duration;
 +        return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(duration * (1 + deviation * random.nextGaussian()))));
 +    }
-+    // Plazma end - Variable entity wakeup duration
++    // Plazma end
      private static int checkInactiveWakeup(Entity entity) {
          Level world = entity.level();
          SpigotWorldConfig config = world.spigotConfig;
-+        org.plazmamc.plazma.configurations.WorldConfigurations plazmaConfig = world.plazmaConfig(); // Plazma - Variable entity wakeup duration
++        org.plazmamc.plazma.configurations.WorldConfigurations plazmaConfig = world.plazmaConfig(); // Plazma
          long inactiveFor = MinecraftServer.currentTick - entity.activatedTick;
          if (entity.activationType == ActivationType.VILLAGER) {
              if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
                  world.wakeupInactiveRemainingVillagers--;
 -                return config.wakeUpInactiveVillagersFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveVillagersFor, plazmaConfig.entity.wakeUpDurationVariance.villager()); // Plazma - Variable entity wakeup duration
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveVillagersFor, plazmaConfig.entity.wakeUpDurationVariance.villager()); // Plazma
              }
          } else if (entity.activationType == ActivationType.ANIMAL) {
              if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) {
                  world.wakeupInactiveRemainingAnimals--;
 -                return config.wakeUpInactiveAnimalsFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveAnimalsFor, plazmaConfig.entity.wakeUpDurationVariance.animal()); // Plazma - Variable entity wakeup duration
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveAnimalsFor, plazmaConfig.entity.wakeUpDurationVariance.animal()); // Plazma
              }
          } else if (entity.activationType == ActivationType.FLYING_MONSTER) {
              if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) {
                  world.wakeupInactiveRemainingFlying--;
 -                return config.wakeUpInactiveFlyingFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveFlyingFor, plazmaConfig.entity.wakeUpDurationVariance.flying()); // Plazma - Variable entity wakeup duration
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveFlyingFor, plazmaConfig.entity.wakeUpDurationVariance.flying()); // Plazma
              }
          } else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) {
              if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) {
                  world.wakeupInactiveRemainingMonsters--;
 -                return config.wakeUpInactiveMonstersFor;
-+                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveMonstersFor, plazmaConfig.entity.wakeUpDurationVariance.monster()); // Plazma - Variable entity wakeup duration
++                return getWakeupDuration(world.getRandom(), config.wakeUpInactiveMonstersFor, plazmaConfig.entity.wakeUpDurationVariance.monster()); // Plazma
              }
          }
          return -1;

patches/server/0030-Optimise-state-lookup-more.patch

@@ -17,7 +17,7 @@ index 57d0cd3ad6f972e986c72a57f1a6e36003f190c2..50d97c5ab33f33b81dbafd7cf42da5af
  
      public ZeroCollidingReferenceStateTable(final StateHolder<?, ?> state, final Map<Property<?>, Comparable<?>> this_map) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-index 5f285d190186a2ff5a61d05070593e1d633dd79a..bcb0ba74f4162437d43199d365ff468222f59985 100644
+index 5f285d190186a2ff5a61d05070593e1d633dd79a..669c42f1598e2a06bb0b95aa0bc413911346f3ff 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 @@ -114,6 +114,12 @@ public abstract class StateHolder<O, S> {
@@ -29,7 +29,7 @@ index 5f285d190186a2ff5a61d05070593e1d633dd79a..bcb0ba74f4162437d43199d365ff4682
 +        if (ret == null) throw new IllegalArgumentException("Cannot set property " + property + " to " + value + " on " + this.owner + ", it is not an allowed value");
 +        return ret;
 +        /*
-+        // Plazma end - Optimise state lookup more
++        // Plazma end
          Comparable<?> comparable = this.values.get(property);
          if (comparable != null && !comparable.equals(value)) {
              S object = this.neighbours.get(property, value);

patches/server/0031-Suppress-errors-from-dirty-attributes.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Suppress errors from dirty attributes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 433e9a06db191f8a0ff6c23d1ac6122606e67959..149ea6b62c88200ecfc50c825a1dcdffa56d9fcb 100644
+index e2dcdc9f317a4ab1a9b30e482607dc041abb7035..085dfb2cf8596f5f0be4b1bf9a3cbe1a0e9b2967 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -404,7 +404,8 @@ public class ServerEntity {
+@@ -395,7 +395,8 @@ public class ServerEntity {
          }
  
          if (this.entity instanceof LivingEntity) {
@@ -18,7 +18,7 @@ index 433e9a06db191f8a0ff6c23d1ac6122606e67959..149ea6b62c88200ecfc50c825a1dcdff
  
              if (!set.isEmpty()) {
                  // CraftBukkit start - Send scaled max health
-@@ -415,7 +416,7 @@ public class ServerEntity {
+@@ -406,7 +407,7 @@ public class ServerEntity {
                  this.broadcastAndSend(new ClientboundUpdateAttributesPacket(this.entity.getId(), set));
              }
  

patches/server/0034-Add-Entity-spawn-deadlock-timer.patch

@@ -1,29 +1,29 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <dev@alpha93.kr>
 Date: Tue, 5 Dec 2023 13:29:28 +0900
-Subject: [PATCH] Add entity spawn deadlock timer
+Subject: [PATCH] Add Entity spawn deadlock timer
 
 [REFERENCE]
 - AbsolemJackdaw/FixMySpawnR
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 40c199812ecf7b16fe5a17c18cb0d6d3ce258910..f01390790cab0425e5d702d93b6755be41e94313 100644
+index 914564a528c360f352927e7681ab2e31ed365b21..090643e977257a097a99a3f54d1d73b995cfd82a 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-@@ -48,6 +48,8 @@ public abstract class BaseSpawner {
+@@ -46,6 +46,8 @@ public abstract class BaseSpawner {
      public int requiredPlayerRange = 16;
      public int spawnRange = 4;
-     private int tickDelay = 0; // Paper - Configurable mob spawner tick rate
-+    private int blockExistsTick = 0; // Plazma - Add entity spawn deadlock timer
-+    private boolean blockLockedByTime = false; // Plazma - Add entity spawn deadlock timer
- 
-     public BaseSpawner() {}
- 
-@@ -83,6 +85,17 @@ public abstract class BaseSpawner {
+     private int tickDelay = 0; // Paper
++    private int blockExistsTick = 0; // Plazma - Implement FixMySpawnR
++    private boolean blockLockedByTime = false; // Plazma - Implement FixMySpawnR
+     // Paper start - ported from 1.20.3 Fix MC-259321
+     static <B, T extends B> net.minecraft.world.level.entity.EntityTypeTest<B, T> forExactClass(Class<T> clazz) {
+         return new net.minecraft.world.level.entity.EntityTypeTest<>() {
+@@ -97,6 +99,17 @@ public abstract class BaseSpawner {
      }
  
      public void serverTick(ServerLevel world, BlockPos pos) {
-+        // Plazma start - Add entity spawn deadlock timer
++        // Plazma start - Implement FixMySpawnR
 +        if (world.plazmaConfig().entity.spawnDeadlockTimer.enabled) {
 +            if (!this.blockLockedByTime) {
 +                if (this.blockExistsTick > world.plazmaConfig().entity.spawnDeadlockTimer.timerTimeout)
@@ -33,29 +33,30 @@ index 40c199812ecf7b16fe5a17c18cb0d6d3ce258910..f01390790cab0425e5d702d93b6755be
 +
 +            if (blockLockedByTime && world.getBestNeighborSignal(pos) > 0) return;
 +        }
-+        // Plazma end - Add entity spawn deadlock timer
++        // Plazma end
          if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick
          // Paper start - Configurable mob spawner tick rate
          if (spawnDelay > 0 && --tickDelay > 0) return;
-@@ -280,6 +293,12 @@ public abstract class BaseSpawner {
+@@ -301,6 +314,12 @@ public abstract class BaseSpawner {
          if (nbt.contains("SpawnRange", 99)) {
              this.spawnRange = nbt.getShort("SpawnRange");
          }
-+        // Plazma start - Add entity spawn deadlock timer
++        // Plazma start - Implement FixMySpawnR
 +        if (nbt.contains("Plazma.SpawnerTicks", 99)) {
 +            this.blockExistsTick = nbt.getInt("Plazma.SpawnerTicks");
 +            this.blockLockedByTime = nbt.getBoolean("Plazma.SpawnerLocked");
 +        }
-+        // Plazma end - Add entity spawn deadlock timer
++        // Plazma end
  
          this.displayEntity = null;
      }
-@@ -309,6 +328,8 @@ public abstract class BaseSpawner {
+@@ -330,6 +349,9 @@ public abstract class BaseSpawner {
              }));
          }
  
-+        nbt.putInt("Plazma.SpawnerTicks", this.blockExistsTick); // Plazma - Add entity spawn deadlock timer
-+        nbt.putBoolean("Plazma.SpawnerLocked", this.blockLockedByTime); // Plazma - Add entity spawn deadlock timer
++        nbt.putInt("Plazma.SpawnerTicks", this.blockExistsTick); // Plazma - Implement FixMySpawnR
++        nbt.putBoolean("Plazma.SpawnerLocked", this.blockLockedByTime); // Plazma - Implement FixMySpawnR
++
          nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).result().orElseThrow());
          return nbt;
      }

patches/server/0035-Reduce-allocations.patch

@@ -89,10 +89,10 @@ index 190c5f0b02a3d99054704ae1afbffb3498ddffe1..042ea49ec61ee327c0f67ddcf0807740
  
      public int size() {
 diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java
-index 17ce14f2dcbf900890efbc2351782bc6f8867068..a8d4acc1dbb3e8e5cd8d181fbd8335f84e252d0c 100644
+index f975cb93716e137d973ff2f9011acdbef58859a2..2e4c87596fe3f15d25c07c1a2b590f892cbb78c0 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java
 +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java
-@@ -42,6 +42,7 @@ import java.util.function.Consumer;
+@@ -41,6 +41,7 @@ import java.util.function.Consumer;
  public final class ChunkTaskScheduler {
  
      private static final Logger LOGGER = LogUtils.getClassLogger();
@@ -100,7 +100,7 @@ index 17ce14f2dcbf900890efbc2351782bc6f8867068..a8d4acc1dbb3e8e5cd8d181fbd8335f8
  
      static int newChunkSystemIOThreads;
      static int newChunkSystemWorkerThreads;
-@@ -854,7 +855,7 @@ public final class ChunkTaskScheduler {
+@@ -851,7 +852,7 @@ public final class ChunkTaskScheduler {
  
      public static ChunkInfo[] getChunkInfos() {
          synchronized (WAITING_CHUNKS) {
@@ -123,19 +123,19 @@ index ae60bd96b5284d54676d8e7e4dd5d170b526ec1e..359c4b080bd47234e569dce7055da03d
          return true;
      }
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
-index eedbf46e04b5ae420f9bedcbc2bbb10643ba7e22..1ac70b965f5dd9441658156e19a38419cbcc47d6 100644
+index 08b1aab5d37a56dc42542ce15ba1f7ccd1b08400..a5634b36946bf63e54638a249d4de8c260e2b6cd 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
-@@ -47,6 +47,8 @@ import java.util.logging.Level;
- class PaperPluginInstanceManager {
+@@ -48,6 +48,8 @@ class PaperPluginInstanceManager {
  
      private static final FileProviderSource FILE_PROVIDER_SOURCE = new FileProviderSource("File '%s'"::formatted);
-+    private static final JavaPlugin[] EMPTY_JPLUGIN = new JavaPlugin[0]; // Plazma - Reduce allocations
+     private static final DirectoryProviderSource DIRECTORY_PROVIDER_SOURCE = new DirectoryProviderSource();
 +    private static final Plugin[] EMPTY_PLUGIN = new Plugin[0]; // Plazma - Reduce allocations
++    private static final JavaPlugin[] EMPTY_JAVA_PLUGIN = new JavaPlugin[0]; // Plazma - Reduce allocations
  
      private final List<Plugin> plugins = new ArrayList<>();
      private final Map<String, Plugin> lookupNames = new HashMap<>();
-@@ -68,7 +70,7 @@ class PaperPluginInstanceManager {
+@@ -69,7 +71,7 @@ class PaperPluginInstanceManager {
      }
  
      public @NotNull Plugin[] getPlugins() {
@@ -144,17 +144,17 @@ index eedbf46e04b5ae420f9bedcbc2bbb10643ba7e22..1ac70b965f5dd9441658156e19a38419
      }
  
      public boolean isPluginEnabled(@NotNull String name) {
-@@ -136,7 +138,7 @@ class PaperPluginInstanceManager {
+@@ -138,7 +140,7 @@ class PaperPluginInstanceManager {
              this.server.getLogger().log(Level.SEVERE, "Unknown error occurred while loading plugins through PluginManager.", e);
          }
  
 -        return runtimePluginEntrypointHandler.getPluginProviderStorage().getLoaded().toArray(new JavaPlugin[0]);
-+        return runtimePluginEntrypointHandler.getPluginProviderStorage().getLoaded().toArray(EMPTY_JPLUGIN); // Plazma - Reduce allocations
++        return runtimePluginEntrypointHandler.getPluginProviderStorage().getLoaded().toArray(EMPTY_JAVA_PLUGIN); // Plazma - Reduce allocations
      }
  
      // Plugins are disabled in order like this inorder to "rougly" prevent
 diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java
-index ee0331a6bc40cdde08d926fd8eb1dc642630c2e5..bafa781ea77afa159576afca3449bacb01ab387d 100644
+index bfb1de19f53d5d7c7b65e25a606fabfa416706b3..4a5d622d6b4c71f498488cb5712c4fdf73f957ef 100644
 --- a/src/main/java/io/papermc/paper/util/CollisionUtil.java
 +++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java
 @@ -1149,7 +1149,7 @@ public final class CollisionUtil {
@@ -167,42 +167,24 @@ index ee0331a6bc40cdde08d926fd8eb1dc642630c2e5..bafa781ea77afa159576afca3449bacb
  
          private static int[] getIndices(final int length) {
 diff --git a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-index c78cbec447032de9fe69748591bef6be300160ed..8ca248e844e73685a8d44a966144657315a799aa 100644
+index 7e8dc9e8f381abfdcce2746edc93122d623622d1..bf882040399015b38b917c7982f01e74137945f7 100644
 --- a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
 +++ b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
-@@ -304,7 +304,7 @@ public final class ChunkEntitySlices {
+@@ -303,7 +303,7 @@ public final class ChunkEntitySlices {
  
      protected static final class BasicEntityList<E extends Entity> {
  
 -        protected static final Entity[] EMPTY = new Entity[0];
-+        //protected static final Entity[] EMPTY = new Entity[0]; // Plazma - Reduce allocations
++        protected static final Entity[] EMPTY = org.plazmamc.plazma.constants.Empty.ENTITY; // Plazma - Reduce allocations
          protected static final int DEFAULT_CAPACITY = 4;
  
          protected E[] storage;
-@@ -315,7 +315,7 @@ public final class ChunkEntitySlices {
-         }
- 
-         public BasicEntityList(final int cap) {
--            this.storage = (E[])(cap <= 0 ? EMPTY : new Entity[cap]);
-+            this.storage = (E[])(cap <= 0 ? org.plazmamc.plazma.constants.Empty.ENTITY : new Entity[cap]);
-         }
- 
-         public boolean isEmpty() {
-@@ -327,7 +327,7 @@ public final class ChunkEntitySlices {
-         }
- 
-         private void resize() {
--            if (this.storage == EMPTY) {
-+            if (this.storage == org.plazmamc.plazma.constants.Empty.ENTITY) {
-                 this.storage = (E[])new Entity[DEFAULT_CAPACITY];
-             } else {
-                 this.storage = Arrays.copyOf(this.storage, this.storage.length * 2);
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index c5a3f9c2daf3da135cccecb757353534e1688821..e5585c6befeef62ecf130e8dabbe6b78f9e90a65 100644
+index ae02c029f0169d30a34d4a4e65ea6cb4fa498111..dba579b63fcbe3a7256496e523ae45df62f0db79 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -30,7 +30,7 @@ public class CrashReport {
-     @Nullable
+@@ -28,7 +28,7 @@ public class CrashReport {
+     private final List<CrashReportCategory> details = Lists.newArrayList();
      private File saveFile;
      private boolean trackingStackTrace = true;
 -    private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
@@ -224,10 +206,10 @@ index b54ddd0ba0b001fbcb1838a838ca4890df936f1b..2bfe33ed7e602ada8638d71ed8e91125
      public CrashReportCategory(String title) {
          this.title = title;
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index b40864e41e1506884fdefefbf3cf4833a8f706c3..b8e3b6b69955ea81862f0297a5be6209088cd1f0 100644
+index 5c1503f5b173138fc9e918d5562a981ca8b66d06..f499f1d9da1f6ea8ecc19b55520b22ba770a4f4b 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -408,7 +408,7 @@ public class Util {
+@@ -402,7 +402,7 @@ public class Util {
          } else if (futures.size() == 1) {
              return futures.get(0).thenApply(List::of);
          } else {
@@ -250,10 +232,10 @@ index 06648f9751fd8a322d0809ffebf6a544596ee1a4..b0ea87e2ed8f9bf04b33c2ff8a827d4f
  
      @Override
 diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
-index eea9866aecb7189455319d83561fcef35a777d7a..56cff647c4e89a12b116426ebf84df6675601a01 100644
+index 84fc2adf591f02a14862f7c1cd645c2efde55c3d..104081261f46692baf5c977e5419311d1d5c1a9d 100644
 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java
 +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
-@@ -420,7 +420,7 @@ public class CompoundTag implements Tag {
+@@ -416,7 +416,7 @@ public class CompoundTag implements Tag {
              throw new ReportedException(this.createReport(key, ByteArrayTag.TYPE, var3));
          }
  
@@ -262,7 +244,7 @@ index eea9866aecb7189455319d83561fcef35a777d7a..56cff647c4e89a12b116426ebf84df66
      }
  
      public int[] getIntArray(String key) {
-@@ -432,7 +432,7 @@ public class CompoundTag implements Tag {
+@@ -428,7 +428,7 @@ public class CompoundTag implements Tag {
              throw new ReportedException(this.createReport(key, IntArrayTag.TYPE, var3));
          }
  
@@ -271,7 +253,7 @@ index eea9866aecb7189455319d83561fcef35a777d7a..56cff647c4e89a12b116426ebf84df66
      }
  
      public long[] getLongArray(String key) {
-@@ -444,7 +444,7 @@ public class CompoundTag implements Tag {
+@@ -440,7 +440,7 @@ public class CompoundTag implements Tag {
              throw new ReportedException(this.createReport(key, LongArrayTag.TYPE, var3));
          }
  
@@ -294,10 +276,10 @@ index ff13d67151c50ea11a45117e524c7524e2b1a202..5048ec707c147b9a5b2dd8736d518d93
  
      @Override
 diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java
-index 24ad8d22b5180cd7d7f793e3074e438f9192448f..c902b478d331a1cad9ac66a6eeb66c19fbcd8789 100644
+index 0ef36f5cfebf60c491d021b77b55c393f26feab5..84602e16f321d99b09aa63866e2246cfc0f06634 100644
 --- a/src/main/java/net/minecraft/nbt/ListTag.java
 +++ b/src/main/java/net/minecraft/nbt/ListTag.java
-@@ -279,7 +279,7 @@ public class ListTag extends CollectionTag<Tag> {
+@@ -261,7 +261,7 @@ public class ListTag extends CollectionTag<Tag> {
              }
          }
  
@@ -306,7 +288,7 @@ index 24ad8d22b5180cd7d7f793e3074e438f9192448f..c902b478d331a1cad9ac66a6eeb66c19
      }
  
      public long[] getLongArray(int index) {
-@@ -291,7 +291,7 @@ public class ListTag extends CollectionTag<Tag> {
+@@ -272,7 +272,7 @@ public class ListTag extends CollectionTag<Tag> {
              }
          }
  
@@ -328,19 +310,6 @@ index 3604e22f593275140d706c296355ee06ca8ec888..6974ca1efbef05c845dc41e643bfed6d
      }
  
      @Override
-diff --git a/src/main/java/net/minecraft/nbt/NbtIo.java b/src/main/java/net/minecraft/nbt/NbtIo.java
-index c2044d2e8ce2d4747aa73ba90e5b975b1b7d2c19..b4e043379ece86ce39eacd4c1eb9114a2b6727ca 100644
---- a/src/main/java/net/minecraft/nbt/NbtIo.java
-+++ b/src/main/java/net/minecraft/nbt/NbtIo.java
-@@ -249,7 +249,7 @@ public class NbtIo {
- 
-     @Nullable
-     public static CompoundTag read(Path path) throws IOException {
--        if (!Files.exists(path, new LinkOption[0])) {
-+        if (!Files.exists(path/*, new LinkOption[0]*/)) { // Plazma - Reduce allocations
-             return null;
-         } else {
-             InputStream inputstream = Files.newInputStream(path);
 diff --git a/src/main/java/net/minecraft/network/CipherBase.java b/src/main/java/net/minecraft/network/CipherBase.java
 index a2920b8a9eff77d9c5d1d7f70ad3abdacba8f0fa..70d776d5cfdb0612f65d92333d6f872afedc2207 100644
 --- a/src/main/java/net/minecraft/network/CipherBase.java
@@ -357,7 +326,7 @@ index a2920b8a9eff77d9c5d1d7f70ad3abdacba8f0fa..70d776d5cfdb0612f65d92333d6f872a
      protected CipherBase(Cipher cipher) {
          this.cipher = cipher;
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index b41cab778f446434b788946ea9d3e02c152e570e..1c71cea8554a055973bb85c7a8181f08e3246148 100644
+index ff99d6fa919391d43b7737a2819cf9ebb7e134da..f99eae21d07d09229eb5d8467022f373e47c0b51 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -321,7 +321,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -370,10 +339,10 @@ index b41cab778f446434b788946ea9d3e02c152e570e..1c71cea8554a055973bb85c7a8181f08
  
          if (enumprotocoldirection != this.receiving) {
 diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index d3a80d0a23be762c05931ae8001d98e43cab2b4a..a94feef330b1836a2fc009405c52945551b7590a 100644
+index b540ce21c65ad52ad7e94d2ca2b3926c0875bee1..601ce6010a9fe5359fab933e9a00c787f14a5643 100644
 --- a/src/main/java/net/minecraft/network/chat/Component.java
 +++ b/src/main/java/net/minecraft/network/chat/Component.java
-@@ -191,7 +191,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -184,7 +184,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
      }
  
      static MutableComponent translatable(String key) {
@@ -382,7 +351,7 @@ index d3a80d0a23be762c05931ae8001d98e43cab2b4a..a94feef330b1836a2fc009405c529455
      }
  
      static MutableComponent translatable(String key, Object... args) {
-@@ -211,7 +211,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -192,7 +192,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
      }
  
      static MutableComponent translatableWithFallback(String key, @Nullable String fallback) {
@@ -392,31 +361,20 @@ index d3a80d0a23be762c05931ae8001d98e43cab2b4a..a94feef330b1836a2fc009405c529455
  
      static MutableComponent translatableWithFallback(String key, @Nullable String fallback, Object... args) {
 diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-index 084ffde43447f6ff5e45e9fe3fc6a86bde65fd5a..2e7b3260085986e26567e50a0c42feb121dba4cd 100644
+index 8a68baf6bd46b59cf57c94ffe5651d47a7cae99c..3d747a0dbe88b88e8df07a594db48cdcc9fb7717 100644
 --- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
 +++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-@@ -28,7 +28,7 @@ import net.minecraft.util.ExtraCodecs;
+@@ -21,7 +21,7 @@ import net.minecraft.network.chat.Style;
  import net.minecraft.world.entity.Entity;
  
  public class TranslatableContents implements ComponentContents {
 -    public static final Object[] NO_ARGS = new Object[0];
 +    //public static final Object[] NO_ARGS = new Object[0]; // Plazma - Reduce allocations
-     private static final Codec<Object> PRIMITIVE_ARG_CODEC = ExtraCodecs.validate(ExtraCodecs.JAVA, TranslatableContents::filterAllowedArguments);
-     private static final Codec<Object> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, ComponentSerialization.CODEC).xmap((either) -> {
-         return either.map((object) -> {
-@@ -83,8 +83,8 @@ public class TranslatableContents implements ComponentContents {
- 
-     private static Object[] adjustArgs(Optional<List<Object>> args) {
-         return args.map((list) -> {
--            return list.isEmpty() ? NO_ARGS : list.toArray();
--        }).orElse(NO_ARGS);
-+            return list.isEmpty() ? org.plazmamc.plazma.constants.Empty.OBJECT : list.toArray();
-+        }).orElse(org.plazmamc.plazma.constants.Empty.OBJECT);
-     }
- 
-     private static TranslatableContents create(String key, Optional<String> fallback, Optional<List<Object>> args) {
+     private static final FormattedText TEXT_PERCENT = FormattedText.of("%");
+     private static final FormattedText TEXT_NULL = FormattedText.of("null");
+     private final String key;
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
-index ccdc2345465313991f065e1176b58fb7d5e8722f..bb50e69a4d84e4753db77be071cc6fc73b08a981 100644
+index e3f355c85eb7cc8c1683e3009502c10a5ed32daa..838f07692c8e34c21c5a93611ab0f01b5059ab5e 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSectionBlocksUpdatePacket.java
 @@ -63,7 +63,7 @@ public class ClientboundSectionBlocksUpdatePacket implements Packet<ClientGamePa
@@ -426,13 +384,13 @@ index ccdc2345465313991f065e1176b58fb7d5e8722f..bb50e69a4d84e4753db77be071cc6fc7
 -        this.states = blockChanges.values().toArray(new BlockState[0]);
 +        this.states = blockChanges.values().toArray(org.plazmamc.plazma.constants.Empty.BLOCK_STATE); // Plazma - Reduce allocations
      }
-     // Paper end - Multi Block Change API
+     // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fcc197256be00621bb3875c20849fe083a453c5c..2ce7351231aa921604698d45220d7e3e34289b62 100644
+index cda99102949ae9d722c347e0dd610dfff625b5b8..0ece8ab1136d300dcf22c0ab2221b1781aa95ee3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1505,13 +1505,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1354,13 +1354,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private Optional<ServerStatus.Favicon> loadStatusIcon() {
@@ -444,17 +402,17 @@ index fcc197256be00621bb3875c20849fe083a453c5c..2ce7351231aa921604698d45220d7e3e
 -            });
 -        });
 +        // Plazma start - Reduce allocations
-+        Optional<Path> optional = Optional.of(this.getFile("server-icon.png").toPath()).
-+            filter(Files::isRegularFile).or(() -> this.storageSource.getIconFile().filter(Files::isRegularFile));
-+        // Plazma end - Reduce allocations
++        Optional<Path> optional = Optional.of(this.getFile("server-icon.png").toPath()).filter(Files::isRegularFile)
++            .or(() -> this.storageSource.getIconFile().filter(Files::isRegularFile));
++        // Plazma end
  
          return optional.flatMap((path) -> {
              try {
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index ba8a8575af92541cef2e116743d51cd68d1e794a..140079be22acbb898720c538c4ffb06194da0860 100644
+index 533a348acb53c8e7590f3d81c19e53a655101713..95ead2443ad161d46e476c6b3fbe6463d0f077fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -130,7 +130,7 @@ public class PlayerAdvancements {
+@@ -131,7 +131,7 @@ public class PlayerAdvancements {
      }
  
      private void load(ServerAdvancementManager advancementLoader) {
@@ -483,7 +441,7 @@ index 0f52e8a61ca7e57e9f52473dceb9cc3464c0c86d..f54bde32760541a653460682e5a3ddd0
      }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerFunctionLibrary.java b/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
-index f65d6dc2b1596232707be402cf0377b5ab90cc01..6735382b229bf6ab66f1ccdf6122215e51d8b10e 100644
+index 6783dc11a321c244296e84223c51cd1a489a9b96..39e5dd4718a59c13afc0da2b73e9adde3786463f 100644
 --- a/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
 +++ b/src/main/java/net/minecraft/server/ServerFunctionLibrary.java
 @@ -81,7 +81,7 @@ public class ServerFunctionLibrary implements PreparableReloadListener {
@@ -496,18 +454,18 @@ index f65d6dc2b1596232707be402cf0377b5ab90cc01..6735382b229bf6ab66f1ccdf6122215e
                  return map;
              });
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d1056b1c91edc3ec06c78e65c8fa2dd1f000c43f..618f2166417b88c92d99a7cf6f10e769eedc95a3 100644
+index a88f6bbed191b6fd3ef2da625df45520331cf7d7..38fac04cea98ed93586280dae25b7386d15d8b89 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -109,6 +109,7 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
- 
- public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider {
- 
+@@ -142,6 +142,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     private final Long2LongMap chunkSaveCooldowns;
+     private final Queue<Runnable> unloadQueue;
+     private int serverViewDistance;
 +    private static final ServerPlayerConnection[] EMPTY_CONNECTION = new ServerPlayerConnection[0]; // Plazma - Reduce allocations
-     private static final byte CHUNK_TYPE_REPLACEABLE = -1;
-     private static final byte CHUNK_TYPE_UNKNOWN = 0;
-     private static final byte CHUNK_TYPE_FULL = 1;
-@@ -1347,7 +1348,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+ 
+     // Paper - rewrite chunk system
+ 
+@@ -1362,7 +1363,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              // stuff could have been removed, so we need to check the trackedPlayers set
              // for players that were removed
  
@@ -517,10 +475,10 @@ index d1056b1c91edc3ec06c78e65c8fa2dd1f000c43f..618f2166417b88c92d99a7cf6f10e769
                      this.updatePlayer(conn.getPlayer());
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 611916db3f9a6d2fbfa720e883fb03973b4a65c2..0aee1fb44f19fd838ca206335764b04f4a3f8a26 100644
+index 9301ec8142fbf5c5112cac75aef1b8e35737ce43..46edffe5604924c13d0c76fcdceed7a377147abe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1449,7 +1449,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1426,7 +1426,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      public static List<Entity> getCurrentlyTickingEntities() {
          Entity ticking = currentlyTickingEntity.get();
@@ -529,22 +487,52 @@ index 611916db3f9a6d2fbfa720e883fb03973b4a65c2..0aee1fb44f19fd838ca206335764b04f
  
          return ret;
      }
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 21def42f813f00c9fbc9c920b9ba61efc5928ef6..73f7c82aa9efb81698d6b95df28c47ee467b8a44 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -794,13 +794,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
+         // CraftBukkit start
+         if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
+-            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause
++            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam"/*, new Object[0]*/), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause // Plazma - Reduce allocations
+             return;
+         }
+         // Paper start
+         String str = packet.getCommand(); int index = -1;
+         if (str.length() > 64 && ((index = str.indexOf(' ')) == -1 || index >= 64)) {
+-            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper
++            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam"/*, new Object[0]*/))); // Paper // Plazma - Reduce allocations
+             return;
+         }
+         // Paper end
+@@ -3274,7 +3274,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         // Paper start
+         if (!org.bukkit.Bukkit.isPrimaryThread()) {
+             if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
+-                this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause
++                this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"/*, new Object[0]*/), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause // Plazma - Reduce allocations
+                 return;
+             }
+         }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 01069a21857f9f3b7905861ee38c3891903af3b8..d45a435a3aa8fc5b8f028e0455c3789b36cbdf12 100644
+index 05ef30ecdb68d1d254246431e7d5cecf9a38427e..f6320b7c987361612792b0c47edeeb1bc2fc6ab0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -138,8 +138,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -159,9 +159,9 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
  
      @Override
      public void handleHello(ServerboundHelloPacket packet) {
 -        Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet", new Object[0]);
--        if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) Validate.validState(Player.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]); // Paper - config username validation
 +        Validate.validState(this.state == ServerLoginPacketListenerImpl.State.HELLO, "Unexpected hello packet"/*, new Object[0]*/); // Plazma - Reduce allocations
-+        if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation && !this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation) Validate.validState(Player.isValidUsername(packet.name()), "Invalid characters in username"/*, new Object[0]*/); // Paper - config username validation // Plazma - Reduce allocations
-         this.requestedUsername = packet.name();
-         GameProfile gameprofile = this.server.getSingleplayerProfile();
- 
-@@ -223,7 +223,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+         if (!org.plazmamc.plazma.configurations.GlobalConfiguration.get().player.allowAnyUsername) // Plazma - Add option to allow any usernames
+-        Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username", new Object[0]);
++        Validate.validState(ServerLoginPacketListenerImpl.isValidUsername(packet.name()), "Invalid characters in username"/*, new Object[0]*/); // Plazma - Reduce allocations
+         // Paper start - validate usernames
+         if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.performUsernameValidation) {
+             if (!this.iKnowThisMayNotBeTheBestIdeaButPleaseDisableUsernameValidation && !validateUsername(packet.name())) {
+@@ -254,7 +254,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
  
      @Override
      public void handleKey(ServerboundKeyPacket packet) {
@@ -553,7 +541,7 @@ index 01069a21857f9f3b7905861ee38c3891903af3b8..d45a435a3aa8fc5b8f028e0455c3789b
  
          final String s;
  
-@@ -403,7 +403,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -436,7 +436,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
  
      @Override
      public void handleLoginAcknowledgement(ServerboundLoginAcknowledgedPacket packet) {
@@ -563,31 +551,23 @@ index 01069a21857f9f3b7905861ee38c3891903af3b8..d45a435a3aa8fc5b8f028e0455c3789b
          ServerConfigurationPacketListenerImpl serverconfigurationpacketlistenerimpl = new ServerConfigurationPacketListenerImpl(this.server, this.connection, commonlistenercookie, this.player); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f3b081abd82036c928655923c44a62a0e9889031..0250b9a90e62ca5a9a7172f6e1012e89514fd6e6 100644
+index 0ff64fc50768a4bed9c871fed1089753912b89d2..24efc55e41bf9d741f78b35ac5cf3d5741c43f34 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -133,6 +133,7 @@ public abstract class PlayerList {
-     private static final Logger LOGGER = LogUtils.getLogger();
-     private static final int SEND_PLAYER_INFO_INTERVAL = 600;
-     private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
-+    private static final org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[] EMPTY_FLAG = new org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[0]; // Plazma - Reduce allocations
-     private final MinecraftServer server;
-     public final List<ServerPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
-     private final Map<UUID, ServerPlayer> playersByUUID = Maps.newHashMap();
-@@ -816,7 +817,7 @@ public abstract class PlayerList {
+@@ -718,7 +718,7 @@ public abstract class PlayerList {
+         while (iterator.hasNext()) {
+             entityplayer = (ServerPlayer) iterator.next();
+             this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
+-            entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.DUPLICATE_LOGIN); // Paper - kick event cause
++            entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.duplicate_login"/*, new Object[0]*/), org.bukkit.event.player.PlayerKickEvent.Cause.DUPLICATE_LOGIN); // Paper - kick event cause // Plazma - Reduce allocations
+         }
  
-     public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason) {
-         // Paper start - Expand PlayerRespawnEvent
--        return respawn(entityplayer, worldserver, flag, location, avoidSuffocation, reason, new org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[0]);
-+        return respawn(entityplayer, worldserver, flag, location, avoidSuffocation, reason, EMPTY_FLAG); // Plazma - Reduce allocations
-     }
- 
-     public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) {
+         // Instead of kicking then returning, we need to store the kick reason
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 7e133752ccb1ea7c0b4fa781feb1a88e2cfdcf6d..1289e8e9c54a584f5037ea8e852df37376af093d 100644
+index 09fc086548b9d0f97849f56f41e3a5be87f5091a..34b7c5421da93f14050425b0fc16bbc27e5f3eba 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -76,7 +76,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -96,7 +96,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      }
  
      public String[] getUserList() {
@@ -609,7 +589,7 @@ index 0ee04fe6ff6a4d09754f326526ae04fe7226bab2..5663ce568a1daa638b7387bee8b9917c
      }
  }
 diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-index f8de91393564b3691c17339ac9196cc0fc1cf748..d0e380e51562f423a0dd937026dfec08d6bd5e18 100644
+index 311625277a26c9c187025a1036978229241b965f..33d70d547f614704e7ac36b9f49bbb7ca13d968c 100644
 --- a/src/main/java/net/minecraft/util/ZeroBitStorage.java
 +++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java
 @@ -5,7 +5,7 @@ import java.util.function.IntConsumer;
@@ -622,7 +602,7 @@ index f8de91393564b3691c17339ac9196cc0fc1cf748..d0e380e51562f423a0dd937026dfec08
  
      public ZeroBitStorage(int size) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 997ab942be9f742804041b07d607e7dd6473ba96..14a61e58987464d7865caf98e6232fb1334c6d88 100644
+index 38a3dcec138d9233a46e5d523bcc6d64bc7fffd0..8424a7f7066fb3f8a4007b063db05ec0b8270ea3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -251,7 +251,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -635,7 +615,7 @@ index 997ab942be9f742804041b07d607e7dd6473ba96..14a61e58987464d7865caf98e6232fb1
          this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index 442eb602f5c82550a87e218e2013171b718abd62..b68f7d1fba18cf08a1844a179f07cb6d873c236b 100644
+index 64aba511e615983988cdb6a0fd45b7d9d4f2f16d..e335c936f1f286c9bf8f19aff7202c5f7e413bbe 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 @@ -122,7 +122,7 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -648,15 +628,15 @@ index 442eb602f5c82550a87e218e2013171b718abd62..b68f7d1fba18cf08a1844a179f07cb6d
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Mob.class, 5, false, false, (entityliving) -> {
              return entityliving instanceof Enemy && !(entityliving instanceof Creeper);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index adfa18c941b5070692ed855d1d609993ca49a01d..b44e752b4fa18d25ca7ac989b1eaacc138512848 100644
+index 97c38b72b998bdf397c72d3ea08fd93186585f30..f3d3c4ca36e9a965047440e572c41674f063a89f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -340,7 +340,7 @@ public class Panda extends Animal {
+@@ -339,7 +339,7 @@ public class Panda extends Animal {
          this.goalSelector.addGoal(13, new FollowParentGoal(this, 1.25D));
          this.goalSelector.addGoal(14, new WaterAvoidingRandomStrollGoal(this, 1.0D));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 -        this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0]));
-+        this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this/*, new Class[0]*/)).setAlertOthers(/*new Class[0]*/)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(1, (new Panda.PandaHurtByTargetGoal(this/*, new Class[0]*/)).setAlertOthers()); // Plazma - Reduce allocations
      }
  
      public static AttributeSupplier.Builder createAttributes() {
@@ -674,7 +654,7 @@ index eae2488f2a46e543b496b7a2919aabbb55dcb825..3383d61551f28b44943c0e935aedfa3c
              this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Wolf.class, true));
              if (!this.hasCustomName()) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index a90055fe8819a32180754b6060a0f88e81d1a3b6..68825a2ad5a6ea1b0784a935206bd150d29e25f9 100644
+index 5d49ed7ddf44a3d549b178ae548664194967776b..28131075d6cfd04e11a0ea24ac1466e34247b60e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -241,7 +241,7 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -682,12 +662,12 @@ index a90055fe8819a32180754b6060a0f88e81d1a3b6..68825a2ad5a6ea1b0784a935206bd150
          this.targetSelector.addGoal(1, new OwnerHurtByTargetGoal(this));
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
 -        this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
-+        this.targetSelector.addGoal(3, (new HurtByTargetGoal(this/*, new Class[0]*/)).setAlertOthers()); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(3, (new HurtByTargetGoal(this/*,new Class[0]*/)).setAlertOthers()); // Plazma - Reduce allocations
          this.targetSelector.addGoal(4, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
          // this.targetSelector.addGoal(5, new NonTameRandomTargetGoal<>(this, Animal.class, false, Wolf.PREY_SELECTOR)); // Purpur - moved to updatePathfinders()
          this.targetSelector.addGoal(6, new NonTameRandomTargetGoal<>(this, Turtle.class, false, Turtle.BABY_ON_LAND_SELECTOR));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 8adcffc1e6434e06ca52d119a7326a1272897307..a6a697868b22224a26d6c39e594533c3b33e724b 100644
+index 3f36eedeae4b94ca684c57f4ec8d2d1ab5c51aae..b9650c83324165fa9c50f4f51bb889b165d4a260 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 @@ -84,7 +84,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -700,20 +680,20 @@ index 8adcffc1e6434e06ca52d119a7326a1272897307..a6a697868b22224a26d6c39e594533c3
      private final DynamicGameEventListener<VibrationSystem.Listener> dynamicVibrationListener;
      private VibrationSystem.Data vibrationData;
 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 1d896c6c49705acd87416dc11a1d8ce205f7844e..6d5c60cf9851fc358f29d25bf5d0de98ff7aeb40 100644
+index b300ebd589f2ce7393dd435cab5b80f3ec9289ee..b34f5e8137c082da776e52b7a42cdcce158bc7b2 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
-@@ -255,7 +255,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -254,7 +254,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
          this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 8.0F));
          this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 -        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
-+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this/*, new Class[0]*/)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(1, new HurtByTargetGoal(this/*,new Class[0]*/)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, LivingEntity.class, 0, false, false, WitherBoss.LIVING_ENTITY_SELECTOR));
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index a00646bc8a9caefe56e48b7682e8fb0c464b81fa..a2b5d2f1be493148a0ed102f10fd8b762b8d3981 100644
+index 28eb98d383d6846a25c29f8cd8ff211c360a56dc..a7de6f15ea81b9e3718c06b020c6eac71718b2a7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -79,7 +79,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -721,25 +701,25 @@ index a00646bc8a9caefe56e48b7682e8fb0c464b81fa..a2b5d2f1be493148a0ed102f10fd8b76
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 -        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
-+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this/*, new Class[0]*/)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(1, new HurtByTargetGoal(this/*,new Class[0]*/)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 54315fb84e3289f0ad8305c2c2cec980a5b2c627..5adcb3cb643025de833935ad0b962cf557d354aa 100644
+index 304ea7fdcd410a7c88ec61143364e14de8db0b0c..5d324a1d3d8f7a990b6caa724d31e2ad8a42ee13 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -154,7 +154,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -153,7 +153,7 @@ public class Creeper extends Monster implements PowerableMob {
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, true));
 -        this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
-+        this.targetSelector.addGoal(2, new HurtByTargetGoal(this/*, new Class[0]*/)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(2, new HurtByTargetGoal(this/*,new Class[0]*/)); // Plazma - Reduce allocations
      }
  
      public static AttributeSupplier.Builder createAttributes() {
 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 13bc6389652f8868d7539676ee6d85f37ba78f67..6e4dca9074132fc0fb8c90878bf5028729b72367 100644
+index 4c9ffa8e1ab97d8156ead0ed189c769ffd9b4aae..7f06da7e9ecc99ddd7e7c6ef38281fdcda50b7fe 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -138,7 +138,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -747,15 +727,15 @@ index 13bc6389652f8868d7539676ee6d85f37ba78f67..6e4dca9074132fc0fb8c90878bf50287
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
          this.targetSelector.addGoal(1, new EnderMan.EndermanLookForPlayerGoal(this, this::isAngryAt));
 -        this.targetSelector.addGoal(2, new HurtByTargetGoal(this, new Class[0]));
-+        this.targetSelector.addGoal(2, new HurtByTargetGoal(this/*, new Class[0]*/)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(2, new HurtByTargetGoal(this/*,new Class[0]*/)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Endermite.class, 10, true, false, (entityliving) -> entityliving.level().purpurConfig.endermanAggroEndermites && entityliving instanceof Endermite endermite && (!entityliving.level().purpurConfig.endermanAggroEndermitesOnlyIfPlayerSpawned || endermite.isPlayerSpawned()))); // Purpur
          this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 931412a5ab315d4080a9f5209d3e85d78642f4c2..0678c916eb6c7fe4a96d6716980892f80e77b3d8 100644
+index dbc27afbccb027963ae3f035c268835adedbb933..320916acbf22cd5d9a7aff7d3550de756bafeccd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-@@ -90,7 +90,7 @@ public class Silverfish extends Monster {
+@@ -89,7 +89,7 @@ public class Silverfish extends Monster {
          this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(5, new Silverfish.SilverfishMergeWithStoneGoal(this));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -765,7 +745,7 @@ index 931412a5ab315d4080a9f5209d3e85d78642f4c2..0678c916eb6c7fe4a96d6716980892f8
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index b44ffeb4cc0ef63fdd25683f60c5a20fcdeb9135..284aa2340079a4bdf9f1916b28596ea4a06a53ba 100644
+index 43ce5ffc6fc1853875f446b543d5b57502a21dc7..91504d3f3ce76d6cda743ced6d713a63092da6e6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -95,7 +95,7 @@ public class Spider extends Monster {
@@ -773,12 +753,12 @@ index b44ffeb4cc0ef63fdd25683f60c5a20fcdeb9135..284aa2340079a4bdf9f1916b28596ea4
          this.goalSelector.addGoal(6, new RandomLookAroundGoal(this));
          this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 -        this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
-+        this.targetSelector.addGoal(1, new HurtByTargetGoal(this/*, new Class[0]*/)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(1, new HurtByTargetGoal(this/*,new Class[0]*/)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new Spider.SpiderTargetGoal<>(this, Player.class));
          this.targetSelector.addGoal(3, new Spider.SpiderTargetGoal<>(this, IronGolem.class));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index c531d830f4d6b2d2213e160d7e1a5b50b80dbea5..18f33b417573417d5e3eb06768d9b59362c2dcf1 100644
+index 1be1bfb831198b68d8e20bf5ff922edff8832114..ff93e2b0360953884475e336dd1e786f8ae0288b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -166,7 +166,7 @@ public class Zombie extends Monster {
@@ -786,25 +766,38 @@ index c531d830f4d6b2d2213e160d7e1a5b50b80dbea5..18f33b417573417d5e3eb06768d9b593
          this.goalSelector.addGoal(6, new MoveThroughVillageGoal(this, 1.0D, true, 4, this::canBreakDoors));
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
 -        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(ZombifiedPiglin.class));
-+        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this/*, new Class[0]*/)).setAlertOthers(ZombifiedPiglin.class)); // Plazma - Reduce allocations
++        this.targetSelector.addGoal(1, (new HurtByTargetGoal(this/*,new Class[0]*/)).setAlertOthers(ZombifiedPiglin.class)); // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          // Purpur start
          if ( this.level().spigotConfig.zombieAggressiveTowardsVillager ) this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false) { // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index feba8a264bae656244f60296d0511a8046297f73..37dbf8ab18710fdd889073468c52cc0c6fc3ced2 100644
+index df8c7a45eb49a8c667030eb67d6d49dcbaef4fcf..9aa3a54dcbcc2c62b3b816fbf6c0cbd62202cd57 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -120,7 +120,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
--        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); // Paper - fix PigZombieAngerEvent cancellation
-+        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this/*, new Class[0]*/)).setAlertOthers()); // Paper - fix PigZombieAngerEvent cancellation // Plazma - Reduce allocations
+-        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this, new Class[0])).setAlertOthers()); // Paper - assign field
++        this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = (new HurtByTargetGoal(this/*,new Class[0]*/)).setAlertOthers()); // Paper - assign field // Plazma - Reduce allocations
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
          this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
      }
+diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
+index 17bef91546fa85d401b263c3a69fbf464f290eca..2b89f633c25927a3d6a8d7dd0beafdd3ed718d5d 100644
+--- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
++++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
+@@ -226,7 +226,7 @@ public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookEx
+         }
+ 
+         if (pattern.size() == l) {
+-            return new String[0];
++            return org.plazmamc.plazma.constants.Empty.STRING; // Plazma - Reduce allocations
+         } else {
+             String[] astring = new String[pattern.size() - l - k];
+ 
 diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-index a097cfc528f709c80575f35483b6878314ea2717..61840d78c4e99e706de56613d13d5741576ad660 100644
+index 252fc22844682c0f67dc02a87478e01e49b6430d..d61dfdb192dd8bfa9c669573f645682519e51c15 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 @@ -27,6 +27,7 @@ public class ShapelessRecipe extends io.papermc.paper.inventory.recipe.RecipeBoo
@@ -825,18 +818,18 @@ index a097cfc528f709c80575f35483b6878314ea2717..61840d78c4e99e706de56613d13d5741
              inventory: for (int index = 0; index < inventory.getContainerSize(); index++) {
                  ItemStack itemStack = inventory.getItem(index);
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 47b7baa41f341087bcd5dfec1d2a13b96f8357ca..72e410ad6bed528b7a1febd30079ab39e10fd5ed 100644
+index 596b77306f690a2298835f0f0fea1abee2a7c85d..18c5f56796388bc27d796000b14ca595c20d7a98 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -62,6 +62,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -60,6 +60,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          avoxelshape[8] = avoxelshape[7];
      });
 +    private static final int[] ZERO_INT = new int[]{0}; // Plazma - Reduce allocations // Plazma - Reduce allocations
  
-     @Override
-     public MapCodec<ComposterBlock> codec() {
-@@ -450,7 +451,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+     public static void bootStrap() {
+         ComposterBlock.COMPOSTABLES.defaultReturnValue(-1.0F);
+@@ -443,7 +444,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -845,7 +838,7 @@ index 47b7baa41f341087bcd5dfec1d2a13b96f8357ca..72e410ad6bed528b7a1febd30079ab39
          }
  
          @Override
-@@ -499,7 +500,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -492,7 +493,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -854,7 +847,7 @@ index 47b7baa41f341087bcd5dfec1d2a13b96f8357ca..72e410ad6bed528b7a1febd30079ab39
          }
  
          @Override
-@@ -541,7 +542,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -534,7 +535,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
  
          @Override
          public int[] getSlotsForFace(Direction side) {
@@ -877,7 +870,7 @@ index a907b79fd8291a0e92db138f37239d17424188a1..a402db6baa4b24b4c6750b01b8b2f56e
          int i = 0;
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 6cf83502a954cce9c562ec036bfeddb477d38b73..d28bffce82d0b40c31f240c016621ac06bbad178 100644
+index 9248769e6d357f6eec68945fd7700e79b2942c41..931806f365cf9a0587b18d115d98f5308a2f9407 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -444,7 +444,7 @@ public class RegionFile implements AutoCloseable {
@@ -921,7 +914,7 @@ index c68736b023127c7b395835f4fa82d9062110697b..71ca67be643254b49afa963068b5813c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-index 399da9d43aefbb95897df4697860d5bce5317152..df7816c1c5f069d89a22dbd876a2d663ba68949f 100644
+index 4bcecf2aaab3aed5daa96e1897fb105f013c82cc..c176150191809eaa9d44d7a5f4528c0e11cb52f4 100644
 --- a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
 +++ b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
 @@ -110,7 +110,7 @@ public class LevelStorageSource {
@@ -933,7 +926,7 @@ index 399da9d43aefbb95897df4697860d5bce5317152..df7816c1c5f069d89a22dbd876a2d663
              try {
                  BufferedReader bufferedreader = Files.newBufferedReader(allowedSymlinksFile);
  
-@@ -189,7 +189,7 @@ public class LevelStorageSource {
+@@ -180,7 +180,7 @@ public class LevelStorageSource {
      }
  
      public LevelStorageSource.LevelCandidates findLevelCandidates() throws LevelStorageException {
@@ -942,7 +935,7 @@ index 399da9d43aefbb95897df4697860d5bce5317152..df7816c1c5f069d89a22dbd876a2d663
              throw new LevelStorageException(Component.translatable("selectWorld.load_folder_access"));
          } else {
              try {
-@@ -198,11 +198,12 @@ public class LevelStorageSource {
+@@ -189,11 +189,12 @@ public class LevelStorageSource {
                  LevelStorageSource.LevelCandidates convertable_a;
  
                  try {
@@ -960,16 +953,31 @@ index 399da9d43aefbb95897df4697860d5bce5317152..df7816c1c5f069d89a22dbd876a2d663
  
                      convertable_a = new LevelStorageSource.LevelCandidates(list);
                  } catch (Throwable throwable) {
-@@ -312,7 +313,7 @@ public class LevelStorageSource {
-     private LevelSummary readLevelSummary(LevelStorageSource.LevelDirectory save, boolean locked) {
-         Path path = save.dataFile();
+@@ -278,12 +279,12 @@ public class LevelStorageSource {
  
--        if (Files.exists(path, new LinkOption[0])) {
-+        if (Files.exists(path/*, new LinkOption[0]*/)) { // Plazma - Reduce allocations
-             try {
-                 if (Files.isSymbolicLink(path)) {
-                     List<ForbiddenSymlinkInfo> list = this.worldDirValidator.validateSymlink(path);
-@@ -411,7 +412,7 @@ public class LevelStorageSource {
+     @Nullable
+     <T> T readLevelData(LevelStorageSource.LevelDirectory levelSave, BiFunction<Path, DataFixer, T> levelDataParser) {
+-        if (!Files.exists(levelSave.path(), new LinkOption[0])) {
++        if (!Files.exists(levelSave.path()/*, new LinkOption[0]*/)) { // Plazma - Reduce allocations
+             return null;
+         } else {
+             Path path = levelSave.dataFile();
+ 
+-            if (Files.exists(path, new LinkOption[0])) {
++            if (Files.exists(path)/*, new LinkOption[0]*/) { // Plazma - Reduce allocations
+                 T t0 = levelDataParser.apply(path, this.fixerUpper);
+ 
+                 if (t0 != null) {
+@@ -292,7 +293,7 @@ public class LevelStorageSource {
+             }
+ 
+             path = levelSave.oldDataFile();
+-            return Files.exists(path, new LinkOption[0]) ? levelDataParser.apply(path, this.fixerUpper) : null;
++            return Files.exists(path/*, new LinkOption[0]*/) ? levelDataParser.apply(path, this.fixerUpper) : null; // Plazma - Reduce allocations
+         }
+     }
+ 
+@@ -423,7 +424,7 @@ public class LevelStorageSource {
  
      public boolean levelExists(String name) {
          try {
@@ -978,20 +986,20 @@ index 399da9d43aefbb95897df4697860d5bce5317152..df7816c1c5f069d89a22dbd876a2d663
          } catch (InvalidPathException invalidpathexception) {
              return false;
          }
-@@ -752,7 +753,7 @@ public class LevelStorageSource {
-         }
+@@ -675,7 +676,7 @@ public class LevelStorageSource {
+             this.checkLock();
+             Path path = this.levelDirectory.dataFile();
  
-         public boolean hasWorldData() {
--            return Files.exists(this.levelDirectory.dataFile(), new LinkOption[0]) || Files.exists(this.levelDirectory.oldDataFile(), new LinkOption[0]);
-+            return Files.exists(this.levelDirectory.dataFile()/*, new LinkOption[0]*/) || Files.exists(this.levelDirectory.oldDataFile()/*, new LinkOption[0]*/); // Plazma - Reduce allocations
-         }
+-            if (Files.exists(path, new LinkOption[0])) {
++            if (Files.exists(path)/*, new LinkOption[0]*/) { // Plazma - Reduce allocations
+                 CompoundTag nbttagcompound = NbtIo.readCompressed(path.toFile());
+                 CompoundTag nbttagcompound1 = nbttagcompound.getCompound("Data");
  
-         public void close() throws IOException {
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 3dca62446fbb7c92f5f2908b36926bbe5e905dbb..042617c7de30707f66e60536cebc31e210647b64 100644
+index b4b74bff0579b919266e91464b36c9381342b677..5d521f0f614cdaaba68f64b9ee4051e347b28426 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -125,7 +125,7 @@ public class PlayerDataStorage {
+@@ -120,7 +120,7 @@ public class PlayerDataStorage {
          String[] astring = this.playerDir.list();
  
          if (astring == null) {
@@ -1014,10 +1022,10 @@ index 16d2aa4556bc9f32a2def7f9ca282aa3fa23fb87..8514da343ce287298477f2c977e49491
  
          @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 988cc1290200de629a4c24cc67a03e69c2fcc727..eb709829d84a4536208b39572e265ffb230ddd8a 100644
+index 3b3bbeda831f82b6d9b284d85a31a1fff578a64f..ce591f0ea9d135280fda83011b05cc74caf3b695 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -426,7 +426,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -457,7 +457,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void sendTitle(Title title) {
          Preconditions.checkNotNull(title, "Title is null");
          setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
@@ -1027,10 +1035,10 @@ index 988cc1290200de629a4c24cc67a03e69c2fcc727..eb709829d84a4536208b39572e265ffb
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index c5d1ba7a1be3f102edcdfdc05fc50b30ef1f775b..66006d9ff581ac96f13389261de0cd647279b98a 100644
+index 6d85237b21650edf1d2dc71abaf0edbe7a8aef6b..be71bfb63970d21e9b79f6b1b26138d5cd4ca0b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -610,7 +610,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -609,7 +609,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
                  throw new IllegalArgumentException("Invalid page number " + page + "/" + CraftMetaBook.this.getPageCount());
              }
  
@@ -1039,7 +1047,7 @@ index c5d1ba7a1be3f102edcdfdc05fc50b30ef1f775b..66006d9ff581ac96f13389261de0cd64
              CraftMetaBook.this.pages.set(page - 1, this.componentsToPage(newText));
          }
  
-@@ -623,7 +623,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -622,7 +622,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          public void addPage(final BaseComponent[]... pages) {
              for (BaseComponent[] page : pages) {
                  if (page == null) {

patches/server/0036-Lithium-HashedList.patch

@@ -288,7 +288,7 @@ index 0000000000000000000000000000000000000000..d11579075e653868a43fe826bdf9b41d
 +
 +}
 diff --git a/src/main/java/net/minecraft/util/random/WeightedRandomList.java b/src/main/java/net/minecraft/util/random/WeightedRandomList.java
-index 1bcb5a58b945cdb3dc94efb314d7ba41fbb38e07..3bd989b2af76392a31d2aca23fdab20a79dc3933 100644
+index 1bcb5a58b945cdb3dc94efb314d7ba41fbb38e07..34beb1b0af10877b3388e6f44913253eb51e7a51 100644
 --- a/src/main/java/net/minecraft/util/random/WeightedRandomList.java
 +++ b/src/main/java/net/minecraft/util/random/WeightedRandomList.java
 @@ -8,10 +8,10 @@ import net.minecraft.util.RandomSource;
@@ -300,7 +300,7 @@ index 1bcb5a58b945cdb3dc94efb314d7ba41fbb38e07..3bd989b2af76392a31d2aca23fdab20a
  
      WeightedRandomList(List<? extends E> entries) {
 -        this.items = ImmutableList.copyOf(entries);
-+        this.items = entries.size() > 4 ? ImmutableList.copyOf(entries) : java.util.Collections.unmodifiableList(new me.jellysquid.mods.lithium.common.util.collections.HashedReferenceList<>(entries)); // Plazma - Lithium: collections.mob_spawning
++        this.items = entries.size() > 4 ? ImmutableList.copyOf(entries) : java.util.Collections.unmodifiableList(new me.jellysquid.mods.lithium.common.util.collections.HashedReferenceList<>(entries));// Plazma - Lithium: collections.mob_spawning
          this.totalWeight = WeightedRandom.getTotalWeight(entries);
      }
  

patches/server/0037-Improve-SwingTime-ticking.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Improve SwingTime ticking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bfa69b2c37f07132f8b31c12d26f4ceb074901a5..61cf0db77966e35da9ca30718b7e667f4c8a9297 100644
+index 7fdb4d5eb1ab6c45c88ca18112d5b1b26bfd5947..57b1f741609193eced5e5ab1d45f18bea005eeb7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2624,6 +2624,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2602,6 +2602,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void updateSwingTime() {
-+        if (!this.swinging && this.swingTime == 0) return; // Plazma - Improve SwingTime ticking
++        if (!this.swinging && this.swingTime == 0) return; // Plazma - de-sisyphus :skull:
          int i = this.getCurrentSwingDuration();
  
          if (this.swinging) {

patches/server/0038-Save-Json-list-asynchronously.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Save Json list asynchronously
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java b/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
-index 1c9cf5e1c4ee05724ffcdbd77a19bca1ab2be4d3..bc3b251a3f8ad345bdaaf67be59ff2c143d4d130 100644
+index 935dac757280731bfeb0a8f033cbe315ecac46da..038f370ac2cb768e14fe7605b32b2ac811c33b8f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java
 @@ -60,20 +60,20 @@ public class DedicatedPlayerList extends PlayerList {
@@ -13,63 +13,63 @@ index 1c9cf5e1c4ee05724ffcdbd77a19bca1ab2be4d3..bc3b251a3f8ad345bdaaf67be59ff2c1
  
      private void saveIpBanList() {
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
++        //try { // Plazma - Build fix
              this.getIpBans().save();
 -        } catch (IOException var2) {
-+        /*} catch (IOException var2) { // Plazma - Save Json list asynchronously
++        /*} catch (IOException var2) { // Plazma - Build fix
              LOGGER.warn("Failed to save ip banlist: ", (Throwable)var2);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
++        }*/ // Plazma - Build fix
  
      }
  
      private void saveUserBanList() {
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
++        //try { // Plazma - Build fix
              this.getBans().save();
 -        } catch (IOException var2) {
-+        /*} catch (IOException var2) { // Plazma - Save Json list asynchronously
++        /*} catch (IOException var2) { // Plazma - Build fix
              LOGGER.warn("Failed to save user banlist: ", (Throwable)var2);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
++        }*/ // Plazma - Build fix
  
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index 1289e8e9c54a584f5037ea8e852df37376af093d..2014e0c4f412bead5881de588ec941a9a5ae3565 100644
+index 34b7c5421da93f14050425b0fc16bbc27e5f3eba..a35340b9231bc3009ca9449fa6ea8f8ae6929146 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
-@@ -43,11 +43,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -61,11 +61,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      public void add(V entry) {
          this.map.put(this.getKeyForUser(entry.getUser()), entry);
  
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
++        //try { // Plazma - Fix build
              this.save();
 -        } catch (IOException ioexception) {
-+        /*} catch (IOException ioexception) { // Plazma - Save Json list asynchronously
++        /*} catch (IOException ioexception) { // Plazma - Fix build
              StoredUserList.LOGGER.warn("Could not save the list after adding a user.", ioexception);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
++        }*/ // Plazma - Fix build
  
      }
  
-@@ -63,11 +63,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -83,11 +83,11 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
      public void remove(K key) {
          this.map.remove(this.getKeyForUser(key));
  
 -        try {
-+        //try { // Plazma - Save Json list asynchronously
++        //try { // Plazma - Fix build
              this.save();
 -        } catch (IOException ioexception) {
-+        /*} catch (IOException ioexception) { // Plazma - Save Json list asynchronously
++        /*} catch (IOException ioexception) { // Plazma - Fix build
              StoredUserList.LOGGER.warn("Could not save the list after removing a user.", ioexception);
 -        }
-+        }*/ // Plazma - Save Json list asynchronously
++        }*/ // Plazma - Fix build
  
      }
  
-@@ -102,7 +102,10 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -142,7 +142,10 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
          return this.map.values();
      }
  
@@ -81,7 +81,7 @@ index 1289e8e9c54a584f5037ea8e852df37376af093d..2014e0c4f412bead5881de588ec941a9
          this.removeExpired(); // Paper - remove expired values before saving
          JsonArray jsonarray = new JsonArray();
          Stream<JsonObject> stream = this.map.values().stream().map((jsonlistentry) -> { // CraftBukkit - decompile error
-@@ -114,27 +117,16 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+@@ -154,27 +157,16 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
  
          Objects.requireNonNull(jsonarray);
          stream.forEach(jsonarray::add);
@@ -110,7 +110,7 @@ index 1289e8e9c54a584f5037ea8e852df37376af093d..2014e0c4f412bead5881de588ec941a9
  
 +        });
      }
-+    // Plazma end - Save Json list asynchronously
++    // Plazma end
  
      public void load() throws IOException {
          if (this.file.exists()) {

patches/server/0039-Async-PathProcessing.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Async PathProcessing
 
 
 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 abcc3ef59475ac170fd10b4dd4a4f3371faf17e0..4d9f3df83c1f30b7cd9446679429a7e6243a3287 100644
+index 8f8b29f80d1573981ccffd207dd6e0941e71a352..5b74ad5cbfc874af29293ec3a7bb17c737cff32f 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
 @@ -68,6 +68,31 @@ public class AcquirePoi {
@@ -440,10 +440,10 @@ index 8db20db72cd51046213625fac46c35854c59ec5d..51755c966cc9c778f746bc0f972d8887
              // Paper end - optimise POI access
              if (path != null && path.canReach()) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 8f28c80cdb15005ddc0886581cd457e880f1f71c..8c341e6b67a601139053b99acb0fdb69848162dc 100644
+index 8424a7f7066fb3f8a4007b063db05ec0b8270ea3..a28bd4eb001466750ad78bf98a843265cf8e2f0b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -1155,6 +1155,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1148,6 +1148,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                              Bee.this.pathfindRandomlyTowards(Bee.this.hivePos);
                          }
                      } else {
@@ -451,7 +451,7 @@ index 8f28c80cdb15005ddc0886581cd457e880f1f71c..8c341e6b67a601139053b99acb0fdb69
                          boolean flag = this.pathfindDirectlyTowards(Bee.this.hivePos);
  
                          if (!flag) {
-@@ -1216,7 +1217,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -1209,7 +1210,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
              } else {
                  Path pathentity = Bee.this.navigation.getPath();
  
@@ -461,10 +461,10 @@ index 8f28c80cdb15005ddc0886581cd457e880f1f71c..8c341e6b67a601139053b99acb0fdb69
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index de5b3f19eea5f63732905fc1f2c95b05c720d134..0123fd94e1f415dd2dcc8262ada7ca8732cd75ea 100644
+index 4e471e4a259a64c44da5ab450f0137691428ff6a..34c69053708d26ca94ae6619b06c2cbf09e427e1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-@@ -455,6 +455,18 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -460,6 +460,18 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
              super(frog, world);
          }
  
@@ -483,7 +483,7 @@ index de5b3f19eea5f63732905fc1f2c95b05c720d134..0123fd94e1f415dd2dcc8262ada7ca87
          @Override
          public boolean canCutCorner(BlockPathTypes nodeType) {
              return nodeType != BlockPathTypes.WATER_BORDER && super.canCutCorner(nodeType);
-@@ -464,6 +476,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
+@@ -469,6 +481,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
          protected PathFinder createPathFinder(int range) {
              this.nodeEvaluator = new Frog.FrogNodeEvaluator(true);
              this.nodeEvaluator.setCanPassDoors(true);
@@ -492,7 +492,7 @@ index de5b3f19eea5f63732905fc1f2c95b05c720d134..0123fd94e1f415dd2dcc8262ada7ca87
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 034bb2d1292dde6276885c3ea71d886c3894311c..7b0daf88a0f841ce23b01faf0bcc29a8bcc5795f 100644
+index 63a1cf5604c14025171d7be7434e2d6b64c98107..c6153ee51da405c02b53b9820a9bb424068ccbde 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -293,7 +293,7 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -536,10 +536,10 @@ index 2f49b528601a1feb7246fe7a9b83ce828c2d78fc..23d3eb11ac84a1eac53690f6d5acceed
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 0386aeaeee04b62cc30badb30dd6dcd34d6045b7..060203a6fd246224cbf59e39bf3dc29118b43892 100644
+index 8a5d8f9ad1bd94ca53c1ffd1872275c07a52f0b7..9aedb96f7eeaa73150010ec320e2677a105b5ac0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -642,6 +642,15 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -641,6 +641,15 @@ public class Warden extends Monster implements VibrationSystem {
              protected PathFinder createPathFinder(int range) {
                  this.nodeEvaluator = new WalkNodeEvaluator();
                  this.nodeEvaluator.setCanPassDoors(true);
@@ -716,7 +716,7 @@ index 0e2b14e7dfedf209d63279c81723fd7955122d78..49bc50ea74a59e67a6d43ff9a68c17e9
      public SwimNodeEvaluator(boolean canJumpOutOfWater) {
          this.allowBreaching = canJumpOutOfWater;
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
-index c83125338d0eea86c65a42450367b084c3c9df44..98f7a83628cdbe3e48cfefd14e29386a5ede3de1 100644
+index 3cfb9357d0c61e84488c2c60f073fa12df942b8e..c8948dca6c8325d16f4d8f2184d7490bf1265a49 100644
 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
 @@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations;
@@ -727,7 +727,7 @@ index c83125338d0eea86c65a42450367b084c3c9df44..98f7a83628cdbe3e48cfefd14e29386a
  import org.spongepowered.configurate.objectmapping.meta.Setting;
  
  @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
-@@ -65,6 +66,35 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -66,6 +67,35 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      }
  

settings.gradle.kts

@@ -23,7 +23,7 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "plazma"
-for (name in listOf("Plazma-API", "Plazma-Server", "Plazma-MojangAPI")) {
+for (name in listOf("Plazma-API", "Plazma-Server")) {
     val projName = name.lowercase(Locale.ENGLISH)
     include(projName)
     findProject(":$projName")!!.projectDir = file(name)