1.21.4 (#413)

* init 1.21.4, and boom! * build change, but weight not work * just work * Build changes, and delete timings * Fix API patches (#406) * Fix API patches * merge --------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> * 0006/0129 * 0009/0129 * 0011/0129 * 0018/0129 * 0030/0129 * 0035/0129 * 0043/0129 * 0048/0129 * 0049/0129 * 0057/0129 * 0065/0129 * 0086/0129 (#408) * 0072/0129 * 0080/0129 * Readd patch infos * 0086/0129 * Delete applied patches * 0087/0129 * 0091/0129 * 0097/0129 * 0101/0129 * 102/129 * 0107/0129 * 0112/0129 * 0118/0129 * 0129/0129, 100% patched * fix some * server work * Protocol... (#409) * Jade v7 * Fix changed part for Jade * Formatting imports, add Lms Paster protocol * REI payloads 5/8 * Add REI support, remove unnecessary content in Jade * Rename * Make jade better * Make action work * fix action jar * Fix some protocol * Fix bot action, and entity tickCount * Fix Warden GameEventListener register on load * Fix extra Raider drop * Fix grindstone overstacking * Update Paper, and some doc * Merge * [ci skip] Update Action --------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
2025-12-19 06:49:34 +00:00 · 2025-02-14 23:55:46 +08:00
parent 46e8b6c59c
commit d5c9306a7f
457 changed files with 34990 additions and 33902 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
      - name: Get Build Number
        run: bash scripts/GetBuildNumber.sh
      - name: Apply Patches
-        run: ./gradlew applyPatches
+        run: ./gradlew applyAllPatches
      - name: Create Leavesclip Jar
        run: ./gradlew createMojmapLeavesclipJar
        env:
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,10 +25,10 @@ jobs:
          cache-read-only: false
      - name: Setup Git Config
        run: |
-          git config --global user.email "ci@leavesmc.org"
-          git config --global user.name "LeavesMC CI"
+          git config --global user.email "ci-test@leavesmc.org"
+          git config --global user.name "LeavesMC Test CI"
      - name: Apply Patches
-        run: ./gradlew applyPatches
+        run: ./gradlew applyAllPatches
      - name: Create Leavesclip Jar
        run: ./gradlew createMojmapLeavesclipJar
      - name: Move Jar
@@ -38,7 +38,7 @@ jobs:
          }
          
          jarName="leaves-$(prop mcVersion).jar"
-          mv build/libs/Leaves-leavesclip-"$(prop version)"-mojmap.jar "$jarName"
+          mv leaves-server/build/libs/leaves-leavesclip-"$(prop version)"-mojmap.jar "$jarName"
          echo "jar=$jarName" >> "$GITHUB_ENV"
      - name: Upload Artifact
        uses: actions/upload-artifact@v4
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-.gradle/
-build/
+.gradle

 # Eclipse stuff
 .classpath
@@ -24,9 +23,10 @@ dependency-reduced-pom.xml
 .*.sw[a-p]

 # various other potential build files
-build/
-bin/
-dist/
+/build
+*/build/
+bin
+dist
 manifest.mf

 # Mac filesystem dust
@@ -44,12 +44,13 @@ out/
 *~

 # other stuff
-leaves-server
-leaves-api
-paper-api-generator
-mc-dev
-.idea
-testserver
+/leaves-api/build.gradle.kts
+/leaves-server/build.gradle.kts
+/leaves-server/src/minecraft
+
+/paper-server
+/paper-api
+
 run

 # other sh
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ maven {
 }

 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves-api:1.21.3-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves-api:1.21.4-R0.1-SNAPSHOT")
 }
 ```

@@ -40,7 +40,7 @@ Each time you want to update your dependency, you must re-build Leaves.
 Leaves-Server:
 ```kotlin
 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves:1.21.3-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves:1.21.4-R0.1-SNAPSHOT")
 }
 ```

@@ -48,9 +48,9 @@ dependencies {

 You need JDK 21 and good Internet conditions

-Clone this repo, run `./gradlew applyPatches`, then run `./gradlew createMojmapLeavesclipJar` in your terminal.  
+Clone this repo, run `./gradlew applyAllPatches`, then run `./gradlew createMojmapLeavesclipJar` in your terminal.  

-You can find the jars in the `build/libs` directory.
+You can find the jars in the `leaves-server/build/libs` directory.

 ## Pull Requests

--- a/README_cn.md
+++ b/README_cn.md
@@ -30,7 +30,7 @@ maven {
 }

 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves-api:1.21.3-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves-api:1.21.4-R0.1-SNAPSHOT")
 }
 ```

@@ -39,7 +39,7 @@ dependencies {
 Leaves-Server:
 ```kotlin
 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves:1.21.3-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves:1.21.4-R0.1-SNAPSHOT")
 }
 ```

@@ -47,9 +47,9 @@ dependencies {

 你需要最低 JDK 21 和一个可以正常访问各种 git/maven 库的网络

-首先克隆此储存库，然后在你的终端里依次执行 `./gradlew applyPatches` 和 `./gradlew createMojmapLeavesclipJar`
+首先克隆此储存库，然后在你的终端里依次执行 `./gradlew applyAllPatches` 和 `./gradlew createMojmapLeavesclipJar`

-最后 你可以在 `build/libs` 文件夹里找到对应的jar文件
+最后 你可以在 `leaves-server/build/libs` 文件夹里找到对应的jar文件

 ## 对于想要出一份力的开发者

--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,32 +1,35 @@
 plugins {
    java
-    `maven-publish`
-    id("org.leavesmc.leavesweight.patcher") version "1.0.2-SNAPSHOT"
+    id("org.leavesmc.leavesweight.patcher") version "2.0.0-SNAPSHOT"
 }

-allprojects {
-    apply(plugin = "java")
+subprojects {
+    apply(plugin = "java-library")
    apply(plugin = "maven-publish")

-    java {
+    extensions.configure<JavaPluginExtension> {
        toolchain {
            languageVersion = JavaLanguageVersion.of(21)
        }
    }
-}

-subprojects {
-    apply(plugin = "java")
-
-    java {
-        toolchain {
-            languageVersion.set(JavaLanguageVersion.of(21))
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven("https://repo.papermc.io/repository/maven-public/")
+        maven("https://repo.leavesmc.org/releases") {
+            content { onlyForConfigurations("leavesclip") }
        }
    }

+    tasks.withType<AbstractArchiveTask>().configureEach {
+        isPreserveFileTimestamps = false
+        isReproducibleFileOrder = true
+    }
    tasks.withType<JavaCompile> {
        options.encoding = Charsets.UTF_8.name()
-        options.release.set(21)
+        options.release = 21
+        options.isFork = true
    }
    tasks.withType<Javadoc> {
        options.encoding = Charsets.UTF_8.name()
@@ -35,58 +38,8 @@ subprojects {
        filteringCharset = Charsets.UTF_8.name()
    }

-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven("https://oss.sonatype.org/content/groups/public/")
-        maven("https://repo.papermc.io/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")
-    }
-}

-repositories {
-    mavenCentral()
-    maven("https://repo.leavesmc.org/releases") {
-        content { onlyForConfigurations("leavesclip") }
-    }
-}
-
-dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
-    decompiler("org.vineflower:vineflower:1.10.1")
-    leavesclip("org.leavesmc:leavesclip:2.0.1")
-}
-
-paperweight {
-    serverProject.set(project(":leaves-server"))
-
-    remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://files.minecraftforge.net/maven/")
-
-    usePaperArchiveUpstream(providers.gradleProperty("paperRef")) {
-        withPaperPatcher {
-            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("leaves-api"))
-
-            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("leaves-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")
-        }
-    }
-}
-
-allprojects {
-    publishing {
+    extensions.configure<PublishingExtension> {
        repositories {
            maven("https://repo.leavesmc.org/snapshots") {
                name = "leaves"
@@ -98,3 +51,26 @@ allprojects {
        }
    }
 }
+
+paperweight {
+    upstreams.paper {
+        ref = providers.gradleProperty("paperRef")
+
+        patchFile {
+            path = "paper-server/build.gradle.kts"
+            outputFile = file("leaves-server/build.gradle.kts")
+            patchFile = file("leaves-server/build.gradle.kts.patch")
+        }
+        patchFile {
+            path = "paper-api/build.gradle.kts"
+            outputFile = file("leaves-api/build.gradle.kts")
+            patchFile = file("leaves-api/build.gradle.kts.patch")
+        }
+        patchDir("paperApi") {
+            upstreamPath = "paper-api"
+            excludes = setOf("build.gradle.kts")
+            patchesDir = file("leaves-api/paper-patches")
+            outputDir = file("paper-api")
+        }
+    }
+}
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -41,7 +41,7 @@ The patching system is based on git, and you can learn about it at here: <https:
 If you have forked the main repository, then you should follow the steps below:

 1. Clone your repository to local
-2. Run Gradle's `applyPatches` task in your IDE or terminal (You can run `./gradlew applyPatches` directly in terminal.)
+2. Run Gradle's `applyAllPatches` task in your IDE or terminal (You can run `./gradlew applyAllPatches` directly in terminal.)
 3. Enter `leaves-api` or `leaves-server` directory to carry out modifications.

 BTW, `leaves-api` and `leaves-server` are not normal git repositories.
@@ -57,7 +57,7 @@ It's very easy to to add patches by following the steps below:
 1. Modify the code of `leaves-api` and / or `leaves-server`
 2. Add these changes to the local git repository (For example, `git add .`)
 3. Commit these changes using `git commit -m <Commit Message>`
-4. Run Gradle's task `rebuildPatches` to convert your commits to a new patch
+4. Run Gradle's task `rebuildAllServerPatches` to convert your commits to a new patch
 5. Push your patches to your repository

 After pushing, you can open a PR to submit your patches.
@@ -70,5 +70,5 @@ You can modify a existing patch by following the steps below:
 2. Run `git commit -a --fixup <hash>` in your terminal to make a fix-up commit
    - If you want to edit the commit message, replace `--fixup` with `--squash`.
 3. Run `git rebase -i --autosquash base` to rebase automatically, then just type `:q` to close the confirm page
-4. Run Gradle's task `rebuildPatches` to modify existing patches
+4. Run Gradle's task `rebuildAllServerPatches` to modify existing patches
 5. Push and PR again
--- a/docs/CONTRIBUTING_cn.md
+++ b/docs/CONTRIBUTING_cn.md
@@ -38,7 +38,7 @@ Leaves 使用和 Paper 一样的补丁系统，并为了针对不同部分的修
 如果你已经 Fork 了主储存库，那么下面你应该这么做：

 1. 将你的仓库 clone 到本地；
-2. 在你的 IDE 或 终端 内执行 Gradle 的 `applyPatches` 任务，如果是在终端内，你可以执行 `./gradlew applyPatches`；
+2. 在你的 IDE 或 终端 内执行 Gradle 的 `applyAllPatches` 任务，如果是在终端内，你可以执行 `./gradlew applyAllPatches`；
 3. 进入 `leaves-api` 或 `leaves-server` 文件夹进行修改。

 By the way，`leaves-api` 和 `leaves-server` 并不是正常的 git 仓库。
@@ -54,7 +54,7 @@ By the way，`leaves-api` 和 `leaves-server` 并不是正常的 git 仓库。
 1. 对 `leaves-api` 或者 / 和 `leaves-server` 进行修改；
 2. 使用 git 添加你的修改，比如 `git add .`；
 3. 使用 `git commit -m <提交信息>` 进行提交；
-4. 运行 Gradle 任务 `rebuildPatches` 将你的提交转化为一个补丁；
+4. 运行 Gradle 任务 `rebuildAllServerPatches` 将你的提交转化为一个补丁；
 5. 将你生成的补丁文件进行推送。

 这样做以后，你就可以将你的补丁文件进行 PR 提交。
@@ -67,5 +67,5 @@ By the way，`leaves-api` 和 `leaves-server` 并不是正常的 git 仓库。
 2. 使用 `git commit -a --fixup <hash>` 来进行一个更正提交；
   - 如果你想要更改提交信息，你也可以用 `--squash` 来代替 `--fixup`。
 3. 使用 `git rebase -i --autosquash base` 来进行自动变基，你只需要输入 `:q` 来关闭确认页面即可；
-4. 运行 Gradle 任务 `rebuildPatches` 来修改已被修改的补丁；
+4. 运行 Gradle 任务 `rebuildAllServerPatches` 来修改已被修改的补丁；
 5. 将修改后的补丁 PR 发回储存库。
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group=org.leavesmc.leaves
-version=1.21.3-R0.1-SNAPSHOT
-mcVersion=1.21.3
-paperRef=5a60ffb8b1cc88c1480a4c5f5c221291be97527f
-preVersion=false
+version=1.21.4-R0.1-SNAPSHOT
+mcVersion=1.21.4
+paperRef=46f4fdaae3661941ac86f2157e625d907fdd8e81
+preVersion=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.caching=true
 org.gradle.parallel=true
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/leaves-api/build.gradle.kts.patch
+++ b/leaves-api/build.gradle.kts.patch
@@ -0,0 +1,84 @@
+--- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts
+@@ -93,19 +_,33 @@
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+ }
+ 
+-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() // Leaves - build change
+ idea {
+     module {
+         generatedSourceDirs.add(generatedApiPath.toFile())
+     }
+ }
+// Leaves start - build change
+ sourceSets {
+     main {
+         java {
+             srcDir(generatedApiPath)
+            srcDir(file("../paper-api/src/main/java"))
+        }
+        resources {
+            srcDir(file("../paper-api/src/main/resources"))
+        }
+    }
+    test {
+        java {
+            srcDir(file("../paper-api/src/test/java"))
+        }
+        resources {
+            srcDir(file("../paper-api/src/test/resources"))
+         }
+     }
+ }
+// Leaves end - build change
+ 
+ val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
+ val mainCapability = "${project.group}:${project.name}:${project.version}"
+@@ -150,6 +_,16 @@
+     }
+ }
+ 
+// Leaves start - hide irrelevant compilation warnings
+tasks.withType<JavaCompile> {
+    val compilerArgs = options.compilerArgs
+    compilerArgs.add("-Xlint:-module")
+    compilerArgs.add("-Xlint:-removal")
+    compilerArgs.add("-Xlint:-dep-ann")
+    compilerArgs.add("--add-modules=jdk.incubator.vector") // Leaves - SIMD support
+}
+// Leaves end - hide irrelevant compilation warnings
+
+ tasks.jar {
+     from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
+         into("META-INF/maven/${project.group}/${project.name}")
+@@ -169,7 +_,7 @@
+ 
+ tasks.withType<Javadoc> {
+     val options = options as StandardJavadocDocletOptions
+-    options.overview = "src/main/javadoc/overview.html"
+    options.overview = "../paper-api/src/main/javadoc/overview.html" // Leaves - build change
+     options.use()
+     options.isDocFilesSubDirs = true
+     options.links(
+@@ -202,16 +_,18 @@
+     }
+ 
+     // workaround for https://github.com/gradle/gradle/issues/4046
+-    inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset")
+    inputs.dir("../paper-api/src/main/javadoc").withPropertyName("javadoc-sourceset") // Leaves - build change
+     val fsOps = services.fileSystemOperations
+     doLast {
+         fsOps.copy {
+-            from("src/main/javadoc") {
+            from("../paper-api/src/main/javadoc") { // Leaves - build change
+                 include("**/doc-files/**")
+             }
+             into("build/docs/javadoc")
+         }
+     }
+    options.addStringOption("Xdoclint:none", "-quiet") // Leaves - hide irrelevant compilation warnings
+    options.addStringOption("-add-modules", "jdk.incubator.vector") // Leaves - SIMD support
+ }
+ 
+ tasks.test {
--- a/leaves-api/paper-patches/features/0001-Delete-Timings.patch
+++ b/leaves-api/paper-patches/features/0001-Delete-Timings.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Thu, 24 Aug 2023 19:21:31 +0800
+Date: Sun, 26 Jan 2025 14:49:07 +0800
 Subject: [PATCH] Delete Timings


@@ -2094,8 +2094,776 @@ index 632c4961515f5052551f841cfa840e60bba7a257..00000000000000000000000000000000
 -        super.stopTiming();
 -    }
 -}
+diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
+deleted file mode 100644
+index dae84243804b4b076cafb3e1b29bdcf614efc93f..0000000000000000000000000000000000000000
+--- a/src/main/java/co/aikar/util/Counter.java
+++ /dev/null
+@@ -1,39 +0,0 @@
+-package co.aikar.util;
+-
+-import com.google.common.collect.ForwardingMap;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-
+-@Deprecated(forRemoval = true)
+-public class Counter <T> extends ForwardingMap<T, Long> {
+-    private final Map<T, Long> counts = new HashMap<>();
+-
+-    public long decrement(@Nullable T key) {
+-        return increment(key, -1);
+-    }
+-    public long increment(@Nullable T key) {
+-        return increment(key, 1);
+-    }
+-    public long decrement(@Nullable T key, long amount) {
+-        return increment(key, -amount);
+-    }
+-    public long increment(@Nullable T key, long amount) {
+-        Long count = this.getCount(key);
+-        count += amount;
+-        this.counts.put(key, count);
+-        return count;
+-    }
+-
+-    public long getCount(@Nullable T key) {
+-        return this.counts.getOrDefault(key, 0L);
+-    }
+-
+-    @NotNull
+-    @Override
+-    protected Map<T, Long> delegate() {
+-        return this.counts;
+-    }
+-}
+diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
+deleted file mode 100644
+index c105a1429ca58b37be265708ec345e00f0d43ed8..0000000000000000000000000000000000000000
+--- a/src/main/java/co/aikar/util/JSONUtil.java
+++ /dev/null
+@@ -1,141 +0,0 @@
+-package co.aikar.util;
+-
+-import com.google.common.base.Function;
+-import com.google.common.collect.Lists;
+-import com.google.common.collect.Maps;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-import org.json.simple.JSONArray;
+-import org.json.simple.JSONObject;
+-
+-import java.util.ArrayList;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Provides Utility methods that assist with generating JSON Objects
+- */
+-@SuppressWarnings({"rawtypes", "SuppressionAnnotation"})
+-@Deprecated(forRemoval = true)
+-public final class JSONUtil {
+-    private JSONUtil() {}
+-
+-    /**
+-     * Creates a key/value "JSONPair" object
+-     *
+-     * @param key Key to use
+-     * @param obj Value to use
+-     * @return JSONPair
+-     */
+-    @NotNull
+-    public static JSONPair pair(@NotNull String key, @Nullable Object obj) {
+-        return new JSONPair(key, obj);
+-    }
+-
+-    @NotNull
+-    public static JSONPair pair(long key, @Nullable Object obj) {
+-        return new JSONPair(String.valueOf(key), obj);
+-    }
+-
+-    /**
+-     * Creates a new JSON object from multiple JSONPair key/value pairs
+-     *
+-     * @param data JSONPairs
+-     * @return Map
+-     */
+-    @NotNull
+-    public static Map<String, Object> createObject(@NotNull JSONPair... data) {
+-        return appendObjectData(new LinkedHashMap(), data);
+-    }
+-
+-    /**
+-     * This appends multiple key/value Obj pairs into a JSON Object
+-     *
+-     * @param parent Map to be appended to
+-     * @param data Data to append
+-     * @return Map
+-     */
+-    @NotNull
+-    public static Map<String, Object> appendObjectData(@NotNull Map parent, @NotNull JSONPair... data) {
+-        for (JSONPair JSONPair : data) {
+-            parent.put(JSONPair.key, JSONPair.val);
+-        }
+-        return parent;
+-    }
+-
+-    /**
+-     * This builds a JSON array from a set of data
+-     *
+-     * @param data Data to build JSON array from
+-     * @return List
+-     */
+-    @NotNull
+-    public static List toArray(@NotNull Object... data) {
+-        return Lists.newArrayList(data);
+-    }
+-
+-    /**
+-     * These help build a single JSON array using a mapper function
+-     *
+-     * @param collection Collection to apply to
+-     * @param mapper Mapper to apply
+-     * @param <E> Element Type
+-     * @return List
+-     */
+-    @NotNull
+-    public static <E> List toArrayMapper(@NotNull E[] collection, @NotNull Function<E, Object> mapper) {
+-        return toArrayMapper(Lists.newArrayList(collection), mapper);
+-    }
+-
+-    @NotNull
+-    public static <E> List toArrayMapper(@NotNull Iterable<E> collection, @NotNull Function<E, Object> mapper) {
+-        List array = Lists.newArrayList();
+-        for (E e : collection) {
+-            Object object = mapper.apply(e);
+-            if (object != null) {
+-                array.add(object);
+-            }
+-        }
+-        return array;
+-    }
+-
+-    /**
+-     * These help build a single JSON Object from a collection, using a mapper function
+-     *
+-     * @param collection Collection to apply to
+-     * @param mapper Mapper to apply
+-     * @param <E> Element Type
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <E> Map toObjectMapper(@NotNull E[] collection, @NotNull Function<E, JSONPair> mapper) {
+-        return toObjectMapper(Lists.newArrayList(collection), mapper);
+-    }
+-
+-    @NotNull
+-    public static <E> Map toObjectMapper(@NotNull Iterable<E> collection, @NotNull Function<E, JSONPair> mapper) {
+-        Map object = Maps.newLinkedHashMap();
+-        for (E e : collection) {
+-            JSONPair JSONPair = mapper.apply(e);
+-            if (JSONPair != null) {
+-                object.put(JSONPair.key, JSONPair.val);
+-            }
+-        }
+-        return object;
+-    }
+-
+-    /**
+-     * Simply stores a key and a value, used internally by many methods below.
+-     */
+-    @SuppressWarnings("PublicInnerClass")
+-    public static class JSONPair {
+-        final String key;
+-        final Object val;
+-
+-        JSONPair(@NotNull String key, @NotNull Object val) {
+-            this.key = key;
+-            this.val = val;
+-        }
+-    }
+-}
+diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
+deleted file mode 100644
+index 5753b9bce89db2ac378ec41f1b61907cc2e23335..0000000000000000000000000000000000000000
+--- a/src/main/java/co/aikar/util/LoadingIntMap.java
+++ /dev/null
+@@ -1,77 +0,0 @@
+-/*
+- * Copyright (c) 2015. Starlis LLC / dba Empire Minecraft
+- *
+- * This source code is proprietary software and must not be redistributed without Starlis LLC's approval
+- *
+- */
+-package co.aikar.util;
+-
+-
+-import com.google.common.base.Function;
+-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-
+-/**
+- * Allows you to pass a Loader function that when a key is accessed that doesn't exist,
+- * automatically loads the entry into the map by calling the loader Function.
+- *
+- * .get() Will only return null if the Loader can return null.
+- *
+- * You may pass any backing Map to use.
+- *
+- * This class is not thread safe and should be wrapped with Collections.synchronizedMap on the OUTSIDE of the LoadingMap if needed.
+- *
+- * Do not wrap the backing map with Collections.synchronizedMap.
+- *
+- * @param <V> Value
+- */
+-@Deprecated(forRemoval = true)
+-public class LoadingIntMap<V> extends Int2ObjectOpenHashMap<V> {
+-    private final Function<Integer, V> loader;
+-
+-    public LoadingIntMap(@NotNull Function<Integer, V> loader) {
+-        super();
+-        this.loader = loader;
+-    }
+-
+-    public LoadingIntMap(int expectedSize, @NotNull Function<Integer, V> loader) {
+-        super(expectedSize);
+-        this.loader = loader;
+-    }
+-
+-    public LoadingIntMap(int expectedSize, float loadFactor, @NotNull Function<Integer, V> loader) {
+-        super(expectedSize, loadFactor);
+-        this.loader = loader;
+-    }
+-
+-
+-    @Nullable
+-    @Override
+-    public V get(int key) {
+-        V res = super.get(key);
+-        if (res == null) {
+-            res = loader.apply(key);
+-            if (res != null) {
+-                put(key, res);
+-            }
+-        }
+-        return res;
+-    }
+-
+-    /**
+-     * Due to java stuff, you will need to cast it to (Function) for some cases
+-     *
+-     * @param <T> Type
+-     */
+-    public abstract static class Feeder <T> implements Function<T, T> {
+-        @Nullable
+-        @Override
+-        public T apply(@Nullable Object input) {
+-            return apply();
+-        }
+-
+-        @Nullable
+-        public abstract T apply();
+-    }
+-}
+diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
+deleted file mode 100644
+index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..0000000000000000000000000000000000000000
+--- a/src/main/java/co/aikar/util/LoadingMap.java
+++ /dev/null
+@@ -1,369 +0,0 @@
+-/*
+- * This file is licensed under the MIT License (MIT).
+- *
+- * Copyright (c) 2014 Daniel Ennis <http://aikar.co>
+- *
+- * 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.
+- */
+-package co.aikar.util;
+-
+-import com.google.common.base.Preconditions;
+-import java.lang.reflect.Constructor;
+-import java.util.AbstractMap;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.IdentityHashMap;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.function.Function;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-
+-/**
+- * Allows you to pass a Loader function that when a key is accessed that doesn't exists,
+- * automatically loads the entry into the map by calling the loader Function.
+- *
+- * .get() Will only return null if the Loader can return null.
+- *
+- * You may pass any backing Map to use.
+- *
+- * This class is not thread safe and should be wrapped with Collections.synchronizedMap on the OUTSIDE of the LoadingMap if needed.
+- *
+- * Do not wrap the backing map with Collections.synchronizedMap.
+- *
+- * @param <K> Key
+- * @param <V> Value
+- */
+-@Deprecated(forRemoval = true)
+-public class LoadingMap <K, V> extends AbstractMap<K, V> {
+-    private final Map<K, V> backingMap;
+-    private final java.util.function.Function<K, V> loader;
+-
+-    /**
+-     * Initializes an auto loading map using specified loader and backing map
+-     * @param backingMap Map to wrap
+-     * @param loader Loader
+-     */
+-    public LoadingMap(@NotNull Map<K, V> backingMap, @NotNull java.util.function.Function<K, V> loader) {
+-        this.backingMap = backingMap;
+-        this.loader = loader;
+-    }
+-
+-    /**
+-     * Creates a new LoadingMap with the specified map and loader
+-     *
+-     * @param backingMap Actual map being used.
+-     * @param loader Loader to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> of(@NotNull Map<K, V> backingMap, @NotNull Function<K, V> loader) {
+-        return new LoadingMap<>(backingMap, loader);
+-    }
+-
+-    /**
+-     * Creates a LoadingMap with an auto instantiating loader.
+-     *
+-     * Will auto construct class of of Value when not found
+-     *
+-     * Since this uses Reflection, It is more effecient to define your own static loader
+-     * than using this helper, but if performance is not critical, this is easier.
+-     *
+-     * @param backingMap Actual map being used.
+-     * @param keyClass Class used for the K generic
+-     * @param valueClass Class used for the V generic
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map that auto instantiates on .get()
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newAutoMap(@NotNull Map<K, V> backingMap, @Nullable final Class<? extends K> keyClass,
+-                                              @NotNull final Class<? extends V> valueClass) {
+-        return new LoadingMap<>(backingMap, new AutoInstantiatingLoader<>(keyClass, valueClass));
+-    }
+-    /**
+-     * Creates a LoadingMap with an auto instantiating loader.
+-     *
+-     * Will auto construct class of of Value when not found
+-     *
+-     * Since this uses Reflection, It is more effecient to define your own static loader
+-     * than using this helper, but if performance is not critical, this is easier.
+-     *
+-     * @param backingMap Actual map being used.
+-     * @param valueClass Class used for the V generic
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map that auto instantiates on .get()
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newAutoMap(@NotNull Map<K, V> backingMap,
+-                                              @NotNull final Class<? extends V> valueClass) {
+-        return newAutoMap(backingMap, null, valueClass);
+-    }
+-
+-    /**
+-     * @see #newAutoMap
+-     *
+-     * new Auto initializing map using a HashMap.
+-     *
+-     * @param keyClass Class used for the K generic
+-     * @param valueClass Class used for the V generic
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map that auto instantiates on .get()
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashAutoMap(@Nullable final Class<? extends K> keyClass, @NotNull final Class<? extends V> valueClass) {
+-        return newAutoMap(new HashMap<>(), keyClass, valueClass);
+-    }
+-
+-    /**
+-     * @see #newAutoMap
+-     *
+-     * new Auto initializing map using a HashMap.
+-     *
+-     * @param valueClass Class used for the V generic
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map that auto instantiates on .get()
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashAutoMap(@NotNull final Class<? extends V> valueClass) {
+-        return newHashAutoMap(null, valueClass);
+-    }
+-
+-    /**
+-     * @see #newAutoMap
+-     *
+-     * new Auto initializing map using a HashMap.
+-     *
+-     * @param keyClass Class used for the K generic
+-     * @param valueClass Class used for the V generic
+-     * @param initialCapacity Initial capacity to use
+-     * @param loadFactor Load factor to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map that auto instantiates on .get()
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashAutoMap(@Nullable final Class<? extends K> keyClass, @NotNull final Class<? extends V> valueClass, int initialCapacity, float loadFactor) {
+-        return newAutoMap(new HashMap<>(initialCapacity, loadFactor), keyClass, valueClass);
+-    }
+-
+-    /**
+-     * @see #newAutoMap
+-     *
+-     * new Auto initializing map using a HashMap.
+-     *
+-     * @param valueClass Class used for the V generic
+-     * @param initialCapacity Initial capacity to use
+-     * @param loadFactor Load factor to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return  Map that auto instantiates on .get()
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashAutoMap(@NotNull final Class<? extends V> valueClass, int initialCapacity, float loadFactor) {
+-        return newHashAutoMap(null, valueClass, initialCapacity, loadFactor);
+-    }
+-
+-    /**
+-     * Initializes an auto loading map using a HashMap
+-     *
+-     * @param loader Loader to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashMap(@NotNull Function<K, V> loader) {
+-        return new LoadingMap<>(new HashMap<>(), loader);
+-    }
+-
+-    /**
+-     * Initializes an auto loading map using a HashMap
+-     *
+-     * @param loader Loader to use
+-     * @param initialCapacity Initial capacity to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashMap(@NotNull Function<K, V> loader, int initialCapacity) {
+-        return new LoadingMap<>(new HashMap<>(initialCapacity), loader);
+-    }
+-    /**
+-     * Initializes an auto loading map using a HashMap
+-     *
+-     * @param loader Loader to use
+-     * @param initialCapacity Initial capacity to use
+-     * @param loadFactor Load factor to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newHashMap(@NotNull Function<K, V> loader, int initialCapacity, float loadFactor) {
+-        return new LoadingMap<>(new HashMap<>(initialCapacity, loadFactor), loader);
+-    }
+-
+-    /**
+-     * Initializes an auto loading map using an Identity HashMap
+-     *
+-     * @param loader Loader to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newIdentityHashMap(@NotNull Function<K, V> loader) {
+-        return new LoadingMap<>(new IdentityHashMap<>(), loader);
+-    }
+-
+-    /**
+-     * Initializes an auto loading map using an Identity HashMap
+-     *
+-     * @param loader Loader to use
+-     * @param initialCapacity Initial capacity to use
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> newIdentityHashMap(@NotNull Function<K, V> loader, int initialCapacity) {
+-        return new LoadingMap<>(new IdentityHashMap<>(initialCapacity), loader);
+-    }
+-
+-    @Override
+-    public int size() {return backingMap.size();}
+-
+-    @Override
+-    public boolean isEmpty() {return backingMap.isEmpty();}
+-
+-    @Override
+-    public boolean containsKey(@Nullable Object key) {return backingMap.containsKey(key);}
+-
+-    @Override
+-    public boolean containsValue(@Nullable Object value) {return backingMap.containsValue(value);}
+-
+-    @Nullable
+-    @Override
+-    public V get(@Nullable Object key) {
+-        V v = backingMap.get(key);
+-        if (v != null) {
+-            return v;
+-        }
+-        return backingMap.computeIfAbsent((K) key, loader);
+-    }
+-
+-    @Nullable
+-    public V put(@Nullable K key, @Nullable V value) {return backingMap.put(key, value);}
+-
+-    @Nullable
+-    @Override
+-    public V remove(@Nullable Object key) {return backingMap.remove(key);}
+-
+-    public void putAll(@NotNull Map<? extends K, ? extends V> m) {backingMap.putAll(m);}
+-
+-    @Override
+-    public void clear() {backingMap.clear();}
+-
+-    @NotNull
+-    @Override
+-    public Set<K> keySet() {return backingMap.keySet();}
+-
+-    @NotNull
+-    @Override
+-    public Collection<V> values() {return backingMap.values();}
+-
+-    @Override
+-    public boolean equals(@Nullable Object o) {return backingMap.equals(o);}
+-
+-    @Override
+-    public int hashCode() {return backingMap.hashCode();}
+-
+-    @NotNull
+-    @Override
+-    public Set<Entry<K, V>> entrySet() {
+-        return backingMap.entrySet();
+-    }
+-
+-    @NotNull
+-    public LoadingMap<K, V> clone() {
+-        return new LoadingMap<>(backingMap, loader);
+-    }
+-
+-    private static class AutoInstantiatingLoader<K, V> implements Function<K, V> {
+-        final Constructor<? extends V> constructor;
+-        private final Class<? extends V> valueClass;
+-
+-        AutoInstantiatingLoader(@Nullable Class<? extends K> keyClass, @NotNull Class<? extends V> valueClass) {
+-            try {
+-                this.valueClass = valueClass;
+-                if (keyClass != null) {
+-                    constructor = valueClass.getConstructor(keyClass);
+-                } else {
+-                    constructor = null;
+-                }
+-            } catch (NoSuchMethodException e) {
+-                throw new IllegalStateException(
+-                    valueClass.getName() + " does not have a constructor for " + (keyClass != null ? keyClass.getName() : null));
+-            }
+-        }
+-
+-        @NotNull
+-        @Override
+-        public V apply(@Nullable K input) {
+-            try {
+-                return (constructor != null ? constructor.newInstance(input) : valueClass.newInstance());
+-            } catch (Exception e) {
+-                throw new ExceptionInInitializerError(e);
+-            }
+-        }
+-
+-        @Override
+-        public int hashCode() {
+-            return super.hashCode();
+-        }
+-
+-        @Override
+-        public boolean equals(Object object) {
+-            return false;
+-        }
+-    }
+-
+-    /**
+-     * Due to java stuff, you will need to cast it to (Function) for some cases
+-     *
+-     * @param <T> Type
+-     */
+-    public abstract static class Feeder <T> implements Function<T, T> {
+-        @Nullable
+-        @Override
+-        public T apply(@Nullable Object input) {
+-            return apply();
+-        }
+-
+-        @Nullable
+-        public abstract T apply();
+-    }
+-}
+diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
+deleted file mode 100644
+index 3e61a926620a67daec3af54b72a1b911eaef2ed4..0000000000000000000000000000000000000000
+--- a/src/main/java/co/aikar/util/MRUMapCache.java
+++ /dev/null
+@@ -1,112 +0,0 @@
+-/*
+- * This file is licensed under the MIT License (MIT).
+- *
+- * Copyright (c) 2014 Daniel Ennis <http://aikar.co>
+- *
+- * 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.
+- */
+-package co.aikar.util;
+-
+-import java.util.AbstractMap;
+-import java.util.Collection;
+-import java.util.Map;
+-import java.util.Set;
+-import org.jetbrains.annotations.NotNull;
+-import org.jetbrains.annotations.Nullable;
+-
+-/**
+- * Implements a Most Recently Used cache in front of a backing map, to quickly access the last accessed result.
+- *
+- * @param <K> Key Type of the Map
+- * @param <V> Value Type of the Map
+- */
+-@Deprecated(forRemoval = true)
+-public class MRUMapCache<K, V> extends AbstractMap<K, V> {
+-    final Map<K, V> backingMap;
+-    Object cacheKey;
+-    V cacheValue;
+-    public MRUMapCache(@NotNull final Map<K, V> backingMap) {
+-        this.backingMap = backingMap;
+-    }
+-
+-    public int size() {return backingMap.size();}
+-
+-    public boolean isEmpty() {return backingMap.isEmpty();}
+-
+-    public boolean containsKey(@Nullable Object key) {
+-        return key != null && key.equals(cacheKey) || backingMap.containsKey(key);
+-    }
+-
+-    public boolean containsValue(@Nullable Object value) {
+-        return value != null && value == cacheValue || backingMap.containsValue(value);
+-    }
+-
+-    @Nullable
+-    public V get(@Nullable Object key) {
+-        if (cacheKey != null && cacheKey.equals(key)) {
+-            return cacheValue;
+-        }
+-        cacheKey = key;
+-        return cacheValue = backingMap.get(key);
+-    }
+-
+-    @Nullable
+-    public V put(@Nullable K key, @Nullable V value) {
+-        cacheKey = key;
+-        return cacheValue = backingMap.put(key, value);
+-    }
+-
+-    @Nullable
+-    public V remove(@Nullable Object key) {
+-        if (key != null && key.equals(cacheKey)) {
+-            cacheKey = null;
+-        }
+-        return backingMap.remove(key);
+-    }
+-
+-    public void putAll(@NotNull Map<? extends K, ? extends V> m) {backingMap.putAll(m);}
+-
+-    public void clear() {
+-        cacheKey = null;
+-        cacheValue = null;
+-        backingMap.clear();
+-    }
+-
+-    @NotNull
+-    public Set<K> keySet() {return backingMap.keySet();}
+-
+-    @NotNull
+-    public Collection<V> values() {return backingMap.values();}
+-
+-    @NotNull
+-    public Set<Map.Entry<K, V>> entrySet() {return backingMap.entrySet();}
+-
+-    /**
+-     * Wraps the specified map with a most recently used cache
+-     *
+-     * @param map Map to be wrapped
+-     * @param <K> Key Type of the Map
+-     * @param <V> Value Type of the Map
+-     * @return Map
+-     */
+-    @NotNull
+-    public static <K, V> Map<K, V> of(@NotNull Map<K, V> map) {
+-        return new MRUMapCache<K, V>(map);
+-    }
+-}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 0a26fffe9b1e5080b5639767a03af11006108b4a..3b73c0e59788f5f49ca2423032550f11855d52ae 100644
+index 71eb845a4d3b8b6ec3b816a0f20ec807e0f9a86d..a43419c23aa0f6fd809caf5a841cb138f350b7ba 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
@@ -33,16 +33,6 @@ public abstract class Command {
@@ -2177,43 +2945,39 @@ index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..940565704d0e8914a76cf25daf7d1f5e
             server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
             //target.timings.stopTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index b878e7167cfcdea0e224c182b40abeadd339d3b3..fc0239bca93e3dfb740af3239c1276b004607643 100644
+index 001465eedafa51ac027a4db51cba6223edfe1171..dd98b4886d21ac92d9f9139450258754e985fb85 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -720,12 +720,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -720,7 +720,6 @@ public final class SimplePluginManager implements PluginManager {
             throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
         }
 
 -        executor = new co.aikar.timings.TimedEventExecutor(executor, plugin, null, event); // Paper
-        if (false) { // Spigot - RL handles useTimings check now // Paper
-            getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-        } else {
-            getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-        }
-+        getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-     }
- 
-     @NotNull
-@@ -955,8 +950,7 @@ public final class SimplePluginManager implements PluginManager {
+         if (false) { // Spigot - RL handles useTimings check now // Paper
+             getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
+         } else {
+@@ -955,18 +954,7 @@ public final class SimplePluginManager implements PluginManager {
 
     @Override
     public boolean useTimings() {
 -        if (true) {return this.paperPluginManager.useTimings();} // Paper
 -        return co.aikar.timings.Timings.isTimingsEnabled(); // Spigot
-+        return false;
-     }
- 
-     /**
-@@ -966,7 +960,6 @@ public final class SimplePluginManager implements PluginManager {
-      */
-     @Deprecated(forRemoval = true)
-     public void useTimings(boolean use) {
+-    }
+-
+-    /**
+-     * Sets whether or not per event timing code should be used
+-     *
+-     * @param use True if per event timing code should be used
+-     */
+-    @Deprecated(forRemoval = true)
+-    public void useTimings(boolean use) {
 -        co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
+        return false;
     }
 
     // Paper start
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..5c8004c307e1c7923e9d6b0126921127e44f23a2 100644
+index b412aaf08901d169ac9fc89b36f9d6ccb95c53d3..b2257f3e51a754b7d3d946b434745f22e3305b0a 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -43,7 +43,6 @@ import org.bukkit.plugin.TimedRegisteredListener;
@@ -2238,13 +3002,13 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..5c8004c307e1c7923e9d6b0126921127
                     }
                 }
 -            }, plugin, method, eventClass); // Paper
-+            };
+            }; // Paper
             if (false) { // Spigot - RL handles useTimings check now
                 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
             } else {
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
 deleted file mode 100644
-index 12946bd55fcf7c40d39081779a7fa30049ee6165..0000000000000000000000000000000000000000
+index 5fbacfcf108432c5187aa9a4092d00d7d5b0fd53..0000000000000000000000000000000000000000
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ /dev/null
@@ -1,67 +0,0 @@
@@ -2298,7 +3062,7 @@ index 12946bd55fcf7c40d39081779a7fa30049ee6165..00000000000000000000000000000000
 -    public CustomTimingsHandler(@NotNull String name) {
 -        Timing timing;
 -
-        new AuthorNagException("Deprecated use of CustomTimingsHandler. Please Switch to Timings.of ASAP").printStackTrace();
+-        new AuthorNagException("Deprecated use of CustomTimingsHandler. Timings has been removed.").printStackTrace();
 -        try {
 -            final Method ofSafe = TimingsManager.class.getDeclaredMethod("getHandler", String.class, String.class, Timing.class);
 -            ofSafe.setAccessible(true);
--- a/leaves-api/paper-patches/features/0002-Add-isShrink-to-EntityResurrectEvent.patch
+++ b/leaves-api/paper-patches/features/0002-Add-isShrink-to-EntityResurrectEvent.patch
--- a/leaves-api/paper-patches/features/0003-Add-fakeplayer-api.patch
+++ b/leaves-api/paper-patches/features/0003-Add-fakeplayer-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer api


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5ce98e09e9bfcae45896401c69578aa879222893..cb7e06ad207239a5626fc475c46d991fabb48293 100644
+index 9764489c0801eecb8bbfb06103607f0902bf23ab..8185c76052d7af4c2ea83805a9ee6c709148d3c3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2964,6 +2964,17 @@ public final class Bukkit {
+@@ -2980,6 +2980,17 @@ public final class Bukkit {
     }
     // Paper end - Folia region threading API
 
@@ -27,10 +27,10 @@ index 5ce98e09e9bfcae45896401c69578aa879222893..cb7e06ad207239a5626fc475c46d991f
     public static Server.Spigot spigot() {
         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0bae85d3489b628d2a2542f3c7b6f91f4a7c4af5..967bb7ba476f494ac8bfebb599f260017176f3e3 100644
+index fa6f9d50577059d99ee98662497f3fc049fa74ac..430fb104e3190ae0ef9a08627c7c0d0d636898c8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -62,6 +62,7 @@ import org.jetbrains.annotations.ApiStatus;
+@@ -66,6 +66,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -38,7 +38,7 @@ index 0bae85d3489b628d2a2542f3c7b6f91f4a7c4af5..967bb7ba476f494ac8bfebb599f26001
 
 /**
  * Represents a server implementation.
-@@ -2615,4 +2616,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2658,4 +2659,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      */
     void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
     // Paper end - API to check if the server is sleeping
--- a/leaves-api/paper-patches/features/0004-Player-operation-limiter.patch
+++ b/leaves-api/paper-patches/features/0004-Player-operation-limiter.patch
--- a/leaves-api/paper-patches/features/0005-Force-peaceful-mode-switch.patch
+++ b/leaves-api/paper-patches/features/0005-Force-peaceful-mode-switch.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7a439c99fc4c5ee17d674460c8e58a9fe0c64e02..3d5893c4cb6fc914ff2dbbb2267420ec8653dac3 100644
+index 2729f71ac5525b7669fb7cc8719a75e5ce8d1dfc..f150caee08d5069e9e92bb09040522513097cff5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4314,6 +4314,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4323,6 +4323,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
     void setSendViewDistance(int viewDistance);
     // Paper end - view distance api
 
--- a/leaves-api/paper-patches/features/0006-Replay-Mod-API.patch
+++ b/leaves-api/paper-patches/features/0006-Replay-Mod-API.patch
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MC_XiaoHei <xiaohei.xor7studio@foxmail.com>
-Date: Sat, 5 Aug 2023 09:10:59 +0800
+From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
+Date: Sun, 26 Jan 2025 01:39:16 -0500
 Subject: [PATCH] Replay Mod API


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cb7e06ad207239a5626fc475c46d991fabb48293..e37015328e3e53ae5f960c8235ef827b7abe329d 100644
+index 8185c76052d7af4c2ea83805a9ee6c709148d3c3..9564d2e3f3126104f73a1942ea5c45a69ebb158a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2974,6 +2974,11 @@ public final class Bukkit {
+@@ -2990,6 +2990,11 @@ public final class Bukkit {
         return server.getBotManager();
     }
     // Leaves end - Bot API
@@ -21,10 +21,10 @@ index cb7e06ad207239a5626fc475c46d991fabb48293..e37015328e3e53ae5f960c8235ef827b
     @NotNull
     public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 967bb7ba476f494ac8bfebb599f260017176f3e3..cc86476f68e6934a3f8e6a5404876a39b943a926 100644
+index 430fb104e3190ae0ef9a08627c7c0d0d636898c8..991ec55218da08377bb71272fd6bca9f3bed0582 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -63,6 +63,7 @@ import org.jetbrains.annotations.Contract;
+@@ -67,6 +67,7 @@ import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.leavesmc.leaves.entity.BotManager;
@@ -32,7 +32,7 @@ index 967bb7ba476f494ac8bfebb599f260017176f3e3..cc86476f68e6934a3f8e6a5404876a39
 
 /**
  * Represents a server implementation.
-@@ -2625,4 +2626,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2668,4 +2669,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      */
     @NotNull BotManager getBotManager();
     // Leaves end - Bot API
--- a/leaves-api/paper-patches/features/0007-Bytebuf-API.patch
+++ b/leaves-api/paper-patches/features/0007-Bytebuf-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e37015328e3e53ae5f960c8235ef827b7abe329d..d4d30b4da5e05d1f60f9fbb41a7a11b98d7cf6a0 100644
+index 9564d2e3f3126104f73a1942ea5c45a69ebb158a..63c90d151f4a50e2da63f640587d7041dcc1a8b6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2980,6 +2980,12 @@ public final class Bukkit {
+@@ -2996,6 +2996,12 @@ public final class Bukkit {
     }
     // Leaves end - Photographer API
 
@@ -22,10 +22,10 @@ index e37015328e3e53ae5f960c8235ef827b7abe329d..d4d30b4da5e05d1f60f9fbb41a7a11b9
     public static Server.Spigot spigot() {
         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cc86476f68e6934a3f8e6a5404876a39b943a926..6a5afc818073989b6d3a108261aeff285409cfc0 100644
+index 991ec55218da08377bb71272fd6bca9f3bed0582..2590bc0813672ca566dfae734812de6a53519a1a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2629,4 +2629,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2672,4 +2672,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
     // Leaves start - Photographer API
     @NotNull PhotographerManager getPhotographerManager();
     // Leaves end - Photographer API
@@ -35,10 +35,10 @@ index cc86476f68e6934a3f8e6a5404876a39b943a926..6a5afc818073989b6d3a108261aeff28
 +    // Leaves end - Bytebuf API
 }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 95f0b3186e313c7fbd5c8531d52b82a69e525f94..ec2a5f77c135706a544a870808241ea1d6b6e814 100644
+index 0081dd53b6a81ce7892e58d61f9f8a6718e30775..c706a782a1739b54af85d4b6a996bf1d5d571ba1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3895,6 +3895,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3853,6 +3853,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
     boolean isChunkSent(long chunkKey);
     // Paper end
 
@@ -48,9 +48,9 @@ index 95f0b3186e313c7fbd5c8531d52b82a69e525f94..ec2a5f77c135706a544a870808241ea1
 +    void sendPacket(org.leavesmc.leaves.bytebuf.Bytebuf buf, org.leavesmc.leaves.bytebuf.packet.PacketType type);
 +    // Leaves end - Bytebuf API
 +
-     @NotNull
     @Override
     Spigot spigot();
+     // Spigot end
 diff --git a/src/main/java/org/leavesmc/leaves/bytebuf/Bytebuf.java b/src/main/java/org/leavesmc/leaves/bytebuf/Bytebuf.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..7038b2a5090154fe8d75ba9c9413952d834bb609
--- a/leaves-api/paper-patches/features/0008-Revert-raid-changes.patch
+++ b/leaves-api/paper-patches/features/0008-Revert-raid-changes.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: huanli233 <392352840@qq.com>
+Date: Thu, 6 Feb 2025 12:49:03 +0800
+Subject: [PATCH] Revert raid changes
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+index 8fdfcbc7d20fe0af6b220ab94516247093637621..3eb836575307116ce0668eadd6a6ee0a9aafc7cd 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+@@ -219,9 +219,7 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
+         /**
+          * When a player gets bad omen after killing a patrol captain.
+          *
+-         * @deprecated no longer used, player now gets an ominous bottle instead
+          */
+-        @Deprecated(since = "1.21") // Paper
+         PATROL_CAPTAIN,
+         /**
+          * When a potion effect is modified through the plugin methods.
--- a/leaves-server/build.gradle.kts.patch
+++ b/leaves-server/build.gradle.kts.patch
@@ -0,0 +1,155 @@
+--- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts
+@@ -5,14 +_,14 @@
+ plugins {
+     `java-library`
+     `maven-publish`
+-    id("io.papermc.paperweight.core")
+    id("org.leavesmc.leavesweight.core") // Leaves - build change
+ }
+ 
+ val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
+ 
+ dependencies {
+     mache("io.papermc:mache:1.21.4+build.7")
+-    paperclip("io.papermc:paperclip:3.0.3")
+    leavesclip("org.leavesmc:leavesclip:2.0.1") // Leaves - build change
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+ }
+ 
+@@ -21,6 +_,18 @@
+     // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
+     // gitFilePatches = true
+ 
+    // Leaves start - build change
+    val leaves = forks.register("leaves") {
+        upstream.patchDir("paperServer") {
+            upstreamPath = "paper-server"
+            excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
+            patchesDir = rootDirectory.dir("leaves-server/paper-patches")
+            outputDir = rootDirectory.dir("paper-server")
+        }
+    }
+    activeFork = leaves
+    // Leaves end - build change
+
+     spigot {
+         buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
+         packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
+@@ -101,7 +_,22 @@
+     }
+ }
+ 
+-val log4jPlugins = sourceSets.create("log4jPlugins")
+// Leaves start - build change
+sourceSets {
+    main {
+        java { srcDir("../paper-server/src/main/java") }
+        resources { srcDir("../paper-server/src/main/resources") }
+    }
+    test {
+        java { srcDir("../paper-server/src/test/java") }
+        resources { srcDir("../paper-server/src/test/resources") }
+    }
+}
+val log4jPlugins = sourceSets.create("log4jPlugins") {
+    java { srcDir("../paper-server/src/log4jPlugins/java") }
+}
+// Leaves end - build change
+
+ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+     extendsFrom(configurations.compileClasspath.get())
+ }
+@@ -119,7 +_,13 @@
+ }
+ 
+ dependencies {
+-    implementation(project(":paper-api"))
+    implementation(project(":leaves-api")) // Leaves - build change
+    // Leaves start - linear
+    implementation("com.github.luben:zstd-jni:1.5.4-1")
+    implementation("org.lz4:lz4-java:1.8.0")
+    implementation("net.openhft:zero-allocation-hashing:0.16")
+    // Leaves end - linear
+    implementation("org.spongepowered:configurate-hocon:4.2.0-SNAPSHOT") // Leaves - leaves plugins
+     implementation("ca.spottedleaf:concurrentutil:0.0.3")
+     implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
+     implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
+@@ -176,6 +_,16 @@
+     implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
+ }
+ 
+// Leaves start - hide irrelevant compilation warnings
+tasks.withType<JavaCompile> {
+    val compilerArgs = options.compilerArgs
+    compilerArgs.add("-Xlint:-module")
+    compilerArgs.add("-Xlint:-removal")
+    compilerArgs.add("-Xlint:-dep-ann")
+    compilerArgs.add("--add-modules=jdk.incubator.vector") // SIMD
+}
+// Leaves end - hide irrelevant compilation warnings
+
+ tasks.jar {
+     manifest {
+         val git = Git(rootProject.layout.projectDirectory.path)
+@@ -188,14 +_,14 @@
+         val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
+         attributes(
+             "Main-Class" to "org.bukkit.craftbukkit.Main",
+-            "Implementation-Title" to "Paper",
+            "Implementation-Title" to "Leaves", // Leaves - build change
+             "Implementation-Version" to implementationVersion,
+             "Implementation-Vendor" to date,
+-            "Specification-Title" to "Paper",
+            "Specification-Title" to "Leaves", // Leaves - build change
+             "Specification-Version" to project.version,
+-            "Specification-Vendor" to "Paper Team",
+-            "Brand-Id" to "papermc:paper",
+-            "Brand-Name" to "Paper",
+            "Specification-Vendor" to "Leaves Team", // Leaves - build change
+            "Brand-Id" to "leavesmc:leaves", // Leaves - build change
+            "Brand-Name" to "Leaves", // Leaves - build change
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to buildTime.toString(),
+             "Git-Branch" to gitBranch,
+@@ -306,6 +_,14 @@
+     classpath(sourceSets.main.map { it.runtimeClasspath })
+ }
+ 
+// Leaves start - create config file
+tasks.registerRunTask("createLeavesConfig") {
+    description = "Create a new leaves.yml"
+    mainClass = "org.leavesmc.leaves.config.GlobalConfigCreator"
+    classpath(sourceSets.main.map { it.runtimeClasspath })
+}
+// Leaves end - create config file
+
+ tasks.registerRunTask("runBundler") {
+     description = "Spin up a test server from the Mojang mapped bundler jar"
+     classpath(tasks.createMojmapBundlerJar.flatMap { it.outputZip })
+@@ -316,13 +_,15 @@
+     classpath(tasks.createReobfBundlerJar.flatMap { it.outputZip })
+     mainClass.set(null as String?)
+ }
+-tasks.registerRunTask("runPaperclip") {
+-    description = "Spin up a test server from the Mojang mapped Paperclip jar"
+-    classpath(tasks.createMojmapPaperclipJar.flatMap { it.outputZip })
+-    mainClass.set(null as String?)
+-}
+-tasks.registerRunTask("runReobfPaperclip") {
+-    description = "Spin up a test server from the reobf Paperclip jar"
+-    classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
+-    mainClass.set(null as String?)
+-}
+// Leaves start - build change
+tasks.registerRunTask("runLeavesclip") {
+    description = "Spin up a test server from the Mojang mapped Leavesclip jar"
+    classpath(tasks.createMojmapLeavesclipJar.flatMap { it.outputZip })
+    mainClass.set(null as String?)
+}
+tasks.registerRunTask("runReobfLeavesclip") {
+    description = "Spin up a test server from the reobf Leavesclip jar"
+    classpath(tasks.createReobfLeavesclipJar.flatMap { it.outputZip })
+    mainClass.set(null as String?)
+}
+// Leaves end - build change
--- a/leaves-server/minecraft-patches/features/0001-Build-changes.patch
+++ b/leaves-server/minecraft-patches/features/0001-Build-changes.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 26 Jan 2025 13:58:49 +0800
+Subject: [PATCH] Build changes
+
+
+diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
+index 4d344559a20a0c35c181e297e81788c747363ec9..9d25c263508da5b6a027132e6cc071b675e4af44 100644
+--- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
+++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
+@@ -28,7 +28,7 @@ import net.minecraft.world.phys.AABB;
+ import java.util.List;
+ import java.util.function.Predicate;
+ 
+-public final class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks {
+public class PaperHooks extends BaseChunkSystemHooks implements PlatformHooks { // Leaves - not final
+ 
+     @Override
+     public String getBrand() {
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index ae220a732c78ab076261f20b5a54c71d7fceb407..5dfdf76c8de5eda9a02f9a5fa1c3bada8ec7dcde 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1192,7 +1192,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 LOGGER.info("*************************************************************************************");
+                 LOGGER.info("This is the first time you're starting this server.");
+                 LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
+-                LOGGER.info("View this and more helpful information here: https://docs.papermc.io/paper/next-steps");
+                LOGGER.info("View this and more helpful information here: https://docs.leavesmc.org/leaves/guides/next-steps"); // Leaves - change
+                 LOGGER.info("*************************************************************************************");
+             }
+             // Paper end - Add onboarding message for initial server start
+@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     @DontObfuscate
+     public String getServerModName() {
+-        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
+        return org.leavesmc.leaves.LeavesConfig.mics.serverModName; // Leaves - Custom // Paper
+     }
+ 
+     public SystemReport fillSystemReport(SystemReport systemReport) {
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index 97a294d2f5c1ddf0af7ffec3e1425eb329c5751b..fc9f1b1cde5516eee06d6365645386cd0e3d14ec 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -223,9 +223,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
+         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
+         this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
+-        com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ 
+        com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
+
+         this.setPvpAllowed(properties.pvp);
+         this.setFlightAllowed(properties.allowFlight);
+         this.setMotd(properties.motd);
+diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java
+index f262a7c5ae4e7d56f16f5c0f4f145a2e428abbe4..a2b69a0cc34adb4d3da00250db8320b26d0ed697 100644
+--- a/net/minecraft/server/gui/MinecraftServerGui.java
+++ b/net/minecraft/server/gui/MinecraftServerGui.java
+@@ -183,7 +183,7 @@ public class MinecraftServerGui extends JComponent {
+ 
+     // Paper start - Add onboarding message for initial server start
+     private JComponent buildOnboardingPanel() {
+-        String onboardingLink = "https://docs.papermc.io/paper/next-steps";
+        String onboardingLink = "https://docs.leavesmc.org/leaves/guides/next-steps"; // Leaves - change
+         JPanel jPanel = new JPanel();
+ 
+         javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
--- a/leaves-server/minecraft-patches/features/0002-Leaves-Server-Config-And-Command.patch
+++ b/leaves-server/minecraft-patches/features/0002-Leaves-Server-Config-And-Command.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sat, 1 Feb 2025 14:21:05 +0800
+Subject: [PATCH] Leaves Server Config And Command
+
+
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index fc9f1b1cde5516eee06d6365645386cd0e3d14ec..64708df57aeca5c1f656748da96c6dadfba67ed7 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -225,6 +225,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ 
+		org.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
+
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
+ 
+         this.setPvpAllowed(properties.pvp);
--- a/leaves-server/minecraft-patches/features/0003-Leaves-Protocol-Core.patch
+++ b/leaves-server/minecraft-patches/features/0003-Leaves-Protocol-Core.patch
@@ -0,0 +1,94 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 2 Feb 2025 13:08:32 +0800
+Subject: [PATCH] Leaves Protocol Core
+
+
+diff --git a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..7e19dfe90a63ff26f03b95891dacb7360bba5a3c 100644
+--- a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+++ b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
+@@ -40,13 +40,23 @@ public interface CustomPacketPayload {
+ 
+             @Override
+             public void encode(B buffer, CustomPacketPayload value) {
+                // Leaves start - protocol core
+                if (value instanceof org.leavesmc.leaves.protocol.core.LeavesCustomPayload<?> payload) {
+                    buffer.writeResourceLocation(payload.id());
+                    payload.write(buffer);
+                    return;
+                }
+                // Leaves end - protocol core
+                 this.writeCap(buffer, value.type(), value);
+             }
+ 
+             @Override
+             public CustomPacketPayload decode(B buffer) {
+                 ResourceLocation resourceLocation = buffer.readResourceLocation();
+-                return (CustomPacketPayload)this.findCodec(resourceLocation).decode(buffer);
+                // Leaves start - protocol core
+                var payload = org.leavesmc.leaves.protocol.core.LeavesProtocolManager.decode(resourceLocation, buffer);
+                return java.util.Objects.requireNonNullElseGet(payload, () -> this.findCodec(resourceLocation).decode(buffer));
+                // Leaves end - protocol core
+             }
+         };
+     }
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 5dfdf76c8de5eda9a02f9a5fa1c3bada8ec7dcde..bde8ddadd3930100d1e31e630f809e77d6a70dac 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1744,6 +1744,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+         profilerFiller.popPush("server gui refresh");
+ 
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
+
+         for (int i = 0; i < this.tickables.size(); i++) {
+             this.tickables.get(i).run();
+         }
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index e71c1a564e5d4ac43460f89879ff709ee685706f..46ffae71b5119c7c4527a21b19c8e822f4d87114 100644
+--- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+@@ -136,6 +136,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+ 
+     @Override
+     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
+        // Leaves start - protocol
+        if (packet.payload() instanceof org.leavesmc.leaves.protocol.core.LeavesCustomPayload<?> leavesPayload) {
+            org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePayload(player, leavesPayload);
+        }
+        // Leaves end - protocol
+
+         // CraftBukkit start
+         // Paper start - Brand support
+         if (packet.payload() instanceof net.minecraft.network.protocol.common.custom.BrandPayload(String brand)) {
+@@ -154,6 +160,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+                 String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
+                 for (String channel : channels.split("\0")) {
+                     this.getCraftPlayer().addChannel(channel);
+                    org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleMinecraftRegister(channel, player); // Leaves - protocol
+                 }
+             } catch (Exception ex) {
+                 ServerGamePacketListenerImpl.LOGGER.error("Couldn't register custom payload", ex);
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 03feaf0adb8ee87e33744a4615dc2507a02f92d7..31d145e2368ee935235f8e88278dcaea0c72f2c0 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -330,6 +330,8 @@ public abstract class PlayerList {
+             return;
+         }
+ 
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player); // Leaves - protocol
+
+         final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
+ 
+         if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
+@@ -500,6 +502,7 @@ public abstract class PlayerList {
+         return this.remove(player, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? player.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(player.getDisplayName())));
+     }
+     public net.kyori.adventure.text.Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) {
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerLeave(player); // Leaves - protocol
+         // Paper end - Fix kick event leave message not being sent
+         ServerLevel serverLevel = player.serverLevel();
+         player.awardStat(Stats.LEAVE_GAME);
--- a/leaves-server/minecraft-patches/features/0004-Fix-trading-with-the-void.patch
+++ b/leaves-server/minecraft-patches/features/0004-Fix-trading-with-the-void.patch
@@ -4,13 +4,13 @@ Date: Wed, 26 Jan 2022 17:20:54 +0800
 Subject: [PATCH] Fix trading with the void


-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 585e2b43a0326f0b81597fa1234d3c67c76af550..7d88402b024a5c11e1796d9bccdc1c352650ad07 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2761,11 +2761,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index 67de67cf1e33672fe33fbb88aeb92e3a020a4ae5..a91136ca7b47b242f8e454f6472fd60712736754 100644
+--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
+@@ -2675,11 +2675,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             // Spigot end
-             // Spigot Start
+             // Spigot start
             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
 -                // Paper start - Fix merchant inventory not closing on entity removal
 -                if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) {
--- a/leaves-server/minecraft-patches/features/0005-Make-snowball-and-egg-can-knockback-player.patch
+++ b/leaves-server/minecraft-patches/features/0005-Make-snowball-and-egg-can-knockback-player.patch
@@ -4,15 +4,14 @@ Date: Fri, 28 Jan 2022 18:34:29 +0800
 Subject: [PATCH] Make snowball and egg can knockback player


-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-index 70961e151666a0ecf5b791853f4581eaebbdcc8b..5d9834ce6a8f892339438a4fe262c9f5d52484fb 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-@@ -61,6 +61,13 @@ public class Snowball extends ThrowableItemProjectile {
+diff --git a/net/minecraft/world/entity/projectile/Snowball.java b/net/minecraft/world/entity/projectile/Snowball.java
+index c57bbdc13221d2ce349f3f1d894193f80ff1e24b..51e412e814523c4acccee9caf39af729e1e950d8 100644
+--- a/net/minecraft/world/entity/projectile/Snowball.java
+++ b/net/minecraft/world/entity/projectile/Snowball.java
+@@ -54,6 +54,12 @@ public class Snowball extends ThrowableItemProjectile {
+         Entity entity = result.getEntity();
         int i = entity instanceof Blaze ? 3 : 0;
- 
-         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
-+
+         entity.hurt(this.damageSources().thrown(this, this.getOwner()), i);
 +        // Leaves start - make snowball can knockback player
 +        if (org.leavesmc.leaves.LeavesConfig.modify.snowballAndEggCanKnockback && entity instanceof net.minecraft.server.level.ServerPlayer player) {
 +            player.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F);
@@ -22,16 +21,16 @@ index 70961e151666a0ecf5b791853f4581eaebbdcc8b..5d9834ce6a8f892339438a4fe262c9f5
     }
 
     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-index 155c2bbd35adacb7c3668fbe81a7c454e5102c8b..26696c09a2ce5c483dc2f723689ed985445663b8 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java
-@@ -52,6 +52,12 @@ public class ThrownEgg extends ThrowableItemProjectile {
-     protected void onHitEntity(EntityHitResult entityHitResult) {
-         super.onHitEntity(entityHitResult);
-         entityHitResult.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.0F);
+diff --git a/net/minecraft/world/entity/projectile/ThrownEgg.java b/net/minecraft/world/entity/projectile/ThrownEgg.java
+index 76481c0e77fc3a2e4be8eeb9de8d1e6de5507c64..14aeb330627e6fa06834736ab747b0fe64666bec 100644
+--- a/net/minecraft/world/entity/projectile/ThrownEgg.java
+++ b/net/minecraft/world/entity/projectile/ThrownEgg.java
+@@ -53,6 +53,12 @@ public class ThrownEgg extends ThrowableItemProjectile {
+     protected void onHitEntity(EntityHitResult result) {
+         super.onHitEntity(result);
+         result.getEntity().hurt(this.damageSources().thrown(this, this.getOwner()), 0.0F);
 +        // Leaves start - make egg can knockback player
-+        if (org.leavesmc.leaves.LeavesConfig.modify.snowballAndEggCanKnockback && entityHitResult.getEntity() instanceof ServerPlayer player) {
+        if (org.leavesmc.leaves.LeavesConfig.modify.snowballAndEggCanKnockback && result.getEntity() instanceof net.minecraft.server.level.ServerPlayer player) {
 +            player.hurt(this.damageSources().thrown(this, this.getOwner()), 0.0000001F);
 +            player.knockback(0.4000000059604645D, this.getX() - player.getX(), this.getZ() - player.getZ(), this, io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.DAMAGE);
 +        }
--- a/leaves-server/minecraft-patches/features/0006-Leaves-Fakeplayer.patch
+++ b/leaves-server/minecraft-patches/features/0006-Leaves-Fakeplayer.patch
@@ -0,0 +1,479 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 2 Feb 2025 15:28:11 +0800
+Subject: [PATCH] Leaves Fakeplayer
+
+
+diff --git a/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+index 4b2ae046413146b11912e7aa4a9a3d643de6afd1..c5733fe17b4dd5dfe4bce461a305a13a188b2f77 100644
+--- a/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+++ b/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+@@ -39,6 +39,7 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
+     }
+ 
+     protected void trigger(ServerPlayer player, Predicate<T> testTrigger) {
+        if (player instanceof org.leavesmc.leaves.bot.ServerBot) return; // Leaves - bot skip
+         PlayerAdvancements advancements = player.getAdvancements();
+         Set<CriterionTrigger.Listener<T>> set = (Set) advancements.criterionData.get(this); // Paper - fix PlayerAdvancements leak
+         if (set != null && !set.isEmpty()) {
+diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
+index e1000d8ab5ae0034b56a3524d2caee8c299b50e7..f8a67220ebb72fd446006b7aaed87fc69bd0454d 100644
+--- a/net/minecraft/network/Connection.java
+++ b/net/minecraft/network/Connection.java
+@@ -96,7 +96,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     @Nullable
+     private volatile PacketListener disconnectListener;
+     @Nullable
+-    private volatile PacketListener packetListener;
+    protected volatile PacketListener packetListener; // Leaves - private -> protected
+     @Nullable
+     private DisconnectionDetails disconnectionDetails;
+     private boolean encrypted;
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index bde8ddadd3930100d1e31e630f809e77d6a70dac..073d4a57f78dc18e4cf95bdb852877b8624ec3f8 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -304,6 +304,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping
+     public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
+ 
+    private org.leavesmc.leaves.bot.BotList botList; // Leaves - fakeplayer
+
+     public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {
+         ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system
+         AtomicReference<S> atomicReference = new AtomicReference<>();
+@@ -740,6 +742,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         }
+         // Paper end - Configurable player collision
+ 
+        this.getBotList().loadResume(); // Leaves - load resident bot
+
+         this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
+         this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
+         this.server.spark.enableAfterPlugins(this.server); // Paper - spark
+@@ -1001,6 +1005,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+         LOGGER.info("Stopping server");
+         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
+        this.getBotList().removeAll(); // Leaves - save or remove bot
+         // CraftBukkit start
+         if (this.server != null) {
+             this.server.spark.disable(); // Paper - spark
+@@ -1762,6 +1767,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     public void tickConnection() {
+         this.getConnection().tick();
+        this.botList.networkTick(); // Leaves - fakeplayer
+     }
+ 
+     private void synchronizeTime(ServerLevel level) {
+@@ -2811,6 +2817,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return 0;
+     }
+ 
+    // Leaves start - fakeplayer
+    protected void setBotList(org.leavesmc.leaves.bot.BotList botList) {
+        this.botList = botList;
+    }
+
+    public org.leavesmc.leaves.bot.BotList getBotList() {
+        return botList;
+    }
+    // Leaves end - fakeplayer
+
+     public record ReloadableResources(CloseableResourceManager resourceManager, ReloadableServerResources managers) implements AutoCloseable {
+         @Override
+         public void close() {
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
+index 64dbee1f67eaa17c93c13bfa38fbe27de57651e4..459e59c370a729dfeed3872f3a5984dd3da96abe 100644
+--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
+@@ -168,6 +168,11 @@ public class PlayerAdvancements {
+     }
+ 
+     public boolean award(AdvancementHolder advancement, String criterionKey) {
+        // Leaves start - bot can't get advancement
+        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
+            return false;
+        }
+        // Leaves end - bot can't get advancement
+         boolean flag = false;
+         AdvancementProgress orStartProgress = this.getOrStartProgress(advancement);
+         boolean isDone = orStartProgress.isDone();
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index 64708df57aeca5c1f656748da96c6dadfba67ed7..0c4e5aa382fed846a35badf903cab2756621a678 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -203,6 +203,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         }
+ 
+         // Spigot start
+        this.setBotList(new org.leavesmc.leaves.bot.BotList(this)); // Leaves - fakeplayer
+         this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage));
+         org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings"));
+         org.spigotmc.SpigotConfig.registerCommands();
+diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
+index b3f498558614243cf633dcd71e3c49c2c55e6e0f..36c0a690e7e9b301c5a3d63fae2c7cbe36ba6cdf 100644
+--- a/net/minecraft/server/level/ChunkMap.java
+++ b/net/minecraft/server/level/ChunkMap.java
+@@ -1247,6 +1247,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                     }
+                 } else if (this.seenBy.remove(player.connection)) {
+                     this.serverEntity.removePairing(player);
+                    // Leaves start - render bot
+                    if (entity instanceof org.leavesmc.leaves.bot.ServerBot bot) {
+                        if (bot.needSendFakeData(player)) {
+                            bot.sendFakeData(player.connection, false);
+                        }
+                    }
+                    // Leaves end - render bot
+                 }
+             }
+         }
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index a91136ca7b47b242f8e454f6472fd60712736754..c91d6d24d44b3d718680771b2299f04724c15992 100644
+--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
+@@ -215,6 +215,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+     public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
+     public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
+     private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current)
+    final List<ServerPlayer> realPlayers; // Leaves - skip
+ 
+     public LevelChunk getChunkIfLoaded(int x, int z) {
+         return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
+@@ -681,6 +682,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler);
+         // Paper end - rewrite chunk system
+         this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
+        this.realPlayers = Lists.newArrayList(); // Leaves - skip
+     }
+ 
+     // Paper start
+@@ -2204,6 +2206,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+         return this.players;
+     }
+ 
+    // Leaves start - fakeplayer skip
+    public List<ServerPlayer> realPlayers() {
+        return this.realPlayers;
+    }
+    // Leaves end - fakeplayer skip
+
+     @Override
+     public void onBlockStateChange(BlockPos pos, BlockState blockState, BlockState newState) {
+         Optional<Holder<PoiType>> optional = PoiTypes.forState(blockState);
+@@ -2618,6 +2626,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.add(serverPlayer);
+                // Leaves start - skip
+                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
+                    ServerLevel.this.realPlayers.add(serverPlayer);
+                }
+                // Leaves end - skip
+                 ServerLevel.this.updateSleepingPlayerList();
+             }
+ 
+@@ -2684,6 +2697,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             ServerLevel.this.getChunkSource().removeEntity(entity);
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.remove(serverPlayer);
+                // Leaves start - skip
+                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
+                    ServerLevel.this.realPlayers.remove(serverPlayer);
+                }
+                // Leaves end - skip
+                 ServerLevel.this.updateSleepingPlayerList();
+             }
+ 
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..f8b80a6a9d98f69dcbb84629607ee55c8191b55f 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -197,7 +197,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     );
+     public ServerGamePacketListenerImpl connection;
+     public final MinecraftServer server;
+-    public final ServerPlayerGameMode gameMode;
+    public ServerPlayerGameMode gameMode; // Leaves - not final
+     private final PlayerAdvancements advancements;
+     private final ServerStatsCounter stats;
+     private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
+@@ -804,16 +804,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+             this.invulnerableTime--;
+         }
+ 
+-        // Paper start - Configurable container update tick rate
+-        if (--this.containerUpdateDelay <= 0) {
+-            this.containerMenu.broadcastChanges();
+-            this.containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
+-        }
+-        // Paper end - Configurable container update tick rate
+-        if (this.containerMenu != this.inventoryMenu && (this.isImmobile() || !this.containerMenu.stillValid(this))) { // Paper - Prevent opening inventories when frozen
+-            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
+-            this.containerMenu = this.inventoryMenu;
+        // Leaves start - skip bot
+        if (!(this instanceof org.leavesmc.leaves.bot.ServerBot)) {
+            // Paper start - Configurable container update tick rate
+            if (--this.containerUpdateDelay <= 0) {
+                this.containerMenu.broadcastChanges();
+                this.containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
+            }
+            // Paper end - Configurable container update tick rate
+            if (this.containerMenu != this.inventoryMenu && (this.isImmobile() || !this.containerMenu.stillValid(this))) { // Paper - Prevent opening inventories when frozen
+                this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
+                this.containerMenu = this.inventoryMenu;
+            }
+         }
+        // Leaves end - skip bot
+ 
+         Entity camera = this.getCamera();
+         if (camera != this) {
+@@ -828,7 +832,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+             }
+         }
+ 
+-        CriteriaTriggers.TICK.trigger(this);
+        if (!(this instanceof org.leavesmc.leaves.bot.ServerBot)) CriteriaTriggers.TICK.trigger(this); // Leaves - skip bot
+         if (this.levitationStartPos != null) {
+             CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
+         }
+@@ -1462,6 +1466,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+                 this.lastSentHealth = -1.0F;
+                 this.lastSentFood = -1;
+ 
+                // Leaves start - bot support
+                if (org.leavesmc.leaves.LeavesConfig.modify.fakeplayer.enable) {
+                    this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(this, true)); // Leaves - render bot
+                }
+                // Leaves end - bot support
+ 
+                 // CraftBukkit start
+                 org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 99e82b35800ef5c1ed24967fe9194aa35d3e2f24..f7db21ff9ce35f4a3b80e1e36366a1878605931b 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -332,6 +332,19 @@ public abstract class PlayerList {
+ 
+         org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player); // Leaves - protocol
+ 
+        // Leaves start - bot support
+        if (org.leavesmc.leaves.LeavesConfig.modify.fakeplayer.enable) {
+            org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName());
+            if (bot != null) {
+                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false);
+            }
+            this.server.getBotList().bots.forEach(bot1 -> {
+                bot1.sendPlayerInfo(player);
+                bot1.sendFakeDataIfNeed(player, true);
+            }); // Leaves - render bot
+        }
+        // Leaves end - bot support
+
+         final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
+ 
+         if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
+@@ -852,6 +865,12 @@ public abstract class PlayerList {
+         }
+         // Paper end - Add PlayerPostRespawnEvent
+ 
+        // Leaves start - bot support
+        if (org.leavesmc.leaves.LeavesConfig.modify.fakeplayer.enable) {
+            this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(serverPlayer, true)); // Leaves - render bot
+        }
+        // Leaves end - bot support
+
+         // CraftBukkit end
+ 
+         return serverPlayer;
+@@ -957,11 +976,16 @@ public abstract class PlayerList {
+     }
+ 
+     public String[] getPlayerNamesArray() {
+-        String[] strings = new String[this.players.size()];
+        String[] strings = new String[this.players.size() + this.server.getBotList().bots.size()]; // Leaves - fakeplayer support
+ 
+         for (int i = 0; i < this.players.size(); i++) {
+             strings[i] = this.players.get(i).getGameProfile().getName();
+         }
+        // Leaves start - fakeplayer support
+        for (int i = this.players.size(); i < strings.length; ++i) {
+            strings[i] = this.server.getBotList().bots.get(i - this.players.size()).getGameProfile().getName();
+        }
+        // Leaves end - fakeplayer support
+ 
+         return strings;
+     }
+@@ -1045,7 +1069,14 @@ public abstract class PlayerList {
+ 
+     @Nullable
+     public ServerPlayer getPlayerByName(String username) {
+-        return this.playersByName.get(username.toLowerCase(java.util.Locale.ROOT)); // Spigot
+        // Leaves start - fakeplayer support
+        username = username.toLowerCase(java.util.Locale.ROOT);
+        ServerPlayer player = this.playersByName.get(username);
+        if (player == null) {
+            player = this.server.getBotList().getBotByName(username);
+        }
+        return player; // Spigot
+        // Leaves end - fakeplayer support
+     }
+ 
+     public void broadcast(@Nullable Player except, double x, double y, double z, double radius, ResourceKey<Level> dimension, Packet<?> packet) {
+@@ -1356,7 +1387,13 @@ public abstract class PlayerList {
+ 
+     @Nullable
+     public ServerPlayer getPlayer(UUID playerUUID) {
+-        return this.playersByUUID.get(playerUUID);
+        // Leaves start - fakeplayer support
+        ServerPlayer player = this.playersByUUID.get(playerUUID);
+        if (player == null) {
+            player = this.server.getBotList().getBot(playerUUID);
+        }
+        return player;
+        // Leaves start - fakeplayer support
+     }
+ 
+     public boolean canBypassPlayerLimit(GameProfile profile) {
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 711e3da3626807d264730c66dd392e27492721e5..83d8bd3e6008a5253ab225a324a393dcddd38789 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -1431,7 +1431,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     }
+ 
+     // Paper start - optimise collisions
+-    private Vec3 collide(Vec3 movement) {
+    public Vec3 collide(Vec3 movement) { // Leaves - private -> public
+         final boolean xZero = movement.x == 0.0;
+         final boolean yZero = movement.y == 0.0;
+         final boolean zZero = movement.z == 0.0;
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index c996a547d4448f7e21f8d5ccfe7e0021ccb3c44c..b1c4ac288b71f622b30e896323a8b986aba8d04b 100644
+--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
+@@ -186,7 +186,7 @@ public abstract class Player extends LivingEntity {
+     private int lastLevelUpTime;
+     public GameProfile gameProfile;
+     private boolean reducedDebugInfo;
+-    private ItemStack lastItemInMainHand = ItemStack.EMPTY;
+    protected ItemStack lastItemInMainHand = ItemStack.EMPTY;
+     private final ItemCooldowns cooldowns = this.createItemCooldowns();
+     private Optional<GlobalPos> lastDeathLocation = Optional.empty();
+     @Nullable
+@@ -347,6 +347,12 @@ public abstract class Player extends LivingEntity {
+         }
+     }
+ 
+    // Leaves start - fakeplayer
+    protected void livingEntityTick() {
+        super.tick();
+    }
+    // Leaves end - fakeplayer
+
+     @Override
+     protected float getMaxHeadRotationRelativeToBody() {
+         return this.isBlocking() ? 15.0F : super.getMaxHeadRotationRelativeToBody();
+@@ -658,7 +664,7 @@ public abstract class Player extends LivingEntity {
+         }
+     }
+ 
+-    private void touch(Entity entity) {
+    public void touch(Entity entity) { // Leaves - private -> public
+         entity.playerTouch(this);
+     }
+ 
+diff --git a/net/minecraft/world/entity/projectile/FishingHook.java b/net/minecraft/world/entity/projectile/FishingHook.java
+index 1e012c7ef699a64ff3f1b00f897bb893ab25ecbd..f2bf0cdbd29438ca51b74ae2fcdf49dba0d52804 100644
+--- a/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/net/minecraft/world/entity/projectile/FishingHook.java
+@@ -55,7 +55,7 @@ public class FishingHook extends Projectile {
+     public static final EntityDataAccessor<Integer> DATA_HOOKED_ENTITY = SynchedEntityData.defineId(FishingHook.class, EntityDataSerializers.INT);
+     private static final EntityDataAccessor<Boolean> DATA_BITING = SynchedEntityData.defineId(FishingHook.class, EntityDataSerializers.BOOLEAN);
+     private int life;
+-    private int nibble;
+    public int nibble; // Leaves - private -> public
+     public int timeUntilLured;
+     public int timeUntilHooked;
+     public float fishAngle;
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
+index 50af953a4698a3c6e16b840fab764dd733b3fbc9..b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4 100644
+--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
+@@ -365,6 +365,7 @@ public abstract class AbstractContainerMenu {
+ 
+     private void doClick(int slotId, int button, ClickType clickType, Player player) {
+         Inventory inventory = player.getInventory();
+        if (!doClickCheck(slotId, button, clickType, player)) return; // Leaves - doClick check
+         if (clickType == ClickType.QUICK_CRAFT) {
+             int i = this.quickcraftStatus;
+             this.quickcraftStatus = getQuickcraftHeader(button);
+@@ -641,6 +642,22 @@ public abstract class AbstractContainerMenu {
+         }
+     }
+ 
+    // Leaves start - doClick check
+    private boolean doClickCheck(int slotIndex, int button, ClickType actionType, Player player) {
+        if (slotIndex < 0) {
+            return true;
+        }
+
+        Slot slot = getSlot(slotIndex);
+        ItemStack itemStack = slot.getItem();
+        net.minecraft.world.item.component.CustomData customData = itemStack.get(net.minecraft.core.component.DataComponents.CUSTOM_DATA);
+        if (customData != null && customData.contains("Leaves.Gui.Placeholder")) {
+            return !customData.copyTag().getBoolean("Leaves.Gui.Placeholder");
+        }
+        return true;
+    }
+    // Leaves end - doClick check
+
+     private boolean tryItemClickBehaviourOverride(Player player, ClickAction action, Slot slot, ItemStack clickedItem, ItemStack carriedItem) {
+         FeatureFlagSet featureFlagSet = player.level().enabledFeatures();
+         return carriedItem.isItemEnabled(featureFlagSet) && carriedItem.overrideStackedOnOther(slot, action, player)
+diff --git a/net/minecraft/world/level/levelgen/PhantomSpawner.java b/net/minecraft/world/level/levelgen/PhantomSpawner.java
+index 11d25e64349b27bf54dc1620e4cce444c79f581c..82d9d53ef0aa57342173af29d14d00e4039fb583 100644
+--- a/net/minecraft/world/level/levelgen/PhantomSpawner.java
+++ b/net/minecraft/world/level/levelgen/PhantomSpawner.java
+@@ -57,6 +57,13 @@ public class PhantomSpawner implements CustomSpawner {
+                                     ServerStatsCounter stats = serverPlayer.getStats();
+                                     int i1 = Mth.clamp(stats.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
+                                     int i2 = 24000;
+
+                                    // Leaves start - fakeplayer spawn
+                                    if (serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot bot && bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.SPAWN_PHANTOM)) {
+                                        i1 = Math.max(bot.notSleepTicks, 1);
+                                    }
+                                    // Leaves end - fakeplayer spawn
+
+                                     if (randomSource.nextInt(i1) >= level.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
+                                         BlockPos blockPos1 = blockPos.above(20 + randomSource.nextInt(15))
+                                             .east(-10 + randomSource.nextInt(21))
+diff --git a/net/minecraft/world/level/storage/LevelResource.java b/net/minecraft/world/level/storage/LevelResource.java
+index bef794c3f58c41d910aa0bcc63fbdeea7225fddf..a601da588e6973cc5b87d3e3eeba49b53f6d9a6d 100644
+--- a/net/minecraft/world/level/storage/LevelResource.java
+++ b/net/minecraft/world/level/storage/LevelResource.java
+@@ -15,7 +15,7 @@ public class LevelResource {
+     public static final LevelResource ROOT = new LevelResource(".");
+     private final String id;
+ 
+-    private LevelResource(String id) {
+    public LevelResource(String id) { // Leaves - private -> public
+         this.id = id;
+     }
+ 
+diff --git a/net/minecraft/world/level/storage/PlayerDataStorage.java b/net/minecraft/world/level/storage/PlayerDataStorage.java
+index c44110b123ba5912af18faf0065e9ded780da9b7..e9da7206f9508bb2597f1b6ba8e52fa81e993a10 100644
+--- a/net/minecraft/world/level/storage/PlayerDataStorage.java
+++ b/net/minecraft/world/level/storage/PlayerDataStorage.java
+@@ -20,7 +20,7 @@ import net.minecraft.world.entity.player.Player;
+ import org.bukkit.craftbukkit.entity.CraftPlayer;
+ import org.slf4j.Logger;
+ 
+-public class PlayerDataStorage {
+public class PlayerDataStorage implements org.leavesmc.leaves.bot.IPlayerDataStorage {
+     private static final Logger LOGGER = LogUtils.getLogger();
+     private final File playerDir;
+     protected final DataFixer fixerUpper;
--- a/leaves-server/minecraft-patches/features/0007-Make-shears-in-dispenser-can-unlimited-use.patch
+++ b/leaves-server/minecraft-patches/features/0007-Make-shears-in-dispenser-can-unlimited-use.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 27 Feb 2022 14:07:57 +0800
+Subject: [PATCH] Make shears in dispenser can unlimited use
+
+
+diff --git a/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+index 626e9feb6a6e7a2cbc7c63e30ba4fb6b923e85c7..e8622aed7c59c15ecf73901e610688778dee56fc 100644
+--- a/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+++ b/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+@@ -46,7 +46,7 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
+         if (!serverLevel.isClientSide()) {
+             BlockPos blockPos = blockSource.pos().relative(blockSource.state().getValue(DispenserBlock.FACING));
+             this.setSuccess(tryShearBeehive(serverLevel, blockPos) || tryShearLivingEntity(serverLevel, blockPos, item, bukkitBlock, craftItem)); // CraftBukkit
+-            if (this.isSuccess()) {
+            if (this.isSuccess() && !org.leavesmc.leaves.LeavesConfig.modify.oldMC.shearsInDispenserCanZeroAmount) { // Leaves - Make shears in dispenser can unlimited use
+                 item.hurtAndBreak(1, serverLevel, null, item1 -> {});
+             }
+         }
--- a/leaves-server/minecraft-patches/features/0008-Redstone-Shears-Wrench.patch
+++ b/leaves-server/minecraft-patches/features/0008-Redstone-Shears-Wrench.patch
@@ -0,0 +1,102 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 27 Mar 2022 12:48:40 +0800
+Subject: [PATCH] Redstone Shears Wrench
+
+
+diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
+index 9140b41f2ffef897b74792c916e8320a9a7afb7c..0f4f970071a289209eb8131d289e23426d53e818 100644
+--- a/net/minecraft/world/item/ShearsItem.java
+++ b/net/minecraft/world/item/ShearsItem.java
+@@ -23,6 +23,22 @@ import net.minecraft.world.level.block.GrowingPlantHeadBlock;
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.level.gameevent.GameEvent;
+ 
+// Leaves start - shears wrench
+import net.minecraft.Util;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.level.block.ComparatorBlock;
+import net.minecraft.world.level.block.DispenserBlock;
+import net.minecraft.world.level.block.HopperBlock;
+import net.minecraft.world.level.block.ObserverBlock;
+import net.minecraft.world.level.block.RepeaterBlock;
+import net.minecraft.world.level.block.CrafterBlock;
+import net.minecraft.world.level.block.LeverBlock;
+import net.minecraft.world.level.block.CocoaBlock;
+import net.minecraft.world.level.block.piston.PistonBaseBlock;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.properties.Property;
+// Leaves end - shears wrench
+
+ public class ShearsItem extends Item {
+     public ShearsItem(Item.Properties properties) {
+         super(properties);
+@@ -81,7 +97,68 @@ public class ShearsItem extends Item {
+ 
+             return InteractionResult.SUCCESS;
+         } else {
+            // Leaves start - shears wrench
+            Block block = blockState.getBlock();
+            if (org.leavesmc.leaves.LeavesConfig.modify.redstoneShearsWrench && block instanceof ObserverBlock || block instanceof DispenserBlock ||
+                    block instanceof PistonBaseBlock || block instanceof HopperBlock || block instanceof RepeaterBlock || block instanceof ComparatorBlock ||
+                    block instanceof CrafterBlock || block instanceof LeverBlock || block instanceof CocoaBlock) {
+                StateDefinition<Block, BlockState> blockstatelist = block.getStateDefinition();
+                Property<?> iblockstate = block instanceof CrafterBlock ? blockstatelist.getProperty("orientation") : blockstatelist.getProperty("facing");
+                Player player = context.getPlayer();
+
+                if (iblockstate == null || player == null) {
+                    return InteractionResult.FAIL;
+                }
+
+                if (block instanceof PistonBaseBlock) {
+                    if (getNameHelper(blockState, PistonBaseBlock.EXTENDED).equals("true")) {
+                        return InteractionResult.FAIL;
+                    }
+                }
+
+                if (block instanceof RepeaterBlock || block instanceof ComparatorBlock) {
+                    if (getNameHelper(blockState, ComparatorBlock.POWERED).equals("true")) {
+                        return InteractionResult.FAIL;
+                    }
+                    if (block instanceof RepeaterBlock) {
+                        if (getNameHelper(blockState, RepeaterBlock.LOCKED).equals("true")) {
+                            return InteractionResult.FAIL;
+                        }
+                    }
+                }
+
+                if (block instanceof CrafterBlock) {
+                    if (getNameHelper(blockState, CrafterBlock.CRAFTING).equals("true")) {
+                        return InteractionResult.FAIL;
+                    }
+                }
+
+                BlockState iblockdata1 = ShearsItem.cycleState(blockState, iblockstate, player.isSecondaryUseActive());
+                level.setBlock(clickedPos, iblockdata1, 18);
+                ShearsItem.message(player, Component.translatable("item.minecraft.debug_stick.update", iblockstate.getName(), ShearsItem.getNameHelper(iblockdata1, iblockstate)));
+                return InteractionResult.CONSUME;
+            }
+            // Leaves end - shears wrench
+
+             return super.useOn(context);
+         }
+     }
+
+    // Leaves start - shears wrench
+    private static <T extends Comparable<T>> BlockState cycleState(BlockState state, Property<T> property, boolean inverse) {
+        return state.setValue(property, ShearsItem.getRelative(property.getPossibleValues(), state.getValue(property), inverse)); // CraftBukkit - decompile error
+    }
+
+    private static <T> T getRelative(Iterable<T> elements, T current, boolean inverse) {
+        return inverse ? Util.findPreviousInIterable(elements, current) : Util.findNextInIterable(elements, current);
+    }
+
+    private static void message(Player player, Component message) {
+        ((ServerPlayer) player).sendSystemMessage(message, true);
+    }
+
+    private static <T extends Comparable<T>> String getNameHelper(BlockState state, Property<T> property) {
+        return property.getName(state.getValue(property));
+    }
+    // Leaves end - shears wrench
+ }
--- a/leaves-server/minecraft-patches/features/0009-Add-isShrink-to-EntityResurrectEvent.patch
+++ b/leaves-server/minecraft-patches/features/0009-Add-isShrink-to-EntityResurrectEvent.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 30 Mar 2022 08:58:45 +0000
+Subject: [PATCH] Add isShrink to EntityResurrectEvent
+
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 239c443ddc9bacc08a39a8ef2ab17016a2480549..985a6428f91c5834f36b5cea632af83f50f49f2d 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -1595,14 +1595,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
+             }
+ 
+             final org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
+-            final EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
+            final EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot, true); // Leaves - can dont shrink
+             event.setCancelled(itemStack == null);
+             this.level().getCraftServer().getPluginManager().callEvent(event);
+             if (event.isCancelled()) {
+                 // Set death protection to null as the event was cancelled. Prevent any attempt at ressurection.
+                 deathProtection = null;
+             } else {
+-                if (!itemInHand.isEmpty() && itemStack != null) { // Paper - only reduce item if actual totem was found
+                if (!itemInHand.isEmpty() && itemStack != null && event.isShrink()) { // Paper - only reduce item if actual totem was found // Leaves - can dont shrink
+                     itemInHand.shrink(1);
+                 }
+                 // Paper start - fix NPE when pre-cancelled EntityResurrectEvent is uncancelled
--- a/leaves-server/minecraft-patches/features/0010-Budding-Amethyst-can-push-by-piston.patch
+++ b/leaves-server/minecraft-patches/features/0010-Budding-Amethyst-can-push-by-piston.patch
@@ -4,11 +4,11 @@ Date: Sun, 3 Apr 2022 11:31:04 +0800
 Subject: [PATCH] Budding Amethyst can push by piston


-diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index b6d6c2cb9b227a17fb4ce42bc75f92206fbea043..b3a3388ef62b0622906b2470056cb41f0deb0391 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -583,6 +583,13 @@ public class Block extends BlockBehaviour implements ItemLike {
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
+index 976de81d65b6494cdad20f4ec5125fceec86f951..37f561ae2eca0d118c63f519fabdcfe9cb710826 100644
+--- a/net/minecraft/world/level/block/Block.java
+++ b/net/minecraft/world/level/block/Block.java
+@@ -557,6 +557,13 @@ public class Block extends BlockBehaviour implements ItemLike {
     }
     // Spigot end
 
@@ -19,31 +19,31 @@ index b6d6c2cb9b227a17fb4ce42bc75f92206fbea043..b3a3388ef62b0622906b2470056cb41f
 +    }
 +    // Leaves end - reset push reaction
 +
-     private static record ShapePairKey(VoxelShape first, VoxelShape second) {
- 
-         public boolean equals(Object object) {
-diff --git a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
-index 8920855b07a31715327b8102c7faafc9f916825d..e6cc94e9c1b2388b8e42821e6bfaa2e22d44f9d3 100644
--- a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
-@@ -60,4 +60,12 @@ public class BuddingAmethystBlock extends AmethystBlock {
+     record ShapePairKey(VoxelShape first, VoxelShape second) {
+         @Override
+         public boolean equals(Object other) {
+diff --git a/net/minecraft/world/level/block/BuddingAmethystBlock.java b/net/minecraft/world/level/block/BuddingAmethystBlock.java
+index f6850d3ab54a6eb4ff718d861f39aac2facd3a88..5f51b4689b0ea92eb7e4e5e42e9eb5538930d60d 100644
+--- a/net/minecraft/world/level/block/BuddingAmethystBlock.java
+++ b/net/minecraft/world/level/block/BuddingAmethystBlock.java
+@@ -58,4 +58,12 @@ public class BuddingAmethystBlock extends AmethystBlock {
     public static boolean canClusterGrowAtState(BlockState state) {
         return state.isAir() || state.is(Blocks.WATER) && state.getFluidState().getAmount() == 8;
     }
 +
 +    // Leaves start - budding amethyst can push by piston
-+    @org.jetbrains.annotations.Nullable
 +    @Override
+    @org.jetbrains.annotations.Nullable
 +    public net.minecraft.world.level.material.PushReaction getResetPushReaction() {
 +        return org.leavesmc.leaves.LeavesConfig.modify.buddingAmethystCanPushByPiston ? net.minecraft.world.level.material.PushReaction.PUSH_ONLY : null;
 +    }
 +    // Leaves end - budding amethyst can push by piston
 }
-diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 99fd67a78539133adf78d65e2c520ff3dd260301..4c1ec8de5aa2edde1dbcff350a65b7fc4a4b5e74 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -1159,7 +1159,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
+index 5473b4006f7e0266ea11a7b05cef78a113c30d97..a37a5528b36ebade8b0e3fe570c6d4819ab1cfbf 100644
+--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
+@@ -766,7 +766,7 @@ public abstract class BlockBehaviour implements FeatureElement {
         }
 
         public PushReaction getPistonPushReaction() {
--- a/leaves-server/minecraft-patches/features/0011-Spectator-dont-get-Advancement.patch
+++ b/leaves-server/minecraft-patches/features/0011-Spectator-dont-get-Advancement.patch
@@ -4,14 +4,14 @@ Date: Sat, 25 Jun 2022 18:04:35 +0800
 Subject: [PATCH] Spectator dont get Advancement


-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index b9ed92cd8a12f648eeaa02427d95d75468534420..7f8eaf4590a29b147aa8c05cec919fd7744e74ba 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -221,6 +221,11 @@ public class PlayerAdvancements {
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
+index 459e59c370a729dfeed3872f3a5984dd3da96abe..4e9ce0c8b459ef41a6945182401c47c61b16b1f7 100644
+--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
+@@ -168,6 +168,11 @@ public class PlayerAdvancements {
     }
 
-     public boolean award(AdvancementHolder advancement, String criterionName) {
+     public boolean award(AdvancementHolder advancement, String criterionKey) {
 +        // Leaves start - spectator don't get advancement
 +        if (org.leavesmc.leaves.LeavesConfig.modify.spectatorDontGetAdvancement && player.gameMode.getGameModeForPlayer() == net.minecraft.world.level.GameType.SPECTATOR) {
 +            return false;
--- a/leaves-server/minecraft-patches/features/0012-Stick-can-change-ArmorStand-arm-status.patch
+++ b/leaves-server/minecraft-patches/features/0012-Stick-can-change-ArmorStand-arm-status.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sat, 25 Jun 2022 19:54:23 +0800
+Subject: [PATCH] Stick can change ArmorStand arm status
+
+
+diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
+index a3cc0001a949597e345d7919c3f6109fa4a949ad..dfae614a67476d649be2a8c2cd8258abe12842e3 100644
+--- a/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/net/minecraft/world/entity/decoration/ArmorStand.java
+@@ -341,6 +341,12 @@ public class ArmorStand extends LivingEntity {
+                     return InteractionResult.SUCCESS_SERVER;
+                 }
+             } else {
+                // Leaves start - stick can change ArmorStand arm status
+                if (org.leavesmc.leaves.LeavesConfig.modify.stickChangeArmorStandArmStatus && itemInHand.is(Items.STICK) && player.isShiftKeyDown()) {
+                    setShowArms(!showArms());
+                }
+                // Leaves end - stick can change ArmorStand arm status
+
+                 if (this.isDisabled(equipmentSlotForItem)) {
+                     return InteractionResult.FAIL;
+                 }
--- a/leaves-server/minecraft-patches/features/0013-Configurable-MC-59471.patch
+++ b/leaves-server/minecraft-patches/features/0013-Configurable-MC-59471.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sat, 30 Jul 2022 01:11:30 +0800
+Subject: [PATCH] Configurable MC-59471
+
+
+diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
+index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..15454e9b3289a722c8d7e33ce421a544d03966fa 100644
+--- a/net/minecraft/world/level/block/TripWireHookBlock.java
+++ b/net/minecraft/world/level/block/TripWireHookBlock.java
+@@ -201,7 +201,6 @@ public class TripWireHookBlock extends Block {
+             if (!cancelledEmitterHook) { // Paper - Call BlockRedstoneEvent
+             emitState(level, pos, flag2, flag3, flag, flag1);
+             if (!attaching) {
+-                if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.skipTripwireHookPlacementValidation || level.getBlockState(pos).is(Blocks.TRIPWIRE_HOOK)) // Paper - Validate tripwire hook placement before update
+                 level.setBlock(pos, blockState1.setValue(FACING, direction), 3);
+                 if (shouldNotifyNeighbours) {
+                     notifyNeighbors(block, level, pos, direction);
+@@ -214,10 +213,17 @@ public class TripWireHookBlock extends Block {
+                     BlockPos blockPos1 = pos.relative(direction, i2);
+                     BlockState blockState2 = blockStates[i2];
+                     if (blockState2 != null) {
+-                        BlockState blockState3 = level.getBlockState(blockPos1);
+-                        if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
+-                            level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
+                        // Leaves start - MC-59471
+                        if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.stringTripwireHookDuplicate) {
+                            level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3);
+                            level.getBlockState(blockPos1);
+                        } else {
+                            BlockState blockState3 = level.getBlockState(blockPos1);
+                            if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
+                                level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
+                            }
+                         }
+                        // Leaves end - MC-59471
+                     }
+                 }
+             }
--- a/leaves-server/minecraft-patches/features/0014-No-chat-sign.patch
+++ b/leaves-server/minecraft-patches/features/0014-No-chat-sign.patch
@@ -0,0 +1,147 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 3 Aug 2022 11:20:51 +0800
+Subject: [PATCH] No chat sign
+
+
+diff --git a/net/minecraft/commands/arguments/ArgumentSignatures.java b/net/minecraft/commands/arguments/ArgumentSignatures.java
+index 47cb25aa9c37bd84d156288c397321009f1d9ae2..a94981882ac37ea215df3a71117d4a9b1ab79fcd 100644
+--- a/net/minecraft/commands/arguments/ArgumentSignatures.java
+++ b/net/minecraft/commands/arguments/ArgumentSignatures.java
+@@ -13,10 +13,17 @@ public record ArgumentSignatures(List<ArgumentSignatures.Entry> entries) {
+     private static final int MAX_ARGUMENT_COUNT = 8;
+     private static final int MAX_ARGUMENT_NAME_LENGTH = 16;
+ 
+    // Leaves start - no chat sign
+     public ArgumentSignatures(FriendlyByteBuf buffer) {
+-        this(buffer.readCollection(FriendlyByteBuf.<List<ArgumentSignatures.Entry>>limitValue(ArrayList::new, 8), ArgumentSignatures.Entry::new));
+        this(readSign(buffer));
+     }
+ 
+    private static List<ArgumentSignatures.Entry> readSign(FriendlyByteBuf buf) {
+        var entries = buf.readCollection(FriendlyByteBuf.<List<ArgumentSignatures.Entry>>limitValue(ArrayList::new, 8), ArgumentSignatures.Entry::new);
+        return org.leavesmc.leaves.LeavesConfig.mics.noChatSign ? List.of() : entries;
+    }
+    // Leaves end - no chat sign
+
+     public void write(FriendlyByteBuf buffer) {
+         buffer.writeCollection(this.entries, (buffer1, entry) -> entry.write(buffer1));
+     }
+diff --git a/net/minecraft/network/FriendlyByteBuf.java b/net/minecraft/network/FriendlyByteBuf.java
+index e5e5d9bc095ccd9fbf1c8aaa09e5c4ebb1d1c920..2e4b1883b0338cbb2a8767c7eafcf41558a55ae9 100644
+--- a/net/minecraft/network/FriendlyByteBuf.java
+++ b/net/minecraft/network/FriendlyByteBuf.java
+@@ -114,6 +114,14 @@ public class FriendlyByteBuf extends ByteBuf {
+     public <T> void writeJsonWithCodec(Codec<T> codec, T value, int maxLength) {
+         // Paper end - Adventure; add max length parameter
+         DataResult<JsonElement> dataResult = codec.encodeStart(JsonOps.INSTANCE, value);
+        // Leaves start - no chat sign
+        if (codec == net.minecraft.network.protocol.status.ServerStatus.CODEC) {
+            JsonElement element = dataResult.getOrThrow(string -> new EncoderException("Failed to encode: " + string + " " + value));
+            element.getAsJsonObject().addProperty("preventsChatReports", org.leavesmc.leaves.LeavesConfig.mics.noChatSign);
+            this.writeUtf(GSON.toJson(element));
+            return;
+        }
+        // Leaves end - no chat sign
+         this.writeUtf(GSON.toJson(dataResult.getOrThrow(exception -> new EncoderException("Failed to encode: " + exception + " " + value))), maxLength); // Paper - Adventure; add max length parameter
+     }
+ 
+diff --git a/net/minecraft/network/protocol/game/ServerboundChatPacket.java b/net/minecraft/network/protocol/game/ServerboundChatPacket.java
+index b5afc05924ae899e020c303c8b86398e1d4ab8a0..4479634e577913372faf87138b5ba26ba02ea4f7 100644
+--- a/net/minecraft/network/protocol/game/ServerboundChatPacket.java
+++ b/net/minecraft/network/protocol/game/ServerboundChatPacket.java
+@@ -16,7 +16,7 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
+     );
+ 
+     private ServerboundChatPacket(FriendlyByteBuf buffer) {
+-        this(buffer.readUtf(256), buffer.readInstant(), buffer.readLong(), buffer.readNullable(MessageSignature::read), new LastSeenMessages.Update(buffer));
+        this(buffer.readUtf(256), buffer.readInstant(), buffer.readLong(), buffer.readNullable(ServerboundChatPacket::readSign), new LastSeenMessages.Update(buffer)); // Leaves - no chat sign
+     }
+ 
+     private void write(FriendlyByteBuf buffer) {
+@@ -27,6 +27,14 @@ public record ServerboundChatPacket(String message, Instant timeStamp, long salt
+         this.lastSeenMessages.write(buffer);
+     }
+ 
+    // Leaves start - no chat sign
+    private static MessageSignature readSign(FriendlyByteBuf buf) {
+        byte[] bs = new byte[256];
+        buf.readBytes(bs);
+        return org.leavesmc.leaves.LeavesConfig.mics.noChatSign ? null : new MessageSignature(bs);
+    }
+    // Leaves end - no chat sign
+
+     @Override
+     public PacketType<ServerboundChatPacket> type() {
+         return GamePacketTypes.SERVERBOUND_CHAT;
+diff --git a/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java b/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
+index 1df628ac0b414511aaed6e09d78f884c4170f730..b92081d70ffeec47c304e553ce1aea0a8980752d 100644
+--- a/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
+++ b/net/minecraft/network/protocol/game/ServerboundChatSessionUpdatePacket.java
+@@ -26,6 +26,11 @@ public record ServerboundChatSessionUpdatePacket(RemoteChatSession.Data chatSess
+ 
+     @Override
+     public void handle(ServerGamePacketListener handler) {
+        // Leaves start - no chat report
+        if (org.leavesmc.leaves.LeavesConfig.mics.noChatSign) {
+            return;
+        }
+        // Leaves end - no chat report
+         handler.handleChatSessionUpdate(this);
+     }
+ }
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index 0c4e5aa382fed846a35badf903cab2756621a678..765521cae8bc1c65e3a390d018190646e39c4eb0 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -616,7 +616,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         // Paper start - Add setting for proxy online mode status
+         return properties.enforceSecureProfile
+             && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
+-            && this.services.canValidateProfileKeys();
+            && this.services.canValidateProfileKeys() && !org.leavesmc.leaves.LeavesConfig.mics.noChatSign; // Leaves - no chat sign
+         // Paper end - Add setting for proxy online mode status
+     }
+ 
+diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+index 46ffae71b5119c7c4527a21b19c8e822f4d87114..d3962942cfaf93e8a8f169f243a2cb3c6f4a0ed3 100644
+--- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+@@ -284,10 +284,24 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+     }
+ 
+     public void send(Packet<?> packet) {
+        // Leaves start - rebuild ClientboundPlayerChatPacket
+        if (org.leavesmc.leaves.LeavesConfig.mics.noChatSign) {
+            if (this instanceof ServerGamePacketListenerImpl && packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket chat) {
+                packet = new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(chat.chatType().decorate(chat.unsignedContent() != null ? chat.unsignedContent() : Component.literal(chat.body().content())), false);
+            }
+        }
+        // Leaves end - rebuild ClientboundPlayerChatPacket
+         this.send(packet, null);
+     }
+ 
+     public void send(Packet<?> packet, @Nullable PacketSendListener listener) {
+        // Leaves start - no ClientboundPlayerChatHeaderPacket and rebuild ClientboundPlayerChatPacket
+        if (org.leavesmc.leaves.LeavesConfig.mics.noChatSign) {
+            if (packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket && listener != null) {
+                listener = null;
+            }
+        }
+        // Leaves end - no ClientboundPlayerChatHeaderPacket and rebuild ClientboundPlayerChatPacket
+         // CraftBukkit start
+         if (packet == null || this.processedDisconnect) { // Spigot
+             return;
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 43e1ee3c9e02a1ea33fbd41604c92fe12726ae04..07a2dad0480d030fe198785fab2faa6108a38214 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -1315,7 +1315,7 @@ public abstract class PlayerList {
+     }
+ 
+     public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public
+-        return message.hasSignature() && !message.hasExpiredServer(Instant.now());
+        return org.leavesmc.leaves.LeavesConfig.mics.noChatSign || (message.hasSignature() && !message.hasExpiredServer(Instant.now())); // Leaves - No Not Secure
+     }
+ 
+     // CraftBukkit start
--- a/leaves-server/minecraft-patches/features/0015-Dont-send-useless-entity-packets.patch
+++ b/leaves-server/minecraft-patches/features/0015-Dont-send-useless-entity-packets.patch
@@ -5,24 +5,24 @@ Subject: [PATCH] Dont send useless entity packets

 This patch is Powered by Purpur(https://github.com/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 90eb4927fa51ce3df86aa7b6c71f49150a03e337..1e1e5ade09d368f0fdc6533f26281bd7d6d31751 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -226,6 +226,11 @@ public class ServerEntity {
-                         packet1 = ClientboundEntityPositionSyncPacket.of(this.entity);
-                         flag3 = true;
+diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
+index 0fb253aa55a24b56b17f524b3261c5b75c7d7e59..f2974a0f49711d17c349fdfa8f57d3a4706ff0ca 100644
+--- a/net/minecraft/server/level/ServerEntity.java
+++ b/net/minecraft/server/level/ServerEntity.java
+@@ -186,6 +186,11 @@ public class ServerEntity {
+                     } else if (flag) {
+                         packet = new ClientboundMoveEntityPacket.Rot(this.entity.getId(), b, b1, this.entity.onGround());
                         flag4 = true;
 +                        // Leaves start - dont send useless entity packets
-+                        if (org.leavesmc.leaves.LeavesConfig.performance.dontSendUselessEntityPackets && isUselessPacket(packet1)) {
-+                            packet1 = null;
+                        if (org.leavesmc.leaves.LeavesConfig.performance.dontSendUselessEntityPackets && isUselessPacket(packet)) {
+                            packet = null;
 +                        }
 +                        // Leaves end - dont send useless entity packets
                     }
- 
-                     if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -332,6 +337,21 @@ public class ServerEntity {
-         });
+                 } else {
+                     packet = new ClientboundMoveEntityPacket.PosRot(this.entity.getId(), (short)l, (short)l1, (short)l2, b, b1, this.entity.onGround());
+@@ -302,6 +307,21 @@ public class ServerEntity {
+         return currentPassengers.stream().filter(entity -> !initialPassengers.contains(entity));
     }
 
 +    // Leaves start - dont send useless entity packets
@@ -42,4 +42,4 @@ index 90eb4927fa51ce3df86aa7b6c71f49150a03e337..1e1e5ade09d368f0fdc6533f26281bd7
 +
     public void removePairing(ServerPlayer player) {
         this.entity.stopSeenByPlayer(player);
-         player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
+         player.connection.send(new ClientboundRemoveEntitiesPacket(this.entity.getId()));
--- a/leaves-server/minecraft-patches/features/0016-Optimize-suffocation.patch
+++ b/leaves-server/minecraft-patches/features/0016-Optimize-suffocation.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 14 Aug 2022 08:25:24 +0800
+Subject: [PATCH] Optimize suffocation
+
+This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 985a6428f91c5834f36b5cea632af83f50f49f2d..144b756fede8afcb42015a4b155801d6c3715a45 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -452,7 +452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         if (this.isAlive()) {
+             boolean flag = this instanceof Player;
+             if (this.level() instanceof ServerLevel serverLevel1) {
+-                if (this.isInWall()) {
+                if ((!org.leavesmc.leaves.LeavesConfig.performance.enableSuffocationOptimization || this instanceof WitherBoss || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F))) && this.isInWall()) { // Leaves - optimize suffocation
+                     this.hurtServer(serverLevel1, this.damageSources().inWall(), 1.0F);
+                 } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
+                     double d = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
+@@ -1359,6 +1359,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         return this.getHealth() <= 0.0F;
+     }
+ 
+    // Leaves start - optimize suffocation
+    public boolean couldPossiblyBeHurt(float amount) {
+        return !((float) this.invulnerableTime > (float) this.invulnerableDuration / 2.0F) || !(amount <= this.lastHurt);
+    }
+    // Leaves end - optimize suffocation
+
+     @Override
+     public boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
+         if (this.isInvulnerableTo(level, damageSource)) {
--- a/leaves-server/minecraft-patches/features/0017-Only-check-for-spooky-season-once-an-hour.patch
+++ b/leaves-server/minecraft-patches/features/0017-Only-check-for-spooky-season-once-an-hour.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Only check for spooky season once an hour

 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)

-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 60c2868f255d372226e0c1389caaa5477bbef41e..d432e00ec084d1c7a23f10be6c457681ae66db37 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -242,13 +242,30 @@ public class Bat extends AmbientCreature {
+diff --git a/net/minecraft/world/entity/ambient/Bat.java b/net/minecraft/world/entity/ambient/Bat.java
+index 5ebe7b1dce367d5c5e1136b97b2b9f6737595201..54e59c1fdc9c189b9c6fb620444aeb3d08fde67a 100644
+--- a/net/minecraft/world/entity/ambient/Bat.java
+++ b/net/minecraft/world/entity/ambient/Bat.java
+@@ -243,12 +243,30 @@ public class Bat extends AmbientCreature {
         }
     }
 
@@ -17,27 +17,27 @@ index 60c2868f255d372226e0c1389caaa5477bbef41e..d432e00ec084d1c7a23f10be6c457681
 +    private static boolean isSpookySeason = false;
 +    private static final int ONE_HOUR = 20 * 60 * 60;
 +    private static int lastSpookyCheck = -ONE_HOUR;
+
     private static boolean isHalloween() {
-        LocalDate localdate = LocalDate.now();
-        int i = localdate.get(ChronoField.DAY_OF_MONTH);
-        int j = localdate.get(ChronoField.MONTH_OF_YEAR);
+-        LocalDate localDate = LocalDate.now();
+-        int i = localDate.get(ChronoField.DAY_OF_MONTH);
+-        int i1 = localDate.get(ChronoField.MONTH_OF_YEAR);
+-        return i1 == 10 && i >= 20 || i1 == 11 && i <= 3;
 +        if (org.leavesmc.leaves.LeavesConfig.performance.checkSpookySeasonOnceAnHour) {
 +            if (net.minecraft.server.MinecraftServer.currentTick - lastSpookyCheck > ONE_HOUR) {
 +                LocalDate localdate = LocalDate.now();
-+                int i = localdate.get(ChronoField.DAY_OF_MONTH);
-+                int j = localdate.get(ChronoField.MONTH_OF_YEAR);
+                int i = localdate.getDayOfMonth();
+                int j = localdate.getMonth().getValue();
 +
 +                isSpookySeason = j == 10 && i >= 20 || j == 11 && i <= 3;
 +                lastSpookyCheck = net.minecraft.server.MinecraftServer.currentTick;
 +            }
 +            return isSpookySeason;
 +        } else {
-+            LocalDate localdate = LocalDate.now();
-+            int i = localdate.get(ChronoField.DAY_OF_MONTH);
-+            int j = localdate.get(ChronoField.MONTH_OF_YEAR);
- 
-        return j == 10 && i >= 20 || j == 11 && i <= 3;
-+            return j == 10 && i >= 20 || j == 11 && i <= 3;
+            LocalDate localDate = LocalDate.now();
+            int i = localDate.get(ChronoField.DAY_OF_MONTH);
+            int i1 = localDate.get(ChronoField.MONTH_OF_YEAR);
+            return i1 == 10 && i >= 20 || i1 == 11 && i <= 3;
 +        }
     }
 +    // Leaves end - only check for spooky season once an hour
--- a/leaves-server/minecraft-patches/features/0018-Config-to-disable-method-profiler.patch
+++ b/leaves-server/minecraft-patches/features/0018-Config-to-disable-method-profiler.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 15 Aug 2022 10:18:36 +0800
+Subject: [PATCH] Config to disable method profiler
+
+This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
+
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 073d4a57f78dc18e4cf95bdb852877b8624ec3f8..09fc1c1923f7cc4470cca3b703810fb165c4ca15 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1249,7 +1249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 lastTick = currentTime;
+                 this.nextTickTimeNanos += l;
+ 
+-                try (Profiler.Scope scope = Profiler.use(this.createProfiler())) {
+                try (Profiler.Scope scope = org.leavesmc.leaves.LeavesConfig.mics.disableMethodProfiler ? null : Profiler.use(this.createProfiler())) { // Leaves - disable profiler
+                     ProfilerFiller profilerFiller = Profiler.get();
+                     profilerFiller.push("tick");
+                     this.tickFrame.start();
+diff --git a/net/minecraft/util/profiling/Profiler.java b/net/minecraft/util/profiling/Profiler.java
+index cbd57d68e169ed044f325a776075da78b473b6f3..3e597d650e262bb6021062521f66c91d9806860b 100644
+--- a/net/minecraft/util/profiling/Profiler.java
+++ b/net/minecraft/util/profiling/Profiler.java
+@@ -44,6 +44,7 @@ public final class Profiler {
+     }
+ 
+     public static ProfilerFiller get() {
+        if (org.leavesmc.leaves.LeavesConfig.mics.disableMethodProfiler) return InactiveProfiler.INSTANCE; // Leaves - disable profiler
+         return ACTIVE_COUNT.get() == 0 ? getDefaultFiller() : Objects.requireNonNullElseGet(ACTIVE.get(), Profiler::getDefaultFiller);
+     }
+ 
--- a/leaves-server/minecraft-patches/features/0019-Throttle-goal-selector-during-inactive-ticking.patch
+++ b/leaves-server/minecraft-patches/features/0019-Throttle-goal-selector-during-inactive-ticking.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Throttle goal selector during inactive ticking

 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)

-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index dbd321f3dc3cc80737830db63aed47a6935e8e89..c80976958ad8f51aadf0dab5d49a3e11c77010d4 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -235,11 +235,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
+index 1ed07fd23985a6bf8cf8300f74c92b7531a79fc6..b694ea0a5fee852c31ff503a42e50a999c5a287b 100644
+--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
+@@ -215,11 +215,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
         return this.lookControl;
     }
 
--- a/leaves-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch
+++ b/leaves-server/minecraft-patches/features/0020-Reduce-entity-allocations.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Reduce entity allocations

 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)

-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 94d04a20f97405e02d7cccaabadc7a7e86e336f7..6b5fd2f97b0d4bdf14a9e9059153b1ccc92ffd58 100644
--- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+diff --git a/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+index 4c808c7ef336de74048f40bd1cc8b14131a9325d..22c315f936982e496d26a2846351969b32fe61e4 100644
+--- a/net/minecraft/world/entity/ai/attributes/AttributeMap.java
+++ b/net/minecraft/world/entity/ai/attributes/AttributeMap.java
@@ -23,9 +23,11 @@ public class AttributeMap {
     private final Set<AttributeInstance> attributesToSync = new ObjectOpenHashSet<>();
     private final Set<AttributeInstance> attributesToUpdate = new ObjectOpenHashSet<>();
     private final AttributeSupplier supplier;
 +    private final java.util.function.Function<Holder<Attribute>, AttributeInstance> createInstance; // Leaves - reduce entity allocations
 
-     public AttributeMap(AttributeSupplier defaultAttributes) {
-         this.supplier = defaultAttributes;
+     public AttributeMap(AttributeSupplier supplier) {
+         this.supplier = supplier;
 +        this.createInstance = attribute -> this.supplier.createInstance(this::onAttributeModified, attribute);
     }
 
@@ -25,12 +25,12 @@ index 94d04a20f97405e02d7cccaabadc7a7e86e336f7..6b5fd2f97b0d4bdf14a9e9059153b1cc
 
     @Nullable
     public AttributeInstance getInstance(Holder<Attribute> attribute) {
-        return this.attributes.computeIfAbsent(attribute, attributex -> this.supplier.createInstance(this::onAttributeModified, attributex));
+-        return this.attributes.computeIfAbsent(attribute, holder -> this.supplier.createInstance(this::onAttributeModified, (Holder<Attribute>)holder));
 +        // Leaves start - cache lambda, as for some reason java allocates it anyways
 +        if (org.leavesmc.leaves.LeavesConfig.performance.reduceEntityAllocations) {
 +            return this.attributes.computeIfAbsent(attribute, this.createInstance);
 +        } else {
-+            return this.attributes.computeIfAbsent(attribute, attributex -> this.supplier.createInstance(this::onAttributeModified, attributex));
+            return this.attributes.computeIfAbsent(attribute, holder -> this.supplier.createInstance(this::onAttributeModified, (Holder<Attribute>)holder));
 +        }
 +        // Leaves end - cache lambda, as for some reason java allocates it anyways
     }
--- a/leaves-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch
+++ b/leaves-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 17 Aug 2022 10:56:49 +0800
+Subject: [PATCH] Remove lambda from ticking guard
+
+This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
+
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index c91d6d24d44b3d718680771b2299f04724c15992..8c8b6c4c6fee9bb9279d02d6b7a47cb2e3f39d93 100644
+--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
+@@ -816,7 +816,23 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+                                     }
+ 
+                                     profilerFiller.push("tick");
+-                                    this.guardEntityTick(this::tickNonPassenger, entity);
+                                    // Leaves start - copied from this.guardEntityTick
+                                    if (org.leavesmc.leaves.LeavesConfig.performance.remove.tickGuardLambda) {
+                                        try {
+                                            this.tickNonPassenger(entity); // Leaves - changed
+                                        } catch (Throwable throwable) {
+                                            if (throwable instanceof ThreadDeath) throw throwable; // Paper
+                                            // Paper start - Prevent block entity and entity crashes
+                                            final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
+                                            MinecraftServer.LOGGER.error(msg, throwable);
+                                            getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, throwable))); // Paper - ServerExceptionEvent
+                                            entity.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
+                                            // Paper end - Prevent block entity and entity crashes
+                                        }
+                                    } else {
+                                        this.guardEntityTick(this::tickNonPassenger, entity);
+                                    }
+                                    // Leaves end - copied from this.guardEntityTick
+                                     profilerFiller.pop();
+                                 }
+                             }
--- a/leaves-server/minecraft-patches/features/0022-Cache-climbing-check-for-activation.patch
+++ b/leaves-server/minecraft-patches/features/0022-Cache-climbing-check-for-activation.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 18 Aug 2022 16:31:08 +0800
+Subject: [PATCH] Cache climbing check for activation
+
+This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
+
+diff --git a/io/papermc/paper/entity/activation/ActivationRange.java b/io/papermc/paper/entity/activation/ActivationRange.java
+index bd888ef719b9bfc93bace0b1d0fb771ac659f515..4b552eca363396c7e4ccfbf25d7b826f1c8163bb 100644
+--- a/io/papermc/paper/entity/activation/ActivationRange.java
+++ b/io/papermc/paper/entity/activation/ActivationRange.java
+@@ -215,7 +215,7 @@ public final class ActivationRange {
+         }
+         // special cases.
+         if (entity instanceof final LivingEntity living) {
+-            if (living.onClimbable() || living.jumping || living.hurtTime > 0 || !living.activeEffects.isEmpty() || living.isFreezing()) {
+            if (living.onClimableCached() || living.jumping || living.hurtTime > 0 || !living.activeEffects.isEmpty() || living.isFreezing()) { // Leaves - use cached
+                 return 1;
+             }
+             if (entity instanceof final Mob mob && mob.getTarget() != null) {
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 144b756fede8afcb42015a4b155801d6c3715a45..2dd370bf00b5ddf133c946b6e4d37b00be3ca5a5 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -2026,6 +2026,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
+         return this.lastClimbablePos;
+     }
+ 
+    // Leaves start - cache climbing check
+    private boolean cachedOnClimable = false;
+    private BlockPos lastClimbingPosition = null;
+
+    public boolean onClimableCached() {
+        if (!org.leavesmc.leaves.LeavesConfig.performance.cacheClimbCheck) {
+            return this.onClimbable();
+        }
+        if (!this.blockPosition().equals(this.lastClimbingPosition)) {
+            this.cachedOnClimable = this.onClimbable();
+            this.lastClimbingPosition = this.blockPosition();
+        }
+        return this.cachedOnClimable;
+    }
+    // Leaves end - cache climbing check
+
+     public boolean onClimbable() {
+         if (this.isSpectator()) {
+             return false;
--- a/leaves-server/minecraft-patches/features/0023-Reduce-chunk-loading-lookups.patch
+++ b/leaves-server/minecraft-patches/features/0023-Reduce-chunk-loading-lookups.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 21 Aug 2022 08:29:15 +0800
+Subject: [PATCH] Reduce chunk loading & lookups
+
+This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
+
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
+index 4b5ffd278e0e9d47100e5452949e8d757bbfece4..e2f1623b977889d31407d060b8e0bf911a80049e 100644
+--- a/net/minecraft/world/entity/monster/EnderMan.java
+++ b/net/minecraft/world/entity/monster/EnderMan.java
+@@ -309,11 +309,28 @@ public class EnderMan extends Monster implements NeutralMob {
+     private boolean teleport(double x, double y, double z) {
+         BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(x, y, z);
+ 
+-        while (mutableBlockPos.getY() > this.level().getMinY() && !this.level().getBlockState(mutableBlockPos).blocksMotion()) {
+-            mutableBlockPos.move(Direction.DOWN);
+        // Leaves start - single chunk lookup
+        BlockState blockState;
+        if (org.leavesmc.leaves.LeavesConfig.performance.reduceChuckLoadAndLookup) {
+            net.minecraft.world.level.chunk.LevelChunk chunk = this.level().getChunkIfLoaded(mutableBlockPos);
+            if (chunk == null) {
+                return false;
+            }
+
+            while (mutableBlockPos.getY() > this.level().getMinY() && !chunk.getBlockState(mutableBlockPos).blocksMotion()) {
+                mutableBlockPos.move(Direction.DOWN);
+            }
+
+            blockState = chunk.getBlockState(mutableBlockPos);
+        } else {
+            while (mutableBlockPos.getY() > this.level().getMinY() && !this.level().getBlockState(mutableBlockPos).blocksMotion()) {
+                mutableBlockPos.move(Direction.DOWN);
+            }
+
+            blockState = this.level().getBlockState(mutableBlockPos);
+         }
+        // Leaves end - single chunk lookup
+ 
+-        BlockState blockState = this.level().getBlockState(mutableBlockPos);
+         boolean flag = blockState.blocksMotion();
+         boolean isWater = blockState.getFluidState().is(FluidTags.WATER);
+         if (flag && !isWater) {
--- a/leaves-server/minecraft-patches/features/0024-InstantBlockUpdater-Reintroduced.patch
+++ b/leaves-server/minecraft-patches/features/0024-InstantBlockUpdater-Reintroduced.patch
@@ -5,22 +5,22 @@ Subject: [PATCH] InstantBlockUpdater Reintroduced

 This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)

-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 022de445bbbb869c38be4972c98dcf1c665539ec..1187453b7d961a0605af636cb6b5ed0c1f6b4be3 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -878,7 +878,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
+index 2bbebb4335d927f240abcac67a5b423e38dc33d7..1c7f7747725f95fe3cb92d26745ada7a9784b407 100644
+--- a/net/minecraft/world/level/Level.java
+++ b/net/minecraft/world/level/Level.java
+@@ -888,7 +888,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
         this.thread = Thread.currentThread();
-         this.biomeManager = new BiomeManager(this, i);
-         this.isDebug = flag1;
-        this.neighborUpdater = new CollectingNeighborUpdater(this, j);
+         this.biomeManager = new BiomeManager(this, biomeZoomSeed);
+         this.isDebug = isDebug;
+-        this.neighborUpdater = new CollectingNeighborUpdater(this, maxChainedNeighborUpdates);
 +        // Leaves start - instantBlockUpdaterReintroduced
 +        if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.updater.instantBlockUpdaterReintroduced) {
 +            this.neighborUpdater = new net.minecraft.world.level.redstone.InstantNeighborUpdater(this);
 +        } else {
-+            this.neighborUpdater = new CollectingNeighborUpdater(this, j);
+            this.neighborUpdater = new CollectingNeighborUpdater(this, maxChainedNeighborUpdates);
 +        }
 +        // Leaves end - instantBlockUpdaterReintroduced
-         this.registryAccess = iregistrycustom;
-         this.damageSources = new DamageSources(iregistrycustom);
-         // CraftBukkit start
+         this.registryAccess = registryAccess;
+         this.damageSources = new DamageSources(registryAccess);
+ 
--- a/leaves-server/minecraft-patches/features/0025-Random-flatten-triangular-distribution.patch
+++ b/leaves-server/minecraft-patches/features/0025-Random-flatten-triangular-distribution.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 30 Nov 2022 07:32:05 +0800
+Subject: [PATCH] Random flatten triangular distribution
+
+This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)
+
+diff --git a/net/minecraft/util/RandomSource.java b/net/minecraft/util/RandomSource.java
+index 98a54bc4de251014342cda6d0951b7fea79ce553..17a79cef7dac1b407e4e62883b4a943d172fa6b9 100644
+--- a/net/minecraft/util/RandomSource.java
+++ b/net/minecraft/util/RandomSource.java
+@@ -52,13 +52,25 @@ public interface RandomSource {
+ 
+     double nextGaussian();
+ 
+    // Leaves start - flattenTriangularDistribution
+     default double triangle(double center, double maxDeviation) {
+-        return center + maxDeviation * (this.nextDouble() - this.nextDouble());
+        if (org.leavesmc.leaves.LeavesConfig.modify.flattenTriangularDistribution) {
+            this.nextDouble();
+            return center + maxDeviation * (-1 + this.nextDouble() * 2);
+        } else {
+            return center + maxDeviation * (this.nextDouble() - this.nextDouble());
+        }
+     }
+ 
+     default float triangle(float center, float maxDeviation) {
+-        return center + maxDeviation * (this.nextFloat() - this.nextFloat());
+        if (org.leavesmc.leaves.LeavesConfig.modify.flattenTriangularDistribution) {
+            this.nextFloat();
+            return center + maxDeviation * (-1 + this.nextFloat() * 2);
+        } else {
+            return center + maxDeviation * (this.nextFloat() - this.nextFloat());
+        }
+     }
+    // Leaves end - flattenTriangularDistribution
+ 
+     default void consumeCount(int count) {
+         for (int i = 0; i < count; i++) {
--- a/leaves-server/minecraft-patches/features/0026-BBOR-Protocol.patch
+++ b/leaves-server/minecraft-patches/features/0026-BBOR-Protocol.patch
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:03:42 +0800
+Subject: [PATCH] BBOR Protocol
+
+
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 07a2dad0480d030fe198785fab2faa6108a38214..7628d226960414f9d90d24dd2a9614d6c7e8ebca 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -1438,6 +1438,7 @@ public abstract class PlayerList {
+             serverPlayer.connection.send(clientboundUpdateRecipesPacket);
+             serverPlayer.getRecipeBook().sendInitialRecipeBook(serverPlayer);
+         }
+        org.leavesmc.leaves.protocol.BBORProtocol.onDataPackReload(); // Leaves - bbor
+     }
+ 
+     public boolean isAllowCommandsForAllPlayers() {
+diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
+index 761fdcd4a4e18f45547afd8edff44f61c6eeacb4..1776b79309ffd9a8a52f27a144606ed9a441251e 100644
+--- a/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -739,6 +739,11 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+ 
+     public void setLoaded(boolean loaded) {
+         this.loaded = loaded;
+        // Leaves start - bbor
+        if (loaded) {
+            org.leavesmc.leaves.protocol.BBORProtocol.onChunkLoaded(this);
+        }
+        // Leaves end - bbor
+     }
+ 
+     public Level getLevel() {
--- a/leaves-server/minecraft-patches/features/0027-PCA-sync-protocol.patch
+++ b/leaves-server/minecraft-patches/features/0027-PCA-sync-protocol.patch
@@ -0,0 +1,289 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:17:03 +0800
+Subject: [PATCH] PCA sync protocol
+
+This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
+
+diff --git a/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+index d52a8315f1e6876c26c732f4c4caa47bc6bebf6e..8f287d11ab9ce493d34bf70780964c0f9a7faaa0 100644
+--- a/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+@@ -422,6 +422,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+ 
+     @Override
+     public void containerChanged(Container invBasic) {
+        // Leaves start - pca
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncEntityToClient(this);
+        }
+        // Leaves end - pca
+         boolean isSaddled = this.isSaddled();
+         this.syncSaddleToClients();
+         if (this.tickCount > 20 && !isSaddled && this.isSaddled()) {
+diff --git a/net/minecraft/world/entity/npc/AbstractVillager.java b/net/minecraft/world/entity/npc/AbstractVillager.java
+index a71d16d968bb90fd7aca6f01a3dd56df4f9a7ce6..18a087a52070b9bdee4d02ff3fc6a3c063e444d4 100644
+--- a/net/minecraft/world/entity/npc/AbstractVillager.java
+++ b/net/minecraft/world/entity/npc/AbstractVillager.java
+@@ -65,6 +65,15 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
+         super(entityType, level);
+         this.setPathfindingMalus(PathType.DANGER_FIRE, 16.0F);
+         this.setPathfindingMalus(PathType.DAMAGE_FIRE, -1.0F);
+        // Leaves start - pca
+        if (!this.level().isClientSide()) {
+            this.inventory.addListener(inventory -> {
+                if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+                    org.leavesmc.leaves.protocol.PcaSyncProtocol.syncEntityToClient(this);
+                }
+            });
+        }
+        // Leaves end - pca
+     }
+ 
+     @Override
+diff --git a/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+index 516b230769fb9ddaa49adca9b6aa64d4510810da..c279e2cdafbb710b799a730e5cf7056dd2142d3b 100644
+--- a/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+@@ -64,6 +64,11 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+ 
+     @Override
+     public void setChanged() {
+        // Leaves start - pca
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncEntityToClient(this);
+        }
+        // Leaves end - pca
+     }
+ 
+     @Override
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index cb4b8567c029e3a53aafda2755e3773ea8b95af7..77e7188180cce9ef881de64b263c704b219b610a 100644
+--- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+@@ -434,6 +434,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+         }
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     @Override
+     public void setRecipeUsed(@Nullable RecipeHolder<?> recipe) {
+         if (recipe != null) {
+diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+index 0f808855f58281578c2758513787f0f7330c9291..e31f55ad12160c8406c0ab719f593d4c35ac9100 100644
+--- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+@@ -120,6 +120,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+         this.items = items;
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     @Override
+     protected Component getDefaultName() {
+         return Component.translatable("container.barrel");
+diff --git a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+index 47582c2cbae227c47684b8451c7bac39bce7e0aa..56e65301adba14c0c8af161a7aa9049949ecaddc 100644
+--- a/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+@@ -151,6 +151,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+             super.setChanged();
+         }
+ 
+        // Leaves start - pca
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+        // Leaves end - pca
+         return list;
+     }
+ 
+@@ -208,6 +213,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+                 this.level.gameEvent(GameEvent.BLOCK_CHANGE, blockPos, GameEvent.Context.of(bee, this.getBlockState()));
+             }
+ 
+            // Leaves start - pca
+            if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+                org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+            }
+            // Leaves end - pca
+             bee.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.ENTER_BLOCK); // CraftBukkit - add Bukkit remove cause
+             super.setChanged();
+         }
+@@ -329,6 +339,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+                 if (releaseOccupant(level, pos, state, beeData.toOccupant(), null, beeReleaseStatus, savedFlowerPos)) {
+                     flag = true;
+                     iterator.remove();
+                    // Leaves start - pca
+                    if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+                        org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(java.util.Objects.requireNonNull(level.getBlockEntity(pos)));
+                    }
+                    // Leaves end - pca
+                 }
+                 // Paper start - Fix bees aging inside; use exitTickCounter to keep actual bee life
+                 else {
+@@ -372,6 +387,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+             this.maxBees = tag.getInt("Bukkit.MaxEntities");
+         }
+         // CraftBukkit end
+        // Leaves start - pca
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+        // Leaves end - pca
+     }
+ 
+     @Override
+diff --git a/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+index 94f9477e78600eded6eecc4c961576501001d187..a9a85655aac78a0be91100e8b411a28eb066162d 100644
+--- a/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+@@ -324,4 +324,14 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+     protected AbstractContainerMenu createMenu(int id, Inventory player) {
+         return new BrewingStandMenu(id, player, this, this.dataAccess);
+     }
+
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+ }
+diff --git a/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+index afd9d657e3dc5715f22a49acb100412d00df7b7a..c59bf8a56e61cfcae064fc8a92d2c9840f733b77 100644
+--- a/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+@@ -198,6 +198,16 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
+         otherChest.setItems(items);
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     @Override
+     protected AbstractContainerMenu createMenu(int id, Inventory player) {
+         return ChestMenu.threeRows(id, player, this);
+diff --git a/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java b/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java
+index d3bff18645f4d3c5b71a9ee232b8e51fa8aaaaa0..2922ce789b7ae5bcd4adb70ab153ecb19355e030 100644
+--- a/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/ComparatorBlockEntity.java
+@@ -24,6 +24,16 @@ public class ComparatorBlockEntity extends BlockEntity {
+         this.output = tag.getInt("OutputSignal");
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     public int getOutputSignal() {
+         return this.output;
+     }
+diff --git a/net/minecraft/world/level/block/entity/DispenserBlockEntity.java b/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
+index 33ca79c5713961a657d3a7af1f53b89e9449eba9..3c62662e626d3f0e309d2a973c73e6ac1055cae3 100644
+--- a/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
+@@ -99,6 +99,16 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
+         return stack;
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     @Override
+     protected Component getDefaultName() {
+         return Component.translatable("container.dispenser");
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 5cd1326ad5d046c88b2b3449d610a78fa880b4cd..42a29e700d2549de7cd905c373212e9757bcfcf1 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -118,6 +118,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+         this.facing = blockState.getValue(HopperBlock.FACING);
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     @Override
+     protected Component getDefaultName() {
+         return Component.translatable("container.hopper");
+@@ -194,6 +204,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                 if (flag) {
+                     blockEntity.setCooldown(level.spigotConfig.hopperTransfer); // Spigot
+                     setChanged(level, pos, state);
+                    // Leaves start - pca
+                    if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+                        org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(blockEntity);
+                    }
+                    // Leaves end - pca
+                     return true;
+                 }
+             }
+diff --git a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+index a2ae4b47d742e7fb9809cfc4575517c06400ec61..cc8781c0a357eebc2bff936b4e7be53cc316716d 100644
+--- a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+@@ -258,6 +258,16 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+         this.itemStacks = items;
+     }
+ 
+    // Leaves start - pca
+    @Override
+    public void setChanged() {
+        super.setChanged();
+        if (org.leavesmc.leaves.LeavesConfig.protocol.pca.enable) {
+            org.leavesmc.leaves.protocol.PcaSyncProtocol.syncBlockEntityToClient(this);
+        }
+    }
+    // Leaves end - pca
+
+     @Override
+     public int[] getSlotsForFace(Direction side) {
+         return SLOTS;
--- a/leaves-server/minecraft-patches/features/0028-Jade-Protocol.patch
+++ b/leaves-server/minecraft-patches/features/0028-Jade-Protocol.patch
@@ -0,0 +1,111 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:33:19 +0800
+Subject: [PATCH] Jade Protocol
+
+This patch is Powered by Jade(https://github.com/Snownee/Jade)
+
+diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index dfdbcb31458095a71c187efc2774ecc4945dd11b..cbcd0b7d2107f7ddd353b2bc2d51a0af32450c57 100644
+--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -61,7 +61,7 @@ public class Armadillo extends Animal {
+     public final AnimationState rollOutAnimationState = new AnimationState();
+     public final AnimationState rollUpAnimationState = new AnimationState();
+     public final AnimationState peekAnimationState = new AnimationState();
+-    private int scuteTime;
+    public int scuteTime; // Leaves - private -> public
+     private boolean peekReceivedClient = false;
+ 
+     public Armadillo(EntityType<? extends Animal> entityType, Level level) {
+diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java
+index 97adf8142cdd322c4873c420ed760e9dee34da23..cd04199fa8861025e92884f9ec2d3c721c50ad75 100644
+--- a/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/net/minecraft/world/entity/animal/frog/Tadpole.java
+@@ -253,7 +253,7 @@ public class Tadpole extends AbstractFish {
+         }
+     }
+ 
+-    private int getTicksLeftUntilAdult() {
+    public int getTicksLeftUntilAdult() { // Leaves - private -> public
+         return Math.max(0, ticksToBeFrog - this.age);
+     }
+ 
+diff --git a/net/minecraft/world/level/storage/loot/LootPool.java b/net/minecraft/world/level/storage/loot/LootPool.java
+index 29ad43245a310756c4227acd7532e905f7f8b8ee..ad422817593449b8e914628b51d760e732e2d50c 100644
+--- a/net/minecraft/world/level/storage/loot/LootPool.java
+++ b/net/minecraft/world/level/storage/loot/LootPool.java
+@@ -36,7 +36,7 @@ public class LootPool {
+             )
+             .apply(instance, LootPool::new)
+     );
+-    private final List<LootPoolEntryContainer> entries;
+    public final List<LootPoolEntryContainer> entries; // Leaves - private -> public
+     private final List<LootItemCondition> conditions;
+     private final Predicate<LootContext> compositeCondition;
+     private final List<LootItemFunction> functions;
+diff --git a/net/minecraft/world/level/storage/loot/LootTable.java b/net/minecraft/world/level/storage/loot/LootTable.java
+index f95d0f2da3d958519d28278079555c800aad02f8..bebffd07047e41c53b9e4f1ad5917680b8e8c796 100644
+--- a/net/minecraft/world/level/storage/loot/LootTable.java
+++ b/net/minecraft/world/level/storage/loot/LootTable.java
+@@ -45,7 +45,7 @@ public class LootTable {
+     public static final Codec<Holder<LootTable>> CODEC = RegistryFileCodec.create(Registries.LOOT_TABLE, DIRECT_CODEC);
+     private final ContextKeySet paramSet;
+     private final Optional<ResourceLocation> randomSequence;
+-    private final List<LootPool> pools;
+    public final List<LootPool> pools; // Leaves - private -> public
+     private final List<LootItemFunction> functions;
+     private final BiFunction<ItemStack, LootContext, ItemStack> compositeFunction;
+     public org.bukkit.craftbukkit.CraftLootTable craftLootTable; // CraftBukkit
+diff --git a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
+index 8e91ddc6c0e492d165ad8322b4a3d5c3bad5409c..6e420bfb3c223b094157bdfec7dad20d8eab4968 100644
+--- a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
+++ b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
+@@ -9,7 +9,7 @@ import net.minecraft.world.level.storage.loot.ValidationContext;
+ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+ 
+ public abstract class CompositeEntryBase extends LootPoolEntryContainer {
+-    protected final List<LootPoolEntryContainer> children;
+    public final List<LootPoolEntryContainer> children; // Leaves - private -> public
+     private final ComposableEntryContainer composedChildren;
+ 
+     protected CompositeEntryBase(List<LootPoolEntryContainer> children, List<LootItemCondition> conditions) {
+diff --git a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
+index e0e933245e038b7229eeddbda272b081161ab603..c5e3834fa970ac909cefea43420378394153d781 100644
+--- a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
+++ b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
+@@ -13,7 +13,7 @@ import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder;
+ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+ 
+ public abstract class LootPoolEntryContainer implements ComposableEntryContainer {
+-    protected final List<LootItemCondition> conditions;
+    public final List<LootItemCondition> conditions; // Leaves - private -> public
+     private final Predicate<LootContext> compositeCondition;
+ 
+     protected LootPoolEntryContainer(List<LootItemCondition> conditions) {
+diff --git a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
+index d5e697a0cf6091a7f37c68e3c2a52851535735b1..a8a5a872a8647896e80f91cb5a89adead4005cf7 100644
+--- a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
+++ b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
+@@ -25,7 +25,7 @@ public class NestedLootTable extends LootPoolSingletonContainer {
+             .and(singletonFields(instance))
+             .apply(instance, NestedLootTable::new)
+     );
+-    private final Either<ResourceKey<LootTable>, LootTable> contents;
+    public final Either<ResourceKey<LootTable>, LootTable> contents; // Leaves - private -> public
+ 
+     private NestedLootTable(
+         Either<ResourceKey<LootTable>, LootTable> contents, int weight, int quality, List<LootItemCondition> conditions, List<LootItemFunction> functions
+diff --git a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
+index 7134c54984a12949cd6a2e8dc35c2e1c0431e524..52f36fbb9bfcad81004e531efab85e9b87d3284d 100644
+--- a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
+++ b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
+@@ -11,7 +11,7 @@ import net.minecraft.world.level.storage.loot.LootContext;
+ import net.minecraft.world.level.storage.loot.ValidationContext;
+ 
+ public abstract class CompositeLootItemCondition implements LootItemCondition {
+-    protected final List<LootItemCondition> terms;
+    public final List<LootItemCondition> terms; // Leaves - private -> public
+     private final Predicate<LootContext> composedPredicate;
+ 
+     protected CompositeLootItemCondition(List<LootItemCondition> terms, Predicate<LootContext> composedPredicate) {
--- a/leaves-server/minecraft-patches/features/0029-Alternative-block-placement-Protocol.patch
+++ b/leaves-server/minecraft-patches/features/0029-Alternative-block-placement-Protocol.patch
@@ -0,0 +1,101 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 13:51:26 +0800
+Subject: [PATCH] Alternative block placement Protocol
+
+This patch is Powered by
+carpet-extra(https://github.com/gnembon/carpet-extra)
+MasaGadget(https://github.com/plusls/MasaGadget)
+litematica(https://github.com/maruohon/litematica)
+
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index 68e50c6ade879d263424f244070677cb81c34c33..e619a872d51bf0be64ff594c916c89a5bbf1d3fc 100644
+--- a/net/minecraft/world/item/BlockItem.java
+++ b/net/minecraft/world/item/BlockItem.java
+@@ -158,6 +158,27 @@ public class BlockItem extends Item {
+     @Nullable
+     protected BlockState getPlacementState(BlockPlaceContext context) {
+         BlockState stateForPlacement = this.getBlock().getStateForPlacement(context);
+        // Leaves start - alternativeBlockPlacement
+        switch (org.leavesmc.leaves.LeavesConfig.protocol.alternativeBlockPlacement) {
+            case CARPET -> {
+                BlockState tryState = org.leavesmc.leaves.protocol.CarpetAlternativeBlockPlacement.alternativeBlockPlacement(getBlock(), context);
+                if (tryState != null) {
+                    stateForPlacement = tryState;
+                }
+            }
+            case CARPET_FIX -> {
+                BlockState tryState = org.leavesmc.leaves.protocol.CarpetAlternativeBlockPlacement.alternativeBlockPlacementFix(getBlock(), context);
+                if (tryState != null) {
+                    stateForPlacement = tryState;
+                }
+            }
+            case LITEMATICA -> {
+                if (stateForPlacement != null && this.canPlace(context, stateForPlacement)) {
+                    return org.leavesmc.leaves.protocol.LitematicaEasyPlaceProtocol.applyPlacementProtocol(stateForPlacement, context);
+                }
+            }
+        }
+        // Leaves end - alternativeBlockPlacement
+         return stateForPlacement != null && this.canPlace(context, stateForPlacement) ? stateForPlacement : null;
+     }
+ 
+diff --git a/net/minecraft/world/item/StandingAndWallBlockItem.java b/net/minecraft/world/item/StandingAndWallBlockItem.java
+index 12c6c8aeec89a0a55633c62fe98f5a3aa75fd476..1f0e7c391d02b18e2c89700025713ec3d759f2ea 100644
+--- a/net/minecraft/world/item/StandingAndWallBlockItem.java
+++ b/net/minecraft/world/item/StandingAndWallBlockItem.java
+@@ -27,14 +27,14 @@ public class StandingAndWallBlockItem extends BlockItem {
+     @Nullable
+     @Override
+     protected BlockState getPlacementState(BlockPlaceContext context) {
+-        BlockState stateForPlacement = this.wallBlock.getStateForPlacement(context);
+        BlockState stateForPlacement = this.wallBlock.getRealStateForPlacement(context); // Leaves - alternativeBlockPlacement
+         BlockState blockState = null;
+         LevelReader level = context.getLevel();
+         BlockPos clickedPos = context.getClickedPos();
+ 
+         for (Direction direction : context.getNearestLookingDirections()) {
+             if (direction != this.attachmentDirection.getOpposite()) {
+-                BlockState blockState1 = direction == this.attachmentDirection ? this.getBlock().getStateForPlacement(context) : stateForPlacement;
+                BlockState blockState1 = direction == this.attachmentDirection ? this.getBlock().getRealStateForPlacement(context) : stateForPlacement; // Leaves - alternativeBlockPlacement
+                 if (blockState1 != null && this.canPlace(level, blockState1, clickedPos)) {
+                     blockState = blockState1;
+                     break;
+diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
+index 37f561ae2eca0d118c63f519fabdcfe9cb710826..43e338e75b7ded9f80e4ff2ce1a7dac043c93ea1 100644
+--- a/net/minecraft/world/level/block/Block.java
+++ b/net/minecraft/world/level/block/Block.java
+@@ -392,6 +392,33 @@ public class Block extends BlockBehaviour implements ItemLike {
+     public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
+     }
+ 
+    // Leaves start - alternativeBlockPlacement
+    @Nullable
+    public BlockState getRealStateForPlacement(BlockPlaceContext ctx) {
+        BlockState vanillaState = getStateForPlacement(ctx);
+        switch (org.leavesmc.leaves.LeavesConfig.protocol.alternativeBlockPlacement) {
+            case CARPET -> {
+                BlockState tryState = org.leavesmc.leaves.protocol.CarpetAlternativeBlockPlacement.alternativeBlockPlacement(this, ctx);
+                if (tryState != null) {
+                    return tryState;
+                }
+            }
+            case CARPET_FIX -> {
+                BlockState tryState = org.leavesmc.leaves.protocol.CarpetAlternativeBlockPlacement.alternativeBlockPlacementFix(this, ctx);
+                if (tryState != null) {
+                    return tryState;
+                }
+            }
+            case LITEMATICA -> {
+                if (vanillaState != null) {
+                    return org.leavesmc.leaves.protocol.LitematicaEasyPlaceProtocol.applyPlacementProtocol(vanillaState, ctx);
+                }
+            }
+        }
+        return vanillaState;
+    }
+    // Leaves end - alternativeBlockPlacement
+
+     @Nullable
+     public BlockState getStateForPlacement(BlockPlaceContext context) {
+         return this.defaultBlockState();
--- a/leaves-server/minecraft-patches/features/0030-Player-operation-limiter.patch
+++ b/leaves-server/minecraft-patches/features/0030-Player-operation-limiter.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Player operation limiter

 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)

-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ebae6c704844755c75aa0c6f460603c5d909b5cf..d02f0123a830c77056e978bbef8d454d110d0589 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -329,6 +329,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index c9e7f3cfe5aff88424ced502be18e7bb0c20240f..68c934aec165690979f066eee73d4b2bc803ed14 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -393,6 +393,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
     public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
     public @Nullable String clientBrandName = null; // Paper - Brand support
     public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -20,18 +20,18 @@ index ebae6c704844755c75aa0c6f460603c5d909b5cf..d02f0123a830c77056e978bbef8d454d
 
     // Paper start - rewrite chunk system
     private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -991,6 +995,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
-             this.joining = false;
+@@ -798,6 +802,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
         }
         // CraftBukkit end
+         this.tickClientLoadTimeout();
 +        this.resetOperationCountPerTick(); // Leaves - player operation limiter
         this.gameMode.tick();
         this.wardenSpawnTracker.tick();
-         --this.spawnInvulnerableTime;
-@@ -3314,5 +3319,32 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
-     public CraftPlayer getBukkitEntity() {
-         return (CraftPlayer) super.getBukkitEntity();
+         if (this.invulnerableTime > 0) {
+@@ -3087,4 +3092,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
     }
+     // CraftBukkit end
 +
 +    // Leaves start - player operation limiter
 +    private void resetOperationCountPerTick() {
@@ -59,54 +59,54 @@ index ebae6c704844755c75aa0c6f460603c5d909b5cf..d02f0123a830c77056e978bbef8d454d
 +        return (instaBreakCountPerTick == 0 || placeBlockCountPerTick == 0) && (instaBreakCountPerTick <= 1 && placeBlockCountPerTick <= 2);
 +    }
 +    // Leaves end - player operation limiter
-     // CraftBukkit end
 }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a96f859a5d0c6ec692d4627a69f3c9ee49199dbc..31ff81ca6a89fc3ce59c4b53a6a547eb4f2e812a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -337,6 +337,19 @@ public class ServerPlayerGameMode {
+diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
+index 623c069f1fe079e020c6391a3db1a3d95cd3dbf5..d2b2290c73826278a89eb02ab81ee503ee41a4a2 100644
+--- a/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -303,6 +303,19 @@ public class ServerPlayerGameMode {
     }
 
-     public void destroyAndAck(BlockPos pos, int sequence, String reason) {
+     public void destroyAndAck(BlockPos pos, int sequence, String message) {
 +        // Leaves start - player operation limiter
 +        if (org.leavesmc.leaves.LeavesConfig.modify.playerOperationLimiter) {
-+            if (reason.equals("insta mine")) {
+            if (message.equals("insta mine")) {
 +                player.addInstaBreakCountPerTick();
 +                if (!player.allowOperation()) {
-+                    MinecraftServer.getServer().server.getPluginManager().callEvent(new org.leavesmc.leaves.event.player.PlayerOperationLimitEvent(player.getBukkitEntity(), org.leavesmc.leaves.event.player.PlayerOperationLimitEvent.Operation.MINE, CraftBlock.at(level, pos)));
+                    this.level.getCraftServer().getPluginManager().callEvent(new org.leavesmc.leaves.event.player.PlayerOperationLimitEvent(player.getBukkitEntity(), org.leavesmc.leaves.event.player.PlayerOperationLimitEvent.Operation.MINE, org.bukkit.craftbukkit.block.CraftBlock.at(level, pos)));
 +                    this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
-+                    this.debugLogging(pos, false, sequence, reason);
+                    this.debugLogging(pos, false, sequence, message);
 +                    return;
 +                }
 +            }
 +        }
 +        // Leaves end - player operation limiter
         if (this.destroyBlock(pos)) {
-             this.debugLogging(pos, true, sequence, reason);
+             this.debugLogging(pos, true, sequence, message);
         } else {
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index dba8ee20f9fed3adf26885471897ade154ec1d4d..77309808abd4ab476e815d60015ad828102a1f6b 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -74,6 +74,20 @@ public class BlockItem extends Item {
-                 final org.bukkit.block.BlockState oldBlockstate = blockstate != null ? blockstate : org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos()); // Paper - Reset placed block on exception
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index e619a872d51bf0be64ff594c916c89a5bbf1d3fc..1f4a3d2610abfa2ea2b1d5feba9606b806d6d416 100644
+--- a/net/minecraft/world/item/BlockItem.java
+++ b/net/minecraft/world/item/BlockItem.java
+@@ -72,6 +72,21 @@ public class BlockItem extends Item {
+                 final org.bukkit.block.BlockState oldBukkitState = bukkitState != null ? bukkitState : org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockPlaceContext.getLevel(), blockPlaceContext.getClickedPos()); // Paper - Reset placed block on exception
                 // CraftBukkit end
 
 +                // Leaves start - player operation limiter
 +                if (org.leavesmc.leaves.LeavesConfig.modify.playerOperationLimiter && !context.getLevel().isClientSide()) {
 +                    ServerPlayer player = (ServerPlayer) context.getPlayer();
-+                    if (player != null && iblockdata != null) {
+                    if (player != null && placementState != null) {
 +                        player.addPlaceBlockCountPerTick();
 +                        if (!player.allowOperation()) {
-+                            if (blockstate != null) {
-+                                MinecraftServer.getServer().server.getPluginManager().callEvent(new org.leavesmc.leaves.event.player.PlayerOperationLimitEvent(player.getBukkitEntity(), org.leavesmc.leaves.event.player.PlayerOperationLimitEvent.Operation.PLACE, blockstate.getBlock()));
+                            if (bukkitState != null) {
+                                context.getLevel().getCraftServer().getPluginManager().callEvent(new org.leavesmc.leaves.event.player.PlayerOperationLimitEvent(player.getBukkitEntity(), org.leavesmc.leaves.event.player.PlayerOperationLimitEvent.Operation.PLACE, bukkitState.getBlock()));
 +                            }
 +                            return InteractionResult.FAIL;
 +                        }
 +                    }
 +                }
 +                // Leaves end - player operation limiter
-                 if (iblockdata == null) {
+
+                 if (placementState == null) {
                     return InteractionResult.FAIL;
-                 } else if (!this.placeBlock(blockactioncontext1, iblockdata)) {
+                 } else if (!this.placeBlock(blockPlaceContext, placementState)) {
--- a/leaves-server/minecraft-patches/features/0031-Renewable-Elytra.patch
+++ b/leaves-server/minecraft-patches/features/0031-Renewable-Elytra.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Renewable Elytra

 This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)

-diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 150fd890ac65097b5434fd88e8d2b24a89dca79a..e47de71f7c120cf7f1a7cdb5e49b1d89163e5722 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -233,6 +233,20 @@ public class Phantom extends FlyingMob implements Enemy {
-         return predicate.test(world, this, target);
+diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
+index a91aba11ecda561d117c9d8db85c92cdcd81887e..d4123b93cec95daeb9991cf20b1d2c8701474606 100644
+--- a/net/minecraft/world/entity/monster/Phantom.java
+++ b/net/minecraft/world/entity/monster/Phantom.java
+@@ -242,6 +242,20 @@ public class Phantom extends FlyingMob implements Enemy {
+         return targetingConditions.test(level, this, entity);
     }
 
 +    // Leaves start - renewable elytra
@@ -27,6 +27,6 @@ index 150fd890ac65097b5434fd88e8d2b24a89dca79a..e47de71f7c120cf7f1a7cdb5e49b1d89
 +    }
 +    // Leaves end - renewable elytra
 +
-     // Paper start
-     @Nullable
-     java.util.UUID spawningEntity;
+     static enum AttackPhase {
+         CIRCLE,
+         SWOOP;
--- a/leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch
+++ b/leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch
@@ -0,0 +1,393 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 14 Dec 2022 14:47:06 +0800
+Subject: [PATCH] Stackable ShulkerBoxes
+
+This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet) and plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
+
+diff --git a/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java b/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
+index 828fbe03e7beb860cd0816c7ac8adbffe196533b..513988c37de927ddf48f2bc9cf6905c70c41e75d 100644
+--- a/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
+++ b/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
+@@ -23,7 +23,7 @@ public class ClientboundContainerSetContentPacket implements Packet<ClientGamePa
+         this.items = NonNullList.withSize(items.size(), ItemStack.EMPTY);
+ 
+         for (int i = 0; i < items.size(); i++) {
+-            this.items.set(i, items.get(i).copy());
+            this.items.set(i, org.leavesmc.leaves.util.ShulkerBoxUtils.correctItemStackMaxStackSize(items.get(i).copy())); // Leaves - stackable shulker boxes
+         }
+ 
+         this.carriedItem = carriedItem.copy();
+diff --git a/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java b/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
+index c1130f596cf3443eeb62eb1b12587172fe0859ee..ad51ad9f104f8f7238298b025e2d7485aa88a253 100644
+--- a/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
+++ b/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
+@@ -19,7 +19,7 @@ public class ClientboundContainerSetSlotPacket implements Packet<ClientGamePacke
+         this.containerId = containerId;
+         this.stateId = stateId;
+         this.slot = slot;
+-        this.itemStack = itemStack.copy();
+        this.itemStack = org.leavesmc.leaves.util.ShulkerBoxUtils.correctItemStackMaxStackSize(itemStack.copy()); // Leaves - stackable shulker boxes
+     }
+ 
+     private ClientboundContainerSetSlotPacket(RegistryFriendlyByteBuf buffer) {
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 882dbb1276c548316938bbc50f5f7e01f8547ff8..9955fc7bcf75dbe86c5fcbace2dd1f2ccf479207 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3380,7 +3380,7 @@ public class ServerGamePacketListenerImpl
+             }
+ 
+             boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
+-            boolean flag2 = itemStack.isEmpty() || itemStack.getCount() <= itemStack.getMaxStackSize();
+            boolean flag2 = itemStack.isEmpty() || itemStack.getCount() <= org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemStack); // Leaves - stackable shulker boxes
+             if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot
+                 // CraftBukkit start - Call click event
+                 InventoryView inventory = this.player.inventoryMenu.getBukkitView();
+diff --git a/net/minecraft/world/Container.java b/net/minecraft/world/Container.java
+index 2d3721e311851c1801b090e99d4f9d0daf4e5f99..f779d27603e6d81435c061214a2db3a14a31c11e 100644
+--- a/net/minecraft/world/Container.java
+++ b/net/minecraft/world/Container.java
+@@ -30,6 +30,12 @@ public interface Container extends Clearable {
+         return Math.min(this.getMaxStackSize(), stack.getMaxStackSize());
+     }
+ 
+    // Leaves start - stackable shulker boxes
+    default int getMaxStackLeaves(ItemStack stack) {
+        return Math.min(this.getMaxStackSize(), org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(stack));
+    }
+    // Leaves end - stackable shulker boxes
+
+     void setChanged();
+ 
+     boolean stillValid(Player player);
+diff --git a/net/minecraft/world/SimpleContainer.java b/net/minecraft/world/SimpleContainer.java
+index 190190463086f2fcbe28f00fa2f23795bf11f279..6ee5ecc89e360ca30ed5f7f355ae943c5a6337ca 100644
+--- a/net/minecraft/world/SimpleContainer.java
+++ b/net/minecraft/world/SimpleContainer.java
+@@ -205,7 +205,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     @Override
+     public void setItem(int index, ItemStack stack) {
+         this.items.set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack));
+         this.setChanged();
+     }
+ 
+@@ -280,7 +280,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     }
+ 
+     private void moveItemsBetweenStacks(ItemStack stack, ItemStack other) {
+-        int maxStackSize = this.getMaxStackSize(other);
+        int maxStackSize = this.getMaxStackLeaves(other); // Leaves - stackable shulker boxes
+         int min = Math.min(stack.getCount(), maxStackSize - other.getCount());
+         if (min > 0) {
+             other.grow(min);
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index 52a7ed0d991758bad0dcedcb7f97fb15ac6c6d04..d2d258246e7f7332c0420077e33c05e222bda46d 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
+++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -274,10 +274,52 @@ public class ItemEntity extends Entity implements TraceableEntity {
+ 
+     private boolean isMergable() {
+         ItemStack item = this.getItem();
+-        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && item.getCount() < item.getMaxStackSize(); // Paper - Alternative item-despawn-rate
+        return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && item.getCount() < org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(item); // Paper - Alternative item-despawn-rate // Leaves - stackable shulker boxes
+     }
+ 
+    // Leaves end - stackable shulker boxes
+    private boolean tryStackShulkerBoxes(ItemEntity other) {
+        ItemStack selfStack = this.getItem();
+        if (org.leavesmc.leaves.LeavesConfig.modify.shulkerBoxStackSize == 1 ||
+                !(selfStack.getItem() instanceof net.minecraft.world.item.BlockItem blockItem) ||
+                !(blockItem.getBlock() instanceof net.minecraft.world.level.block.ShulkerBoxBlock)
+        ) {
+            return false;
+        }
+
+        ItemStack otherStack = other.getItem();
+        if (selfStack.getItem() == otherStack.getItem()
+                && org.leavesmc.leaves.util.ShulkerBoxUtils.shulkerBoxNoItem(selfStack)
+                && org.leavesmc.leaves.util.ShulkerBoxUtils.shulkerBoxNoItem(otherStack)
+                && Objects.equals(selfStack.getComponents(), otherStack.getComponents()) // empty block entity tags are cleaned up when spawning
+                && selfStack.getCount() != org.leavesmc.leaves.LeavesConfig.modify.shulkerBoxStackSize) {
+            int amount = Math.min(otherStack.getCount(), org.leavesmc.leaves.LeavesConfig.modify.shulkerBoxStackSize - selfStack.getCount());
+
+            selfStack.grow(amount);
+            this.setItem(selfStack);
+
+            this.pickupDelay = Math.max(other.pickupDelay, this.pickupDelay);
+            this.age = Math.min(other.getAge(), this.age);
+
+            otherStack.shrink(amount);
+            if (otherStack.isEmpty()) {
+                other.discard();
+            }
+            else {
+                other.setItem(otherStack);
+            }
+            return true;
+        }
+        return false;
+    }
+    // Leaves end - stackable shulker boxes
+
+     private void tryToMerge(ItemEntity itemEntity) {
+        // Leaves start - stackable shulker boxes
+        if (tryStackShulkerBoxes(itemEntity)) {
+            return;
+        }
+        // Leaves end - stackable shulker boxes
+         ItemStack item = this.getItem();
+         ItemStack item1 = itemEntity.getItem();
+         if (Objects.equals(this.target, itemEntity.target) && areMergable(item, item1)) {
+diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java
+index 839cbb67d3d38960d9114a4db5bab911b66a573c..9b628d553d3206a4881ed5e07fa6d2552b710cea 100644
+--- a/net/minecraft/world/entity/player/Inventory.java
+++ b/net/minecraft/world/entity/player/Inventory.java
+@@ -97,10 +97,12 @@ public class Inventory implements Container, Nameable {
+     }
+ 
+     private boolean hasRemainingSpaceForItem(ItemStack destination, ItemStack origin) {
+        // Leaves start - stackable shulker boxes
+         return !destination.isEmpty()
+-            && destination.isStackable()
+-            && destination.getCount() < this.getMaxStackSize(destination)
+            && org.leavesmc.leaves.util.ShulkerBoxUtils.isStackable(destination)
+            && destination.getCount() < org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(destination)
+             && ItemStack.isSameItemSameComponents(destination, origin); // Paper - check if itemstack is stackable first
+        // Leaves end - stackable shulker boxes
+     }
+ 
+     // CraftBukkit start - Watch method above! :D
+@@ -113,7 +115,7 @@ public class Inventory implements Container, Nameable {
+             }
+ 
+             if (this.hasRemainingSpaceForItem(itemInSlot, itemStack)) {
+-                remains -= (itemInSlot.getMaxStackSize() < this.getMaxStackSize() ? itemInSlot.getMaxStackSize() : this.getMaxStackSize()) - itemInSlot.getCount();
+                remains -= (org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemInSlot) < this.getMaxStackSize() ? org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemInSlot) : this.getMaxStackSize()) - itemInSlot.getCount(); // Leaves - stackable shulker boxes
+             }
+             if (remains <= 0) {
+                 return itemStack.getCount();
+@@ -122,7 +124,7 @@ public class Inventory implements Container, Nameable {
+ 
+         ItemStack itemInOffhand = this.getItem(this.items.size() + this.armor.size());
+         if (this.hasRemainingSpaceForItem(itemInOffhand, itemStack)) {
+-            remains -= (itemInOffhand.getMaxStackSize() < this.getMaxStackSize() ? itemInOffhand.getMaxStackSize() : this.getMaxStackSize()) - itemInOffhand.getCount();
+            remains -= (org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemInOffhand) < this.getMaxStackSize() ? org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemInOffhand) : this.getMaxStackSize()) - itemInOffhand.getCount(); // Leaves - stackable shulker boxes
+         }
+         if (remains <= 0) {
+             return itemStack.getCount();
+@@ -252,7 +254,7 @@ public class Inventory implements Container, Nameable {
+             this.setItem(slot, item);
+         }
+ 
+-        int i = this.getMaxStackSize(item) - item.getCount();
+        int i = this.getMaxStackLeaves(item) - item.getCount(); // Leaves - stackable shulker boxes
+         int min = Math.min(count, i);
+         if (min == 0) {
+             return count;
+@@ -359,7 +361,7 @@ public class Inventory implements Container, Nameable {
+                 break;
+             }
+ 
+-            int i = stack.getMaxStackSize() - this.getItem(slotWithRemainingSpace).getCount();
+            int i = org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(stack) - this.getItem(slotWithRemainingSpace).getCount(); // Leaves - stackable shulker boxes
+             if (this.add(slotWithRemainingSpace, stack.split(i)) && sendPacket && this.player instanceof ServerPlayer serverPlayer) {
+                 serverPlayer.connection.send(this.createInventoryUpdatePacket(slotWithRemainingSpace));
+             }
+diff --git a/net/minecraft/world/entity/vehicle/ContainerEntity.java b/net/minecraft/world/entity/vehicle/ContainerEntity.java
+index c18aea2bb5ddddadbc858b253ff4c08d82178a18..6a24b442a21298ef3bdbcb76de9bdcf006890c5d 100644
+--- a/net/minecraft/world/entity/vehicle/ContainerEntity.java
+++ b/net/minecraft/world/entity/vehicle/ContainerEntity.java
+@@ -164,7 +164,7 @@ public interface ContainerEntity extends Container, MenuProvider {
+     default void setChestVehicleItem(int slot, ItemStack stack) {
+         this.unpackChestVehicleLootTable(null);
+         this.getItemStacks().set(slot, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - stackable shulker boxes
+     }
+ 
+     default SlotAccess getChestVehicleSlot(final int index) {
+diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
+index b7285c67ce3f6db2fa23a6dc91fcfa6a3d19f9b4..bca4a8528ec362471797c2d962cd3c903cae89f2 100644
+--- a/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
+@@ -417,7 +417,7 @@ public abstract class AbstractContainerMenu {
+                             && (this.quickcraftType == 2 || carried1.getCount() >= this.quickcraftSlots.size())
+                             && this.canDragTo(slot1)) {
+                             int i2 = slot1.hasItem() ? slot1.getItem().getCount() : 0;
+-                            int min = Math.min(itemStack.getMaxStackSize(), slot1.getMaxStackSize(itemStack));
+                            int min = Math.min(org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemStack), slot1.getMaxStackSize(itemStack)); // Leaves - stackable shulker boxes
+                             int min1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemStack) + i2, min);
+                             count -= min1 - i2;
+                             // slot1.setByPlayer(itemStack.copyWithCount(min1));
+@@ -531,7 +531,7 @@ public abstract class AbstractContainerMenu {
+                                 slot.setByPlayer(carried2);
+                             }
+                         } else if (ItemStack.isSameItemSameComponents(carried, carried2)) {
+-                            Optional<ItemStack> optional1 = slot.tryRemove(carried.getCount(), carried2.getMaxStackSize() - carried2.getCount(), player);
+                            Optional<ItemStack> optional1 = slot.tryRemove(carried.getCount(), org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(carried2) - carried2.getCount(), player); // Leaves - stackable shulker boxes
+                             optional1.ifPresent(stack -> {
+                                 carried2.grow(stack.getCount());
+                                 slot.onTake(player, stack);
+@@ -593,7 +593,7 @@ public abstract class AbstractContainerMenu {
+             Slot slot2 = this.slots.get(slotId);
+             if (slot2.hasItem()) {
+                 ItemStack itemStack = slot2.getItem();
+-                this.setCarried(itemStack.copyWithCount(itemStack.getMaxStackSize()));
+                this.setCarried(itemStack.copyWithCount(org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemStack))); // Leaves - stackable shulker boxes
+             }
+         } else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotId >= 0) {
+             Slot slot2 = this.slots.get(slotId);
+@@ -624,15 +624,15 @@ public abstract class AbstractContainerMenu {
+                 int maxStackSize = button == 0 ? 1 : -1;
+ 
+                 for (int i3 = 0; i3 < 2; i3++) {
+-                    for (int i4 = count; i4 >= 0 && i4 < this.slots.size() && itemStack.getCount() < itemStack.getMaxStackSize(); i4 += maxStackSize) {
+                    for (int i4 = count; i4 >= 0 && i4 < this.slots.size() && itemStack.getCount() < org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemStack); i4 += maxStackSize) { // Leaves - stackable shulker boxes
+                         Slot slot3 = this.slots.get(i4);
+                         if (slot3.hasItem()
+                             && canItemQuickReplace(slot3, itemStack, true)
+                             && slot3.mayPickup(player)
+                             && this.canTakeItemForPickAll(itemStack, slot3)) {
+                             ItemStack item1 = slot3.getItem();
+-                            if (i3 != 0 || item1.getCount() != item1.getMaxStackSize()) {
+-                                ItemStack itemStack1 = slot3.safeTake(item1.getCount(), itemStack.getMaxStackSize() - itemStack.getCount(), player);
+                            if (i3 != 0 || item1.getCount() != org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(item1)) { // Leaves - stackable shulker boxes
+                                ItemStack itemStack1 = slot3.safeTake(item1.getCount(), org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemStack) - itemStack.getCount(), player); // Leaves - stackable shulker boxes
+                                 itemStack.grow(itemStack1.getCount());
+                             }
+                         }
+@@ -750,7 +750,7 @@ public abstract class AbstractContainerMenu {
+             i = endIndex - 1;
+         }
+ 
+-        if (stack.isStackable()) {
+        if (org.leavesmc.leaves.util.ShulkerBoxUtils.isStackable(stack)) { // Leaves - stackable shulker boxes
+             while (!stack.isEmpty() && (reverseDirection ? i >= startIndex : i < endIndex)) {
+                 Slot slot = this.slots.get(i);
+                 ItemStack item = slot.getItem();
+diff --git a/net/minecraft/world/inventory/MerchantContainer.java b/net/minecraft/world/inventory/MerchantContainer.java
+index a1576c3be00bdb19d02d52658c4b1818ea5c32db..be2f047bf1daab82473105865cd95955d4661a2a 100644
+--- a/net/minecraft/world/inventory/MerchantContainer.java
+++ b/net/minecraft/world/inventory/MerchantContainer.java
+@@ -109,7 +109,7 @@ public class MerchantContainer implements Container {
+     @Override
+     public void setItem(int index, ItemStack stack) {
+         this.itemStacks.set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - stackable shulker boxes
+         if (this.isPaymentSlot(index)) {
+             this.updateSellItem();
+         }
+diff --git a/net/minecraft/world/inventory/Slot.java b/net/minecraft/world/inventory/Slot.java
+index 5ceb8964476b40db4511bec91ff13c4f522a1357..371bad86218971d6e031c6d74307b2ab0d460997 100644
+--- a/net/minecraft/world/inventory/Slot.java
+++ b/net/minecraft/world/inventory/Slot.java
+@@ -75,7 +75,7 @@ public class Slot {
+     }
+ 
+     public int getMaxStackSize(ItemStack stack) {
+-        return Math.min(this.getMaxStackSize(), stack.getMaxStackSize());
+        return Math.min(this.getMaxStackSize(), org.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(stack)); // Leaves - stackable shulker boxes
+     }
+ 
+     @Nullable
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
+index 76f50437396f8f856381d0fbef52953ef7c263f6..6bc431cd0724de406c92830d618c26d69bcd1918 100644
+--- a/net/minecraft/world/item/ItemStack.java
+++ b/net/minecraft/world/item/ItemStack.java
+@@ -199,7 +199,7 @@ public final class ItemStack implements DataComponentHolder {
+     @Deprecated
+     @Nullable
+     private Item item;
+-    PatchedDataComponentMap components;
+    public PatchedDataComponentMap components; // Leaves - stackable shulker boxes
+     @Nullable
+     private Entity entityRepresentation;
+ 
+diff --git a/net/minecraft/world/level/block/AbstractCauldronBlock.java b/net/minecraft/world/level/block/AbstractCauldronBlock.java
+index 648d22cdfcf261494038d589f5a5e32704083076..47e480515715376f568b7cb7468edf2bff3d4307 100644
+--- a/net/minecraft/world/level/block/AbstractCauldronBlock.java
+++ b/net/minecraft/world/level/block/AbstractCauldronBlock.java
+@@ -58,9 +58,27 @@ public abstract class AbstractCauldronBlock extends Block {
+         ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult
+     ) {
+         CauldronInteraction cauldronInteraction = this.interactions.map().get(stack.getItem());
+-        return cauldronInteraction.interact(state, level, pos, player, hand, stack, hitResult.getDirection()); // Paper - pass hit direction
+        return wrapInteractor(cauldronInteraction, state, level, pos, player, hand, stack, hitResult.getDirection()); // Paper - pass hit direction // Leaves - stackable shulker boxes
+     }
+ 
+    // Leaves start - stackable shulker boxes
+    private InteractionResult wrapInteractor(CauldronInteraction cauldronBehavior, BlockState blockState, Level world, BlockPos blockPos, Player playerEntity, InteractionHand hand, ItemStack itemStack, net.minecraft.core.Direction hitDirection) {
+        int count = -1;
+        if (org.leavesmc.leaves.LeavesConfig.modify.shulkerBoxStackSize > 1 && itemStack.getItem() instanceof net.minecraft.world.item.BlockItem bi &&
+            bi.getBlock() instanceof ShulkerBoxBlock) {
+            count = itemStack.getCount();
+        }
+        InteractionResult result = cauldronBehavior.interact(blockState, world, blockPos, playerEntity, hand, itemStack, hitDirection);
+        if (count > 0 && result.consumesAction()) {
+            ItemStack current = playerEntity.getItemInHand(hand);
+            if (current.getItem() instanceof net.minecraft.world.item.BlockItem bi && bi.getBlock() instanceof ShulkerBoxBlock) {
+                current.setCount(count);
+            }
+        }
+        return result;
+    }
+    // Leaves end - stackable shulker boxes
+
+     @Override
+     protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
+         return SHAPE;
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index 77e7188180cce9ef881de64b263c704b219b610a..2f5fa4310f475ecbb29e69c0461c7d3276f8536d 100644
+--- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+@@ -414,7 +414,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+         ItemStack itemStack = this.items.get(index);
+         boolean flag = !stack.isEmpty() && ItemStack.isSameItemSameComponents(itemStack, stack);
+         this.items.set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - stackable shulker boxes
+         if (index == 0 && !flag && this.level instanceof ServerLevel serverLevel) {
+             this.cookingTotalTime = getTotalCookTime(serverLevel, this, this.recipeType, this.cookSpeedMultiplier); // Paper - cook speed multiplier API
+             this.cookingTimer = 0;
+diff --git a/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+index 26db603ed681a6c302596627d4dd5bf8a9bafc4e..9fcb70b5bf1912a5499aa7daeaa089adbe60cc55 100644
+--- a/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+@@ -146,7 +146,7 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co
+     @Override
+     public void setItem(int slot, ItemStack stack) {
+         this.getItems().set(slot, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - stackable shulker boxes
+         this.setChanged();
+     }
+ 
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 42a29e700d2549de7cd905c373212e9757bcfcf1..3122753c96e98e57fa900cd15005ab4874e4b1db 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -109,7 +109,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     public void setItem(int index, ItemStack stack) {
+         this.unpackLootTable(null);
+         this.getItems().set(index, stack);
+-        stack.limitSize(this.getMaxStackSize(stack));
+        stack.limitSize(this.getMaxStackLeaves(stack)); // Leaves - stackable shulker boxes
+     }
+ 
+     @Override
+@@ -688,9 +688,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+             if (item.isEmpty()) {
+                 // Spigot start - SPIGOT-6693, SimpleContainer#setItem
+                 ItemStack leftover = ItemStack.EMPTY; // Paper - Make hoppers respect inventory max stack size
+-                if (!stack.isEmpty() && stack.getCount() > destination.getMaxStackSize()) {
+                if (!stack.isEmpty() && (stack.getCount() > destination.getMaxStackSize() || stack.getCount() > stack.getMaxStackSize())) { // Leaves - stackable shulker boxes
+                     leftover = stack; // Paper - Make hoppers respect inventory max stack size
+-                    stack = stack.split(destination.getMaxStackSize());
+                    stack = stack.split(Math.min(destination.getMaxStackSize(), stack.getMaxStackSize())); // Leaves - stackable shulker boxes
+                 }
+                 // Spigot end
+                 ignoreBlockEntityUpdates = true; // Paper - Perf: Optimize Hoppers
--- a/leaves-server/minecraft-patches/features/0033-MC-Technical-Survival-Mode.patch
+++ b/leaves-server/minecraft-patches/features/0033-MC-Technical-Survival-Mode.patch
@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 19 Jan 2023 23:38:50 +0800
+Subject: [PATCH] MC Technical Survival Mode
+
+Will automatically overwrite some configuration after startup
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 68c934aec165690979f066eee73d4b2bc803ed14..5aa3f4270a4a8c11b3d785987bcfc1e06254ccab 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1684,7 +1684,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     public boolean isInvulnerableTo(ServerLevel level, DamageSource damageSource) {
+         return (super.isInvulnerableTo(level, damageSource) // Paper - disable player cramming;
+             || this.isChangingDimension() && !damageSource.is(DamageTypes.ENDER_PEARL)
+-            || !this.hasClientLoaded()) || (!this.level().paperConfig().collisions.allowPlayerCrammingDamage && damageSource.is(DamageTypes.CRAMMING)); // Paper - disable player cramming;
+            || !this.hasClientLoaded()) || (!org.leavesmc.leaves.LeavesConfig.modify.mcTechnicalMode && !this.level().paperConfig().collisions.allowPlayerCrammingDamage && damageSource.is(DamageTypes.CRAMMING)); // Paper - disable player cramming; // Leaves - mc technical survival mode
+     }
+ 
+     @Override
+diff --git a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+index ff1c84d37db48e1bd0283a900e199647c0e8eba1..cefa4c03b1d3722bb3a7872eb75a9f47517fe040 100644
+--- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
+@@ -64,7 +64,7 @@ public class EndCrystal extends Entity {
+         }
+ 
+         // Paper start - Fix invulnerable end crystals
+-        if (this.level().paperConfig().unsupportedSettings.fixInvulnerableEndCrystalExploit && this.generatedByDragonFight && this.isInvulnerable()) {
+        if (!org.leavesmc.leaves.LeavesConfig.modify.mcTechnicalMode && this.level().paperConfig().unsupportedSettings.fixInvulnerableEndCrystalExploit && this.generatedByDragonFight && this.isInvulnerable()) { // Leaves - mc technical survival mode
+             if (!java.util.Objects.equals(((ServerLevel) this.level()).uuid, this.getOriginWorld())
+                 || ((ServerLevel) this.level()).getDragonFight() == null
+                 || ((ServerLevel) this.level()).getDragonFight().respawnStage == null
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 40da052e7fea1306a007b3cb5c9daa33e0ef523e..583864d73999e4e25f6c26920c0bf9a7504d8463 100644
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -98,7 +98,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+ 
+     @Override
+     public void tick() {
+-        if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
+        if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > (org.leavesmc.leaves.LeavesConfig.modify.mcTechnicalMode ? 2000 : this.level().spigotConfig.maxTntTicksPerTick)) { return; } // Spigot // Leaves - mc technical survival mode
+         this.handlePortal();
+         this.applyGravity();
+         this.move(MoverType.SELF, this.getDeltaMovement());
+diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
+index 17ce115e887cbbb06ad02ab7ddb488e27342c0e4..8fd9c191e5b14fc7dd90e8f7229acd6de97e0f9e 100644
+--- a/net/minecraft/world/level/NaturalSpawner.java
+++ b/net/minecraft/world/level/NaturalSpawner.java
+@@ -88,7 +88,7 @@ public final class NaturalSpawner {
+                 MobCategory category = entity.getType().getCategory();
+                 if (category != MobCategory.MISC) {
+                     // Paper start - Only count natural spawns
+-                    if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
+                    if (!org.leavesmc.leaves.LeavesConfig.modify.mcTechnicalMode && !entity.level().paperConfig().entities.spawning.countAllMobsForSpawning && // Leaves - mc technical survival mode
+                         !(entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL ||
+                             entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
+                         continue;
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 3122753c96e98e57fa900cd15005ab4874e4b1db..50bc72f736e9e7a9839a853254a81f9add03bacf 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -271,7 +271,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                 origItemStack.setCount(originalItemCount);
+             }
+         }
+-        if (foundItem && level.paperConfig().hopper.cooldownWhenFull) { // Inventory was full - cooldown
+        if (foundItem && level.paperConfig().hopper.cooldownWhenFull && !org.leavesmc.leaves.LeavesConfig.modify.mcTechnicalMode) { // Inventory was full - cooldown // Leaves
+             hopper.setCooldown(level.spigotConfig.hopperTransfer);
+         }
+         return false;
+@@ -312,7 +312,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+         }
+         origItemStack.setCount(originalItemCount);
+ 
+-        if (level.paperConfig().hopper.cooldownWhenFull) {
+        if (level.paperConfig().hopper.cooldownWhenFull && !org.leavesmc.leaves.LeavesConfig.modify.mcTechnicalMode) { // Leaves
+             applyCooldown(hopper);
+         }
+ 
--- a/leaves-server/minecraft-patches/features/0034-Return-nether-portal-fix.patch
+++ b/leaves-server/minecraft-patches/features/0034-Return-nether-portal-fix.patch
@@ -0,0 +1,95 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 15:36:21 +0800
+Subject: [PATCH] Return nether portal fix
+
+This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
+
+diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
+index 5aa3f4270a4a8c11b3d785987bcfc1e06254ccab..f881077a6cd6eeffac84d866941a400457085ff5 100644
+--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
+@@ -1481,6 +1481,21 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+                 org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
+                 this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
+                 // CraftBukkit end
+                // Leaves start - nether portal fix
+                if (org.leavesmc.leaves.LeavesConfig.modify.netherPortalFix) {
+                    final ResourceKey<Level> fromDim = serverLevel.dimension();
+                    final ResourceKey<Level> toDim = level().dimension();
+                    final ResourceKey<Level> OVERWORLD = Level.OVERWORLD;
+                    final ResourceKey<Level> THE_NETHER = Level.NETHER;
+                    if (!((fromDim != OVERWORLD || toDim != THE_NETHER) && (fromDim != THE_NETHER || toDim != OVERWORLD))) {
+                        BlockPos fromPortal = org.leavesmc.leaves.util.ReturnPortalManager.findPortalAt(this, fromDim, lastPos);
+                        BlockPos toPos = this.blockPosition();
+                        if (fromPortal != null) {
+                            org.leavesmc.leaves.util.ReturnPortalManager.storeReturnPortal(this, toDim, toPos, fromPortal);
+                        }
+                    }
+                }
+                // Leaves end - nether portal fix
+                 // Paper start - Reset shield blocking on dimension change
+                 if (this.isBlocking()) {
+                     this.stopUsingItem();
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index de20a6fbbc9731a3b1cd30b3a0785637f6a33778..93eb9e2d4e44881181a07b12249c3812635fec14 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -852,6 +852,20 @@ public abstract class PlayerList {
+         if (fromWorld != level) {
+             org.bukkit.event.player.PlayerChangedWorldEvent event = new org.bukkit.event.player.PlayerChangedWorldEvent(player.getBukkitEntity(), fromWorld.getWorld());
+             this.server.server.getPluginManager().callEvent(event);
+            // Leaves start - nether portal fix
+            if (org.leavesmc.leaves.LeavesConfig.modify.netherPortalFix) {
+                final ResourceKey<Level> fromDim = player.level().dimension();
+                final ResourceKey<Level> toDim = serverPlayer.level().dimension();
+                final ResourceKey<Level> OVERWORLD = Level.OVERWORLD;
+                final ResourceKey<Level> THE_NETHER = Level.NETHER;
+                if (!((fromDim != OVERWORLD || toDim != THE_NETHER) && (fromDim != THE_NETHER || toDim != OVERWORLD))) {
+                    BlockPos fromPortal = org.leavesmc.leaves.util.ReturnPortalManager.findPortalAt(serverPlayer, fromDim, serverPlayer.lastPos);
+                    if (fromPortal != null) {
+                        org.leavesmc.leaves.util.ReturnPortalManager.storeReturnPortal(serverPlayer, toDim, serverPlayer.blockPosition(), fromPortal);
+                    }
+                }
+            }
+            // Leaves end - nether portal fix
+         }
+ 
+         // Save player file again if they were disconnected
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 2dd370bf00b5ddf133c946b6e4d37b00be3ca5a5..5e7068bf9b5364c382fccfb110ed2a26a5ac1731 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -274,7 +274,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+     protected ItemStack useItem = ItemStack.EMPTY;
+     public int useItemRemaining;
+     protected int fallFlyTicks;
+-    private BlockPos lastPos;
+    public BlockPos lastPos; // Leaves - private -> public
+     private Optional<BlockPos> lastClimbablePos = Optional.empty();
+     @Nullable
+     private DamageSource lastDamageSource;
+diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java
+index e2eb693b0130513115392cb0cb5a829ede5be8c5..fd6e228e5943c7004a595b5e154b7606ed330ea5 100644
+--- a/net/minecraft/world/level/block/NetherPortalBlock.java
+++ b/net/minecraft/world/level/block/NetherPortalBlock.java
+@@ -183,7 +183,18 @@ public class NetherPortalBlock extends Block implements Portal {
+ 
+     @Nullable
+     private TeleportTransition getExitPortal(ServerLevel level, Entity entity, BlockPos pos, BlockPos exitPos, boolean isNether, WorldBorder worldBorder, int searchRadius, boolean canCreatePortal, int createRadius) { // CraftBukkit
+-        Optional<BlockPos> optional = level.getPortalForcer().findClosestPortalPosition(exitPos, worldBorder, searchRadius); // CraftBukkit
+        // Leaves start - fix return portal
+        Optional<BlockPos> optional = Optional.empty();
+        if (org.leavesmc.leaves.LeavesConfig.modify.netherPortalFix && entity instanceof net.minecraft.server.level.ServerPlayer player) {
+            org.leavesmc.leaves.util.ReturnPortalManager.ReturnPortal portal = org.leavesmc.leaves.util.ReturnPortalManager.findReturnPortal(player, entity.level().dimension(), entity.blockPosition());
+            if (portal != null && level.getBlockState(portal.pos()).is(Blocks.NETHER_PORTAL)) {
+                optional = Optional.of(portal.pos());
+            }
+        }
+        if (optional.isEmpty()) {
+            optional = level.getPortalForcer().findClosestPortalPosition(exitPos, worldBorder, searchRadius); // CraftBukkit
+        }
+        // Leaves end - fix return portal
+         BlockUtil.FoundRectangle largestRectangleAround;
+         TeleportTransition.PostTeleportTransition postTeleportTransition;
+         if (optional.isPresent()) {
--- a/leaves-server/minecraft-patches/features/0035-Leaves-Extra-Yggdrasil-Service.patch
+++ b/leaves-server/minecraft-patches/features/0035-Leaves-Extra-Yggdrasil-Service.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 15:48:19 +0800
+Subject: [PATCH] Leaves Extra Yggdrasil Service
+
+
+diff --git a/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java b/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java
+index 8c3151c25c172b846f0d028b5100718ada2d09d7..d59d05f8894481fb5ebe1aeb8ee7a162b3dc6f1c 100644
+--- a/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java
+++ b/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java
+@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
+ 
+ public class YggdrasilMinecraftSessionService implements MinecraftSessionService {
+     private static final Logger LOGGER = LoggerFactory.getLogger(YggdrasilMinecraftSessionService.class);
+-    private final MinecraftClient client;
+    protected final MinecraftClient client; // Leaves - private -> protected
+     private final ServicesKeySet servicesKeySet;
+     private final String baseUrl;
+     private final URL joinUrl;
+diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
+index 9aa664537cc37e44db46d5a2a64ae3116938c681..1a5a8ad60240c0864875f6314e01adab4a283ddf 100644
+--- a/net/minecraft/server/Main.java
+++ b/net/minecraft/server/Main.java
+@@ -177,7 +177,7 @@ public class Main {
+                 file = new File(bukkitConfiguration.getString("settings.world-container", "."));
+             }
+             // Paper end - fix SPIGOT-5824
+-            Services services = Services.create(new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionSet); // Paper - pass OptionSet to load paper config files; override authentication service; fix world-container
+            Services services = Services.create(new org.leavesmc.leaves.profile.LeavesAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionSet); // Paper - pass OptionSet to load paper config files; override authentication service; fix world-container // Leaves - extra-yggdrasil-service
+             // CraftBukkit start
+             String string = Optional.ofNullable((String) optionSet.valueOf("world")).orElse(dedicatedServerSettings.getProperties().levelName);
+             LevelStorageSource levelStorageSource = LevelStorageSource.createDefault(file.toPath());
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 09fc1c1923f7cc4470cca3b703810fb165c4ca15..1ce3afe6c3e3b7c0aad2706215d75a265d892070 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -245,7 +245,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private boolean isDemo;
+     private volatile boolean isReady;
+     private long lastOverloadWarningNanos;
+-    protected final Services services;
+    public final Services services; // Leaves - protected -> public
+     private long lastServerStatus;
+     public final Thread serverThread;
+     private long lastTickNanos = Util.getNanos();
--- a/leaves-server/minecraft-patches/features/0036-Configurable-vanilla-random.patch
+++ b/leaves-server/minecraft-patches/features/0036-Configurable-vanilla-random.patch
@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 16 Feb 2023 17:25:01 +0800
+Subject: [PATCH] Configurable vanilla random
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index ea808042e8fc647603c213cc1bea2fa16d22e749..bf316830f199c3f83dc2fccccf51885431729389 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -255,7 +255,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     public double zOld;
+     public boolean noPhysics;
+     private boolean wasOnFire;
+-    public final RandomSource random = SHARED_RANDOM; // Paper - Share random for entities to make them more random
+    public final RandomSource random = org.leavesmc.leaves.LeavesConfig.modify.useVanillaRandom ? RandomSource.create() : SHARED_RANDOM; // Paper - Share random for entities to make them more random // Leaves - but mojang use it, optimize? no!
+     public int tickCount;
+     private int remainingFireTicks = -this.getFireImmuneTicks();
+     public boolean wasTouchingWater;
+diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java
+index 94244b148533ef026bf5c56abbc2bb5cfa83c938..91725b42a01790e0ac7d00bdc4a132ebb942a787 100644
+--- a/net/minecraft/world/entity/animal/Bee.java
+++ b/net/minecraft/world/entity/animal/Bee.java
+@@ -801,7 +801,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+     @VisibleForDebug
+     public class BeeGoToHiveGoal extends Bee.BaseBeeGoal {
+         public static final int MAX_TRAVELLING_TICKS = 2400;
+-        int travellingTicks = Bee.this.random.nextInt(10); // CraftBukkit - SPIGOT-7495: Give Bees another chance and let them use their own random, avoid concurrency issues
+        int travellingTicks = org.leavesmc.leaves.LeavesConfig.modify.useVanillaRandom ? Bee.this.level().random.nextInt(10) : Bee.this.random.nextInt(10); // CraftBukkit - SPIGOT-7495: Give Bees another chance and let them use their own random, avoid concurrency issues // Leaves - why no vanilla
+         private static final int MAX_BLACKLISTED_TARGETS = 3;
+         final List<BlockPos> blacklistedTargets = Lists.newArrayList();
+         @Nullable
+@@ -917,7 +917,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ 
+     public class BeeGoToKnownFlowerGoal extends Bee.BaseBeeGoal {
+         private static final int MAX_TRAVELLING_TICKS = 2400;
+-        int travellingTicks = Bee.this.random.nextInt(10); // CraftBukkit - SPIGOT-7495: Give Bees another chance and let them use their own random, avoid concurrency issues
+        int travellingTicks = org.leavesmc.leaves.LeavesConfig.modify.useVanillaRandom ? Bee.this.level().random.nextInt(10) : Bee.this.random.nextInt(10); // CraftBukkit - SPIGOT-7495: Give Bees another chance and let them use their own random, avoid concurrency issues // Leaves - why no vanilla
+ 
+         BeeGoToKnownFlowerGoal() {
+             this.setFlags(EnumSet.of(Goal.Flag.MOVE));
+diff --git a/net/minecraft/world/entity/animal/Squid.java b/net/minecraft/world/entity/animal/Squid.java
+index 687ac3f50ed517a0b4df70c0c0a01215691ac718..dd3a0b30ab99d3a6680243c1dfb6dbddd7af2dbc 100644
+--- a/net/minecraft/world/entity/animal/Squid.java
+++ b/net/minecraft/world/entity/animal/Squid.java
+@@ -46,7 +46,7 @@ public class Squid extends AgeableWaterCreature {
+ 
+     public Squid(EntityType<? extends Squid> entityType, Level level) {
+         super(entityType, level);
+-        //this.random.setSeed(this.getId()); // Paper - Share random for entities to make them more random
+        if (org.leavesmc.leaves.LeavesConfig.modify.useVanillaRandom) this.random.setSeed(this.getId()); // Paper - Share random for entities to make them more random // Leaves - vanilla plz
+         this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F;
+     }
+ 
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index d2d258246e7f7332c0420077e33c05e222bda46d..4f5db8203189a413f410fe7648e4995bae171918 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
+++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -63,7 +63,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
+         // Paper start - Don't use level random in entity constructors (to make them thread-safe)
+         this(EntityType.ITEM, level);
+         this.setPos(posX, posY, posZ);
+-        this.setDeltaMovement(this.random.nextDouble() * 0.2 - 0.1, 0.2, this.random.nextDouble() * 0.2 - 0.1);
+        // Leaves start - vanilla yes, safe no
+        if (org.leavesmc.leaves.LeavesConfig.modify.useVanillaRandom) {
+            this.setDeltaMovement(level.random.nextDouble() * 0.2 - 0.1, 0.2, level.random.nextDouble() * 0.2 - 0.1);
+        } else {
+            this.setDeltaMovement(this.random.nextDouble() * 0.2 - 0.1, 0.2, this.random.nextDouble() * 0.2 - 0.1);
+        }
+        // Leaves end - vanilla yes, safe no
+         this.setItem(itemStack);
+         // Paper end - Don't use level random in entity constructors
+     }
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 583864d73999e4e25f6c26920c0bf9a7504d8463..717d96fa6459c77db9274c9cb3bedec4a4ff1a90 100644
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -66,7 +66,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+     public PrimedTnt(Level level, double x, double y, double z, @Nullable LivingEntity owner) {
+         this(EntityType.TNT, level);
+         this.setPos(x, y, z);
+-        double d = this.random.nextDouble() * (float) (Math.PI * 2); // Paper - Don't use level random in entity constructors
+        double d = (org.leavesmc.leaves.LeavesConfig.modify.useVanillaRandom ? level.random.nextDouble() : this.random.nextDouble()) * (float) (Math.PI * 2); // Paper - Don't use level random in entity constructors // Leaves - why?
+         this.setDeltaMovement(-Math.sin(d) * 0.02, 0.2F, -Math.cos(d) * 0.02);
+         this.setFuse(80);
+         this.xo = x;
--- a/leaves-server/minecraft-patches/features/0037-Catch-update-suppression-crash.patch
+++ b/leaves-server/minecraft-patches/features/0037-Catch-update-suppression-crash.patch
@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Fri, 17 Mar 2023 15:57:08 +0800
+Subject: [PATCH] Catch update suppression crash
+
+
+diff --git a/net/minecraft/network/protocol/PacketUtils.java b/net/minecraft/network/protocol/PacketUtils.java
+index 4535858701b2bb232b9d2feb2af6551526232ddc..2a51acd97afc525170e8001b76f57ad13853aab0 100644
+--- a/net/minecraft/network/protocol/PacketUtils.java
+++ b/net/minecraft/network/protocol/PacketUtils.java
+@@ -27,6 +27,10 @@ public class PacketUtils {
+                 if (processor.shouldHandleMessage(packet)) {
+                     try {
+                         packet.handle(processor);
+                    // Leaves start - update suppression crash fix
+                    } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
+                        org.leavesmc.leaves.LeavesLogger.LOGGER.info(exception.getMessage());
+                    // Leaves start - update suppression crash fix
+                     } catch (Exception var4) {
+                         if (var4 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
+                             throw makeReportedException(var4, packet, processor);
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 1ce3afe6c3e3b7c0aad2706215d75a265d892070..de9b2b92456466376186737914706df22e1578f5 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1727,6 +1727,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+             try {
+                 serverLevel.tick(hasTimeLeft);
+            // Leaves start - update suppression crash fix
+            } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
+                org.leavesmc.leaves.LeavesLogger.LOGGER.info(exception.getMessage());
+            // Leaves start - update suppression crash fix
+             } catch (Throwable var7) {
+                 CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
+                 serverLevel.fillReportDetails(crashReport);
+diff --git a/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java
+index cdf835ff107bc1eadde706d69384e687626fce70..7794e66211af34ecca8524d3ca7e0d928f0ab0eb 100644
+--- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
+++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
+@@ -234,7 +234,17 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
+ 
+     @Override
+     protected int getAnalogOutputSignal(BlockState blockState, Level level, BlockPos pos) {
+-        return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
+        // Leaves start - fix update suppression crash
+        try {
+            return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
+        } catch (ClassCastException ex) {
+            if (org.leavesmc.leaves.LeavesConfig.modify.updateSuppressionCrashFix) {
+                throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, this);
+            } else {
+                throw ex;
+            }
+        }
+        // Leaves end - fix update suppression crash
+     }
+ 
+     public static Block getBlockByColor(@Nullable DyeColor color) {
+diff --git a/net/minecraft/world/level/redstone/NeighborUpdater.java b/net/minecraft/world/level/redstone/NeighborUpdater.java
+index 26c15c60d358273a3b369c286771c81d6f0979dd..1c75e37bf1fa2cc5d80add2bcf00b95defd0079d 100644
+--- a/net/minecraft/world/level/redstone/NeighborUpdater.java
+++ b/net/minecraft/world/level/redstone/NeighborUpdater.java
+@@ -63,9 +63,17 @@ public interface NeighborUpdater {
+             state.handleNeighborChanged(level, pos, neighborBlock, orientation, movedByPiston);
+             // Spigot start
+         } catch (StackOverflowError ex) {
+            // Leaves start - fix update suppression crash
+            if (org.leavesmc.leaves.LeavesConfig.modify.updateSuppressionCrashFix) {
+                throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, neighborBlock);
+            }
+             level.lastPhysicsProblem = new BlockPos(pos);
+             // Spigot end
+         } catch (Throwable var9) {
+            if (org.leavesmc.leaves.LeavesConfig.modify.updateSuppressionCrashFix) {
+                throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, neighborBlock);
+            }
+            // Leaves end - fix update suppression crash
+             CrashReport crashReport = CrashReport.forThrowable(var9, "Exception while updating neighbours");
+             CrashReportCategory crashReportCategory = crashReport.addCategory("Block being updated");
+             crashReportCategory.setDetail(
--- a/leaves-server/minecraft-patches/features/0038-Bedrock-break-list.patch
+++ b/leaves-server/minecraft-patches/features/0038-Bedrock-break-list.patch
@@ -0,0 +1,81 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 8 May 2024 22:19:25 +0800
+Subject: [PATCH] Bedrock break list
+
+
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index de9b2b92456466376186737914706df22e1578f5..7822cecf362cd8d430d90c0daac6e97c8a8d124b 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1754,6 +1754,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         profilerFiller.popPush("server gui refresh");
+ 
+         org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
+        org.leavesmc.leaves.util.BreakBedrockList.endTick(); // Leaves - break bedrock list
+ 
+         for (int i = 0; i < this.tickables.size(); i++) {
+             this.tickables.get(i).run();
+diff --git a/net/minecraft/server/ServerScoreboard.java b/net/minecraft/server/ServerScoreboard.java
+index 16c3bace00357f67a1bc050d95f5a27ec165de93..8c85455783b2b5e9e58b40fa0b3c2cf23de0e2b2 100644
+--- a/net/minecraft/server/ServerScoreboard.java
+++ b/net/minecraft/server/ServerScoreboard.java
+@@ -150,6 +150,7 @@ public class ServerScoreboard extends Scoreboard {
+     @Override
+     public void onObjectiveAdded(Objective objective) {
+         super.onObjectiveAdded(objective);
+        org.leavesmc.leaves.util.BreakBedrockList.onScoreboardAdd(objective); // Leaves - break bedrock list
+         this.setDirty();
+     }
+ 
+@@ -166,6 +167,7 @@ public class ServerScoreboard extends Scoreboard {
+     @Override
+     public void onObjectiveRemoved(Objective objective) {
+         super.onObjectiveRemoved(objective);
+        org.leavesmc.leaves.util.BreakBedrockList.onScoreboardRemove(objective); // Leaves - break bedrock list
+         if (this.trackedObjectives.contains(objective)) {
+             this.stopTrackingObjective(objective);
+         }
+diff --git a/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+index 2b1d5328072710784d2399b523afcbcfb1d7f0cd..080b5611f7e71d4c18837fdacb2cc959ce0a442d 100644
+--- a/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+++ b/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+@@ -97,6 +97,11 @@ public class PistonBaseBlock extends DirectionalBlock {
+     @Override
+     public void setPlacedBy(Level level, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+         if (!level.isClientSide) {
+            // Leaves start - break bedrock list
+            if (placer instanceof net.minecraft.world.entity.player.Player player) {
+                org.leavesmc.leaves.util.BreakBedrockList.onPlayerPlacePiston(level, player, pos);
+            }
+            // Leaves end - break bedrock list
+             this.checkIfExtend(level, pos, state);
+         }
+     }
+@@ -252,7 +257,13 @@ public class PistonBaseBlock extends DirectionalBlock {
+                             }
+                         }
+                         // Paper end - Fix sticky pistons and BlockPistonRetractEvent
+-                        level.removeBlock(pos.relative(direction), false);
+                        // Leaves start - break bedrock list
+                        BlockPos pos1 = pos.relative(direction);
+                        if (level.getBlockState(pos1).getBlock() == Blocks.BEDROCK) {
+                            org.leavesmc.leaves.util.BreakBedrockList.onPistonBreakBedrock(level, pos1);
+                        }
+                        level.removeBlock(pos1, false);
+                        // Leaves end - break bedrock list
+                     } else {
+                         this.moveBlocks(level, pos, direction, false);
+                     }
+@@ -261,6 +272,11 @@ public class PistonBaseBlock extends DirectionalBlock {
+                 // Paper start - Protect Bedrock and End Portal/Frames from being destroyed; fix headless pistons breaking blocks
+                 BlockPos headPos = pos.relative(direction);
+                 if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits || level.getBlockState(headPos) == Blocks.PISTON_HEAD.defaultBlockState().setValue(FACING, direction)) { // double check to make sure we're not a headless piston.
+                    // Leaves start - break bedrock list
+                    if (level.getBlockState(headPos).getBlock() == Blocks.BEDROCK) {
+                        org.leavesmc.leaves.util.BreakBedrockList.onPistonBreakBedrock(level, headPos);
+                    }
+                    // Leaves end - break bedrock list
+                     level.removeBlock(headPos, false);
+                 } else {
+                     ((ServerLevel) level).getChunkSource().blockChanged(headPos); // ... fix client desync
--- a/leaves-server/minecraft-patches/features/0039-Fix-trapdoor-feature.patch
+++ b/leaves-server/minecraft-patches/features/0039-Fix-trapdoor-feature.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 16:42:23 +0800
+Subject: [PATCH] Fix trapdoor feature
+
+
+diff --git a/net/minecraft/world/level/block/TrapDoorBlock.java b/net/minecraft/world/level/block/TrapDoorBlock.java
+index 46c23990e78ce77b188052672778bdef560a0d13..c6aad768cad0f0eccbe5405f41c4fa34583970ba 100644
+--- a/net/minecraft/world/level/block/TrapDoorBlock.java
+++ b/net/minecraft/world/level/block/TrapDoorBlock.java
+@@ -160,6 +160,8 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
+                     hasNeighborSignal = eventRedstone.getNewCurrent() > 0;
+                 }
+                 // CraftBukkit end
+
+                /* Leaves - it is feature, not bug!
+                 // Paper start - break redstone on trapdoors early
+                 boolean open = state.getValue(TrapDoorBlock.OPEN) != hasNeighborSignal;
+                 // note: this must run before any state for this block/its neighborus are written to the world
+@@ -178,8 +180,9 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
+                         }
+                     }
+                 }
+-                if (open) {
+-                // Paper end - break redstone on trapdoors early
+                */
+
+                if (state.getValue(TrapDoorBlock.OPEN) != hasNeighborSignal) {
+                     state = state.setValue(OPEN, Boolean.valueOf(hasNeighborSignal));
+                     this.playSound(null, level, pos, hasNeighborSignal);
+                 }
--- a/leaves-server/minecraft-patches/features/0040-Disable-distance-check-for-UseItemOnPacket.patch
+++ b/leaves-server/minecraft-patches/features/0040-Disable-distance-check-for-UseItemOnPacket.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 23 May 2023 17:10:00 +0800
+Subject: [PATCH] Disable distance check for UseItemOnPacket
+
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 9955fc7bcf75dbe86c5fcbace2dd1f2ccf479207..29a6d220adeecafa8e8f19c90e392d809fcd7568 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1921,7 +1921,7 @@ public class ServerGamePacketListenerImpl
+                 if (this.player.canInteractWithBlock(blockPos, 1.0)) {
+                     Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos));
+                     double d = 1.0000001;
+-                    if (Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) {
+                    if (org.leavesmc.leaves.LeavesConfig.modify.disableDistanceCheckForUseItem ||Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) { // Leaves - disableDistanceCheckForUseItem
+                         Direction direction = hitResult.getDirection();
+                         this.player.resetLastActionTime();
+                         int maxY = this.player.level().getMaxY();
--- a/leaves-server/minecraft-patches/features/0041-No-feather-falling-trample.patch
+++ b/leaves-server/minecraft-patches/features/0041-No-feather-falling-trample.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 25 May 2023 16:37:06 +0800
+Subject: [PATCH] No feather falling trample
+
+
+diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
+index 47c9b32c89e7e6f84a279c2f6098ada77dc58b6b..9aafef742de9e833cc772da679127cd02cb8c1cb 100644
+--- a/net/minecraft/world/level/block/FarmBlock.java
+++ b/net/minecraft/world/level/block/FarmBlock.java
+@@ -116,6 +116,13 @@ public class FarmBlock extends Block {
+             && entity instanceof LivingEntity
+             && (entity instanceof Player || serverLevel.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))
+             && entity.getBbWidth() * entity.getBbWidth() * entity.getBbHeight() > 0.512F) {
+                // Leaves start - noFeatherFallingTrample
+                if (org.leavesmc.leaves.LeavesConfig.modify.noFeatherFallingTrample) {
+                    if (net.minecraft.world.item.enchantment.EnchantmentHelper.getEnchantmentLevel(level.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.ENCHANTMENT).getOrThrow(net.minecraft.world.item.enchantment.Enchantments.FEATHER_FALLING), (LivingEntity) entity) > 0) {
+                    return;
+                    }
+                }
+                // Leaves end - noFeatherFallingTrample
+                 // CraftBukkit start - Interact soil
+                 org.bukkit.event.Cancellable cancellable;
+                 if (entity instanceof Player) {
--- a/leaves-server/minecraft-patches/features/0042-Syncmatica-Protocol.patch
+++ b/leaves-server/minecraft-patches/features/0042-Syncmatica-Protocol.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 16:51:01 +0800
+Subject: [PATCH] Syncmatica Protocol
+
+This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
+
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index c0e3695e7f25b675aa74ff6125ee821209b5b667..57c68522f7800a8000f3702802a266e441a3dbf3 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -324,8 +324,11 @@ public class ServerGamePacketListenerImpl
+         player.getTextFilter().join();
+         this.signedMessageDecoder = SignedMessageChain.Decoder.unsigned(player.getUUID(), server::enforceSecureProfile);
+         this.chatMessageChain = new FutureChain(server.chatExecutor); // CraftBukkit - async chat
+        this.exchangeTarget = new org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget(this); // Leaves - Syncmatica Protocol
+     }
+ 
+    public final org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget exchangeTarget; // Leaves - Syncmatica Protocol
+
+     @Override
+     public void tick() {
+         if (this.ackBlockChangesUpTo > -1) {
--- a/leaves-server/minecraft-patches/features/0043-Shared-villager-discounts.patch
+++ b/leaves-server/minecraft-patches/features/0043-Shared-villager-discounts.patch
@@ -4,24 +4,24 @@ Date: Thu, 25 May 2023 17:15:22 +0800
 Subject: [PATCH] Shared villager discounts


-diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-index c7f012674361a323c1efeca4660cd3f46d308ee1..c211b62fd753adad649c084fe791918c8c620c04 100644
--- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
+diff --git a/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/net/minecraft/world/entity/ai/gossip/GossipContainer.java
+index b74a4ce1b629d440681a1f5c026997ccaf1d0373..4eb97c8265ed8346b208d06a37f8068004593944 100644
+--- a/net/minecraft/world/entity/ai/gossip/GossipContainer.java
+++ b/net/minecraft/world/entity/ai/gossip/GossipContainer.java
@@ -115,6 +115,16 @@ public class GossipContainer {
 
-     public int getReputation(UUID target, Predicate<GossipType> gossipTypeFilter) {
-         GossipContainer.EntityGossips entityGossips = this.gossips.get(target);
+     public int getReputation(UUID identifier, Predicate<GossipType> gossip) {
+         GossipContainer.EntityGossips entityGossips = this.gossips.get(identifier);
 +        // Leaves start - sharedVillagerDiscounts
-+        if (org.leavesmc.leaves.LeavesConfig.modify.sharedVillagerDiscounts && gossipTypeFilter.test(GossipType.MAJOR_POSITIVE)) {
+        if (org.leavesmc.leaves.LeavesConfig.modify.sharedVillagerDiscounts && gossip.test(GossipType.MAJOR_POSITIVE)) {
 +            int otherRep = 0;
 +            if (entityGossips != null) {
-+                otherRep = entityGossips.weightedValue(v -> gossipTypeFilter.test(v) && !v.equals(GossipType.MAJOR_POSITIVE));
+                otherRep = entityGossips.weightedValue(v -> gossip.test(v) && !v.equals(GossipType.MAJOR_POSITIVE));
 +            }
 +            int majorPositiveRep = this.gossips.values().stream().mapToInt(a -> a.weightedValue(v -> v.equals(GossipType.MAJOR_POSITIVE))).sum();
 +            return otherRep + Math.min(majorPositiveRep, GossipType.MAJOR_POSITIVE.max * GossipType.MAJOR_POSITIVE.weight);
 +        }
 +        // Leaves end - sharedVillagerDiscounts
-         return entityGossips != null ? entityGossips.weightedValue(gossipTypeFilter) : 0;
+         return entityGossips != null ? entityGossips.weightedValue(gossip) : 0;
     }
 
--- a/leaves-server/minecraft-patches/features/0044-Redstone-wire-dont-connect-if-on-trapdoor.patch
+++ b/leaves-server/minecraft-patches/features/0044-Redstone-wire-dont-connect-if-on-trapdoor.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 14 Jun 2023 12:07:07 +0800
+Subject: [PATCH] Redstone wire dont connect if on trapdoor
+
+
+diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java
+index 12c9d60314c99fb65e640d255a2d0c6b7790ad4d..ff29671f78a4e896e70daf89f440f3b9425b0760 100644
+--- a/net/minecraft/world/level/block/RedStoneWireBlock.java
+++ b/net/minecraft/world/level/block/RedStoneWireBlock.java
+@@ -204,7 +204,7 @@ public class RedStoneWireBlock extends Block {
+         RandomSource random
+     ) {
+         if (direction == Direction.DOWN) {
+-            return !this.canSurviveOn(level, neighborPos, neighborState) ? Blocks.AIR.defaultBlockState() : state;
+            return org.leavesmc.leaves.LeavesConfig.modify.oldMC.updater.redstoneDontCantOnTrapDoor ? state : !this.canSurviveOn(level, neighborPos, neighborState) ? Blocks.AIR.defaultBlockState() : state; // Leaves - behavior to 1.19
+         } else if (direction == Direction.UP) {
+             return this.getConnectionState(level, state, pos);
+         } else {
+@@ -263,7 +263,7 @@ public class RedStoneWireBlock extends Block {
+         BlockPos blockPos = pos.relative(direction);
+         BlockState blockState = level.getBlockState(blockPos);
+         if (nonNormalCubeAbove) {
+-            boolean flag = blockState.getBlock() instanceof TrapDoorBlock || this.canSurviveOn(level, blockPos, blockState);
+            boolean flag = (!org.leavesmc.leaves.LeavesConfig.modify.oldMC.updater.redstoneDontCantOnTrapDoor && blockState.getBlock() instanceof TrapDoorBlock) || this.canSurviveOn(level, blockPos, blockState); // Leaves - behavior to 1.19
+             if (flag && shouldConnectTo(level.getBlockState(blockPos.above()))) {
+                 if (blockState.isFaceSturdy(level, blockPos, direction.getOpposite())) {
+                     return RedstoneSide.UP;
--- a/leaves-server/minecraft-patches/features/0045-Disable-check-out-of-order-command.patch
+++ b/leaves-server/minecraft-patches/features/0045-Disable-check-out-of-order-command.patch
@@ -4,10 +4,10 @@ Date: Sun, 10 Dec 2023 13:13:14 +0800
 Subject: [PATCH] Disable check out-of-order command


-diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-index 300929a406905f5ff1ede664d5b99fb0938d4d2e..48ffdcc799999f1d5f76e0bf124efc44c1aec3f8 100644
--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+diff --git a/net/minecraft/network/chat/SignedMessageChain.java b/net/minecraft/network/chat/SignedMessageChain.java
+index f6eed34b2fd72ab74cc9dc4b99ca184d512c0a66..a0c6b998bdf0477f524aa70e353f51e4fa37883c 100644
+--- a/net/minecraft/network/chat/SignedMessageChain.java
+++ b/net/minecraft/network/chat/SignedMessageChain.java
@@ -45,7 +45,7 @@ public class SignedMessageChain {
                     SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
                     if (signedMessageLink == null) {
--- a/leaves-server/minecraft-patches/features/0046-Despawn-enderman-with-block.patch
+++ b/leaves-server/minecraft-patches/features/0046-Despawn-enderman-with-block.patch
@@ -4,11 +4,11 @@ Date: Sat, 17 Jun 2023 15:20:28 +0800
 Subject: [PATCH] Despawn enderman with block


-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 2b8e1a8e233071821411eb1f95c705efb4a6e816..e7a004ab26bd73a264bc7c911f99107c57661367 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -458,7 +458,7 @@ public class EnderMan extends Monster implements NeutralMob {
+diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
+index e2f1623b977889d31407d060b8e0bf911a80049e..a2437f181602cc334dc8b590c1b63565b2e67054 100644
+--- a/net/minecraft/world/entity/monster/EnderMan.java
+++ b/net/minecraft/world/entity/monster/EnderMan.java
+@@ -457,7 +457,7 @@ public class EnderMan extends Monster implements NeutralMob {
 
     @Override
     public boolean requiresCustomPersistence() {
@@ -16,4 +16,4 @@ index 2b8e1a8e233071821411eb1f95c705efb4a6e816..e7a004ab26bd73a264bc7c911f99107c
 +        return super.requiresCustomPersistence() || (!org.leavesmc.leaves.LeavesConfig.modify.despawnEndermanWithBlock && this.getCarriedBlock() != null); // Leaves - despawn enderman with block
     }
 
-     private static class EndermanFreezeWhenLookedAt extends Goal {
+     static class EndermanFreezeWhenLookedAt extends Goal {
--- a/leaves-server/minecraft-patches/features/0047-Creative-fly-no-clip.patch
+++ b/leaves-server/minecraft-patches/features/0047-Creative-fly-no-clip.patch
@@ -0,0 +1,121 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 27 Jun 2023 09:26:58 +0800
+Subject: [PATCH] Creative fly no clip
+
+
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index f60336d17e4052551ee13d75c047f7b416b72ff4..7c6e0b0179f6c1381956915bd8993f8a75efd818 100644
+--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
+@@ -262,8 +262,8 @@ public abstract class Player extends LivingEntity {
+ 
+     @Override
+     public void tick() {
+-        this.noPhysics = this.isSpectator();
+-        if (this.isSpectator() || this.isPassenger()) {
+        this.noPhysics = this.isCreativeFlyOrSpectator(); // Leaves - creative no clip
+        if (this.isCreativeFlyOrSpectator() || this.isPassenger()) { // Leaves - creative no clip
+             this.setOnGround(false);
+         }
+ 
+@@ -470,7 +470,7 @@ public abstract class Player extends LivingEntity {
+             }
+ 
+             Pose pose1;
+-            if (this.isSpectator() || this.isPassenger() || this.canPlayerFitWithinBlocksAndEntitiesWhen(pose)) {
+            if (this.isCreativeFlyOrSpectator() || this.isPassenger() || this.canPlayerFitWithinBlocksAndEntitiesWhen(pose)) { // Leaves - creative no clip
+                 pose1 = pose;
+             } else if (this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.CROUCHING)) {
+                 pose1 = Pose.CROUCHING;
+@@ -604,7 +604,7 @@ public abstract class Player extends LivingEntity {
+         }
+ 
+         this.bob = this.bob + (f - this.bob) * 0.4F;
+-        if (this.getHealth() > 0.0F && !this.isSpectator()) {
+        if (this.getHealth() > 0.0F && !this.isCreativeFlyOrSpectator()) { // Leaves - creative no clip
+             AABB aabb;
+             if (this.isPassenger() && !this.getVehicle().isRemoved()) {
+                 aabb = this.getBoundingBox().minmax(this.getVehicle().getBoundingBox()).inflate(1.0, 0.0, 1.0);
+@@ -2042,6 +2042,21 @@ public abstract class Player extends LivingEntity {
+     @Override
+     public abstract boolean isSpectator();
+ 
+    // Leaves start - creative no clip
+    public boolean isCreativeFlyOrSpectator() {
+        return isSpectator() || (org.leavesmc.leaves.LeavesConfig.modify.creativeNoClip && isCreative() && getAbilities().flying);
+    }
+
+    public boolean canSpectatingPlace(net.minecraft.world.level.LevelReader world, BlockState state, BlockPos pos, net.minecraft.world.phys.shapes.CollisionContext context) {
+        if (this.isCreativeFlyOrSpectator()) {
+            net.minecraft.world.phys.shapes.VoxelShape voxelShape = state.getCollisionShape(world, pos, context);
+            return voxelShape.isEmpty() || world.isUnobstructed(this, voxelShape.move(pos.getX(), pos.getY(), pos.getZ()));
+        } else {
+            return world.isUnobstructed(state, pos, context);
+        }
+    }
+    // Leaves end - creative no clip
+
+     @Override
+     public boolean canBeHitByProjectile() {
+         return !this.isSpectator() && super.canBeHitByProjectile();
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index 1f4a3d2610abfa2ea2b1d5feba9606b806d6d416..c74e09eed6b8fe2852b3cb592e1a1e628ba9f22a 100644
+--- a/net/minecraft/world/item/BlockItem.java
+++ b/net/minecraft/world/item/BlockItem.java
+@@ -216,7 +216,7 @@ public class BlockItem extends Item {
+         CollisionContext collisionContext = player == null ? CollisionContext.empty() : CollisionContext.of(player);
+         // CraftBukkit start
+         Level world = context.getLevel(); // Paper - Cancel hit for vanished players
+-        boolean canBuild = (!this.mustSurvive() || state.canSurvive(world, context.getClickedPos())) && world.checkEntityCollision(state, player, collisionContext, context.getClickedPos(), true); // Paper - Cancel hit for vanished players
+        boolean canBuild = (!this.mustSurvive() || state.canSurvive(world, context.getClickedPos())) && ((org.leavesmc.leaves.LeavesConfig.modify.creativeNoClip && context.getPlayer() != null) ? context.getPlayer().canSpectatingPlace(world, state, context.getClickedPos(), collisionContext) : world.checkEntityCollision(state, player, collisionContext, context.getClickedPos(), true)); // Paper - Cancel hit for vanished players // Leaves - creative no clip
+         org.bukkit.entity.Player bukkitPlayer = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
+ 
+         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(world, context.getClickedPos()), bukkitPlayer, CraftBlockData.fromData(state), canBuild, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
+diff --git a/net/minecraft/world/item/StandingAndWallBlockItem.java b/net/minecraft/world/item/StandingAndWallBlockItem.java
+index 1f0e7c391d02b18e2c89700025713ec3d759f2ea..300ee12ca9584e53e9d72e3ebfd039beb3fab3b2 100644
+--- a/net/minecraft/world/item/StandingAndWallBlockItem.java
+++ b/net/minecraft/world/item/StandingAndWallBlockItem.java
+@@ -45,7 +45,7 @@ public class StandingAndWallBlockItem extends BlockItem {
+         // return blockState != null && level.isUnobstructed(blockState, clickedPos, CollisionContext.empty()) ? blockState : null;
+         // CraftBukkit start
+         if (blockState != null) {
+-            boolean defaultReturn = level.isUnobstructed(blockState, clickedPos, CollisionContext.empty());
+            boolean defaultReturn = (org.leavesmc.leaves.LeavesConfig.modify.creativeNoClip && context.getPlayer() != null) ? context.getPlayer().canSpectatingPlace(level, blockState, clickedPos, CollisionContext.empty()) : level.isUnobstructed(blockState, clickedPos, CollisionContext.empty()); // Leaves - creative no clip
+             org.bukkit.entity.Player player = (context.getPlayer() instanceof net.minecraft.server.level.ServerPlayer serverPlayer) ? serverPlayer.getBukkitEntity() : null;
+ 
+             org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.event.block.BlockCanBuildEvent(org.bukkit.craftbukkit.block.CraftBlock.at(context.getLevel(), clickedPos), player, org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
+diff --git a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+index cc8781c0a357eebc2bff936b4e7be53cc316716d..f5264831b2dc1843b09599086f2bb586d041535d 100644
+--- a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+@@ -147,7 +147,7 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+             List<Entity> entities = level.getEntities(null, progressDeltaAabb);
+             if (!entities.isEmpty()) {
+                 for (Entity entity : entities) {
+-                    if (entity.getPistonPushReaction() != PushReaction.IGNORE) {
+                    if (entity.getPistonPushReaction() != PushReaction.IGNORE && !(entity instanceof Player player && player.isCreativeFlyOrSpectator())) { // Leaves - creative no clip
+                         entity.move(
+                             MoverType.SHULKER_BOX,
+                             new Vec3(
+diff --git a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+index 1e6e940fca9d96ef410c7bf05524bd9b24db4a79..362007621cc03ccd4ce7b2c0f77680d25535d7b2 100644
+--- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+@@ -148,7 +148,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
+                                         d3 = movementDirection.getStepZ();
+                                 }
+ 
+-                                entity.setDeltaMovement(d1, d2, d3);
+                                if (!(entity instanceof net.minecraft.world.entity.player.Player player) || !player.isCreativeFlyOrSpectator()) entity.setDeltaMovement(d1, d2, d3); // Leaves - creative no clip
+                                 // Paper - EAR items stuck in slime pushed by a piston
+                                 entity.activatedTick = Math.max(entity.activatedTick, net.minecraft.server.MinecraftServer.currentTick + 10);
+                                 entity.activatedImmunityTick = Math.max(entity.activatedImmunityTick, net.minecraft.server.MinecraftServer.currentTick + 10);
+@@ -184,6 +184,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
+     }
+ 
+     private static void moveEntityByPiston(Direction noClipDirection, Entity entity, double progress, Direction direction) {
+        if (entity instanceof net.minecraft.world.entity.player.Player player && player.isCreativeFlyOrSpectator()) return; // Leaves - creative no clip
+         NOCLIP.set(noClipDirection);
+         entity.move(MoverType.PISTON, new Vec3(progress * direction.getStepX(), progress * direction.getStepY(), progress * direction.getStepZ()));
+         entity.applyEffectsFromBlocks();
--- a/leaves-server/minecraft-patches/features/0048-Optimized-dragon-respawn.patch
+++ b/leaves-server/minecraft-patches/features/0048-Optimized-dragon-respawn.patch
@@ -4,24 +4,24 @@ Date: Tue, 27 Jun 2023 13:22:34 +0800
 Subject: [PATCH] Optimized dragon respawn


-diff --git a/src/main/java/net/minecraft/world/level/block/state/pattern/BlockPattern.java b/src/main/java/net/minecraft/world/level/block/state/pattern/BlockPattern.java
-index ee99519ebd46b1db3e76e7eb86e5cc121c867dc4..63f6f1328c4e39cc1f35480166ae5e22df943119 100644
--- a/src/main/java/net/minecraft/world/level/block/state/pattern/BlockPattern.java
-+++ b/src/main/java/net/minecraft/world/level/block/state/pattern/BlockPattern.java
+diff --git a/net/minecraft/world/level/block/state/pattern/BlockPattern.java b/net/minecraft/world/level/block/state/pattern/BlockPattern.java
+index f7bb979f08634a7e1b77c59040f59fb5e11aafa5..3cad7d6bca9af77bace18bfd7cc013ac22be4075 100644
+--- a/net/minecraft/world/level/block/state/pattern/BlockPattern.java
+++ b/net/minecraft/world/level/block/state/pattern/BlockPattern.java
@@ -59,7 +59,7 @@ public class BlockPattern {
     }
 
     @Nullable
-    private BlockPattern.BlockPatternMatch matches(BlockPos frontTopLeft, Direction forwards, Direction up, LoadingCache<BlockPos, BlockInWorld> cache) {
-+    public BlockPattern.BlockPatternMatch matches(BlockPos frontTopLeft, Direction forwards, Direction up, LoadingCache<BlockPos, BlockInWorld> cache) { // Leaves - private -> public
+-    private BlockPattern.BlockPatternMatch matches(BlockPos pos, Direction finger, Direction thumb, LoadingCache<BlockPos, BlockInWorld> cache) {
+    public BlockPattern.BlockPatternMatch matches(BlockPos pos, Direction finger, Direction thumb, LoadingCache<BlockPos, BlockInWorld> cache) { // Leaves - private -> public
         for (int i = 0; i < this.width; i++) {
-             for (int j = 0; j < this.height; j++) {
-                 for (int k = 0; k < this.depth; k++) {
-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 b331c93c82c27f9456fec208a0c008c5bedfa8c4..e944a730503a9c50bcde819515a1d7e7f1ec59fd 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
-@@ -292,8 +292,67 @@ public class EndDragonFight {
+             for (int i1 = 0; i1 < this.height; i1++) {
+                 for (int i2 = 0; i2 < this.depth; i2++) {
+diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java
+index 6e7e87c32734b3aae354bc34459e5f207da5c78f..5a28a821bb401f8f1465b085c9ffda52ba9a0a9f 100644
+--- a/net/minecraft/world/level/dimension/end/EndDragonFight.java
+++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java
+@@ -274,8 +274,68 @@ public class EndDragonFight {
         return false;
     }
 
@@ -85,53 +85,20 @@ index b331c93c82c27f9456fec208a0c008c5bedfa8c4..e944a730503a9c50bcde819515a1d7e7
 +
 +            return null;
 +        }
-+    // Leaves end - optimizedDragonRespawn
-         ChunkPos chunkcoordintpair = new ChunkPos(this.origin);
+        // Leaves end - optimizedDragonRespawn
+
+         ChunkPos chunkPos = new ChunkPos(this.origin);
 
-         int i;
-@@ -624,6 +683,11 @@ public class EndDragonFight {
+         for (int i = -8 + chunkPos.x; i <= 8 + chunkPos.x; i++) {
+@@ -571,6 +631,11 @@ public class EndDragonFight {
     }
 
-     public boolean respawnDragon(List<EndCrystal> list) { // CraftBukkit - return boolean
+     public boolean respawnDragon(List<EndCrystal> crystals) { // CraftBukkit - return boolean
 +        // Leaves - start optimizedDragonRespawn
 +        cachePortalChunkIteratorX = -8;
 +        cachePortalChunkIteratorZ = -8;
 +        cachePortalOriginIteratorY = -1;
 +        // Leaves - end optimizedDragonRespawn
         if (this.dragonKilled && this.respawnStage == null) {
-             for (BlockPattern.BlockPatternMatch shapedetector_shapedetectorcollection = this.findExitPortal(); shapedetector_shapedetectorcollection != null; shapedetector_shapedetectorcollection = this.findExitPortal()) {
-                 for (int i = 0; i < this.exitPortalPattern.getWidth(); ++i) {
-diff --git a/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java b/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..567cd33afbd17d61ac1847692f5cb762270a3c40
--- /dev/null
-+++ b/src/main/java/org/leavesmc/leaves/util/BlockPatternHelper.java
-@@ -0,0 +1,28 @@
-+package org.leavesmc.leaves.util;
-+
-+import com.google.common.cache.LoadingCache;
-+import net.minecraft.core.BlockPos;
-+import net.minecraft.core.Direction;
-+import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.state.pattern.BlockInWorld;
-+import net.minecraft.world.level.block.state.pattern.BlockPattern;
-+
-+// Powered by Carpet-AMS-Addition(https://github.com/Minecraft-AMS/Carpet-AMS-Addition)
-+public class BlockPatternHelper {
-+    public static BlockPattern.BlockPatternMatch partialSearchAround(BlockPattern pattern, Level world, BlockPos pos) {
-+        LoadingCache<BlockPos, BlockInWorld> loadingCache = BlockPattern.createLevelCache(world, false);
-+        int i = Math.max(Math.max(pattern.getWidth(), pattern.getHeight()), pattern.getDepth());
-+
-+        for (BlockPos blockPos : BlockPos.betweenClosed(pos, pos.offset(i - 1, 0, i - 1))) {
-+            for (Direction direction : Direction.values()) {
-+                for (Direction direction2 : Direction.values()) {
-+                    BlockPattern.BlockPatternMatch result;
-+                    if (direction2 == direction || direction2 == direction.getOpposite() || (result = pattern.matches(blockPos, direction, direction2, loadingCache)) == null)
-+                        continue;
-+                    return result;
-+                }
-+            }
-+        }
-+        return null;
-+    }
-+}
+             for (BlockPattern.BlockPatternMatch blockPatternMatch = this.findExitPortal(); blockPatternMatch != null; blockPatternMatch = this.findExitPortal()) {
+                 for (int i = 0; i < this.exitPortalPattern.getWidth(); i++) {
--- a/leaves-server/minecraft-patches/features/0049-Shave-snow-layers.patch
+++ b/leaves-server/minecraft-patches/features/0049-Shave-snow-layers.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 27 Jun 2023 14:07:00 +0800
+Subject: [PATCH] Shave snow layers
+
+
+diff --git a/net/minecraft/world/item/ShovelItem.java b/net/minecraft/world/item/ShovelItem.java
+index 75bbe901e79d9ba3250ed2426a36c1c3363c19c1..29849cd8f53daf2da0b9973c805d44376984013c 100644
+--- a/net/minecraft/world/item/ShovelItem.java
+++ b/net/minecraft/world/item/ShovelItem.java
+@@ -44,6 +44,26 @@ public class ShovelItem extends DiggerItem {
+             return InteractionResult.PASS;
+         } else {
+             Player player = context.getPlayer();
+            // Leaves start - shaveSnowLayers
+            if (org.leavesmc.leaves.LeavesConfig.modify.shaveSnowLayers && blockState.is(Blocks.SNOW)) {
+                int layers = blockState.getValue(net.minecraft.world.level.block.SnowLayerBlock.LAYERS);
+                ItemStack tool = context.getItemInHand();
+                boolean hasSilkTouch = net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(level.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.ENCHANTMENT).getOrThrow(net.minecraft.world.item.enchantment.Enchantments.SILK_TOUCH), tool) > 0;
+                BlockState shavedBlockState = layers > 1 ? blockState.setValue(net.minecraft.world.level.block.SnowLayerBlock.LAYERS, layers - 1) : Blocks.AIR.defaultBlockState();
+
+                level.setBlock(clickedPos, shavedBlockState, Block.UPDATE_ALL_IMMEDIATE);
+                level.gameEvent(GameEvent.BLOCK_CHANGE, clickedPos, GameEvent.Context.of(player, shavedBlockState));
+
+                Block.popResource(level, clickedPos, new ItemStack(hasSilkTouch ? Items.SNOW : Items.SNOWBALL));
+                level.playSound(player, clickedPos, SoundEvents.SNOW_BREAK, SoundSource.BLOCKS, 1.0F, 1.0F);
+
+                if (player != null) {
+                    tool.hurtAndBreak(1, player, LivingEntity.getSlotForHand(context.getHand()));
+                }
+
+                return InteractionResult.SUCCESS;
+            }
+            // Leaves end -  shaveSnowLayers
+             BlockState blockState1 = FLATTENABLES.get(blockState.getBlock());
+             BlockState blockState2 = null;
+             Runnable afterAction = null; // Paper
--- a/leaves-server/minecraft-patches/features/0050-Elytra-aeronautics-no-chunk-load.patch
+++ b/leaves-server/minecraft-patches/features/0050-Elytra-aeronautics-no-chunk-load.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 2 Jul 2023 09:25:00 +0800
+Subject: [PATCH] Elytra aeronautics no chunk load
+
+
+diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
+index 36c0a690e7e9b301c5a3d63fae2c7cbe36ba6cdf..6b625fbd538e5a4073e86e22adfcd382e1efde86 100644
+--- a/net/minecraft/server/level/ChunkMap.java
+++ b/net/minecraft/server/level/ChunkMap.java
+@@ -792,7 +792,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+ 
+     private boolean skipPlayer(ServerPlayer player) {
+-        return player.isSpectator() && !this.level.getGameRules().getBoolean(GameRules.RULE_SPECTATORSGENERATECHUNKS);
+        return (player.isSpectator() && !this.level.getGameRules().getBoolean(GameRules.RULE_SPECTATORSGENERATECHUNKS))
+            || (org.leavesmc.leaves.LeavesConfig.modify.elytraAeronautics.noChunk && player.elytraAeronauticsNoChunk); // Leaves - Elytra aeronautics
+     }
+ 
+     void updatePlayerStatus(ServerPlayer player, boolean track) {
+@@ -826,6 +827,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+ 
+     public void move(ServerPlayer player) {
+        if (player.elytraAeronauticsNoChunk) return; // Leaves - no chunk
+         // Paper - optimise entity tracker
+ 
+         SectionPos lastSectionPos = player.getLastSectionPos();
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 1f8b1d6b72056ebd66bade417b10ce23b7e11b8a..24f2a1d295a02a8fdc1518f914549a980cd035c9 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -547,7 +547,7 @@ public class ServerGamePacketListenerImpl
+                 speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
+ 
+                 // Paper start - Prevent moving into unloaded chunks
+-                if (this.player.level().paperConfig().chunks.preventMovingIntoUnloadedChunks && (
+                if (this.player.level().paperConfig().chunks.preventMovingIntoUnloadedChunks && !player.elytraAeronauticsNoChunk && ( // Leaves - no chunk load
+                     !serverLevel.areChunksLoadedForMove(this.player.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(this.player.position()))) ||
+                         !serverLevel.areChunksLoadedForMove(rootVehicle.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(rootVehicle.position())))
+                 )) {
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index c34e32549813af3a5d6e3edc2a606613ca2abb8f..92f363180ed4d2a91da996de9e8adfa4f3b17e69 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -1108,7 +1108,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                     return;
+                 }
+             }
+-
+            // Leaves start - elytra aeronautics
+            if (org.leavesmc.leaves.LeavesConfig.modify.elytraAeronautics.noChunk && this instanceof Player player) {
+                if (type == MoverType.PLAYER && player.isFallFlying()) {
+                    org.leavesmc.leaves.util.ElytraAeronauticsHelper.flightBehaviour(player, movement);
+                }
+            }
+            // Leaves end - elytra aeronautics
+             ProfilerFiller profilerFiller = Profiler.get();
+             profilerFiller.push("move");
+             if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7) {
+@@ -2058,6 +2064,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         this.yo = y;
+         this.zo = d1;
+         this.setPos(d, y, d1);
+        if (this instanceof Player player && player.elytraAeronauticsNoChunk) return; // Leaves - elytra aeronautics
+         if (this.valid) this.level.getChunk((int) Math.floor(this.getX()) >> 4, (int) Math.floor(this.getZ()) >> 4); // CraftBukkit
+     }
+ 
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index 1f72a78beee96d942b5f838c5de034c99c8fe98f..2cc72279fbe2b408ab3515da462701cc6ca6c257 100644
+--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
+@@ -200,6 +200,7 @@ public abstract class Player extends LivingEntity {
+     private int currentImpulseContextResetGraceTime;
+     public boolean affectsSpawning = true; // Paper - Affects Spawning API
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
+    public boolean elytraAeronauticsNoChunk = false; // Leaves - Elytra aeronautics
+ 
+     // CraftBukkit start
+     public boolean fauxSleeping;
--- a/leaves-server/minecraft-patches/features/0051-Cache-ignite-odds.patch
+++ b/leaves-server/minecraft-patches/features/0051-Cache-ignite-odds.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Wed, 5 Jul 2023 17:42:24 +0800
+Subject: [PATCH] Cache ignite odds
+
+
+diff --git a/net/minecraft/world/level/block/FireBlock.java b/net/minecraft/world/level/block/FireBlock.java
+index 7340c664fdcf991a2549c8f07f6ab093bbe6e4e8..d9796f683de7c0c12f45f62597792f80c66c60b7 100644
+--- a/net/minecraft/world/level/block/FireBlock.java
+++ b/net/minecraft/world/level/block/FireBlock.java
+@@ -225,6 +225,7 @@ public class FireBlock extends BaseFireBlock {
+                 this.checkBurnOut(level, pos.south(), 300 + i, random, ageValue, pos);
+                 // CraftBukkit end
+                 BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+                Object2IntOpenHashMap<BlockPos> blockPositionIgniteCache = new Object2IntOpenHashMap<>(); // Leaves - cache ignite odds
+ 
+                 for (int i1 = -1; i1 <= 1; i1++) {
+                     for (int i2 = -1; i2 <= 1; i2++) {
+@@ -236,7 +237,7 @@ public class FireBlock extends BaseFireBlock {
+                                 }
+ 
+                                 mutableBlockPos.setWithOffset(pos, i1, i3, i2);
+-                                int igniteOdds = this.getIgniteOdds(level, mutableBlockPos);
+                                int igniteOdds = this.getIgniteOdds(level, mutableBlockPos, org.leavesmc.leaves.LeavesConfig.performance.cacheIgniteOdds ? blockPositionIgniteCache : null); // Leaves - cache ignite odds
+                                 if (igniteOdds > 0) {
+                                     int i5 = (igniteOdds + 40 + level.getDifficulty().getId() * 7) / (ageValue + 30);
+                                     if (isIncreasedFireBurnout) {
+@@ -340,20 +341,33 @@ public class FireBlock extends BaseFireBlock {
+         return false;
+     }
+ 
+    // Leaves start - cache ignite odds
+     private int getIgniteOdds(LevelReader level, BlockPos pos) {
+        return getIgniteOdds(level, pos, null);
+    }
+
+    private int getIgniteOdds(LevelReader level, BlockPos pos, @org.jetbrains.annotations.Nullable Object2IntOpenHashMap<BlockPos> cache) {
+         if (!level.isEmptyBlock(pos)) {
+             return 0;
+         } else {
+             int i = 0;
+ 
+             for (Direction direction : Direction.values()) {
+-                BlockState blockState = level.getBlockState(pos.relative(direction));
+-                i = Math.max(this.getIgniteOdds(blockState), i);
+                if (cache != null) {
+                    i = Math.max(cache.computeIfAbsent(pos, key -> {
+                        BlockState blockState = level.getBlockState(pos.relative(direction));
+                        return this.getIgniteOdds(blockState);
+                    }), i);
+                } else {
+                    BlockState blockState = level.getBlockState(pos.relative(direction));
+                    i = Math.max(this.getIgniteOdds(blockState), i);
+                }
+             }
+ 
+             return i;
+         }
+     }
+    // Leaves end - cache ignite odds
+ 
+     @Override
+     protected boolean canBurn(BlockState state) {
--- a/leaves-server/minecraft-patches/features/0052-Lava-riptide.patch
+++ b/leaves-server/minecraft-patches/features/0052-Lava-riptide.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Fri, 7 Jul 2023 16:53:32 +0800
+Subject: [PATCH] Lava riptide
+
+
+diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
+index 23284dbeff327d1b8dc89f3a0dc0ee549cec2daa..edf6ac62e068f46f68b76ea1e8a801cfe2611d3e 100644
+--- a/net/minecraft/world/item/TridentItem.java
+++ b/net/minecraft/world/item/TridentItem.java
+@@ -78,7 +78,7 @@ public class TridentItem extends Item implements ProjectileItem {
+                 return false;
+             } else {
+                 float tridentSpinAttackStrength = EnchantmentHelper.getTridentSpinAttackStrength(stack, player);
+-                if (tridentSpinAttackStrength > 0.0F && !player.isInWaterOrRain()) {
+                if (tridentSpinAttackStrength > 0.0F && !player.isInWaterOrRain() || (org.leavesmc.leaves.LeavesConfig.modify.lavaRiptide && player.isInLava())) { // Leaves - lava riptide
+                     return false;
+                 } else if (stack.nextDamageWillBreak()) {
+                     return false;
+@@ -154,7 +154,7 @@ public class TridentItem extends Item implements ProjectileItem {
+         ItemStack itemInHand = player.getItemInHand(hand);
+         if (itemInHand.nextDamageWillBreak()) {
+             return InteractionResult.FAIL;
+-        } else if (EnchantmentHelper.getTridentSpinAttackStrength(itemInHand, player) > 0.0F && !player.isInWaterOrRain()) {
+        } else if (EnchantmentHelper.getTridentSpinAttackStrength(itemInHand, player) > 0.0F && !player.isInWaterOrRain() && !(org.leavesmc.leaves.LeavesConfig.modify.lavaRiptide && player.isInLava())) { // Leaves - lava riptide
+             return InteractionResult.FAIL;
+         } else {
+             player.startUsingItem(hand);
--- a/leaves-server/minecraft-patches/features/0053-No-block-update-command.patch
+++ b/leaves-server/minecraft-patches/features/0053-No-block-update-command.patch
@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 19:16:16 +0800
+Subject: [PATCH] No block update command
+
+
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index 8c8b6c4c6fee9bb9279d02d6b7a47cb2e3f39d93..ed37ba4ca1303a0ce97e7a1fce1b29682276292b 100644
+--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
+@@ -2383,6 +2383,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+ 
+     @Override
+     public void blockUpdated(BlockPos pos, Block block) {
+        if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
+         if (!this.isDebug()) {
+             // CraftBukkit start
+             if (this.populating) {
+diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
+index 6bc431cd0724de406c92830d618c26d69bcd1918..a212135f15701cb887b61081c16313105d952890 100644
+--- a/net/minecraft/world/item/ItemStack.java
+++ b/net/minecraft/world/item/ItemStack.java
+@@ -484,7 +484,7 @@ public final class ItemStack implements DataComponentHolder {
+                         net.minecraft.world.level.block.state.BlockState block = serverLevel.getBlockState(newPos);
+ 
+                         if (!(block.getBlock() instanceof net.minecraft.world.level.block.BaseEntityBlock)) { // Containers get placed automatically
+-                            block.onPlace(serverLevel, newPos, oldBlock, true, context);
+                            if (!org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) block.onPlace(serverLevel, newPos, oldBlock, true, context); // Leaves - no block update
+                         }
+ 
+                         serverLevel.notifyAndUpdatePhysics(newPos, null, oldBlock, block, serverLevel.getBlockState(newPos), updateFlag, net.minecraft.world.level.block.Block.UPDATE_LIMIT); // send null chunk as chunk.k() returns false by this point
+diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
+index 1776b79309ffd9a8a52f27a144606ed9a441251e..1e4e1a3236fc6b9aa515f2025cdef5a901c64d58 100644
+--- a/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/net/minecraft/world/level/chunk/LevelChunk.java
+@@ -405,7 +405,7 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
+                     return null;
+                 } else {
+                     if (!this.level.isClientSide && doPlace && (!this.level.captureBlockStates || block instanceof net.minecraft.world.level.block.BaseEntityBlock)) { // CraftBukkit - Don't place while processing the BlockPlaceEvent, unless it's a BlockContainer. Prevents blocks such as TNT from activating when cancelled.
+-                        state.onPlace(this.level, pos, blockState, isMoving);
+                        if (!org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) state.onPlace(this.level, pos, blockState, isMoving); // Leaves - no block update
+                     }
+ 
+                     if (state.hasBlockEntity()) {
+diff --git a/net/minecraft/world/level/material/FlowingFluid.java b/net/minecraft/world/level/material/FlowingFluid.java
+index e30499bdcd6600e5c9d4a755c1182fb6dff3735f..ce3a74860f4a6b65e6eb1cf422f71ec1f844ecd2 100644
+--- a/net/minecraft/world/level/material/FlowingFluid.java
+++ b/net/minecraft/world/level/material/FlowingFluid.java
+@@ -475,6 +475,7 @@ public abstract class FlowingFluid extends Fluid {
+ 
+     @Override
+     public void tick(ServerLevel level, BlockPos pos, BlockState blockState, FluidState fluidState) {
+        if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
+         if (!fluidState.isSource()) {
+             FluidState newLiquid = this.getNewLiquid(level, pos, level.getBlockState(pos));
+             int spreadDelay = this.getSpreadDelay(level, pos, fluidState, newLiquid);
+diff --git a/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
+index 028eae2f9a459b60e92f3344091083aa93b54485..63684402f7c89c7c5d71902db4bfb23132b1d28d 100644
+--- a/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
+++ b/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
+@@ -47,6 +47,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
+     }
+ 
+     private void addAndRun(BlockPos pos, CollectingNeighborUpdater.NeighborUpdates updates) {
+        if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
+         boolean flag = this.count > 0;
+         boolean flag1 = this.maxChainedNeighborUpdates >= 0 && this.count >= this.maxChainedNeighborUpdates;
+         this.count++;
+diff --git a/net/minecraft/world/level/redstone/InstantNeighborUpdater.java b/net/minecraft/world/level/redstone/InstantNeighborUpdater.java
+index d0da64e325f83ab073221a3fa7284e42b6a88534..32e10dccde3e80969641ba1fb67479b5a0bada06 100644
+--- a/net/minecraft/world/level/redstone/InstantNeighborUpdater.java
+++ b/net/minecraft/world/level/redstone/InstantNeighborUpdater.java
+@@ -16,17 +16,20 @@ public class InstantNeighborUpdater implements NeighborUpdater {
+ 
+     @Override
+     public void shapeUpdate(Direction direction, BlockState state, BlockPos pos, BlockPos neighborPos, int flags, int recursionLevel) {
+        if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
+         NeighborUpdater.executeShapeUpdate(this.level, direction, pos, neighborPos, state, flags, recursionLevel - 1);
+     }
+ 
+     @Override
+     public void neighborChanged(BlockPos pos, Block neighborBlock, @Nullable Orientation orientation) {
+        if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
+         BlockState blockState = this.level.getBlockState(pos);
+         this.neighborChanged(blockState, pos, neighborBlock, orientation, false);
+     }
+ 
+     @Override
+     public void neighborChanged(BlockState state, BlockPos pos, Block neighborBlock, @Nullable Orientation orientation, boolean movedByPiston) {
+        if (org.leavesmc.leaves.command.NoBlockUpdateCommand.isNoBlockUpdate()) return; // Leaves - no block update
+         NeighborUpdater.executeUpdate(this.level, state, pos, neighborBlock, orientation, movedByPiston);
+     }
+ }
--- a/leaves-server/minecraft-patches/features/0054-Raider-die-skip-self-raid-check.patch
+++ b/leaves-server/minecraft-patches/features/0054-Raider-die-skip-self-raid-check.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 9 Jul 2023 16:51:47 +0800
+Subject: [PATCH] Raider die skip self raid check
+
+
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 8270d76a753bfd26a4c8ef6610bee5c24ee59cfe..72551960faaedbf43d1c65ad061f6d366028a3e9 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
+++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -115,7 +115,7 @@ public abstract class Raider extends PatrollingMonster {
+             Entity entity = cause.getEntity();
+             Raid currentRaid = this.getCurrentRaid();
+             if (currentRaid != null) {
+-                if (this.isPatrolLeader()) {
+                if (!org.leavesmc.leaves.LeavesConfig.modify.skipSelfRaidCheck && this.isPatrolLeader()) { // Leaves - skip self raid check
+                     currentRaid.removeLeader(this.getWave());
+                 }
+ 
--- a/leaves-server/minecraft-patches/features/0055-Container-open-passthrough.patch
+++ b/leaves-server/minecraft-patches/features/0055-Container-open-passthrough.patch
@@ -0,0 +1,80 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 3 Feb 2025 21:31:03 +0800
+Subject: [PATCH] Container open passthrough
+
+
+diff --git a/net/minecraft/world/entity/decoration/ItemFrame.java b/net/minecraft/world/entity/decoration/ItemFrame.java
+index 65e1d7c5ac94b1cfb921fa009be59d3e5872f0b5..34a60bc540cd08da0ebec3a37ec0a01da3dd24de 100644
+--- a/net/minecraft/world/entity/decoration/ItemFrame.java
+++ b/net/minecraft/world/entity/decoration/ItemFrame.java
+@@ -408,6 +408,20 @@ public class ItemFrame extends HangingEntity {
+                     return InteractionResult.PASS;
+                 }
+             } else {
+                // Leaves start - itemFrameContainerPassthrough
+                if (org.leavesmc.leaves.LeavesConfig.modify.containerPassthrough && !player.isShiftKeyDown()) {
+                    BlockPos pos1 = this.pos.relative(this.direction.getOpposite());
+                    if (level().getBlockEntity(pos1) instanceof net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity) {
+                        BlockState blockState = level().getBlockState(pos1);
+                        net.minecraft.world.phys.BlockHitResult hitResult = new net.minecraft.world.phys.BlockHitResult(Vec3.atCenterOf(pos1), this.direction, pos1, false);
+                        if (flag1) {
+                            return blockState.useItemOn(itemInHand, level(), player, hand, hitResult);
+                        } else {
+                            return blockState.useWithoutItem(level(), player, hitResult);
+                        }
+                    }
+                }
+                // Leaves end - itemFrameContainerPassthrough
+                 // Paper start - Add PlayerItemFrameChangeEvent
+                 io.papermc.paper.event.player.PlayerItemFrameChangeEvent event = new io.papermc.paper.event.player.PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), io.papermc.paper.event.player.PlayerItemFrameChangeEvent.ItemFrameChangeAction.ROTATE);
+                 if (!event.callEvent()) {
+diff --git a/net/minecraft/world/level/block/SignBlock.java b/net/minecraft/world/level/block/SignBlock.java
+index f33a42b4888dbf46175e0be409aa6c8688d552b9..da815a9a5e447e9a1cf44f54e4fcbb9481d65d86 100644
+--- a/net/minecraft/world/level/block/SignBlock.java
+++ b/net/minecraft/world/level/block/SignBlock.java
+@@ -106,6 +106,18 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
+                     } else {
+                         return InteractionResult.TRY_WITH_EMPTY_HAND;
+                     }
+                    // Leaves start - signContainerPassthrough
+                } else if (org.leavesmc.leaves.LeavesConfig.modify.containerPassthrough) {
+                    BlockPos pos1 = pos.relative(hitResult.getDirection().getOpposite());
+                    if (this instanceof WallSignBlock || this instanceof WallHangingSignBlock) {
+                        pos1 = pos.relative(state.getValue(HorizontalDirectionalBlock.FACING).getOpposite());
+                    }
+                    if (level.getBlockEntity(pos1) instanceof net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity) {
+                        BlockState state1 = level.getBlockState(pos1);
+                        return state1.useItemOn(stack, level, player, hand, hitResult.withPosition(pos1));
+                    }
+                    return InteractionResult.PASS;
+                    // Leaves end - signContainerPassthrough
+                 } else {
+                     return InteractionResult.TRY_WITH_EMPTY_HAND;
+                 }
+@@ -131,6 +143,25 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
+                 return InteractionResult.SUCCESS_SERVER;
+             } else if (flag) {
+                 return InteractionResult.SUCCESS_SERVER;
+                // Leaves start - signContainerPassthrough
+            } else if (org.leavesmc.leaves.LeavesConfig.modify.containerPassthrough) {
+                if (player.isShiftKeyDown()) {
+                    if (!this.otherPlayerIsEditingSign(player, signBlockEntity) && player.mayBuild() && this.hasEditableText(player, signBlockEntity, isFacingFrontText)) {
+                        this.openTextEdit(player, signBlockEntity, isFacingFrontText);
+                        return InteractionResult.SUCCESS;
+                    }
+                }
+
+                BlockPos pos1 = pos.relative(hitResult.getDirection().getOpposite());
+                if (this instanceof WallSignBlock || this instanceof WallHangingSignBlock) {
+                    pos1 = pos.relative(state.getValue(HorizontalDirectionalBlock.FACING).getOpposite());
+                }
+                if (level.getBlockEntity(pos1) instanceof net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity) {
+                    BlockState state1 = level.getBlockState(pos1);
+                    return state1.useWithoutItem(level, player, hitResult.withPosition(pos1));
+                }
+                return InteractionResult.PASS;
+                // Leaves end - signContainerPassthrough
+             } else if (!this.otherPlayerIsEditingSign(player, signBlockEntity)
+                 && player.mayBuild()
+                 && this.hasEditableText(player, signBlockEntity, isFacingFrontText)) {
--- a/leaves-server/minecraft-patches/features/0056-Dont-respond-ping-before-start-fully.patch
+++ b/leaves-server/minecraft-patches/features/0056-Dont-respond-ping-before-start-fully.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 17 Jul 2023 23:16:58 +0800
+Subject: [PATCH] Dont respond ping before start fully
+
+This patch is Powered by Gale(https://github.com/GaleMC/Gale)
+
+diff --git a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+index 465559113071a47e706f77a5b0996597ee986b3d..f64b21ef2660a1e60e3d6cddef04950e983b3baa 100644
+--- a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
+@@ -37,6 +37,12 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
+         } else {
+             this.hasRequestedStatus = true;
+             // this.connection.send(new ClientboundStatusResponsePacket(this.status)); // Paper
+            // Leaves start - dont respond it before start full
+            var status = net.minecraft.server.MinecraftServer.getServer().getStatus();
+            if (org.leavesmc.leaves.LeavesConfig.mics.dontRespondPingBeforeStart && (status == null || status.version().isEmpty())) {
+                return;
+            }
+            // Leaves end - dont respond it before start full
+             com.destroystokyo.paper.network.StandardPaperServerListPingEventImpl.processRequest(net.minecraft.server.MinecraftServer.getServer(), this.connection); // Paper - handle status request
+         }
+     }
--- a/leaves-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch
+++ b/leaves-server/minecraft-patches/features/0057-Faster-chunk-serialization.patch
@@ -0,0 +1,272 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 18 Jul 2023 13:14:15 +0800
+Subject: [PATCH] Faster chunk serialization
+
+This patch is Powered by Gale(https://github.com/GaleMC/Gale)
+
+diff --git a/net/minecraft/util/BitStorage.java b/net/minecraft/util/BitStorage.java
+index 02502d50f0255f5bbcc0ecb965abb48cc1a112da..0abee1cd9d6a5a22d3136e3711de926c3a2d4d73 100644
+--- a/net/minecraft/util/BitStorage.java
+++ b/net/minecraft/util/BitStorage.java
+@@ -21,6 +21,8 @@ public interface BitStorage extends ca.spottedleaf.moonrise.patches.block_counti
+ 
+     BitStorage copy();
+ 
+    <T> void compact(net.minecraft.world.level.chunk.Palette<T> srcPalette, net.minecraft.world.level.chunk.Palette<T> dstPalette, short[] out); // Leaves - faster chunk serialization
+
+     // Paper start - block counting
+     // provide default impl in case mods implement this...
+     @Override
+diff --git a/net/minecraft/util/SimpleBitStorage.java b/net/minecraft/util/SimpleBitStorage.java
+index e6306a68c8652d4c5d22d5ecb1416f5f931f76ee..7b4b3b8a02be3ab5ecafdea1ab74c246daf37d98 100644
+--- a/net/minecraft/util/SimpleBitStorage.java
+++ b/net/minecraft/util/SimpleBitStorage.java
+@@ -465,4 +465,44 @@ public class SimpleBitStorage implements BitStorage {
+             super(message);
+         }
+     }
+
+    // Leaves start - faster chunk serialization
+    @Override
+    public <T> void compact(net.minecraft.world.level.chunk.Palette<T> srcPalette, net.minecraft.world.level.chunk.Palette<T> dstPalette, short[] out) {
+        if (this.size >= Short.MAX_VALUE) {
+            throw new IllegalStateException("Array too large");
+        }
+
+        if (this.size != out.length) {
+            throw new IllegalStateException("Array size mismatch");
+        }
+
+        short[] mappings = new short[(int) (this.mask + 1)];
+
+        int idx = 0;
+
+        for (long word : this.data) {
+            long bits = word;
+
+            for (int elementIdx = 0; elementIdx < this.valuesPerLong; ++elementIdx) {
+                int value = (int) (bits & this.mask);
+                int remappedId = mappings[value];
+
+                if (remappedId == 0) {
+                    remappedId = dstPalette.idFor(srcPalette.valueFor(value)) + 1;
+                    mappings[value] = (short) remappedId;
+                }
+
+                out[idx] = (short) (remappedId - 1);
+                bits >>= this.bits;
+
+                ++idx;
+
+                if (idx >= this.size) {
+                    return;
+                }
+            }
+        }
+    }
+    // Leaves end - faster chunk serialization
+ }
+diff --git a/net/minecraft/util/ZeroBitStorage.java b/net/minecraft/util/ZeroBitStorage.java
+index 09fd99c9cbd23b5f3c899bfb00c9b89651948ed8..50993ce7519a77c6a9d36cb925125adccda7037f 100644
+--- a/net/minecraft/util/ZeroBitStorage.java
+++ b/net/minecraft/util/ZeroBitStorage.java
+@@ -63,6 +63,8 @@ public class ZeroBitStorage implements BitStorage {
+         return this;
+     }
+ 
+    @Override public <T> void compact(net.minecraft.world.level.chunk.Palette<T> srcPalette, net.minecraft.world.level.chunk.Palette<T> dstPalette, short[] out) {}  // Leaves - faster chunk serialization
+
+     // Paper start - block counting
+     @Override
+     public final it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap<it.unimi.dsi.fastutil.shorts.ShortArrayList> moonrise$countEntries() {
+diff --git a/net/minecraft/world/level/chunk/PaletteResize.java b/net/minecraft/world/level/chunk/PaletteResize.java
+index c723606fa0be811e580ba47de8c9c575583cc930..c768443c8c6a4b05018bbc70d54b6f41e53e7738 100644
+--- a/net/minecraft/world/level/chunk/PaletteResize.java
+++ b/net/minecraft/world/level/chunk/PaletteResize.java
+@@ -1,5 +1,5 @@
+ package net.minecraft.world.level.chunk;
+ 
+-interface PaletteResize<T> {
+public interface PaletteResize<T> { // Leaves - package -> public
+     int onResize(int bits, T objectAdded);
+ }
+diff --git a/net/minecraft/world/level/chunk/PalettedContainer.java b/net/minecraft/world/level/chunk/PalettedContainer.java
+index f5da433050fd3060e0335d4002d520ebe8cd691f..afd78a03fb29c633cc8dc811a14df43aff69ba98 100644
+--- a/net/minecraft/world/level/chunk/PalettedContainer.java
+++ b/net/minecraft/world/level/chunk/PalettedContainer.java
+@@ -25,6 +25,24 @@ import net.minecraft.util.ThreadingDetector;
+ import net.minecraft.util.ZeroBitStorage;
+ 
+ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainerRO<T> {
+
+    // Leaves start - faster chunk serialization
+    private static final ThreadLocal<short[]> CACHED_ARRAY_4096 = ThreadLocal.withInitial(() -> new short[4096]);
+    private static final ThreadLocal<short[]> CACHED_ARRAY_64 = ThreadLocal.withInitial(() -> new short[64]);
+
+    private Optional<LongStream> asOptional(long[] data) {
+        return Optional.of(Arrays.stream(data));
+    }
+
+    private short[] getOrCreate(int size) {
+        return switch (size) {
+            case 64 -> CACHED_ARRAY_64.get();
+            case 4096 -> CACHED_ARRAY_4096.get();
+            default -> new short[size];
+        };
+    }
+    // Leaves end - faster chunk serialization
+
+     private static final int MIN_PALETTE_BITS = 0;
+     private final PaletteResize<T> dummyPaletteResize = (bits, objectAdded) -> 0;
+     public final IdMap<T> registry;
+@@ -344,28 +362,76 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+     public synchronized PalettedContainerRO.PackedData<T> pack(IdMap<T> registry, PalettedContainer.Strategy strategy) { // Paper - synchronize
+         this.acquire();
+ 
+-        PalettedContainerRO.PackedData var12;
+-        try {
+-            HashMapPalette<T> hashMapPalette = new HashMapPalette<>(registry, this.data.storage.getBits(), this.dummyPaletteResize);
+-            int size = strategy.size();
+-            int[] ints = new int[size];
+-            this.data.storage.unpack(ints);
+-            swapPalette(ints, id -> hashMapPalette.idFor(this.data.palette.valueFor(id)));
+-            int i = strategy.calculateBitsForSerialization(registry, hashMapPalette.getSize());
+-            Optional<LongStream> optional;
+-            if (i != 0) {
+-                SimpleBitStorage simpleBitStorage = new SimpleBitStorage(i, size, ints);
+-                optional = Optional.of(Arrays.stream(simpleBitStorage.getRaw()));
+-            } else {
+-                optional = Optional.empty();
+-            }
+        // Leaves start - faster chunk serialization
+        if (!org.leavesmc.leaves.LeavesConfig.performance.fasterChunkSerialization) {
+            PalettedContainerRO.PackedData var12;
+            try {
+                HashMapPalette<T> hashMapPalette = new HashMapPalette<>(registry, this.data.storage.getBits(), this.dummyPaletteResize);
+                int i = strategy.size();
+                int[] is = new int[i];
+                this.data.storage.unpack(is);
+                swapPalette(is, (id) -> {
+                    return hashMapPalette.idFor(this.data.palette.valueFor(id));
+                });
+                int j = strategy.calculateBitsForSerialization(registry, hashMapPalette.getSize());
+                Optional<LongStream> optional;
+                if (j != 0) {
+                    SimpleBitStorage simpleBitStorage = new SimpleBitStorage(j, i, is);
+                    optional = Optional.of(Arrays.stream(simpleBitStorage.getRaw()));
+                } else {
+                    optional = Optional.empty();
+                }
+ 
+-            var12 = new PalettedContainerRO.PackedData<>(hashMapPalette.getEntries(), optional);
+-        } finally {
+-            this.release();
+                var12 = new PalettedContainerRO.PackedData<>(hashMapPalette.getEntries(), optional);
+            } finally {
+                this.release();
+            }
+            return var12;
+        } else {
+            Optional<LongStream> data = Optional.empty();
+            List<T> elements = null;
+            try {
+                // The palette that will be serialized
+                org.leavesmc.leaves.lithium.common.world.chunk.LithiumHashPalette<T> hashPalette = null;
+
+                final Palette<T> palette = this.data.palette();
+                final BitStorage storage = this.data.storage();
+                if (storage instanceof ZeroBitStorage || palette.getSize() == 1) {
+                    // If the palette only contains one entry, don't attempt to repack it.
+                    elements = List.of(palette.valueFor(0));
+                } else if (palette instanceof org.leavesmc.leaves.lithium.common.world.chunk.LithiumHashPalette<T> lithiumHashPalette) {
+                    hashPalette = lithiumHashPalette;
+                }
+                if (elements == null) {
+                    org.leavesmc.leaves.lithium.common.world.chunk.LithiumHashPalette<T> compactedPalette = new org.leavesmc.leaves.lithium.common.world.chunk.LithiumHashPalette<>(registry, storage.getBits(), this.dummyPaletteResize);
+                    short[] array = this.getOrCreate(strategy.size());
+
+                    storage.compact(this.data.palette(), compactedPalette, array);
+
+                    // If the palette didn't change during compaction, do a simple copy of the data array
+                    if (hashPalette != null && hashPalette.getSize() == compactedPalette.getSize() && storage.getBits() == strategy.calculateBitsForSerialization(registry, hashPalette.getSize())) { // paletteSize can de-sync from palette - see https://github.com/CaffeineMC/lithium-fabric/issues/279
+                        data = this.asOptional(storage.getRaw().clone());
+                        elements = hashPalette.getElements();
+                    } else {
+                        int bits = strategy.calculateBitsForSerialization(registry, compactedPalette.getSize());
+                        if (bits != 0) {
+                            // Re-pack the integer array as the palette has changed size
+                            SimpleBitStorage copy = new SimpleBitStorage(bits, array.length);
+                            for (int i = 0; i < array.length; ++i) {
+                                copy.set(i, array[i]);
+                            }
+                            // We don't need to clone the data array as we are the sole owner of it
+                            data = this.asOptional(copy.getRaw());
+                        }
+                    }
+                    elements = compactedPalette.getElements();
+                }
+            } finally {
+                this.release();
+            }
+            return new PalettedContainerRO.PackedData<>(elements, data);
+         }
+-
+-        return var12;
+        // Leaves end - faster chunk serialization
+     }
+ 
+     private static <T> void swapPalette(int[] bits, IntUnaryOperator operator) {
+@@ -405,13 +471,47 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+ 
+     @Override
+     public void count(PalettedContainer.CountConsumer<T> countConsumer) {
+-        if (this.data.palette.getSize() == 1) {
+-            countConsumer.accept(this.data.palette.valueFor(0), this.data.storage.getSize());
+        // Leaves start - faster chunk serialization
+        if (!org.leavesmc.leaves.LeavesConfig.performance.fasterChunkSerialization) {
+            if (this.data.palette.getSize() == 1) {
+                countConsumer.accept(this.data.palette.valueFor(0), this.data.storage.getSize());
+            } else {
+                Int2IntOpenHashMap int2IntOpenHashMap = new Int2IntOpenHashMap();
+                this.data.storage.getAll((key) -> {
+                    int2IntOpenHashMap.addTo(key, 1);
+                });
+                int2IntOpenHashMap.int2IntEntrySet().forEach((entry) -> {
+                    countConsumer.accept(this.data.palette.valueFor(entry.getIntKey()), entry.getIntValue());
+                });
+            }
+         } else {
+-            Int2IntOpenHashMap map = new Int2IntOpenHashMap();
+-            this.data.storage.getAll(id -> map.addTo(id, 1));
+-            map.int2IntEntrySet().forEach(idEntry -> countConsumer.accept(this.data.palette.valueFor(idEntry.getIntKey()), idEntry.getIntValue()));
+            int len = this.data.palette().getSize();
+
+            // Do not allocate huge arrays if we're using a large palette
+            if (len > 4096) {
+                if (this.data.palette.getSize() == 1) {
+                    countConsumer.accept(this.data.palette.valueFor(0), this.data.storage.getSize());
+                } else {
+                    Int2IntOpenHashMap int2IntOpenHashMap = new Int2IntOpenHashMap();
+                    this.data.storage.getAll((key) -> {
+                        int2IntOpenHashMap.addTo(key, 1);
+                    });
+                    int2IntOpenHashMap.int2IntEntrySet().forEach((entry) -> {
+                        countConsumer.accept(this.data.palette.valueFor(entry.getIntKey()), entry.getIntValue());
+                    });
+                }
+            }
+
+            short[] counts = new short[len];
+            this.data.storage().getAll(i -> counts[i]++);
+            for (int i = 0; i < counts.length; i++) {
+                T obj = this.data.palette().valueFor(i);
+                if (obj != null) {
+                    countConsumer.accept(obj, counts[i]);
+                }
+            }
+         }
+        // Leaves end - faster chunk serialization
+     }
+ 
+     record Configuration<T>(Palette.Factory factory, int bits) {
--- a/leaves-server/minecraft-patches/features/0058-Skip-secondary-POI-sensor-if-absent.patch
+++ b/leaves-server/minecraft-patches/features/0058-Skip-secondary-POI-sensor-if-absent.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Skip secondary POI sensor if absent

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
-index a0e0692d17760f440fe81d52887284c787e562db..c6f5f7f7c0821b707d9cfe239ccab748e6b8b9cb 100644
--- a/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+diff --git a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+index 6b99afb4f237b5d6def98f3e03492975b795bc95..ef4413c0661800d1d712d89b6a8e95d034e90ae3 100644
+--- a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
+++ b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java
@@ -22,6 +22,15 @@ public class SecondaryPoiSensor extends Sensor<Villager> {
 
     @Override
-     protected void doTick(ServerLevel world, Villager entity) {
+     protected void doTick(ServerLevel level, Villager entity) {
 +        // Leaves start - skip secondary POI sensor if absent
 +        if (org.leavesmc.leaves.LeavesConfig.performance.skipSecondaryPOISensorIfAbsent) {
 +            var secondaryPoi = entity.getVillagerData().getProfession().secondaryPoi();
@@ -22,6 +22,6 @@ index a0e0692d17760f440fe81d52887284c787e562db..c6f5f7f7c0821b707d9cfe239ccab748
 +            }
 +        }
 +        // Leaves end - skip secondary POI sensor if absent
-         ResourceKey<Level> resourceKey = world.dimension();
+         ResourceKey<Level> resourceKey = level.dimension();
         BlockPos blockPos = entity.blockPosition();
         List<GlobalPos> list = Lists.newArrayList();
--- a/leaves-server/minecraft-patches/features/0059-Store-mob-counts-in-an-array.patch
+++ b/leaves-server/minecraft-patches/features/0059-Store-mob-counts-in-an-array.patch
@@ -5,34 +5,34 @@ Subject: [PATCH] Store mob counts in an array

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/world/level/LocalMobCapCalculator.java b/src/main/java/net/minecraft/world/level/LocalMobCapCalculator.java
-index 2039b16e5e9bc0797b3f31081d221bb8b34a4dc7..973331b29f2fd672c18c2dea858f473009d59637 100644
--- a/src/main/java/net/minecraft/world/level/LocalMobCapCalculator.java
-+++ b/src/main/java/net/minecraft/world/level/LocalMobCapCalculator.java
+diff --git a/net/minecraft/world/level/LocalMobCapCalculator.java b/net/minecraft/world/level/LocalMobCapCalculator.java
+index 9641219c190261dea0db5f95f040a705ba0a3ff9..463a86eee6a75bdd8989b5bed46f118073a4fe25 100644
+--- a/net/minecraft/world/level/LocalMobCapCalculator.java
+++ b/net/minecraft/world/level/LocalMobCapCalculator.java
@@ -43,13 +43,26 @@ public class LocalMobCapCalculator {
 
     static class MobCounts {
         private final Object2IntMap<MobCategory> counts = new Object2IntOpenHashMap<>(MobCategory.values().length);
 +        public final int[] arrCounts = new int[MobCategory.values().length]; // Leaves - store mob counts in an array
 
-         public void add(MobCategory spawnGroup) {
-            this.counts.computeInt(spawnGroup, (group, density) -> density == null ? 1 : density + 1);
+         public void add(MobCategory category) {
+-            this.counts.computeInt(category, (key, value) -> value == null ? 1 : value + 1);
 +            // Leaves start - store mob counts in an array
 +            if (!org.leavesmc.leaves.LeavesConfig.performance.storeMobCountsInArray) {
-+                this.counts.computeInt(spawnGroup, (group, density) -> density == null ? 1 : density + 1);
+                this.counts.computeInt(category, (group, density) -> density == null ? 1 : density + 1);
 +            } else {
-+                this.arrCounts[spawnGroup.ordinal()]++;
+                this.arrCounts[category.ordinal()]++;
 +            }
 +            // Leaves end - store mob counts in an array
         }
 
-         public boolean canSpawn(MobCategory spawnGroup) {
-            return this.counts.getOrDefault(spawnGroup, 0) < spawnGroup.getMaxInstancesPerChunk();
+         public boolean canSpawn(MobCategory category) {
+-            return this.counts.getOrDefault(category, 0) < category.getMaxInstancesPerChunk();
 +            // Leaves start - store mob counts in an array
 +            if (!org.leavesmc.leaves.LeavesConfig.performance.storeMobCountsInArray) {
-+                return this.counts.getOrDefault(spawnGroup, 0) < spawnGroup.getMaxInstancesPerChunk();
+                return this.counts.getOrDefault(category, 0) < category.getMaxInstancesPerChunk();
 +            } else {
-+                return this.arrCounts[spawnGroup.ordinal()] < spawnGroup.getMaxInstancesPerChunk();
+                return this.arrCounts[category.ordinal()] < category.getMaxInstancesPerChunk();
 +            }
 +            // Leaves end - store mob counts in an array
         }
--- a/leaves-server/minecraft-patches/features/0060-Optimize-noise-generation.patch
+++ b/leaves-server/minecraft-patches/features/0060-Optimize-noise-generation.patch
@@ -0,0 +1,281 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 18 Jul 2023 15:27:19 +0800
+Subject: [PATCH] Optimize noise generation
+
+This patch is Powered by Gale(https://github.com/GaleMC/Gale)
+
+diff --git a/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java b/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java
+index fb11a2eea540d55e50eab59f9857ca5d99f556f8..47225646e98b5707af167cf8758f44c42c3cd38c 100644
+--- a/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java
+++ b/net/minecraft/world/level/levelgen/synth/ImprovedNoise.java
+@@ -11,6 +11,27 @@ public final class ImprovedNoise {
+     public final double yo;
+     public final double zo;
+ 
+    // Leaves start - optimize noise generation
+    private static final double[] FLAT_SIMPLEX_GRAD = new double[]{
+        1, 1, 0, 0,
+        -1, 1, 0, 0,
+        1, -1, 0, 0,
+        -1, -1, 0, 0,
+        1, 0, 1, 0,
+        -1, 0, 1, 0,
+        1, 0, -1, 0,
+        -1, 0, -1, 0,
+        0, 1, 1, 0,
+        0, -1, 1, 0,
+        0, 1, -1, 0,
+        0, -1, -1, 0,
+        1, 1, 0, 0,
+        0, -1, 1, 0,
+        -1, 1, 0, 0,
+        0, -1, -1, 0,
+    };
+    // Leaves end - optimize noise generation
+
+     public ImprovedNoise(RandomSource random) {
+         this.xo = random.nextDouble() * 256.0;
+         this.yo = random.nextDouble() * 256.0;
+@@ -41,9 +62,20 @@ public final class ImprovedNoise {
+         int floor = Mth.floor(d);
+         int floor1 = Mth.floor(d1);
+         int floor2 = Mth.floor(d2);
+-        double d3 = d - floor;
+-        double d4 = d1 - floor1;
+-        double d5 = d2 - floor2;
+        // Leaves start - optimize noise generation
+        double d3;
+        double d4;
+        double d5;
+        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeNoiseGeneration) {
+            d3 = d - (double)floor;
+            d4 = d1 - (double)floor1;
+            d5 = d2 - (double)floor2;
+        } else {
+            d3 = d - floor;
+            d4 = d1 - floor1;
+            d5 = d2 - floor2;
+        }
+        // Leaves end - optimize noise generation
+         double d7;
+         if (yScale != 0.0) {
+             double d6;
+@@ -53,12 +85,24 @@ public final class ImprovedNoise {
+                 d6 = d4;
+             }
+ 
+-            d7 = Mth.floor(d6 / yScale + 1.0E-7F) * yScale;
+            // Leaves start - optimize noise generation
+            if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeNoiseGeneration) {
+                d7 = (double)Mth.floor(d6 / yScale + 1.0E-7F) * yScale;
+            } else {
+                d7 = Math.floor(d6 / yScale + (double)1.0E-7F) * yScale;
+            }
+            // Leaves end - optimize noise generation
+         } else {
+             d7 = 0.0;
+         }
+ 
+-        return this.sampleAndLerp(floor, floor1, floor2, d3, d4 - d7, d5, d4);
+        // Leaves start - optimize noise generation
+        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeNoiseGeneration) {
+            return this.sampleAndLerp(floor, floor1, floor2, d3, d4 - d7, d5, d4);
+        } else {
+            return this.sampleAndLerp((int) floor, (int) floor1, (int) floor2, d3, d4 - d7, d5, d4);
+        }
+        // Leaves end - optimize noise generation
+     }
+ 
+     public double noiseWithDerivative(double x, double y, double z, double[] values) {
+@@ -68,10 +112,19 @@ public final class ImprovedNoise {
+         int floor = Mth.floor(d);
+         int floor1 = Mth.floor(d1);
+         int floor2 = Mth.floor(d2);
+-        double d3 = d - floor;
+-        double d4 = d1 - floor1;
+-        double d5 = d2 - floor2;
+-        return this.sampleWithDerivative(floor, floor1, floor2, d3, d4, d5, values);
+        // Leaves start - optimize noise generation
+        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeNoiseGeneration) {
+            double d3 = d - (double)floor;
+            double d4 = d1 - (double)floor1;
+            double d5 = d2 - (double)floor2;
+            return this.sampleWithDerivative(floor, floor1, floor2, d3, d4, d5, values);
+        } else {
+            double d3 = d - floor;
+            double d4 = d1 - floor1;
+            double d5 = d2 - floor2;
+            return this.sampleWithDerivative((int) floor, (int) floor1, (int) floor2, d3, d4, d5, values);
+        }
+        // Leaves end - optimize noise generation
+     }
+ 
+     private static double gradDot(int gradIndex, double xFactor, double yFactor, double zFactor) {
+@@ -83,24 +136,90 @@ public final class ImprovedNoise {
+     }
+ 
+     private double sampleAndLerp(int gridX, int gridY, int gridZ, double deltaX, double weirdDeltaY, double deltaZ, double deltaY) {
+-        int i = this.p(gridX);
+-        int i1 = this.p(gridX + 1);
+-        int i2 = this.p(i + gridY);
+-        int i3 = this.p(i + gridY + 1);
+-        int i4 = this.p(i1 + gridY);
+-        int i5 = this.p(i1 + gridY + 1);
+-        double d = gradDot(this.p(i2 + gridZ), deltaX, weirdDeltaY, deltaZ);
+-        double d1 = gradDot(this.p(i4 + gridZ), deltaX - 1.0, weirdDeltaY, deltaZ);
+-        double d2 = gradDot(this.p(i3 + gridZ), deltaX, weirdDeltaY - 1.0, deltaZ);
+-        double d3 = gradDot(this.p(i5 + gridZ), deltaX - 1.0, weirdDeltaY - 1.0, deltaZ);
+-        double d4 = gradDot(this.p(i2 + gridZ + 1), deltaX, weirdDeltaY, deltaZ - 1.0);
+-        double d5 = gradDot(this.p(i4 + gridZ + 1), deltaX - 1.0, weirdDeltaY, deltaZ - 1.0);
+-        double d6 = gradDot(this.p(i3 + gridZ + 1), deltaX, weirdDeltaY - 1.0, deltaZ - 1.0);
+-        double d7 = gradDot(this.p(i5 + gridZ + 1), deltaX - 1.0, weirdDeltaY - 1.0, deltaZ - 1.0);
+-        double d8 = Mth.smoothstep(deltaX);
+-        double d9 = Mth.smoothstep(deltaY);
+-        double d10 = Mth.smoothstep(deltaZ);
+-        return Mth.lerp3(d8, d9, d10, d, d1, d2, d3, d4, d5, d6, d7);
+        // Leaves start - optimize noise generation
+        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeNoiseGeneration) {
+            int i = this.p(gridX);
+            int i1 = this.p(gridX + 1);
+            int i2 = this.p(i + gridY);
+            int i3 = this.p(i + gridY + 1);
+            int i4 = this.p(i1 + gridY);
+            int i5 = this.p(i1 + gridY + 1);
+            double d = gradDot(this.p(i2 + gridZ), deltaX, weirdDeltaY, deltaZ);
+            double d1 = gradDot(this.p(i4 + gridZ), deltaX - 1.0, weirdDeltaY, deltaZ);
+            double d2 = gradDot(this.p(i3 + gridZ), deltaX, weirdDeltaY - 1.0, deltaZ);
+            double d3 = gradDot(this.p(i5 + gridZ), deltaX - 1.0, weirdDeltaY - 1.0, deltaZ);
+            double d4 = gradDot(this.p(i2 + gridZ + 1), deltaX, weirdDeltaY, deltaZ - 1.0);
+            double d5 = gradDot(this.p(i4 + gridZ + 1), deltaX - 1.0, weirdDeltaY, deltaZ - 1.0);
+            double d6 = gradDot(this.p(i3 + gridZ + 1), deltaX, weirdDeltaY - 1.0, deltaZ - 1.0);
+            double d7 = gradDot(this.p(i5 + gridZ + 1), deltaX - 1.0, weirdDeltaY - 1.0, deltaZ - 1.0);
+            double d8 = Mth.smoothstep(deltaX);
+            double d9 = Mth.smoothstep(deltaY);
+            double d10 = Mth.smoothstep(deltaZ);
+            return Mth.lerp3(d8, d9, d10, d, d1, d2, d3, d4, d5, d6, d7);
+        } else {
+            final int var0 = gridX & 0xFF;
+            final int var1 = (gridX + 1) & 0xFF;
+            final int var2 = this.p[var0] & 0xFF;
+            final int var3 = this.p[var1] & 0xFF;
+            final int var4 = (var2 + gridY) & 0xFF;
+            final int var5 = (var3 + gridY) & 0xFF;
+            final int var6 = (var2 + gridY + 1) & 0xFF;
+            final int var7 = (var3 + gridY + 1) & 0xFF;
+            final int var8 = this.p[var4] & 0xFF;
+            final int var9 = this.p[var5] & 0xFF;
+            final int var10 = this.p[var6] & 0xFF;
+            final int var11 = this.p[var7] & 0xFF;
+
+            final int var12 = (var8 + gridZ) & 0xFF;
+            final int var13 = (var9 + gridZ) & 0xFF;
+            final int var14 = (var10 + gridZ) & 0xFF;
+            final int var15 = (var11 + gridZ) & 0xFF;
+            final int var16 = (var8 + gridZ + 1) & 0xFF;
+            final int var17 = (var9 + gridZ + 1) & 0xFF;
+            final int var18 = (var10 + gridZ + 1) & 0xFF;
+            final int var19 = (var11 + gridZ + 1) & 0xFF;
+            final int var20 = (this.p[var12] & 15) << 2;
+            final int var21 = (this.p[var13] & 15) << 2;
+            final int var22 = (this.p[var14] & 15) << 2;
+            final int var23 = (this.p[var15] & 15) << 2;
+            final int var24 = (this.p[var16] & 15) << 2;
+            final int var25 = (this.p[var17] & 15) << 2;
+            final int var26 = (this.p[var18] & 15) << 2;
+            final int var27 = (this.p[var19] & 15) << 2;
+            final double var60 = deltaX - 1.0;
+            final double var61 = deltaY - 1.0;
+            final double var62 = deltaZ - 1.0;
+            final double var87 = FLAT_SIMPLEX_GRAD[(var20) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var20) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var20) | 2] * deltaZ;
+            final double var88 = FLAT_SIMPLEX_GRAD[(var21) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var21) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var21) | 2] * deltaZ;
+            final double var89 = FLAT_SIMPLEX_GRAD[(var22) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var22) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var22) | 2] * deltaZ;
+            final double var90 = FLAT_SIMPLEX_GRAD[(var23) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var23) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var23) | 2] * deltaZ;
+            final double var91 = FLAT_SIMPLEX_GRAD[(var24) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var24) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var24) | 2] * var62;
+            final double var92 = FLAT_SIMPLEX_GRAD[(var25) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var25) | 1] * weirdDeltaY + FLAT_SIMPLEX_GRAD[(var25) | 2] * var62;
+            final double var93 = FLAT_SIMPLEX_GRAD[(var26) | 0] * deltaX + FLAT_SIMPLEX_GRAD[(var26) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var26) | 2] * var62;
+            final double var94 = FLAT_SIMPLEX_GRAD[(var27) | 0] * var60 + FLAT_SIMPLEX_GRAD[(var27) | 1] * var61 + FLAT_SIMPLEX_GRAD[(var27) | 2] * var62;
+
+            final double var95 = deltaX * 6.0 - 15.0;
+            final double var96 = weirdDeltaY * 6.0 - 15.0;
+            final double var97 = deltaZ * 6.0 - 15.0;
+            final double var98 = deltaX * var95 + 10.0;
+            final double var99 = weirdDeltaY * var96 + 10.0;
+            final double var100 = deltaZ * var97 + 10.0;
+            final double var101 = deltaX * deltaX * deltaX * var98;
+            final double var102 = weirdDeltaY * weirdDeltaY * weirdDeltaY * var99;
+            final double var103 = deltaZ * deltaZ * deltaZ * var100;
+
+            final double var113 = var87 + var101 * (var88 - var87);
+            final double var114 = var93 + var101 * (var94 - var93);
+            final double var115 = var91 + var101 * (var92 - var91);
+            final double var116 = var89 + var101 * (var90 - var89);
+            final double var117 = var114 - var115;
+            final double var118 = var102 * (var116 - var113);
+            final double var119 = var102 * var117;
+            final double var120 = var113 + var118;
+            final double var121 = var115 + var119;
+            return var120 + (var103 * (var121 - var120));
+        }
+        // Leaves end - optimize noise generation
+     }
+ 
+     private double sampleWithDerivative(int gridX, int gridY, int gridZ, double deltaX, double deltaY, double deltaZ, double[] noiseValues) {
+diff --git a/net/minecraft/world/level/levelgen/synth/PerlinNoise.java b/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
+index da3c26fbad32d75d71f7e59c8c3341316a754756..82a2569139b088b30f9d8a13f50d556fefd78742 100644
+--- a/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
+++ b/net/minecraft/world/level/levelgen/synth/PerlinNoise.java
+@@ -26,6 +26,10 @@ public class PerlinNoise {
+     private final double lowestFreqValueFactor;
+     private final double lowestFreqInputFactor;
+     private final double maxValue;
+    // Leaves start - optimize noise generation
+    private final int octaveSamplersCount;
+    private final double [] amplitudesArray;
+    // Leaves end - optimize noise generation
+ 
+     @Deprecated
+     public static PerlinNoise createLegacyForBlendedNoise(RandomSource random, IntStream octaves) {
+@@ -127,6 +131,10 @@ public class PerlinNoise {
+         this.lowestFreqInputFactor = Math.pow(2.0, -i);
+         this.lowestFreqValueFactor = Math.pow(2.0, size - 1) / (Math.pow(2.0, size) - 1.0);
+         this.maxValue = this.edgeValue(2.0);
+        // Leaves start - optimize noise generation
+        this.octaveSamplersCount = this.noiseLevels.length;
+        this.amplitudesArray = this.amplitudes.toDoubleArray();
+        // Leaves end - optimize noise generation
+     }
+ 
+     protected double maxValue() {
+@@ -138,7 +146,30 @@ public class PerlinNoise {
+     }
+ 
+     public double getValue(double x, double y, double z) {
+-        return this.getValue(x, y, z, 0.0, 0.0, false);
+        // Leaves start - optimize noise generation
+        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeNoiseGeneration) {
+            return this.getValue(x, y, z, 0.0, 0.0, false);
+        } else {
+            double d = 0.0;
+            double e = this.lowestFreqInputFactor;
+            double f = this.lowestFreqValueFactor;
+
+            for(int i = 0; i < this.octaveSamplersCount; ++i) {
+                ImprovedNoise perlinNoiseSampler = this.noiseLevels[i];
+                if (perlinNoiseSampler != null) {
+                    @SuppressWarnings("deprecation")
+                    double g = perlinNoiseSampler.noise(
+                        wrap(x * e), wrap(y * e), wrap(z * e), 0.0, 0.0
+                    );
+                    d += this.amplitudesArray[i] * g * f;
+                }
+
+                e *= 2.0;
+                f /= 2.0;
+            }
+            return d;
+        }
+        // Leaves end - optimize noise generation
+     }
+ 
+     @Deprecated
--- a/leaves-server/minecraft-patches/features/0061-Reduce-array-allocations.patch
+++ b/leaves-server/minecraft-patches/features/0061-Reduce-array-allocations.patch
@@ -0,0 +1,281 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 20 Jul 2023 15:03:28 +0800
+Subject: [PATCH] Reduce array allocations
+
+This patch is Powered by Gale(https://github.com/GaleMC/Gale)
+
+diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
+index d21ce54ebb5724c04eadf56a2cde701d5eeb5db2..fa4b8ea36acf031ceafc1812e657c2312eb49599 100644
+--- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
+++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java
+@@ -29,6 +29,7 @@ import java.util.Arrays;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.function.Predicate;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public final class ChunkEntitySlices {
+ 
+@@ -378,7 +379,7 @@ public final class ChunkEntitySlices {
+ 
+     private static final class BasicEntityList<E extends Entity> {
+ 
+-        private static final Entity[] EMPTY = new Entity[0];
+        // protected static final Entity[] EMPTY = new Entity[0]; // Leaves - reduce array allocations
+         private static final int DEFAULT_CAPACITY = 4;
+ 
+         private E[] storage;
+@@ -389,7 +390,7 @@ public final class ChunkEntitySlices {
+         }
+ 
+         public BasicEntityList(final int cap) {
+-            this.storage = (E[])(cap <= 0 ? EMPTY : new Entity[cap]);
+            this.storage = (E[])(cap <= 0 ? ArrayConstants.emptyEntityArray : new Entity[cap]); // Leaves - reduce array allocations
+         }
+ 
+         public boolean isEmpty() {
+@@ -401,7 +402,7 @@ public final class ChunkEntitySlices {
+         }
+ 
+         private void resize() {
+-            if (this.storage == EMPTY) {
+            if (this.storage == ArrayConstants.emptyEntityArray) { // Leaves - reduce array allocations
+                 this.storage = (E[])new Entity[DEFAULT_CAPACITY];
+             } else {
+                 this.storage = Arrays.copyOf(this.storage, this.storage.length * 2);
+diff --git a/net/minecraft/nbt/ByteArrayTag.java b/net/minecraft/nbt/ByteArrayTag.java
+index 6927124a4ea1f460158bf25679104b6f9e9ccee4..b0e8f47b9fe2b62d03c11a0b95253d7de7b8adac 100644
+--- a/net/minecraft/nbt/ByteArrayTag.java
+++ b/net/minecraft/nbt/ByteArrayTag.java
+@@ -6,6 +6,7 @@ import java.io.IOException;
+ import java.util.Arrays;
+ import java.util.List;
+ import org.apache.commons.lang3.ArrayUtils;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class ByteArrayTag extends CollectionTag<ByteTag> {
+     private static final int SELF_SIZE_IN_BYTES = 24;
+@@ -174,7 +175,7 @@ public class ByteArrayTag extends CollectionTag<ByteTag> {
+ 
+     @Override
+     public void clear() {
+-        this.data = new byte[0];
+        this.data = ArrayConstants.emptyByteArray; // Leaves - reduce array allocations
+     }
+ 
+     @Override
+diff --git a/net/minecraft/nbt/CompoundTag.java b/net/minecraft/nbt/CompoundTag.java
+index 361bc458e0bb590c43da60a1cd993a2785ee45e9..9d1e0ba4ecccfc8a251d440d63ed90796981808e 100644
+--- a/net/minecraft/nbt/CompoundTag.java
+++ b/net/minecraft/nbt/CompoundTag.java
+@@ -18,6 +18,7 @@ import javax.annotation.Nullable;
+ import net.minecraft.CrashReport;
+ import net.minecraft.CrashReportCategory;
+ import net.minecraft.ReportedException;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class CompoundTag implements Tag {
+     public static final Codec<CompoundTag> CODEC = Codec.PASSTHROUGH
+@@ -409,7 +410,7 @@ public class CompoundTag implements Tag {
+             throw new ReportedException(this.createReport(key, ByteArrayTag.TYPE, var3));
+         }
+ 
+-        return new byte[0];
+        return ArrayConstants.emptyByteArray; // Leaves - reduce array allocations
+     }
+ 
+     public int[] getIntArray(String key) {
+@@ -421,7 +422,7 @@ public class CompoundTag implements Tag {
+             throw new ReportedException(this.createReport(key, IntArrayTag.TYPE, var3));
+         }
+ 
+-        return new int[0];
+        return ArrayConstants.emptyIntArray; // Leaves - reduce array allocations
+     }
+ 
+     public long[] getLongArray(String key) {
+@@ -433,7 +434,7 @@ public class CompoundTag implements Tag {
+             throw new ReportedException(this.createReport(key, LongArrayTag.TYPE, var3));
+         }
+ 
+-        return new long[0];
+        return ArrayConstants.emptyLongArray; // Leaves - reduce array allocations
+     }
+ 
+     public CompoundTag getCompound(String key) {
+diff --git a/net/minecraft/nbt/IntArrayTag.java b/net/minecraft/nbt/IntArrayTag.java
+index 7e27546bcb587d03b6de2ab43244e6c61fdb55f4..9e94f41e61687e2dacafec9c06646ec7f7980b62 100644
+--- a/net/minecraft/nbt/IntArrayTag.java
+++ b/net/minecraft/nbt/IntArrayTag.java
+@@ -6,6 +6,7 @@ import java.io.IOException;
+ import java.util.Arrays;
+ import java.util.List;
+ import org.apache.commons.lang3.ArrayUtils;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class IntArrayTag extends CollectionTag<IntTag> {
+     private static final int SELF_SIZE_IN_BYTES = 24;
+@@ -181,7 +182,7 @@ public class IntArrayTag extends CollectionTag<IntTag> {
+ 
+     @Override
+     public void clear() {
+-        this.data = new int[0];
+        this.data = ArrayConstants.emptyIntArray; // Leaves - reduce array allocations
+     }
+ 
+     @Override
+diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
+index f8a67220ebb72fd446006b7aaed87fc69bd0454d..f94b0148d90329e15801fbb893f02cdddbdb4779 100644
+--- a/net/minecraft/network/Connection.java
+++ b/net/minecraft/network/Connection.java
+@@ -65,6 +65,7 @@ import org.apache.commons.lang3.Validate;
+ import org.slf4j.Logger;
+ import org.slf4j.Marker;
+ import org.slf4j.MarkerFactory;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     private static final float AVERAGE_PACKETS_SMOOTHING = 0.75F;
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index ed37ba4ca1303a0ce97e7a1fce1b29682276292b..7763d4c818606ed034f28e050166fe8cae16cfb8 100644
+--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
+@@ -169,6 +169,7 @@ import net.minecraft.world.phys.shapes.Shapes;
+ import net.minecraft.world.phys.shapes.VoxelShape;
+ import net.minecraft.world.ticks.LevelTicks;
+ import org.slf4j.Logger;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevelReader, ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel { // Paper - rewrite chunk system // Paper - chunk tick iteration
+     public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0);
+diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 24f2a1d295a02a8fdc1518f914549a980cd035c9..339be9915708171a5682af8193c09f96f7fba02c 100644
+--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -245,6 +245,7 @@ import org.bukkit.inventory.CraftingInventory;
+ import org.bukkit.inventory.InventoryView;
+ import org.bukkit.inventory.SmithingInventory;
+ // CraftBukkit end
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class ServerGamePacketListenerImpl
+     extends ServerCommonPacketListenerImpl
+@@ -801,7 +802,7 @@ public class ServerGamePacketListenerImpl
+         // Paper start
+         final int index;
+         if (packet.getCommand().length() > 64 && ((index = packet.getCommand().indexOf(' ')) == -1 || index >= 64)) {
+-            this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - add proper async disconnect
+            this.disconnectAsync(Component.translatable("disconnect.spam", ArrayConstants.emptyObjectArray), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - add proper async disconnect // Leaves - reduce array allocations
+             return;
+         }
+         // Paper end
+diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+index 6689aeacf50d1498e8d23cce696fb4fecbd1cf39..66d74f720f60c85d3b0e0c04e45bbceedc4e314a 100644
+--- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+@@ -50,6 +50,7 @@ import org.bukkit.craftbukkit.entity.CraftPlayer;
+ import org.bukkit.craftbukkit.util.Waitable;
+ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
+ import org.bukkit.event.player.PlayerPreLoginEvent;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, TickablePacketListener, CraftPlayer.TransferCookieConnection {
+     // CraftBukkit end
+diff --git a/net/minecraft/server/players/StoredUserList.java b/net/minecraft/server/players/StoredUserList.java
+index d445e8f126f077d8419c52fa5436ea963a1a42a4..0c0f70b5c624e05811aef398a2e6c29c14a9e323 100644
+--- a/net/minecraft/server/players/StoredUserList.java
+++ b/net/minecraft/server/players/StoredUserList.java
+@@ -21,6 +21,7 @@ import javax.annotation.Nullable;
+ import net.minecraft.Util;
+ import net.minecraft.util.GsonHelper;
+ import org.slf4j.Logger;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+     private static final Logger LOGGER = LogUtils.getLogger();
+@@ -70,7 +71,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
+     }
+ 
+     public String[] getUserList() {
+-        return this.map.keySet().toArray(new String[0]);
+        return (String[]) this.map.keySet().toArray(ArrayConstants.emptyStringArray); // Leaves - reduce array allocations
+     }
+ 
+     public boolean isEmpty() {
+diff --git a/net/minecraft/util/ZeroBitStorage.java b/net/minecraft/util/ZeroBitStorage.java
+index 50993ce7519a77c6a9d36cb925125adccda7037f..e5124b566e791c1c011b301f910a892689cf3c65 100644
+--- a/net/minecraft/util/ZeroBitStorage.java
+++ b/net/minecraft/util/ZeroBitStorage.java
+@@ -5,7 +5,7 @@ import java.util.function.IntConsumer;
+ import org.apache.commons.lang3.Validate;
+ 
+ public class ZeroBitStorage implements BitStorage {
+-    public static final long[] RAW = new long[0];
+    public static final long[] RAW = org.leavesmc.leaves.util.ArrayConstants.emptyLongArray; // Leaves - reduce array allocations
+     private final int size;
+ 
+     public ZeroBitStorage(int size) {
+diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
+index e9ec19be9393ccd1e257247de86ba05e51471790..e10f4190393a934d617cd2c7afd05f3a4a6e89f9 100644
+--- a/net/minecraft/world/level/Level.java
+++ b/net/minecraft/world/level/Level.java
+@@ -102,6 +102,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
+ import org.bukkit.entity.SpawnCategory;
+ import org.bukkit.event.block.BlockPhysicsEvent;
+ // CraftBukkit end
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel, ca.spottedleaf.moonrise.patches.chunk_system.world.ChunkSystemEntityGetter { // Paper - rewrite chunk system // Paper - optimise collisions
+     public static final Codec<ResourceKey<Level>> RESOURCE_KEY_CODEC = ResourceKey.codec(Registries.DIMENSION);
+diff --git a/net/minecraft/world/level/block/ComposterBlock.java b/net/minecraft/world/level/block/ComposterBlock.java
+index 86f9c284f434a16888beb60b89f460de2c0450a8..e3177018adab3d87eb4af8ac158def96908b041a 100644
+--- a/net/minecraft/world/level/block/ComposterBlock.java
+++ b/net/minecraft/world/level/block/ComposterBlock.java
+@@ -410,7 +410,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+ 
+         @Override
+         public int[] getSlotsForFace(Direction side) {
+-            return new int[0];
+            return org.leavesmc.leaves.util.ArrayConstants.emptyIntArray; // Leaves - reduce array allocations
+         }
+ 
+         @Override
+@@ -445,7 +445,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+ 
+         @Override
+         public int[] getSlotsForFace(Direction side) {
+-            return side == Direction.UP ? new int[]{0} : new int[0];
+            return side == Direction.UP ? org.leavesmc.leaves.util.ArrayConstants.zeroSingletonIntArray : org.leavesmc.leaves.util.ArrayConstants.emptyIntArray; // Leaves - reduce array allocations
+         }
+ 
+         @Override
+@@ -496,7 +496,7 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+ 
+         @Override
+         public int[] getSlotsForFace(Direction side) {
+-            return side == Direction.DOWN ? new int[]{0} : new int[0];
+            return side == Direction.DOWN ? org.leavesmc.leaves.util.ArrayConstants.zeroSingletonIntArray : org.leavesmc.leaves.util.ArrayConstants.emptyIntArray; // Leaves - reduce array allocations
+         }
+ 
+         @Override
+diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index 2f5fa4310f475ecbb29e69c0461c7d3276f8536d..304940047eee6fab5b763ce13fdd5d7e6f8e70f1 100644
+--- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+@@ -38,13 +38,14 @@ import net.minecraft.world.level.block.AbstractFurnaceBlock;
+ import net.minecraft.world.level.block.Blocks;
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.phys.Vec3;
+import org.leavesmc.leaves.util.ArrayConstants;
+ 
+ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntity implements WorldlyContainer, RecipeCraftingHolder, StackedContentsCompatible {
+     protected static final int SLOT_INPUT = 0;
+     protected static final int SLOT_FUEL = 1;
+     protected static final int SLOT_RESULT = 2;
+     public static final int DATA_LIT_TIME = 0;
+-    private static final int[] SLOTS_FOR_UP = new int[]{0};
+    private static final int[] SLOTS_FOR_UP = ArrayConstants.zeroSingletonIntArray; // Leaves - reduce array allocations
+     private static final int[] SLOTS_FOR_DOWN = new int[]{2, 1};
+     private static final int[] SLOTS_FOR_SIDES = new int[]{1};
+     public static final int DATA_LIT_DURATION = 1;
--- a/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch
+++ b/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch
@@ -5,15 +5,17 @@ Subject: [PATCH] Optimize sun burn tick

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 13956aa8210d0234176a9d7450afdf42a2311f11..6a19f5725387b7178720ba209ebc2a5c46241bf5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2166,8 +2166,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     /** @deprecated */
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 92f363180ed4d2a91da996de9e8adfa4f3b17e69..cbb3062d1bfd9d9695e0d72df3f91ad084e043c2 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -2039,10 +2039,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
     @Deprecated
     public float getLightLevelDependentMagicValue() {
-        return this.level().hasChunkAt(this.getBlockX(), this.getBlockZ()) ? this.level().getLightLevelDependentMagicValue(BlockPos.containing(this.getX(), this.getEyeY(), this.getZ())) : 0.0F;
+-        return this.level().hasChunkAt(this.getBlockX(), this.getBlockZ())
+-            ? this.level().getLightLevelDependentMagicValue(BlockPos.containing(this.getX(), this.getEyeY(), this.getZ()))
+-            : 0.0F;
 +        // Leaves start - optimize sun burn tick
 +        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeSunBurnTick) {
 +            return this.level().hasChunkAt(this.getBlockX(), this.getBlockZ()) ? this.level().getLightLevelDependentMagicValue(BlockPos.containing(this.getX(), this.getEyeY(), this.getZ())) : 0.0F;
@@ -31,15 +33,15 @@ index 13956aa8210d0234176a9d7450afdf42a2311f11..6a19f5725387b7178720ba209ebc2a5c
     }
 +    // Leaves end - optimize sun burn tick
 
-     public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
+     public void absMoveTo(double x, double y, double z, float yRot, float xRot) {
         this.absMoveTo(x, y, z);
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index c80976958ad8f51aadf0dab5d49a3e11c77010d4..b3775c9c5986f460b0b65ce49a5e2ff064349394 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1742,15 +1742,41 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
- 
-     protected void playAttackSound() {}
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
+index b694ea0a5fee852c31ff503a42e50a999c5a287b..6810037ab23e79986ef0f5d959bc317142df67cd 100644
+--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
+@@ -1627,20 +1627,40 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+     protected void playAttackSound() {
+     }
 
 +    // Leaves start - optimize sun burn tick
 +    private BlockPos cached_eye_blockpos;
@@ -48,9 +50,14 @@ index c80976958ad8f51aadf0dab5d49a3e11c77010d4..b3775c9c5986f460b0b65ce49a5e2ff0
 +
     public boolean isSunBurnTick() {
         if (this.level().isDay() && !this.level().isClientSide) {
-            float f = this.getLightLevelDependentMagicValue();
-            BlockPos blockposition = BlockPos.containing(this.getX(), this.getEyeY(), this.getZ());
+-            float lightLevelDependentMagicValue = this.getLightLevelDependentMagicValue();
+-            BlockPos blockPos = BlockPos.containing(this.getX(), this.getEyeY(), this.getZ());
 -            boolean flag = this.isInWaterRainOrBubble() || this.isInPowderSnow || this.wasInPowderSnow;
+-            if (lightLevelDependentMagicValue > 0.5F
+-                && this.random.nextFloat() * 30.0F < (lightLevelDependentMagicValue - 0.4F) * 2.0F
+-                && !flag
+-                && this.level().canSeeSky(blockPos)) {
+-                return true;
 +            // Leaves start - optimize sun burn tick
 +            if (!org.leavesmc.leaves.LeavesConfig.performance.optimizeSunBurnTick) {
 +                float f = this.getLightLevelDependentMagicValue();
@@ -73,14 +80,12 @@ index c80976958ad8f51aadf0dab5d49a3e11c77010d4..b3775c9c5986f460b0b65ce49a5e2ff0
 +                if (f <= 0.5F) return false;
 +                if (this.random.nextFloat() * 30.0F >= (f - 0.4F) * 2.0F) return false;
 +                boolean flag = this.isInWaterRainOrBubble() || this.isInPowderSnow || this.wasInPowderSnow;
- 
-            if (f > 0.5F && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && !flag && this.level().canSeeSky(blockposition)) {
-                return true;
-+                if (!flag && this.level().canSeeSky(this.cached_eye_blockpos)) {
-+                    return true;
-+                }
+                return !flag && this.level().canSeeSky(this.cached_eye_blockpos);
             }
-+            // Leaves end - optimize sun burn tick
         }
- 
+-
         return false;
+        // Leaves end - optimize sun burn tick
+     }
+ 
+     @Override
--- a/leaves-server/minecraft-patches/features/0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
+++ b/leaves-server/minecraft-patches/features/0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
@@ -6,24 +6,24 @@ Subject: [PATCH] Reduce lambda and Optional allocation in

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java b/src/main/java/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
-index 3527f1621ef9b4f3f8d8bbb93379f13ff141c3be..f6e51bce07849553c907c81ad141105f36f393cb 100644
--- a/src/main/java/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
-+++ b/src/main/java/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
+diff --git a/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java b/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
+index 52cb2dcd714cf8c16f167466333eeb923e4ff183..8f2fbfb8d0a24d53697442addf940fa18ae4c69b 100644
+--- a/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
+++ b/net/minecraft/world/level/EntityBasedExplosionDamageCalculator.java
@@ -15,8 +15,20 @@ public class EntityBasedExplosionDamageCalculator extends ExplosionDamageCalcula
 
     @Override
-     public Optional<Float> getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState) {
-        return super.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState)
-            .map(max -> this.source.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState, max));
+     public Optional<Float> getBlockExplosionResistance(Explosion explosion, BlockGetter reader, BlockPos pos, BlockState state, FluidState fluid) {
+-        return super.getBlockExplosionResistance(explosion, reader, pos, state, fluid)
+-            .map(resistance -> this.source.getBlockExplosionResistance(explosion, reader, pos, state, fluid, resistance));
 +        if (!org.leavesmc.leaves.LeavesConfig.performance.remove.damageLambda) {
-+            return super.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState)
-+                .map(max -> this.source.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState, max));
+            return super.getBlockExplosionResistance(explosion, reader, pos, state, fluid)
+                    .map(max -> this.source.getBlockExplosionResistance(explosion, reader, pos, state, fluid, max));
 +        } else {
-+            Optional<Float> optionalBlastResistance = super.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState);
+            Optional<Float> optionalBlastResistance = super.getBlockExplosionResistance(explosion, reader, pos, state, fluid);
 +            if (optionalBlastResistance.isPresent()) {
 +                float blastResistance = optionalBlastResistance.get();
-+                float effectiveExplosionResistance = this.source.getBlockExplosionResistance(explosion, world, pos, blockState, fluidState, blastResistance);
+                float effectiveExplosionResistance = this.source.getBlockExplosionResistance(explosion, reader, pos, state, fluid, blastResistance);
 +                if (effectiveExplosionResistance != blastResistance) {
 +                    return Optional.of(effectiveExplosionResistance);
 +                }
--- a/leaves-server/minecraft-patches/features/0064-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
+++ b/leaves-server/minecraft-patches/features/0064-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Avoid Class#isAssignableFrom call in ClassInstanceMultiMap

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-index 038710ba934a9a57815dfe9f414b98223b848385..fd2176449a9ed8921032d6265c95dd5e7f5ae325 100644
--- a/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
-+++ b/src/main/java/net/minecraft/util/ClassInstanceMultiMap.java
+diff --git a/net/minecraft/util/ClassInstanceMultiMap.java b/net/minecraft/util/ClassInstanceMultiMap.java
+index 2a708ae0d5bb209650b525e3c56051f8b5655074..7f4b29fad0d70f0480b8b13d7a7d8d7a7f90b491 100644
+--- a/net/minecraft/util/ClassInstanceMultiMap.java
+++ b/net/minecraft/util/ClassInstanceMultiMap.java
@@ -56,13 +56,24 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
     }
 
@@ -17,7 +17,7 @@ index 038710ba934a9a57815dfe9f414b98223b848385..fd2176449a9ed8921032d6265c95dd5e
 -            throw new IllegalArgumentException("Don't know how to search for " + type);
 -        } else {
 -            List<? extends T> list = this.byClass
-                .computeIfAbsent(type, typeClass -> this.allInstances.stream().filter(typeClass::isInstance).collect(Util.toMutableList()));
+-                .computeIfAbsent(type, clazz -> this.allInstances.stream().filter(clazz::isInstance).collect(Util.toMutableList()));
 -            return (Collection<S>)Collections.unmodifiableCollection(list);
 +        // Leaves start - avoid Class#isAssignableFrom call in ClassInstanceMultiMap
 +        Collection<T> collection = this.byClass.get(type);
--- a/leaves-server/minecraft-patches/features/0065-Optimized-CubePointRange.patch
+++ b/leaves-server/minecraft-patches/features/0065-Optimized-CubePointRange.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Optimized CubePointRange

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java b/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java
-index ad02cdb00360165f6405eb3044bd8320f01a7ef1..d628e696c3ddd10cc2a347a8dd720d9379cf894c 100644
--- a/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java
-+++ b/src/main/java/net/minecraft/world/phys/shapes/CubePointRange.java
-@@ -3,21 +3,31 @@ package net.minecraft.world.phys.shapes;
+diff --git a/net/minecraft/world/phys/shapes/CubePointRange.java b/net/minecraft/world/phys/shapes/CubePointRange.java
+index 62aea61c5f240aa59b8489dd0bbb3d1b69b54b1c..b8e06a2d7f3a42a1cec1c87b950242acda54b214 100644
+--- a/net/minecraft/world/phys/shapes/CubePointRange.java
+++ b/net/minecraft/world/phys/shapes/CubePointRange.java
+@@ -3,23 +3,33 @@ package net.minecraft.world.phys.shapes;
 import it.unimi.dsi.fastutil.doubles.AbstractDoubleList;
 
 public class CubePointRange extends AbstractDoubleList {
@@ -17,27 +17,29 @@ index ad02cdb00360165f6405eb3044bd8320f01a7ef1..d628e696c3ddd10cc2a347a8dd720d93
     private final int parts;
 +    private final double scale; // Leaves - replace division by multiplication in CubePointRange
 
-     public CubePointRange(int sectionCount) {
-         if (sectionCount <= 0) {
+     public CubePointRange(int parts) {
+         if (parts <= 0) {
             throw new IllegalArgumentException("Need at least 1 part");
         } else {
-             this.parts = sectionCount;
-+            this.size = sectionCount + 1;
+             this.parts = parts;
+            this.size = parts + 1;
         }
-+        this.scale = 1.0D / sectionCount; // Leaves - replace division by multiplication in CubePointRange
+        this.scale = 1.0D / parts; // Leaves - replace division by multiplication in CubePointRange
     }
 
-     public double getDouble(int i) {
-        return (double)i / (double)this.parts;
+     @Override
+     public double getDouble(int value) {
+-        return (double)value / this.parts;
 +        // Leaves start - replace division by multiplication in CubePointRange
 +        if (!org.leavesmc.leaves.LeavesConfig.performance.optimizedCubePointRange) {
-+            return (double)i / (double)this.parts;
+            return (double)value / (double)this.parts;
 +        } else {
-+            return i * this.scale;
+            return value * this.scale;
 +        }
 +        // Leaves start - replace division by multiplication in CubePointRange
     }
 
+     @Override
     public int size() {
 -        return this.parts + 1;
 +        return !org.leavesmc.leaves.LeavesConfig.performance.optimizedCubePointRange ? this.parts + 1 : size; // Leaves - replace parts by size in CubePointRange
--- a/leaves-server/minecraft-patches/features/0066-Check-frozen-ticks-before-landing-block.patch
+++ b/leaves-server/minecraft-patches/features/0066-Check-frozen-ticks-before-landing-block.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 20 Jul 2023 20:33:52 +0800
+Subject: [PATCH] Check frozen ticks before landing block
+
+This patch is Powered by Gale(https://github.com/GaleMC/Gale)
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index 5e7068bf9b5364c382fccfb110ed2a26a5ac1731..9b90d9f9a9317cdec1e2684e68d5ec03a143addc 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -572,10 +572,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
+     }
+ 
+     protected void tryAddFrost() {
+-        if (!this.getBlockStateOnLegacy().isAir()) {
+        if (org.leavesmc.leaves.LeavesConfig.performance.checkFrozenTicksBeforeLandingBlock || !this.getBlockStateOnLegacy().isAir()) { // Leaves - check frozen ticks before landing block
+             int ticksFrozen = this.getTicksFrozen();
+             if (ticksFrozen > 0) {
+-                AttributeInstance attribute = this.getAttribute(Attributes.MOVEMENT_SPEED);
+                AttributeInstance attribute = !org.leavesmc.leaves.LeavesConfig.performance.checkFrozenTicksBeforeLandingBlock || !this.getBlockStateOnLegacy().isAir() ? this.getAttribute(Attributes.MOVEMENT_SPEED) : null; // Leaves - check frozen ticks before landing block
+                 if (attribute == null) {
+                     return;
+                 }
--- a/leaves-server/minecraft-patches/features/0067-Skip-entity-move-if-movement-is-zero.patch
+++ b/leaves-server/minecraft-patches/features/0067-Skip-entity-move-if-movement-is-zero.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Skip entity move if movement is zero

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6a19f5725387b7178720ba209ebc2a5c46241bf5..bab140f5489ab13bb67a3372cb1429e5ead1d93d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -282,6 +282,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index cbb3062d1bfd9d9695e0d72df3f91ad084e043c2..12f37226992986fb633c36e651fc098e46937646 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -235,6 +235,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     public float yRotO;
     public float xRotO;
-     private AABB bb;
+     private AABB bb = INITIAL_AABB;
 +    private boolean boundingBoxChanged = false; // Leaves - skip entity move if movement is zero
     public boolean onGround;
     public boolean horizontalCollision;
     public boolean verticalCollision;
-@@ -1163,6 +1164,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1085,6 +1086,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     // Paper end - detailed watchdog information
 
     public void move(MoverType type, Vec3 movement) {
@@ -31,11 +31,11 @@ index 6a19f5725387b7178720ba209ebc2a5c46241bf5..bab140f5489ab13bb67a3372cb1429e5
         final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
         // Paper start - detailed watchdog information
         ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4421,6 +4429,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4208,6 +4216,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     }
 
-     public final void setBoundingBox(AABB boundingBox) {
-+        if (!this.bb.equals(boundingBox)) this.boundingBoxChanged = true; // Leaves - skip entity move if movement is zero
+     public final void setBoundingBox(AABB bb) {
+        if (!this.bb.equals(bb)) this.boundingBoxChanged = true; // Leaves - skip entity move if movement is zero
         // CraftBukkit start - block invalid bounding boxes
-         double minX = boundingBox.minX,
-                 minY = boundingBox.minY,
+         double minX = bb.minX,
+                 minY = bb.minY,
--- a/leaves-server/minecraft-patches/features/0068-Skip-cloning-advancement-criteria.patch
+++ b/leaves-server/minecraft-patches/features/0068-Skip-cloning-advancement-criteria.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Skip cloning advancement criteria

 This patch is Powered by Gale(https://github.com/GaleMC/Gale)

-diff --git a/src/main/java/net/minecraft/advancements/Advancement.java b/src/main/java/net/minecraft/advancements/Advancement.java
-index fb4b7652c386fa10783d71899615723a958ffd56..dad1164397b112c687bcc13bd44e546e58d9d970 100644
--- a/src/main/java/net/minecraft/advancements/Advancement.java
-+++ b/src/main/java/net/minecraft/advancements/Advancement.java
+diff --git a/net/minecraft/advancements/Advancement.java b/net/minecraft/advancements/Advancement.java
+index d5c824eabf321a2c7600c7081b8d4f3057cfae2e..32a671ffc4c1970c0af918281b031344b07a4029 100644
+--- a/net/minecraft/advancements/Advancement.java
+++ b/net/minecraft/advancements/Advancement.java
@@ -60,7 +60,7 @@ public record Advancement(
         AdvancementRequirements requirements,
         boolean sendsTelemetryEvent
--- a/leaves-server/minecraft-patches/features/0069-Fix-villagers-dont-release-memory.patch
+++ b/leaves-server/minecraft-patches/features/0069-Fix-villagers-dont-release-memory.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sat, 22 Jul 2023 12:00:59 +0800
+Subject: [PATCH] Fix villagers dont release memory
+
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 12f37226992986fb633c36e651fc098e46937646..ab63de942e3a34a84666877a202c4a191391a28b 100644
+--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
+@@ -3837,7 +3837,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         return this;
+     }
+ 
+-    private Entity teleportCrossDimension(ServerLevel level, TeleportTransition teleportTransition) {
+    protected Entity teleportCrossDimension(ServerLevel level, TeleportTransition teleportTransition) { // Leaves - private -> protected
+         List<Entity> passengers = this.getPassengers();
+         List<Entity> list = new ArrayList<>(passengers.size());
+         this.ejectPassengers();
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
+index 2b83262e4a13eae86df82913ce4f3121e3631a43..6b565fcf91e1d94b649dac90bf3c923930d252f8 100644
+--- a/net/minecraft/world/entity/npc/Villager.java
+++ b/net/minecraft/world/entity/npc/Villager.java
+@@ -1017,4 +1017,19 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+         Optional<Long> memory = this.brain.getMemory(MemoryModuleType.LAST_SLEPT);
+         return memory.filter(_long -> gameTime - _long < 24000L).isPresent();
+     }
+
+    // Leaves start - fixes a memory leak when villagers get moved to another world
+    @Override
+    public Entity teleportCrossDimension(ServerLevel world, net.minecraft.world.level.portal.TeleportTransition transition) {
+        if (org.leavesmc.leaves.LeavesConfig.performance.villagersDontReleaseMemoryFix) {
+            this.releaseAllPois();
+            this.getBrain().eraseMemory(MemoryModuleType.HOME);
+            this.getBrain().eraseMemory(MemoryModuleType.JOB_SITE);
+            this.getBrain().eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
+            this.getBrain().eraseMemory(MemoryModuleType.MEETING_POINT);
+            this.refreshBrain(transition.newLevel());
+        }
+        return super.teleportCrossDimension(world, transition);
+    }
+    // Leaves end - fixes a memory leak when villagers get moved to another world
+ }
--- a/leaves-server/minecraft-patches/features/0070-Avoid-anvil-too-expensive.patch
+++ b/leaves-server/minecraft-patches/features/0070-Avoid-anvil-too-expensive.patch
@@ -4,16 +4,16 @@ Date: Sat, 22 Jul 2023 14:16:25 +0800
 Subject: [PATCH] Avoid anvil too expensive


-diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index 286ae002e1711ad9e800b7f2091988d66cd572a7..d27f1b159984032f7cbbd8ed59ea7ab34bdfc79d 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-@@ -287,7 +287,7 @@ public class AnvilMenu extends ItemCombinerMenu {
+diff --git a/net/minecraft/world/inventory/AnvilMenu.java b/net/minecraft/world/inventory/AnvilMenu.java
+index aaa022ac3656d68bad8dbd4c80a90b62fb6f9a16..e9ac7966fc49de16a444d0e991a4b736cfdb0a0d 100644
+--- a/net/minecraft/world/inventory/AnvilMenu.java
+++ b/net/minecraft/world/inventory/AnvilMenu.java
+@@ -260,7 +260,7 @@ public class AnvilMenu extends ItemCombinerMenu {
                 this.onlyRenaming = true;
             }
 
 -            if (this.cost.get() >= this.maximumRepairCost && !this.player.getAbilities().instabuild) { // CraftBukkit
 +            if (this.cost.get() >= this.maximumRepairCost && (!org.leavesmc.leaves.LeavesConfig.modify.avoidAnvilTooExpensive || this.cost.get() == DEFAULT_DENIED_COST) && !this.player.getAbilities().instabuild) { // CraftBukkit // Leaves - avoid anvil too expensive
-                 itemstack1 = ItemStack.EMPTY;
+                 itemStack = ItemStack.EMPTY;
             }
 
--- a/leaves-server/minecraft-patches/features/0071-Bow-infinity-fix.patch
+++ b/leaves-server/minecraft-patches/features/0071-Bow-infinity-fix.patch
@@ -4,16 +4,16 @@ Date: Mon, 24 Jul 2023 15:54:18 +0800
 Subject: [PATCH] Bow infinity fix


-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b36d67774cf34cf95bcfbaa2fc8cb4f56b1e7557..fe9500f96709b9e15f63218de1b8a3f87007087c 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2288,7 +2288,7 @@ public abstract class Player extends LivingEntity {
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index 94dab91807c828131d728374ae3c485d0f4272be..8736461dc3981419c63e0d738cc308d5913fa2c3 100644
+--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
+@@ -2270,7 +2270,7 @@ public abstract class Player extends LivingEntity {
                     }
                 }
 
 -                return this.abilities.instabuild ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
-+                return this.abilities.instabuild || (org.leavesmc.leaves.LeavesConfig.modify.bowInfinityFix && net.minecraft.world.item.enchantment.EnchantmentHelper.processAmmoUse((ServerLevel) this.level(), stack, new ItemStack(Items.ARROW), 1) <= 0) ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
+                return this.abilities.instabuild || (org.leavesmc.leaves.LeavesConfig.modify.bowInfinityFix && net.minecraft.world.item.enchantment.EnchantmentHelper.processAmmoUse((ServerLevel) this.level(), shootable, new ItemStack(Items.ARROW), 1) <= 0) ? new ItemStack(Items.ARROW) : ItemStack.EMPTY; // Leaves - infinity fix
             }
         }
     }
--- a/leaves-server/minecraft-patches/features/0072-Zero-tick-plants.patch
+++ b/leaves-server/minecraft-patches/features/0072-Zero-tick-plants.patch
@@ -0,0 +1,85 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Sun, 30 Jul 2023 12:20:16 +0800
+Subject: [PATCH] Zero tick plants
+
+
+diff --git a/net/minecraft/world/level/block/BambooStalkBlock.java b/net/minecraft/world/level/block/BambooStalkBlock.java
+index d824bb7d86fd9063ec8185f6bc74dc7450c2b73a..7598b403ed10559d271d302a7759f99e41d96dd5 100644
+--- a/net/minecraft/world/level/block/BambooStalkBlock.java
+++ b/net/minecraft/world/level/block/BambooStalkBlock.java
+@@ -119,6 +119,10 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
+     protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+         if (!state.canSurvive(level, pos)) {
+             level.destroyBlock(pos, true);
+            // Leaves start - zero tick plants
+        } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
+            this.randomTick(state, level, pos, random);
+            // Leaves end - zero tick plants
+         }
+     }
+ 
+diff --git a/net/minecraft/world/level/block/CactusBlock.java b/net/minecraft/world/level/block/CactusBlock.java
+index 913779c68b178dbbfac3b1dcee0c6342028e5570..590525a5de0119b8a9652a00ec99b10d6cae2c46 100644
+--- a/net/minecraft/world/level/block/CactusBlock.java
+++ b/net/minecraft/world/level/block/CactusBlock.java
+@@ -43,6 +43,10 @@ public class CactusBlock extends Block {
+     protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+         if (!state.canSurvive(level, pos)) {
+             level.destroyBlock(pos, true);
+            // Leaves start - zero tick plants
+        } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
+            this.randomTick(state, level, pos, random);
+            // Leaves end - zero tick plants
+         }
+     }
+ 
+diff --git a/net/minecraft/world/level/block/ChorusFlowerBlock.java b/net/minecraft/world/level/block/ChorusFlowerBlock.java
+index 3af8f150474a8a461c5829850172196b7b9e7bfd..04e392cabf3b5c171d86cb47b29b34d05222d4a4 100644
+--- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
+++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
+@@ -49,6 +49,9 @@ public class ChorusFlowerBlock extends Block {
+     protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+         if (!state.canSurvive(level, pos)) {
+             level.destroyBlock(pos, true);
+        } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
+            this.randomTick(state, level, pos, random);
+            // Leaves end - zero tick plants
+         }
+     }
+ 
+diff --git a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
+index 0994f7265322d1f33365a1df0faaffd9df05fcc0..90577291e4a2846a89c59bd5297a99e910378276 100644
+--- a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
+++ b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
+@@ -148,4 +148,15 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
+     protected GrowingPlantHeadBlock getHeadBlock() {
+         return this;
+     }
+
+    // Leaves start - zero tick plants
+    @Override
+    public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
+        if (!state.canSurvive(world, pos)) {
+            world.destroyBlock(pos, true);
+        } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
+            this.randomTick(state, world, pos, random);
+        }
+    }
+    // Leaves end - zero tick plants
+ }
+diff --git a/net/minecraft/world/level/block/SugarCaneBlock.java b/net/minecraft/world/level/block/SugarCaneBlock.java
+index 63d53f9090caca304c7f8c3f9910c57a6bdbb4d5..1d1e699926c2e244937b34d9f54c627bbd2ce5b4 100644
+--- a/net/minecraft/world/level/block/SugarCaneBlock.java
+++ b/net/minecraft/world/level/block/SugarCaneBlock.java
+@@ -44,6 +44,10 @@ public class SugarCaneBlock extends Block {
+     protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+         if (!state.canSurvive(level, pos)) {
+             level.destroyBlock(pos, true);
+            // Leaves start - zero tick plants
+        } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
+            this.randomTick(state, level, pos, random);
+            // Leaves end - zero tick plants
+         }
+     }
+ 
--- a/leaves-server/minecraft-patches/features/0073-Force-peaceful-mode-switch.patch
+++ b/leaves-server/minecraft-patches/features/0073-Force-peaceful-mode-switch.patch
@@ -0,0 +1,100 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Thu, 3 Aug 2023 14:21:47 +0800
+Subject: [PATCH] Force peaceful mode switch
+
+
+diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
+index 6540b2d6a1062d883811ce240c49d30d1925b291..f4f44bf7d67f021b115b5d53c7394fe5bb138024 100644
+--- a/net/minecraft/server/level/ServerChunkCache.java
+++ b/net/minecraft/server/level/ServerChunkCache.java
+@@ -181,6 +181,12 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+     }
+     // Paper end - chunk tick iteration optimisations
+ 
+    // Leaves start - peaceful mode switch
+    public int peacefulModeSwitchTick = org.leavesmc.leaves.LeavesConfig.modify.forcePeacefulMode;
+    public int peacefulModeSwitchCount = -1;
+    private final List<Class<? extends Entity>> peacefulModeSwitchEntityTypes = List.of(net.minecraft.world.entity.boss.wither.WitherBoss.class, net.minecraft.world.entity.monster.Shulker.class, net.minecraft.world.entity.monster.warden.Warden.class);
+    // Leaves end - peaceful mode switch
+
+ 
+     public ServerChunkCache(
+         ServerLevel level,
+@@ -507,6 +513,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+         this.lastInhabitedUpdate = gameTime;
+         if (!this.level.isDebug()) {
+             ProfilerFiller profilerFiller = Profiler.get();
+            // Leaves start - peaceful mode switch
+            if (peacefulModeSwitchTick > 0) {
+                if (this.level.getLevelData().getGameTime() % peacefulModeSwitchTick == 0) {
+                    peacefulModeSwitchCount = 0;
+                    this.level.getAllEntities().forEach(entity -> {
+                        if (peacefulModeSwitchEntityTypes.contains(entity.getClass())) {
+                            peacefulModeSwitchCount++;
+                        }
+                    });
+                }
+            } else {
+                peacefulModeSwitchCount = -1;
+            }
+            // Leaves end - peaceful mode switch
+             profilerFiller.push("pollingChunks");
+             if (this.level.tickRateManager().runsNormally()) {
+                 List<LevelChunk> list = this.tickingChunks;
+@@ -598,6 +618,14 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+         boolean _boolean = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
+         int _int = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
+         List<MobCategory> filteredSpawningCategories;
+        // Leaves start - peaceful mode switch
+        boolean peacefulModeSwitch = false;
+        if (lastSpawnState != null && peacefulModeSwitchCount != -1) {
+            if (peacefulModeSwitchCount >= NaturalSpawner.globalLimitForCategory(level, net.minecraft.world.entity.MobCategory.MONSTER, lastSpawnState.getSpawnableChunkCount())) {
+                peacefulModeSwitch = true;
+            }
+        }
+        // Leaves end - peaceful mode switch
+         if (_boolean && (this.spawnEnemies || this.spawnFriendlies)) {
+             // Paper start - PlayerNaturallySpawnCreaturesEvent
+             for (ServerPlayer entityPlayer : this.level.players()) {
+@@ -608,7 +636,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+             }
+             // Paper end - PlayerNaturallySpawnCreaturesEvent
+             boolean flag = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
+-            filteredSpawningCategories = NaturalSpawner.getFilteredSpawningCategories(spawnState, this.spawnFriendlies, this.spawnEnemies, flag, this.level); // CraftBukkit
+            filteredSpawningCategories = NaturalSpawner.getFilteredSpawningCategories(spawnState, this.spawnFriendlies, this.spawnEnemies, flag, this.level, peacefulModeSwitch); // CraftBukkit Leaves start - peaceful mode switch
+         } else {
+             filteredSpawningCategories = List.of();
+         }
+diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
+index 8fd9c191e5b14fc7dd90e8f7229acd6de97e0f9e..268a4489cc5f7d5358c6cd96e0acbaf65852f7d3 100644
+--- a/net/minecraft/world/level/NaturalSpawner.java
+++ b/net/minecraft/world/level/NaturalSpawner.java
+@@ -122,16 +122,26 @@ public final class NaturalSpawner {
+     static Biome getRoughBiome(BlockPos pos, ChunkAccess chunk) {
+         return chunk.getNoiseBiome(QuartPos.fromBlock(pos.getX()), QuartPos.fromBlock(pos.getY()), QuartPos.fromBlock(pos.getZ())).value();
+     }
+-
+    // Leaves start - peaceful mode switch
+     // CraftBukkit start - add server
+     public static List<MobCategory> getFilteredSpawningCategories(
+         NaturalSpawner.SpawnState spawnState, boolean spawnFriendlies, boolean spawnEnemies, boolean spawnPassives, ServerLevel level
+     ) {
+        return getFilteredSpawningCategories(spawnState, spawnFriendlies, spawnEnemies, spawnPassives, level, false);
+    }
+
+    public static List<MobCategory> getFilteredSpawningCategories(NaturalSpawner.SpawnState spawnState, boolean spawnFriendlies, boolean spawnEnemies, boolean spawnPassives, ServerLevel level, boolean peacefulModeSwitch) {
+        // Leaves end - peaceful mode switch
+         LevelData worlddata = level.getLevelData(); // CraftBukkit - Other mob type spawn tick rate
+         // CraftBukkit end
+         List<MobCategory> list = new ArrayList<>(SPAWNING_CATEGORIES.length);
+ 
+         for (MobCategory mobCategory : SPAWNING_CATEGORIES) {
+            // Leaves start - peaceful mode switch
+            if (mobCategory == MobCategory.MONSTER && peacefulModeSwitch) {
+                continue;
+            }
+            // Leaves end - peaceful mode switch
+             // CraftBukkit start - Use per-world spawn limits
+             boolean spawnThisTick = true;
+             int limit = mobCategory.getMaxInstancesPerChunk();
--- a/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch
+++ b/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch
@@ -0,0 +1,357 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 4 Feb 2025 19:45:19 +0800
+Subject: [PATCH] Replay Mod API
+
+This patch is Powered by ReplayMod(https://github.com/ReplayMod)
+
+diff --git a/net/minecraft/commands/CommandSourceStack.java b/net/minecraft/commands/CommandSourceStack.java
+index c2b7164a1395842ab95428540782eeda4c7960b0..a00a59989c28429289fc4b65fb0605cc626de56c 100644
+--- a/net/minecraft/commands/CommandSourceStack.java
+++ b/net/minecraft/commands/CommandSourceStack.java
+@@ -589,7 +589,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
+ 
+     @Override
+     public Collection<String> getOnlinePlayerNames() {
+-        return this.entity instanceof ServerPlayer sourcePlayer && !sourcePlayer.getBukkitEntity().hasPermission("paper.bypass-visibility.tab-completion") ? this.getServer().getPlayerList().getPlayers().stream().filter(serverPlayer -> sourcePlayer.getBukkitEntity().canSee(serverPlayer.getBukkitEntity())).map(serverPlayer -> serverPlayer.getGameProfile().getName()).toList() : Lists.newArrayList(this.server.getPlayerNames()); // Paper - Make CommandSourceStack respect hidden players
+        return this.entity instanceof ServerPlayer sourcePlayer && !(sourcePlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer) && !sourcePlayer.getBukkitEntity().hasPermission("paper.bypass-visibility.tab-completion") ? this.getServer().getPlayerList().getPlayers().stream().filter(serverPlayer -> sourcePlayer.getBukkitEntity().canSee(serverPlayer.getBukkitEntity())).map(serverPlayer -> serverPlayer.getGameProfile().getName()).toList() : Lists.newArrayList(this.server.getPlayerNames()); // Paper - Make CommandSourceStack respect hidden players // Leaves - only real player
+     }
+ 
+     @Override
+diff --git a/net/minecraft/commands/arguments/selector/EntitySelector.java b/net/minecraft/commands/arguments/selector/EntitySelector.java
+index 514f8fbdeb776087608665c35de95294aadf5cf0..2f78ca86f46ea08fdcf4b8047d3d0b04e2e29b0a 100644
+--- a/net/minecraft/commands/arguments/selector/EntitySelector.java
+++ b/net/minecraft/commands/arguments/selector/EntitySelector.java
+@@ -128,11 +128,12 @@ public class EntitySelector {
+             return this.findPlayers(source);
+         } else if (this.playerName != null) {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName);
+            playerByName = playerByName instanceof org.leavesmc.leaves.replay.ServerPhotographer ? null : playerByName; // Leaves - skip photographer
+             return playerByName == null ? List.of() : List.of(playerByName);
+         } else if (this.entityUUID != null) {
+             for (ServerLevel serverLevel : source.getServer().getAllLevels()) {
+                 Entity entity = serverLevel.getEntity(this.entityUUID);
+-                if (entity != null) {
+                if (entity != null && !(entity instanceof org.leavesmc.leaves.replay.ServerPhotographer)) {
+                     if (entity.getType().isEnabled(source.enabledFeatures())) {
+                         return List.of(entity);
+                     }
+@@ -146,7 +147,7 @@ public class EntitySelector {
+             AABB absoluteAabb = this.getAbsoluteAabb(vec3);
+             if (this.currentEntity) {
+                 Predicate<Entity> predicate = this.getPredicate(vec3, absoluteAabb, null);
+-                return source.getEntity() != null && predicate.test(source.getEntity()) ? List.of(source.getEntity()) : List.of();
+                return source.getEntity() != null && !(source.getEntity() instanceof org.leavesmc.leaves.replay.ServerPhotographer) && predicate.test(source.getEntity()) ? List.of(source.getEntity()) : List.of(); // Leaves - skip photographer
+             } else {
+                 Predicate<Entity> predicate = this.getPredicate(vec3, absoluteAabb, source.enabledFeatures());
+                 List<Entity> list = new ObjectArrayList<>();
+@@ -157,6 +158,7 @@ public class EntitySelector {
+                         this.addEntities(list, serverLevel1, absoluteAabb, predicate);
+                     }
+                 }
+                list.removeIf(entity -> entity instanceof org.leavesmc.leaves.replay.ServerPhotographer); // Leaves - skip photographer
+ 
+                 return this.sortAndLimit(vec3, list);
+             }
+@@ -192,9 +194,11 @@ public class EntitySelector {
+         this.checkPermissions(source);
+         if (this.playerName != null) {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayerByName(this.playerName);
+            playerByName = playerByName instanceof org.leavesmc.leaves.replay.ServerPhotographer ? null : playerByName; // Leaves - skip photographer
+             return playerByName == null ? List.of() : List.of(playerByName);
+         } else if (this.entityUUID != null) {
+             ServerPlayer playerByName = source.getServer().getPlayerList().getPlayer(this.entityUUID);
+            playerByName = playerByName instanceof org.leavesmc.leaves.replay.ServerPhotographer ? null : playerByName; // Leaves - skip photographer
+             return playerByName == null ? List.of() : List.of(playerByName);
+         } else {
+             Vec3 vec3 = this.position.apply(source.getPosition());
+@@ -206,12 +210,12 @@ public class EntitySelector {
+                 int resultLimit = this.getResultLimit();
+                 List<ServerPlayer> players;
+                 if (this.isWorldLimited()) {
+-                    players = source.getLevel().getPlayers(predicate, resultLimit);
+                    players = source.getLevel().getPlayers((player -> !(player instanceof org.leavesmc.leaves.replay.ServerPhotographer) && predicate.test(player)), resultLimit); // Leaves - skip photographer
+                 } else {
+                     players = new ObjectArrayList<>();
+ 
+                     for (ServerPlayer serverPlayer1 : source.getServer().getPlayerList().getPlayers()) {
+-                        if (predicate.test(serverPlayer1)) {
+                        if (predicate.test(serverPlayer1) && !(serverPlayer1 instanceof org.leavesmc.leaves.replay.ServerPhotographer)) { // Leaves - skip photographer
+                             players.add(serverPlayer1);
+                             if (players.size() >= resultLimit) {
+                                 return players;
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 7822cecf362cd8d430d90c0daac6e97c8a8d124b..438bbf36d4f80b38482b89e3ef59e9e48d0f62c2 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1639,7 +1639,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
+ 
+     private ServerStatus.Players buildPlayerStatus() {
+-        List<ServerPlayer> players = this.playerList.getPlayers();
+        List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
+         int maxPlayers = this.getMaxPlayers();
+         if (this.hidesOnlinePlayers()) {
+             return new ServerStatus.Players(maxPlayers, players.size(), List.of());
+diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
+index 4e9ce0c8b459ef41a6945182401c47c61b16b1f7..e9961c4fb7d1c808150171dca89b51eddf0c7518 100644
+--- a/net/minecraft/server/PlayerAdvancements.java
+++ b/net/minecraft/server/PlayerAdvancements.java
+@@ -174,7 +174,7 @@ public class PlayerAdvancements {
+         }
+         // Leaves end - spectator don't get advancement
+         // Leaves start - bot can't get advancement
+-        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
+        if (player instanceof org.leavesmc.leaves.bot.ServerBot || player instanceof org.leavesmc.leaves.replay.ServerPhotographer) { // Leaves - and photographer
+             return false;
+         }
+         // Leaves end - bot can't get advancement
+diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
+index 5c0a04db38821dbb0cba2bb6f0787f113d167efd..cd153db93f709c3142942fac88ae3ca2226a65b3 100644
+--- a/net/minecraft/server/commands/OpCommand.java
+++ b/net/minecraft/server/commands/OpCommand.java
+@@ -25,7 +25,7 @@ public class OpCommand {
+                             (context, builder) -> {
+                                 PlayerList playerList = context.getSource().getServer().getPlayerList();
+                                 return SharedSuggestionProvider.suggest(
+-                                    playerList.getPlayers()
+                                    playerList.realPlayers // Leaves - only real player
+                                         .stream()
+                                         .filter(player -> !playerList.isOp(player.getGameProfile()))
+                                         .map(player -> player.getGameProfile().getName()),
+diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
+index 7763d4c818606ed034f28e050166fe8cae16cfb8..1deedd3fc28792fc368580973038c1824b15691d 100644
+--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
+@@ -2645,7 +2645,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.add(serverPlayer);
+                 // Leaves start - skip
+-                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
+                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot) && !(serverPlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer)) { // and photographer
+                     ServerLevel.this.realPlayers.add(serverPlayer);
+                 }
+                 // Leaves end - skip
+@@ -2716,7 +2716,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+             if (entity instanceof ServerPlayer serverPlayer) {
+                 ServerLevel.this.players.remove(serverPlayer);
+                 // Leaves start - skip
+-                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot)) {
+                if (!(serverPlayer instanceof org.leavesmc.leaves.bot.ServerBot) && !(serverPlayer instanceof org.leavesmc.leaves.replay.ServerPhotographer)) { // and photographer
+                     ServerLevel.this.realPlayers.remove(serverPlayer);
+                 }
+                 // Leaves end - skip
+diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
+index 93eb9e2d4e44881181a07b12249c3812635fec14..846a96de92c74cfd3091c21d692cb8bdac60c4eb 100644
+--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
+@@ -131,6 +131,7 @@ public abstract class PlayerList {
+     private boolean allowCommandsForAllPlayers;
+     private static final boolean ALLOW_LOGOUTIVATOR = false;
+     private int sendAllPlayerInfoIn;
+    public final List<ServerPlayer> realPlayers = new java.util.concurrent.CopyOnWriteArrayList(); // Leaves - replay api
+ 
+     // CraftBukkit start
+     private org.bukkit.craftbukkit.CraftServer cserver;
+@@ -149,6 +150,119 @@ public abstract class PlayerList {
+ 
+     abstract public void loadAndSaveFiles(); // Paper - fix converting txt to json file; moved from DedicatedPlayerList constructor
+ 
+    // Leaves start - replay mod api
+    public void placeNewPhotographer(Connection connection, org.leavesmc.leaves.replay.ServerPhotographer player, ServerLevel worldserver) {
+        player.isRealPlayer = true; // Paper
+        player.loginTime = System.currentTimeMillis(); // Paper
+
+        ServerLevel worldserver1 = worldserver;
+
+        player.setServerLevel(worldserver1);
+        player.spawnIn(worldserver1);
+        player.gameMode.setLevel((ServerLevel) player.level());
+
+        LevelData worlddata = worldserver1.getLevelData();
+
+        player.loadGameTypes(null);
+        ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, CommonListenerCookie.createInitial(player.gameProfile, false));
+        GameRules gamerules = worldserver1.getGameRules();
+        boolean flag = gamerules.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN);
+        boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
+        boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
+
+        playerconnection.send(new ClientboundLoginPacket(player.getId(), worlddata.isHardcore(), this.server.levelKeys(), this.getMaxPlayers(), worldserver1.getWorld().getSendViewDistance(), worldserver1.getWorld().getSimulationDistance(), flag1, !flag, flag2, player.createCommonSpawnInfo(worldserver1), this.server.enforceSecureProfile())); // Paper - replace old player chunk management
+        player.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
+        playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
+        playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
+        playerconnection.send(new ClientboundSetHeldSlotPacket(player.getInventory().selected));
+        RecipeManager craftingmanager = this.server.getRecipeManager();
+        playerconnection.send(new ClientboundUpdateRecipesPacket(craftingmanager.getSynchronizedItemProperties(), craftingmanager.getSynchronizedStonecutterRecipes()));
+
+        this.sendPlayerPermissionLevel(player);
+        player.getStats().markAllDirty();
+        player.getRecipeBook().sendInitialRecipeBook(player);
+        this.updateEntireScoreboard(worldserver1.getScoreboard(), player);
+        this.server.invalidateStatus();
+
+        playerconnection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
+        ServerStatus serverping = this.server.getStatus();
+
+        if (serverping != null) {
+            player.sendServerStatus(serverping);
+        }
+
+        this.players.add(player);
+        this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
+        this.playersByUUID.put(player.getUUID(), player);
+
+        player.supressTrackerForLogin = true;
+        worldserver1.addNewPlayer(player);
+        this.server.getCustomBossEvents().onPlayerConnect(player);
+        org.bukkit.craftbukkit.entity.CraftPlayer bukkitPlayer = player.getBukkitEntity();
+
+        player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
+        if (!player.connection.isAcceptingMessages()) {
+            return;
+        }
+
+        // org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handlePlayerJoin(player); // Leaves - protocol
+
+        // Leaves start - bot support
+        if (org.leavesmc.leaves.LeavesConfig.modify.fakeplayer.enable) {
+            org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName());
+            if (bot != null) {
+                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false);
+            }
+            this.server.getBotList().bots.forEach(bot1 -> {
+                bot1.sendPlayerInfo(player);
+                bot1.sendFakeDataIfNeed(player, true);
+            }); // Leaves - render bot
+        }
+        // Leaves end - bot support
+
+        final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1);
+        for (int i = 0; i < this.players.size(); ++i) {
+            ServerPlayer entityplayer1 = this.players.get(i);
+
+            if (entityplayer1 == player || !bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) {
+                continue;
+            }
+
+            onlinePlayers.add(entityplayer1);
+        }
+        if (!onlinePlayers.isEmpty()) {
+            player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player));
+        }
+
+        player.sentListPacket = true;
+        player.supressTrackerForLogin = false;
+        ((ServerLevel)player.level()).getChunkSource().chunkMap.addEntity(player);
+
+        this.sendLevelInfo(player, worldserver1);
+
+        if (player.level() == worldserver1 && !worldserver1.players().contains(player)) {
+            worldserver1.addNewPlayer(player);
+            this.server.getCustomBossEvents().onPlayerConnect(player);
+        }
+
+        worldserver1 = player.serverLevel();
+        java.util.Iterator<net.minecraft.world.effect.MobEffectInstance> iterator = player.getActiveEffects().iterator();
+        while (iterator.hasNext()) {
+            MobEffectInstance mobeffect = iterator.next();
+            playerconnection.send(new ClientboundUpdateMobEffectPacket(player.getId(), mobeffect, false));
+        }
+
+        if (player.isDeadOrDying()) {
+            net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> plains = worldserver1.registryAccess().lookupOrThrow(net.minecraft.core.registries.Registries.BIOME)
+                    .getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
+            player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
+                    new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
+                    worldserver1.getLightEngine(), null, null, false)
+            );
+        }
+    }
+    // Leaves end - replay mod api
+
+     public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie) {
+         player.isRealPlayer = true; // Paper
+         player.loginTime = System.currentTimeMillis(); // Paper - Replace OfflinePlayer#getLastPlayed
+@@ -307,6 +421,7 @@ public abstract class PlayerList {
+ 
+         // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
+         this.players.add(player);
+        this.realPlayers.add(player); // Leaves - replay api
+         this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
+         this.playersByUUID.put(player.getUUID(), player);
+         // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player))); // CraftBukkit - replaced with loop below
+@@ -376,6 +491,12 @@ public abstract class PlayerList {
+                 continue;
+             }
+ 
+            // Leaves start - skip photographer
+            if (entityplayer1 instanceof org.leavesmc.leaves.replay.ServerPhotographer) {
+                continue;
+            }
+            // Leaves end - skip photographer
+
+             onlinePlayers.add(entityplayer1); // Paper - Use single player info update packet on join
+         }
+         // Paper start - Use single player info update packet on join
+@@ -510,6 +631,43 @@ public abstract class PlayerList {
+         }
+     }
+ 
+    // Leaves start - replay mod api
+    public void removePhotographer(org.leavesmc.leaves.replay.ServerPhotographer entityplayer) {
+        ServerLevel worldserver = entityplayer.serverLevel();
+
+        entityplayer.awardStat(Stats.LEAVE_GAME);
+
+        if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
+            entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT);
+        }
+
+        if (server.isSameThread()) entityplayer.doTick();
+
+        if (this.collideRuleTeamName != null) {
+            final net.minecraft.world.scores.Scoreboard scoreBoard = this.server.getLevel(Level.OVERWORLD).getScoreboard();
+            final PlayerTeam team = scoreBoard.getPlayersTeam(this.collideRuleTeamName);
+            if (entityplayer.getTeam() == team && team != null) {
+                scoreBoard.removePlayerFromTeam(entityplayer.getScoreboardName(), team);
+            }
+        }
+
+        worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
+        entityplayer.retireScheduler();
+        entityplayer.getAdvancements().stopListening();
+        this.players.remove(entityplayer);
+        this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT));
+        this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
+        UUID uuid = entityplayer.getUUID();
+        ServerPlayer entityplayer1 = this.playersByUUID.get(uuid);
+
+        if (entityplayer1 == entityplayer) {
+            this.playersByUUID.remove(uuid);
+        }
+
+        this.cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
+    }
+    // Leaves stop - replay mod api
+
+     public net.kyori.adventure.text.Component remove(ServerPlayer player) { // CraftBukkit - return string // Paper - return Component
+         // Paper start - Fix kick event leave message not being sent
+         return this.remove(player, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? player.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(player.getDisplayName())));
+@@ -585,6 +743,7 @@ public abstract class PlayerList {
+         player.retireScheduler(); // Paper - Folia schedulers
+         player.getAdvancements().stopListening();
+         this.players.remove(player);
+        this.realPlayers.remove(player); // Leaves - replay api
+         this.playersByName.remove(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
+         this.server.getCustomBossEvents().onPlayerDisconnect(player);
+         UUID uuid = player.getUUID();
+@@ -681,7 +840,7 @@ public abstract class PlayerList {
+             // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)
+             //     ? Component.translatable("multiplayer.disconnect.server_full")
+             //     : null;
+-            if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)) {
+            if (this.realPlayers.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)) { // Leaves - only real player
+                 event.disallow(org.bukkit.event.player.PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
+             }
+         }
--- a/leaves-server/minecraft-patches/features/0075-Leaves-I18n.patch
+++ b/leaves-server/minecraft-patches/features/0075-Leaves-I18n.patch
@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 4 Feb 2025 20:01:19 +0800
+Subject: [PATCH] Leaves I18n
+
+
+diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
+index 7b9e2a1a208b46a69c16e6afd8b502259893574f..aa0db0cbbcfa079c43dbed6679abf99979e0abf0 100644
+--- a/net/minecraft/locale/Language.java
+++ b/net/minecraft/locale/Language.java
+@@ -31,6 +31,42 @@ public abstract class Language {
+     public static final String DEFAULT = "en_us";
+     private static volatile Language instance = loadDefault();
+ 
+    // Leaves start - i18n
+    public static void loadI18N(String lang) {
+        DeprecatedTranslationsInfo deprecatedTranslationsInfo = DeprecatedTranslationsInfo.loadFromDefaultResource();
+        Map<String, String> map = new HashMap<>();
+        BiConsumer<String, String> biConsumer = map::put;
+        parseTranslations(biConsumer, "/assets/minecraft/lang/" + lang + ".json");
+        deprecatedTranslationsInfo.applyToMap(map);
+        final Map<String, String> map2 = Map.copyOf(map);
+        Language language = new Language() {
+            @Override
+            public String getOrDefault(String key, String fallback) {
+                return map2.getOrDefault(key, fallback);
+            }
+
+            @Override
+            public boolean has(String key) {
+                return map2.containsKey(key);
+            }
+
+            @Override
+            public boolean isDefaultRightToLeft() {
+                return false;
+            }
+
+            @Override
+            public FormattedCharSequence getVisualOrder(FormattedText text) {
+                return visitor -> text.visit(
+                        (style, string) -> StringDecomposer.iterateFormatted(string, style, visitor) ? Optional.empty() : FormattedText.STOP_ITERATION,
+                        Style.EMPTY
+                ).isPresent();
+            }
+        };
+        inject(language);
+    }
+    // Leaves end - i18n
+
+     private static Language loadDefault() {
+         DeprecatedTranslationsInfo deprecatedTranslationsInfo = DeprecatedTranslationsInfo.loadFromDefaultResource();
+         Map<String, String> map = new HashMap<>();
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index 765521cae8bc1c65e3a390d018190646e39c4eb0..92f45558661007e761b48f59ff7f04d67f77f5ed 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -227,6 +227,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ 
+ 		org.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
+        net.minecraft.locale.Language.loadI18N(org.leavesmc.leaves.LeavesConfig.mics.serverLang); // Leaves - i18n
+ 
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
+ 
--- a/leaves-server/minecraft-patches/features/0076-Fix-minecraft-hopper-not-work-without-player.patch
+++ b/leaves-server/minecraft-patches/features/0076-Fix-minecraft-hopper-not-work-without-player.patch
@@ -4,10 +4,10 @@ Date: Wed, 16 Aug 2023 13:10:58 +0800
 Subject: [PATCH] Fix minecraft hopper not work without player


-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java
-index d81a6874e8b25f098df619f84c359e146c7f64de..6c2045844bb18767c0645c24e6629b59beb25f4e 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java
+diff --git a/net/minecraft/world/entity/vehicle/MinecartHopper.java b/net/minecraft/world/entity/vehicle/MinecartHopper.java
+index 8341e7f01606fca90e69384c16fc19bb9e20d1b7..deea1c6bcfbca04b0e9b45869eab5b8c5bbb17ca 100644
+--- a/net/minecraft/world/entity/vehicle/MinecartHopper.java
+++ b/net/minecraft/world/entity/vehicle/MinecartHopper.java
@@ -99,6 +99,13 @@ public class MinecartHopper extends AbstractMinecartContainer implements Hopper
         }
     }
@@ -21,4 +21,4 @@ index d81a6874e8b25f098df619f84c359e146c7f64de..6c2045844bb18767c0645c24e6629b59
 +
     public boolean suckInItems() {
         if (HopperBlockEntity.suckInItems(this.level(), this)) {
-             this.immunize();  // Paper
+             this.immunize(); // Paper
--- a/leaves-server/minecraft-patches/features/0077-RNG-Fishing.patch
+++ b/leaves-server/minecraft-patches/features/0077-RNG-Fishing.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Mon, 4 Sep 2023 22:09:10 +0800
+Subject: [PATCH] RNG Fishing
+
+
+diff --git a/net/minecraft/world/entity/projectile/FishingHook.java b/net/minecraft/world/entity/projectile/FishingHook.java
+index f2bf0cdbd29438ca51b74ae2fcdf49dba0d52804..1d3c2be401d9239b8e6cabfe016518ffcffcb83b 100644
+--- a/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/net/minecraft/world/entity/projectile/FishingHook.java
+@@ -525,7 +525,7 @@ public class FishingHook extends Projectile {
+                     .withLuck(this.luck + playerOwner.getLuck())
+                     .create(LootContextParamSets.FISHING);
+                 LootTable lootTable = this.level().getServer().reloadableRegistries().getLootTable(BuiltInLootTables.FISHING);
+-                List<ItemStack> randomItems = lootTable.getRandomItems(lootParams);
+                List<ItemStack> randomItems = org.leavesmc.leaves.LeavesConfig.modify.oldMC.rngFishing ? lootTable.getRandomItems(lootParams, this.random) : lootTable.getRandomItems(lootParams); // Leaves - world random
+                 CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer)playerOwner, stack, this, randomItems);
+ 
+                 for (ItemStack itemStack : randomItems) {
--- a/leaves-server/minecraft-patches/features/0078-Wool-Hopper-Counter.patch
+++ b/leaves-server/minecraft-patches/features/0078-Wool-Hopper-Counter.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <58360096+s-yh-china@users.noreply.github.com>
+Date: Tue, 4 Feb 2025 20:18:35 +0800
+Subject: [PATCH] Wool Hopper Counter
+
+This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet)
+
+diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 50bc72f736e9e7a9839a853254a81f9add03bacf..bd8d949ff0f3d0b6a893d3b3ae608da380e715f0 100644
+--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -428,6 +428,13 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     // Paper end - Perf: Optimize Hoppers
+ 
+     private static boolean ejectItems(Level level, BlockPos pos, HopperBlockEntity blockEntity) {
+        // Leaves start - hopper counter
+        if (org.leavesmc.leaves.util.HopperCounter.isEnabled()) {
+            if (woolHopperCounter(level, pos, level.getBlockState(pos), HopperBlockEntity.getContainerAt(level, pos))) {
+                return true;
+            }
+        }
+        // Leaves end - hopper counter
+         Container attachedContainer = getAttachedContainer(level, pos, blockEntity);
+         if (attachedContainer == null) {
+             return false;
+@@ -494,6 +501,26 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+         }
+     }
+ 
+    // Leaves start - hopper counter
+    private static boolean woolHopperCounter(Level level, BlockPos blockPos, BlockState state, @Nullable Container container) {
+        if (container == null) {
+            return false;
+        }
+        net.minecraft.world.item.DyeColor woolColor = org.leavesmc.leaves.util.WoolUtils.getWoolColorAtPosition(level, blockPos.relative(state.getValue(HopperBlock.FACING)));
+        if (woolColor != null) {
+            for (int i = 0; i < container.getContainerSize(); ++i) {
+                if (!container.getItem(i).isEmpty()) {
+                    ItemStack itemstack = container.getItem(i);
+                    org.leavesmc.leaves.util.HopperCounter.getCounter(woolColor).add(level.getServer(), itemstack);
+                    container.setItem(i, ItemStack.EMPTY);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+    // Leaves end - hopper counter
+
+     private static int[] getSlots(Container container, Direction direction) {
+         if (container instanceof WorldlyContainer worldlyContainer) {
+             return worldlyContainer.getSlotsForFace(direction);
--- a/leaves-server/minecraft-patches/features/0079-Spider-jockeys-drop-gapples.patch
+++ b/leaves-server/minecraft-patches/features/0079-Spider-jockeys-drop-gapples.patch
@@ -4,12 +4,12 @@ Date: Tue, 5 Sep 2023 08:49:01 +0800
 Subject: [PATCH] Spider jockeys drop gapples


-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 91e521414c3ea5722aac7506b7589fbb399e9636..1b7c703464477d7c8b28f33edd5a971110e73908 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -145,6 +145,18 @@ public class Spider extends Monster {
-         this.entityData.set(Spider.DATA_FLAGS_ID, b0);
+diff --git a/net/minecraft/world/entity/monster/Spider.java b/net/minecraft/world/entity/monster/Spider.java
+index af0305079a367899708ee2bbac82aefaa9129d2f..e9a4734cddc33785ca6811f8f566904ace78fd78 100644
+--- a/net/minecraft/world/entity/monster/Spider.java
+++ b/net/minecraft/world/entity/monster/Spider.java
+@@ -139,6 +139,18 @@ public class Spider extends Monster {
+         this.entityData.set(DATA_FLAGS_ID, b);
     }
 
 +    // Leaves start - spider jockeys drop gapples
@@ -26,4 +26,4 @@ index 91e521414c3ea5722aac7506b7589fbb399e9636..1b7c703464477d7c8b28f33edd5a9711
 +
     @Nullable
     @Override
-     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, EntitySpawnReason spawnReason, @Nullable SpawnGroupData entityData) {
+     public SpawnGroupData finalizeSpawn(
--- a/leaves-server/minecraft-patches/features/0080-Force-Void-Trade.patch
+++ b/leaves-server/minecraft-patches/features/0080-Force-Void-Trade.patch
@@ -4,33 +4,33 @@ Date: Thu, 14 Sep 2023 20:23:03 +0800
 Subject: [PATCH] Force Void Trade


-diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 6c0cece094d36ddb2ae8d67d3c847a2c8faa3da8..cb5524ed59a07693d1d7ff03ca4f27e07774e3e5 100644
--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-@@ -64,6 +64,7 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
+diff --git a/net/minecraft/world/entity/npc/AbstractVillager.java b/net/minecraft/world/entity/npc/AbstractVillager.java
+index 18a087a52070b9bdee4d02ff3fc6a3c063e444d4..dba596ac7a26401a6f4d8726bcea0caf067af10e 100644
+--- a/net/minecraft/world/entity/npc/AbstractVillager.java
+++ b/net/minecraft/world/entity/npc/AbstractVillager.java
+@@ -60,6 +60,7 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
     @Nullable
     protected MerchantOffers offers;
-     private final SimpleContainer inventory = new SimpleContainer(8, (org.bukkit.craftbukkit.entity.CraftAbstractVillager) this.getBukkitEntity()); // CraftBukkit add argument
+     private final SimpleContainer inventory = new SimpleContainer(8, (org.bukkit.craftbukkit.entity.CraftAbstractVillager) this.getBukkitEntity()); // CraftBukkit - add argument
 +    protected boolean voidTrade = false; // Leaves - force void trade
 
-     public AbstractVillager(EntityType<? extends AbstractVillager> type, Level world) {
-         super(type, world);
+     public AbstractVillager(EntityType<? extends AbstractVillager> entityType, Level level) {
+         super(entityType, level);
@@ -154,7 +155,13 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
     @Override
-     public void processTrade(MerchantOffer recipe, @Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent
+     public void processTrade(MerchantOffer offer, @Nullable io.papermc.paper.event.player.PlayerPurchaseEvent event) { // The MerchantRecipe passed in here is the one set by the PlayerPurchaseEvent
         if (event == null || event.willIncreaseTradeUses()) {
-            recipe.increaseUses();
+-            offer.increaseUses();
 +            // Leaves start - force void trade
 +            if (voidTrade) {
-+                recipe.increaseVoidUses();
+                offer.increaseVoidUses();
 +            } else {
-+                recipe.increaseUses();
+                offer.increaseUses();
 +            }
 +            // Leaves end - force void trade
         }
         if (event == null || event.isRewardingExp()) {
-             this.rewardTradeXp(recipe);
+             this.rewardTradeXp(offer);
@@ -166,7 +173,7 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
     @Override
     public void notifyTrade(MerchantOffer offer) {
@@ -39,8 +39,8 @@ index 6c0cece094d36ddb2ae8d67d3c847a2c8faa3da8..cb5524ed59a07693d1d7ff03ca4f27e0
 +        if (!voidTrade) this.ambientSoundTime = -this.getAmbientSoundInterval(); // Leaves - force void trade
         // this.rewardTradeXp(offer); // Paper - Add PlayerTradeEvent and PlayerPurchaseEvent
         if (this.tradingPlayer instanceof ServerPlayer) {
-             CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
-@@ -184,7 +191,7 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
+             CriteriaTriggers.TRADE.trigger((ServerPlayer)this.tradingPlayer, this, offer.getResult());
+@@ -183,7 +190,7 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
     @Override
     public void notifyTradeUpdated(ItemStack stack) {
         if (!this.level().isClientSide && this.ambientSoundTime > -this.getAmbientSoundInterval() + 20) {
@@ -48,8 +48,8 @@ index 6c0cece094d36ddb2ae8d67d3c847a2c8faa3da8..cb5524ed59a07693d1d7ff03ca4f27e0
 +            if (!voidTrade) this.ambientSoundTime = -this.getAmbientSoundInterval(); // Leaves - force void trade
             this.makeSound(this.getTradeUpdatedSound(!stack.isEmpty()));
         }
- 
-@@ -241,6 +248,12 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
+     }
+@@ -235,6 +242,12 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
     }
 
     protected void stopTrading() {
@@ -59,37 +59,37 @@ index 6c0cece094d36ddb2ae8d67d3c847a2c8faa3da8..cb5524ed59a07693d1d7ff03ca4f27e0
 +            this.offers.forEach(MerchantOffer::resetVoidUses);
 +        }
 +        // Leaves end - force void trade
-         this.setTradingPlayer((Player) null);
+         this.setTradingPlayer(null);
     }
 
-@@ -320,4 +333,10 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
-     public boolean isClientSide() {
-         return this.level().isClientSide;
+@@ -313,4 +326,10 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
+     public boolean stillValid(Player player) {
+         return this.getTradingPlayer() == player && this.isAlive() && player.canInteractWithEntity(this, 4.0);
     }
 +
 +    // Leaves start - force void trade
 +    public void setVoidTrade() {
-+        voidTrade = true;
+        this.voidTrade = true;
 +    }
 +    // Leaves end - force void trade
 }
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 8d3959e86ef1357e49aac6ef3c8285c770f2856a..d931e38924c2fbad84efdb2e9ac84061b1764870 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -348,6 +348,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
+index 6b565fcf91e1d94b649dac90bf3c923930d252f8..31c2fb7780b822bf63543c4526739b9d3faad7d8 100644
+--- a/net/minecraft/world/entity/npc/Villager.java
+++ b/net/minecraft/world/entity/npc/Villager.java
+@@ -380,6 +380,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
 
-     private void startTrading(Player customer) {
+     private void startTrading(Player player) {
 +        this.voidTrade = false; // Leaves - force void trade
-         this.updateSpecialPrices(customer);
-         this.setTradingPlayer(customer);
-         this.openTradingScreen(customer, this.getDisplayName(), this.getVillagerData().getLevel());
-@@ -639,8 +640,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+         this.updateSpecialPrices(player);
+         this.setTradingPlayer(player);
+         this.openTradingScreen(player, this.getDisplayName(), this.getVillagerData().getLevel());
+@@ -632,8 +633,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+     @Override
     protected void rewardTradeXp(MerchantOffer offer) {
         int i = 3 + this.random.nextInt(4);
- 
-        this.villagerXp += offer.getXp();
+-        this.villagerXp = this.villagerXp + offer.getXp();
 -        this.lastTradedPlayer = this.getTradingPlayer();
 +        // Leaves start - force void trade
 +        if (!voidTrade) {
@@ -100,11 +100,11 @@ index 8d3959e86ef1357e49aac6ef3c8285c770f2856a..d931e38924c2fbad84efdb2e9ac84061
         if (this.shouldIncreaseLevel()) {
             this.updateMerchantTimer = 40;
             this.increaseProfessionLevelOnUpdate = true;
-diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 1e77cce428d9e53142aaa2cf780b7f862d536eca..2bac91f7f6943c7e1b5f63ea7dfeb3c3e390bcb7 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -123,9 +123,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
+index 6655d06e2011e20e7346dfe57527795269094d8a..8ebf885ceb13a8b5e5b3db74fc7ee859d10f3845 100644
+--- a/net/minecraft/world/entity/npc/WanderingTrader.java
+++ b/net/minecraft/world/entity/npc/WanderingTrader.java
+@@ -133,9 +133,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                     return InteractionResult.CONSUME;
                 }
 
@@ -118,11 +118,11 @@ index 1e77cce428d9e53142aaa2cf780b7f862d536eca..2bac91f7f6943c7e1b5f63ea7dfeb3c3
 
             return InteractionResult.SUCCESS;
         } else {
-diff --git a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-index 6a529b5e289c416c0ebdc0260086ec039777aa40..f41e9303c6e118a426e779d4bbca450011ed7246 100644
--- a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java
-@@ -27,7 +27,7 @@ public class MerchantMenu extends AbstractContainerMenu {
+diff --git a/net/minecraft/world/inventory/MerchantMenu.java b/net/minecraft/world/inventory/MerchantMenu.java
+index 3019790d5eccef23c710e77615243551fcc676b0..9a87c729dd7289dc3cccfcf50087db7dc354f895 100644
+--- a/net/minecraft/world/inventory/MerchantMenu.java
+++ b/net/minecraft/world/inventory/MerchantMenu.java
+@@ -25,7 +25,7 @@ public class MerchantMenu extends AbstractContainerMenu {
     private static final int SELLSLOT2_X = 162;
     private static final int BUYSLOT_X = 220;
     private static final int ROW_Y = 37;
@@ -131,28 +131,28 @@ index 6a529b5e289c416c0ebdc0260086ec039777aa40..f41e9303c6e118a426e779d4bbca4500
     private final MerchantContainer tradeContainer;
     private int merchantLevel;
     private boolean showProgressBar;
-diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-index 0efc8d997b34302c3e0a5d7ec73a11a940dbeefe..d246c9932f3f98972124089306d6ed740bb9a31b 100644
--- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-+++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-@@ -51,6 +51,7 @@ public class MerchantOffer {
+diff --git a/net/minecraft/world/item/trading/MerchantOffer.java b/net/minecraft/world/item/trading/MerchantOffer.java
+index 6c06350751db7543d5bde7723121d9d9dbb79071..262cfdd05f013b2bbc2066ad4f0625ae291213b9 100644
+--- a/net/minecraft/world/item/trading/MerchantOffer.java
+++ b/net/minecraft/world/item/trading/MerchantOffer.java
+@@ -39,6 +39,7 @@ public class MerchantOffer {
     public float priceMultiplier;
     public int xp;
     public boolean ignoreDiscounts; // Paper - Add ignore discounts API
 +    public int voidTradeUses; // Leaves - force void trade
-     // CraftBukkit start
-     private CraftMerchantRecipe bukkitHandle;
 
-@@ -77,6 +78,7 @@ public class MerchantOffer {
+     // CraftBukkit start
+     private org.bukkit.craftbukkit.inventory.@org.jspecify.annotations.Nullable CraftMerchantRecipe bukkitHandle;
+@@ -78,6 +79,7 @@ public class MerchantOffer {
         this.priceMultiplier = priceMultiplier;
-         this.xp = merchantExperience;
+         this.xp = xp;
         this.ignoreDiscounts = ignoreDiscounts; // Paper
 +        this.voidTradeUses = 0; // Leaves - force void trade
     }
 
-     public MerchantOffer(ItemCost buyItem, ItemStack sellItem, int maxUses, int merchantExperience, float priceMultiplier) {
-@@ -154,6 +156,16 @@ public class MerchantOffer {
-         ++this.uses;
+     public MerchantOffer(ItemCost baseCostA, ItemStack result, int maxUses, int xp, float priceMultiplier) {
+@@ -166,6 +168,16 @@ public class MerchantOffer {
+         this.uses++;
     }
 
 +    // Leaves start - force void trade
@@ -168,7 +168,7 @@ index 0efc8d997b34302c3e0a5d7ec73a11a940dbeefe..d246c9932f3f98972124089306d6ed74
     public int getDemand() {
         return this.demand;
     }
-@@ -183,7 +195,7 @@ public class MerchantOffer {
+@@ -195,7 +207,7 @@ public class MerchantOffer {
     }
 
     public boolean isOutOfStock() {
@@ -177,16 +177,17 @@ index 0efc8d997b34302c3e0a5d7ec73a11a940dbeefe..d246c9932f3f98972124089306d6ed74
     }
 
     public void setToOutOfStock() {
-diff --git a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-index a7a21f071161fb7e73a046717d2462f871ab653c..50d726874af316a264fa0c2589f5b04559dffb50 100644
--- a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-@@ -120,6 +120,16 @@ public class EndGatewayBlock extends BaseEntityBlock implements Portal {
-         if (tileentity instanceof TheEndGatewayBlockEntity tileentityendgateway) {
-             Vec3 vec3d = tileentityendgateway.getPortalPosition(world, pos);
- 
+diff --git a/net/minecraft/world/level/block/EndGatewayBlock.java b/net/minecraft/world/level/block/EndGatewayBlock.java
+index 84a1bd5e40e635962d795506861447851e443eee..5c6bc04c241f13a8c09527a39f89fa52feb0eb76 100644
+--- a/net/minecraft/world/level/block/EndGatewayBlock.java
+++ b/net/minecraft/world/level/block/EndGatewayBlock.java
+@@ -108,6 +108,17 @@ public class EndGatewayBlock extends BaseEntityBlock implements Portal {
+     public TeleportTransition getPortalDestination(ServerLevel level, Entity entity, BlockPos pos) {
+         if (level.getBlockEntity(pos) instanceof TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
+             Vec3 portalPosition = theEndGatewayBlockEntity.getPortalPosition(level, pos);
+
 +            // Leaves start - force void trade
-+            if (org.leavesmc.leaves.LeavesConfig.modify.forceVoidTrade && vec3d != null && entity instanceof net.minecraft.server.level.ServerPlayer player) {
+            if (org.leavesmc.leaves.LeavesConfig.modify.forceVoidTrade && portalPosition != null && entity instanceof net.minecraft.server.level.ServerPlayer player) {
 +                if (player.containerMenu instanceof net.minecraft.world.inventory.MerchantMenu merchantMenu) {
 +                    if (merchantMenu.trader instanceof net.minecraft.world.entity.npc.AbstractVillager villager) {
 +                        villager.setVoidTrade();
@@ -195,6 +196,6 @@ index a7a21f071161fb7e73a046717d2462f871ab653c..50d726874af316a264fa0c2589f5b045
 +            }
 +            // Leaves end - force void trade
 +
-             return vec3d == null ? null : (entity instanceof ThrownEnderpearl ? new TeleportTransition(world, vec3d, Vec3.ZERO, 0.0F, 0.0F, Set.of(), TeleportTransition.PLACE_PORTAL_TICKET, PlayerTeleportEvent.TeleportCause.END_GATEWAY) : new TeleportTransition(world, vec3d, Vec3.ZERO, 0.0F, 0.0F, Relative.union(Relative.DELTA, Relative.ROTATION), TeleportTransition.PLACE_PORTAL_TICKET, PlayerTeleportEvent.TeleportCause.END_GATEWAY)); // CraftBukkit
-         } else {
-             return null;
+             if (portalPosition == null) {
+                 return null;
+             } else {
--- a/Show More
+++ b/Show More