Add compression level to linear region format

2023-02-16 01:27:09 +02:00
65 changed files with 1283 additions and 5597 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,22 +1,20 @@
 name: Generate Jars
 on: [ push, pull_request ]
 env:
-  version: '1.20.1'
-  branch: ver/1.20.1
+  version: '1.19.3'
+  branch: ver/1.19.3
 jobs:
  paperclip:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Git Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
      - name: Set up JDK
-        uses: graalvm/setup-graalvm@v1
+        uses: actions/setup-java@v2.5.0
        with:
          java-version: '17'
          cache: 'gradle'
-          distribution: 'graalvm'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 'latest'
+          distribution: 'temurin'
      - name: Configure Git User Details
        run: |
            git config --global user.email "actions@github.com" && git config --global user.name "Github Actions"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,22 +1,20 @@
 name: Release Jars
-on: [push, workflow_dispatch]
+on: workflow_dispatch
 env:
-  version: '1.20.1'
-  branch: ver/1.20.1
+  version: '1.19.3'
+  branch: ver/1.19.3
 jobs:
  paperclip:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Git Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
      - name: Set up JDK
-        uses: graalvm/setup-graalvm@v1
+        uses: actions/setup-java@v2.5.0
        with:
          java-version: '17'
          cache: 'gradle'
-          distribution: 'graalvm'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 'latest'
+          distribution: 'temurin'
      - name: Configure Git User Details
        run: |
            git config --global user.email "actions@github.com" && git config --global user.name "Github Actions"
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -1,4 +1,4 @@
-name: Update Upstream (Folia)
+name: Update Upstream (Purpur)

 on:
  schedule:
@@ -7,7 +7,9 @@ on:

 jobs:
  upstream:
+
    runs-on: ubuntu-latest
+
    steps:
      - name: Checkout Git Repository
        uses: actions/checkout@v2
@@ -20,7 +22,7 @@ jobs:
      - name: Configure Git User Details
        run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions"
      - name: Update Upstream Commit Hash
-        run: ./gradlew foliaRefLatest --stacktrace
+        run: ./gradlew purpurRefLatest --stacktrace
      - name: Apply Patches
        run: ./gradlew applyPatches --stacktrace
      - name: Build Paperclip jar
@@ -35,8 +37,8 @@ jobs:
      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v3
        with:
-          commit-message: Update Upstream (Folia)
+          commit-message: Update Upstream (Purpur)
          branch: update-upstream
          delete-branch: true
-          title: 'Update Upstream (Folia)'
+          title: 'Update Upstream (Purpur)'
          body: ''
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
+
 <div align="center">
  <img src="https://github.com/kugge/Kaiiju/blob/ver/1.19.3/logo.png?" width="32%" height="32%"/>
  <h1>Kaiiju</h1>
-  <h3>Folia fork, designed for vanilla/anarchy servers</h3>
+  <h3>A Server Software Designed For Anarchy</h3>
+  <h4>❗ [ Warning ] Work in progress, contributions are welcome ❗</h4>

  [![License](https://img.shields.io/github/license/kugge/Kaiiju?style=for-the-badge&logo=github)](LICENSE)
  [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/kugge/Kaiiju/build.yml?style=for-the-badge)](https://github.com/kugge/Kaiiju/actions)
@@ -11,72 +13,12 @@

 ## Features

-### Notable
- **Xymb Linear Format**: A Region file format that reduces disk space usage by about 50%.
- **Async Pathfinding**: Petal async pathfinding fixed & reworked.
- **Technical Minecraft**: Enable Vanilla exploits such as sand duping, RNG manipulation...
-
-### Other
- **Small optimizations**: Increase server efficiency by disabling unnecessary features.
- **Commands**: Restore few commands that were previously removed by Folia.
-
-### Configuration
-
-```yaml
-gameplay:
-  server-mod-name: Kaiiju
-  shared-random-for-players: true
-network:
-  send-null-entity-packets: true
-  alternate-keepalive: false
-  kick-player-on-bad-packet: true
-region-format:
-  linear:
-    flush-frequency: 10
-    flush-max-threads: 1
-optimization:
-  disable-vanish-api: false
-  disable-player-stats: false
-  disable-arm-swing-event: false
-  disable-ensure-tick-thread-checks: false
-  async-path-processing:
-    enable: false
-    max-threads: 0
-    keepalive: 60
-world-settings:
-  default:
-    gameplay:
-      fix-void-trading: true
-      break-redstone-on-top-of-trap-doors-early: true
-      fix-tripwire-state-inconsistency: true
-      safe-teleportation: true
-      sand-duplication: false
-      teleport-async-on-high-velocity: false
-    region-format:
-      format: ANVIL
-      linear:
-        compression-level: 1
-        crash-on-broken-symlink: true
-    optimization:
-      shulker-box-drop-contents-when-destroyed: true
-      optimize-hoppers: true
-      tick-when-empty: true
-      enable-entity-throttling: false
-      disable-achievements: false
-      disable-creatures-spawn-events: false
-      disable-dolphin-swim-to-treasure: false
-```
-Documentation: [Kaiiju Wiki](https://github.com/KaiijuMC/Kaiiju/wiki/Configuration)
-
-### Roadmap
- **Stash deduplication**: Make giant dupe stashes possible and lagless.
- **Multithreaded Tracker**: Rework Petal multithreaded tracker.
-
-## Open to contributions
- **Native world conversion**: Convert region file format at startup.
- **Performance patch**: Any significative performance patch.
+### Additions
+- **Xymb Linear Format**: Saves about 50% of disk space in OW and Nether and 95% in The End.
+- **Lobotomize**: Lobotomize mobs and villagers without breaking vanilla mechanics.

 ## Building
+In order to distribute and use this server software, you need a paperclip file:

 ```bash
 ./gradlew applyPatches # Apply Kaiiju patches
@@ -84,4 +26,7 @@ Documentation: [Kaiiju Wiki](https://github.com/KaiijuMC/Kaiiju/wiki/Configurati
 ```

 ## License
-Original patches are licensed under GPL-3.0.
+Patches are licensed under GPL-3.0.  
+All other files are licensed under MIT.
+
+Made with <span style="color: #e25555;">&#9829;</span> on Earth.
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,12 +3,26 @@ import io.papermc.paperweight.util.constants.*

 plugins {
    java
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("io.papermc.paperweight.patcher") version "1.5.4"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("io.papermc.paperweight.patcher") version "1.4.1"
+}
+
+repositories {
+    mavenCentral()
+    maven("https://papermc.io/repo/repository/maven-public/") {
+        content { onlyForConfigurations(PAPERCLIP_CONFIG) }
+    }
+}
+
+dependencies {
+    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
+    decompiler("net.minecraftforge:forgeflower:2.0.605.1")
+    paperclip("io.papermc:paperclip:3.0.2")
 }

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

    java {
        toolchain {
@@ -17,25 +31,8 @@ allprojects {
    }
 }

-val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
-
-repositories {
-    mavenCentral()
-    maven(paperMavenPublicUrl) {
-        content {
-            onlyForConfigurations(PAPERCLIP_CONFIG)
-        }
-    }
-}
-
-dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.629.0")
-    paperclip("io.papermc:paperclip:3.0.3")
-}
-
 subprojects {
-    tasks.withType<JavaCompile>().configureEach {
+    tasks.withType<JavaCompile> {
        options.encoding = Charsets.UTF_8.name()
        options.release.set(17)
    }
@@ -45,9 +42,15 @@ subprojects {
    tasks.withType<ProcessResources> {
        filteringCharset = Charsets.UTF_8.name()
    }
+
    repositories {
        mavenCentral()
-        maven(paperMavenPublicUrl)
+        maven("https://oss.sonatype.org/content/groups/public/")
+        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://ci.emc.gs/nexus/content/groups/aikar/")
+        maven("https://repo.aikar.co/content/groups/aikar")
+        maven("https://repo.md-5.net/content/repositories/releases/")
+        maven("https://hub.spigotmc.org/nexus/content/groups/public/")
        maven("https://jitpack.io")
    }
 }
@@ -55,15 +58,15 @@ subprojects {
 paperweight {
    serverProject.set(project(":kaiiju-server"))

-    remapRepo.set(paperMavenPublicUrl)
-    decompileRepo.set(paperMavenPublicUrl)
+    remapRepo.set("https://maven.fabricmc.net/")
+    decompileRepo.set("https://maven.quiltmc.org")

-    useStandardUpstream("Folia") {
-        url.set(github("PaperMC", "Folia"))
-        ref.set(providers.gradleProperty("foliaRef"))
+    useStandardUpstream("Purpur") {
+        url.set(github("PurpurMC", "Purpur"))
+        ref.set(providers.gradleProperty("purpurRef"))
        
        withStandardPatcher {
-            baseName("Folia")
+            baseName("Purpur")

            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
            apiOutputDir.set(layout.projectDirectory.dir("kaiiju-api"))
@@ -72,35 +75,36 @@ paperweight {
            serverOutputDir.set(layout.projectDirectory.dir("kaiiju-server"))
        }
    }
-}

-tasks.register("foliaRefLatest") {
-    // Update the foliaRef in gradle.properties to be the latest commit.
-    val tempDir = layout.cacheDir("foliaRefLatest");
-    val file = "gradle.properties";
+    tasks.register("purpurRefLatest") {
+        // Update the paperRef in gradle.properties to be the latest commit.3
+        val tempDir = layout.cacheDir("purpurRefLatest");
+        val file = "gradle.properties";
        
-    doFirst {
-        data class GithubCommit(
-                val sha: String
-        )
+        doFirst {
+            data class GithubCommit(
+                    val sha: String
+            )

-        val foliaLatestCommitJson = layout.cache.resolve("foliaLatestCommit.json");
-        download.get().download("https://api.github.com/repos/PaperMC/Folia/commits/master", foliaLatestCommitJson);
-        val foliaLatestCommit = gson.fromJson<paper.libs.com.google.gson.JsonObject>(foliaLatestCommitJson)["sha"].asString;
+            val purpurLatestCommitJson = layout.cache.resolve("purpurLatestCommit.json");
+            download.get().download("https://api.github.com/repos/PurpurMC/Purpur/commits/ver/1.19.3", purpurLatestCommitJson);
+            val purpurLatestCommit = gson.fromJson<paper.libs.com.google.gson.JsonObject>(purpurLatestCommitJson)["sha"].asString;

-        copy {
-            from(file)
-            into(tempDir)
-            filter { line: String ->
-                line.replace("foliaRef = .*".toRegex(), "foliaRef = $foliaLatestCommit")
+            copy {
+                from(file)
+                into(tempDir)
+                filter { line: String ->
+                    line.replace("purpurRef = .*".toRegex(), "purpurRef = $purpurLatestCommit")
+                }
+            }
+        }
+
+        doLast {
+            copy {
+                from(tempDir.file("gradle.properties"))
+                into(project.file(file).parent)
            }
        }
    }
-
-    doLast {
-        copy {
-            from(tempDir.file("gradle.properties"))
-            into(project.file(file).parent)
-        }
-    }
 }
+
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1,9 @@
 group = dev.kaiijumc.kaiiju
-version = 1.20.1-R0.1-SNAPSHOT
-mcVersion = 1.20.1
+version = 1.19.3-R0.1-SNAPSHOT
+mcVersion = 1.19.3

-foliaRef = 3cf16eeaf2e9c2346b9825900e5eaab376654c36
+purpurRef = 08aa4dccaad7e5d31ca51b53489d2d413e49748d

 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
-org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8 -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.SpeculativeGuardMovement=true -Dgraal.WriteableCodeCache=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/276
+++ b/276
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,98 +17,67 @@
 #

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -118,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -129,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
+    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -137,109 +106,80 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi

 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi

+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`

-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/logo.png
+++ b/logo.png
--- a/patches/api/0001-Kaiiju-Configuration.patch
+++ b/patches/api/0001-Kaiiju-Configuration.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Kaiiju Configuration


 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 57d4789c1eb00cb376adce31ece2b6672c4a12a9..aba8170a8254558b33a5ac6635c30c5cc7e39296 100644
+index e0f69edf603c2ec99bc92b16b18912272cc41bd9..b2c8c18437537eb2ea91bdeb9f715e01a182fbcb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2030,6 +2030,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1983,6 +1983,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
         }
-         // Paper end
+         // Purpur end
 
 +        // Kaiiju start
 +        @NotNull
--- a/patches/removed/0016-Fix-off-thread-raid-winners.patch
+++ b/patches/removed/0016-Fix-off-thread-raid-winners.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Tue, 9 May 2023 15:11:56 +0300
-Subject: [PATCH] Fix off thread raid winners
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-index 359f1690497eac00899eb26c17308e0a6fe943ad..3cc320e854cbb9e70b6c63f1f950091c5195edae 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raid.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java
-@@ -404,6 +404,7 @@ public class Raid {
-                             UUID uuid = (UUID) iterator.next();
-                             Entity entity = this.level.getEntity(uuid);
- 
-+                            if (!io.papermc.paper.util.TickThread.isTickThreadFor(entity)) continue; // Kaiiju - Prevent give effect to player off thread
-                             if (entity instanceof LivingEntity && !entity.isSpectator()) {
-                                 LivingEntity entityliving = (LivingEntity) entity;
- 
--- a/patches/removed/0018-Fix-off-thread-spider-addEffect.patch
+++ b/patches/removed/0018-Fix-off-thread-spider-addEffect.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Wed, 10 May 2023 17:58:37 +0300
-Subject: [PATCH] Fix off thread spider addEffect
-
-
-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 05432184077752b1d0cb764a5e39ed875748b2d6..74a68ae68e3c774a63d0a5478dfcda6e7894a514 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -180,7 +180,9 @@ public class Spider extends Monster {
-             MobEffect mobeffectlist = entityspider_groupdataspider.effect;
- 
-             if (mobeffectlist != null) {
-+                this.getBukkitEntity().taskScheduler.schedule(task -> { // Kaiiju - Fix off thread spider add effect
-                 this.addEffect(new MobEffectInstance(mobeffectlist, -1), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.SPIDER_SPAWN); // CraftBukkit
-+                }, null, 1); // Kaiiju - Fix off thread spider add effect
-             }
-         }
- 
--- a/patches/removed/0032-Fix-visual-respawn-issue.patch
+++ b/patches/removed/0032-Fix-visual-respawn-issue.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Wed, 21 Jun 2023 04:15:44 +0300
-Subject: [PATCH] Fix visual respawn issue
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 10c7f5c6fc0e5cb8aafbe125dd68635a37b7b1b9..6f589e7e4bbed0b2fa87403c86f18d36672cf1d0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -633,6 +633,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         ++this.deathTime;
-         if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved() && !this.broadcastedDeath) { // Folia - region threading
-             this.level().broadcastEntityEvent(this, (byte) 60);
-+            this.broadcastedDeath = true; // Kaiiju - Fix respawn issue / Visual bug
-             if (!(this instanceof ServerPlayer)) this.remove(Entity.RemovalReason.KILLED); // Folia - region threading - don't remove, we want the tick scheduler to be running
-             if ((this instanceof ServerPlayer)) this.unRide(); // Folia - region threading - unmount player when dead
-         }
--- a/patches/removed/0039-Fix-teleportAsync-rotation-API.patch
+++ b/patches/removed/0039-Fix-teleportAsync-rotation-API.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kugge <sofiane.djerbi38@gmail.com>
-Date: Thu, 22 Jun 2023 20:32:58 +0200
-Subject: [PATCH] Fix teleportAsync rotation API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 76bcfda336e9cfa039d80ea3ccbebbc3d2b13f7f..24617b3994c0f148f1c17928e18aa1e1a784e6f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1329,7 +1329,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-             boolean success = nmsEntity.teleportAsync(
-                 ((CraftWorld)locationClone.getWorld()).getHandle(),
-                 new net.minecraft.world.phys.Vec3(locationClone.getX(), locationClone.getY(), locationClone.getZ()),
-                null, null, net.minecraft.world.phys.Vec3.ZERO,
-+                locationClone.getYaw(), locationClone.getPitch(), net.minecraft.world.phys.Vec3.ZERO, // Kaiiju - fix teleportAsync() rotation
-                 cause == null ? TeleportCause.UNKNOWN : cause,
-                 Entity.TELEPORT_FLAG_LOAD_CHUNK | Entity.TELEPORT_FLAG_UNMOUNT, // preserve behavior with old API: dismount the entity so it can teleport
-                 (Entity entityTp) -> {
--- a/patches/server/0001-Kaiiju-Rebranding.patch
+++ b/patches/server/0001-Kaiiju-Rebranding.patch
@@ -1,103 +1,99 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 10 Feb 2023 02:58:46 +0200
-Subject: [PATCH] Rebranding
+Subject: [PATCH] Kaiiju Rebranding


 diff --git a/build.gradle.kts b/build.gradle.kts
-index 93f9abd2169a48a4fd32f712c68be7b49b034e83..6d1d7a99a9ab2f165970d7da33702c16d7b18fd8 100644
+index 020927dfe9624453311d1d171a10f44344ec8710..c6a4c48b14a8c927284720b79b93ee1aa9df7da6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
+@@ -7,7 +7,7 @@ plugins {
+ }
 
 dependencies {
-     // Folia start
-    implementation(project(":folia-api"))
-+    implementation(project(":kaiiju-api")) // Kaiiju
+-    implementation(project(":purpur-api")) // Purpur
+    implementation(project(":kaiiju-api")) // Purpur // Kaiiju
+     // Pufferfish start
     implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
         exclude("io.papermc.paper", "paper-api")
-     }
-@@ -76,7 +76,7 @@ tasks.jar {
+@@ -83,7 +83,7 @@ tasks.jar {
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
             "Implementation-Title" to "CraftBukkit",
-            "Implementation-Version" to "git-Folia-$implementationVersion", // Folia
-+            "Implementation-Version" to "git-Kaiiju-$implementationVersion", // Folia // Kaiiju
+-            "Implementation-Version" to "git-Purpur-$implementationVersion", // Purpur
+            "Implementation-Version" to "git-Kaiiju-$implementationVersion", // Purpur // Kaiiju
             "Implementation-Vendor" to date, // Paper
             "Specification-Title" to "Bukkit",
             "Specification-Version" to project.version,
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 58dc84b7b3b04c2d0b00fc5fac5303d3378b3467..a128b1fabd4aadfe26a8375903c0451d7a65983a 100644
+index 9713263c3bd34ab8a3bfc0a8797ba0b1b88ed733..0b95cd5305e4559d6dca59011869e5b203d51576 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -593,7 +593,7 @@ public class Metrics {
             boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
             // Only start Metrics, if it's enabled in the config
             if (config.getBoolean("enabled", true)) {
-                Metrics metrics = new Metrics("Folia", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page
-+                Metrics metrics = new Metrics("Kaiiju", serverUUID, logFailedRequests, Bukkit.getLogger()); // Folia - we have our own bstats page // Kaiiju
+-                Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur
+                Metrics metrics = new Metrics("Kaiiju", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur // Kaiiju
 
                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                     String minecraftVersion = Bukkit.getVersion();
-@@ -612,6 +612,7 @@ public class Metrics {
-                     paperVersion = "unknown";
-                 }
-                 metrics.addCustomChart(new Metrics.SimplePie("folia_version", () -> paperVersion)); // Folia - we have our own bstats page
-+                metrics.addCustomChart(new Metrics.SimplePie("kaiiju_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Kaiiju
+@@ -603,7 +603,7 @@ public class Metrics {
+ 
+                 metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
+                 metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
+-                metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
+                metrics.addCustomChart(new Metrics.SimplePie("kaiiju_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Kaiiju
 
                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                     Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index e2f704c115fd6e00960bb56bb0779f1100c89c17..95bc514df2022dde265b84490d3d0db002685024 100644
+index fba5dbdb7bcbb55400ef18342c9b54612972a718..8aaa2942d35d6447655f8355106841a30429b653 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,9 +20,11 @@ import java.util.stream.StreamSupport;
+@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
 public class PaperVersionFetcher implements VersionFetcher {
     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-     private static final String GITHUB_BRANCH_NAME = "master";
-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+    // Kaiiju start
-+    private static final String DOWNLOAD_PAGE = "https://github.com/KaiijuMC/Kaiiju/releases";
-+    private static int distance = -2; public int distance() { return distance; }
-+    // Kaiiju end
+     // Purpur start
+-    private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
+    private static final String DOWNLOAD_PAGE = "https://github.com/KaiijuMC/Kaiiju/releases"; // Kaiiju
+     private static int distance = -2; public int distance() { return distance; }
+     // Purpur end
     private static @Nullable String mcVer;
-
-     @Override
-     public long getCacheTime() {
-         return 720000;
-@@ -31,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -33,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher {
     @Nonnull
     @Override
     public Component getVersionMessage(@Nonnull String serverVersion) {
-        String[] parts = serverVersion.substring("git-Folia-".length()).split("[-\\s]"); // Folia
-        final Component updateMessage = getUpdateStatusMessage("PaperMC/Folia", GITHUB_BRANCH_NAME, parts[0]); // Folia
-+        String[] parts = serverVersion.substring("git-Kaiiju-".length()).split("[-\\s]"); // Folia // Kaiiju
-+        final Component updateMessage = getUpdateStatusMessage("KaiijuMC/Kaiiju", "ver/" + getMinecraftVersion(), parts[0]); // Folia // Kaiiju
+-        String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
+-        final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Purpur
+        String[] parts = serverVersion.substring("git-Kaiiju-".length()).split("[-\\s]"); // Purpur // Kaiiju
+        final Component updateMessage = getUpdateStatusMessage("KaiijuMC/Kaiiju", "ver/" + getMinecraftVersion(), parts[0]); // Purpur // Kaiiju
         final Component history = getHistory();
 
-         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -45,7 +47,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+         return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
+@@ -47,7 +47,7 @@ public class PaperVersionFetcher implements VersionFetcher {
                 String result = matcher.group();
                 mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
             } else {
-                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!");
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to KaiijuMC!"); // Kaiiju
+-                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Purpur!"); // Purpur
+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Kaiiju!"); // Purpur // Kaiiju
                 org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
                 org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
             }
-@@ -56,6 +58,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -58,6 +58,8 @@ public class PaperVersionFetcher implements VersionFetcher {
 
     private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
-         int distance;
-+        /* // Kaiiju - disable jenkins/api checking
+         //int distance; // Purpur - use field
+        // Kaiiju start - disable jenkins/api checking
+        /*
         try {
             int jenkinsBuild = Integer.parseInt(versionInfo);
             distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
-@@ -63,6 +66,11 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -65,6 +67,10 @@ public class PaperVersionFetcher implements VersionFetcher {
             versionInfo = versionInfo.replace("\"", "");
             distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
         }
-+        // Kaiiju start - disable jenkins/api checking
 +        */
 +        versionInfo = versionInfo.replace("\"", "");
 +        distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
@@ -106,124 +102,128 @@ index e2f704c115fd6e00960bb56bb0779f1100c89c17..95bc514df2022dde265b84490d3d0db0
         switch (distance) {
             case -1:
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..1c7b5d91e914efbcfb50c6137c7760787e38ad94 100644
+index 3cb56595822799926a8141e60a42f5d1edfc6de5..7ae1c10ebfb8b61e7d0fa63c96ff2dee98294f4d 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
     @Override
     protected LineReader buildReader(LineReaderBuilder builder) {
         builder
-                .appName("Paper")
-+                .appName("Kaiiju") // Kaiiju
+-                .appName("Purpur") // Purpur
+                .appName("Kaiiju") // Purpur // Kaiiju
                 .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
                 .completer(new ConsoleCommandCompleter(this.server))
                 .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..52fc6bb99f6024273c7438d01314b576da66bd1a 100644
+index b5b6657e52e4f7a630229bd3ba433438af293e22..afda0d4198398de29a62159fae701b222969e9fa 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
@@ -125,7 +125,7 @@ public class CrashReport {
         stringbuilder.append("---- Minecraft Crash Report ----\n");
+         // Purpur start
+         stringbuilder.append("// ");
+-        stringbuilder.append("// DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!");
+        stringbuilder.append("// DO NOT REPORT THIS TO PAPER/PURPUR! REPORT TO KAIIJU INSTEAD!"); // Kaiiju
+         // Purpur end
         stringbuilder.append("// ");
         stringbuilder.append(CrashReport.getErrorComment());
-        stringbuilder.append("\n\n");
-+        stringbuilder.append("// DO NOT REPORT THIS TO PAPER/FOLIA! REPORT TO KAIIJU INSTEAD!"); // Kaiiju
-         stringbuilder.append("Time: ");
-         stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now()));
-         stringbuilder.append("\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 355acd1dd3b2e9f2a086a8d95928cdebbf63d06f..7e5645d9cb64ce17f60c85619f5640c8de4b1e86 100644
+index cea4447aad2d64db56a76e4ba180dc7326d2e13b..40b4bd2f1a61c2d9a59c9c09b72713401969460b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -995,7 +995,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -927,7 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         shutdownThread = Thread.currentThread();
         org.spigotmc.WatchdogThread.doStop(); // Paper
-         if (false && !isSameThread()) { // Folia - region threading
-            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)");
-+            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO KAIIJU)"); // Kaiiju
+         if (!isSameThread()) {
+-            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
+            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO KAIIJU)"); // Purpur // Kaiiju
             while (this.getRunningThread().isAlive()) {
                 this.getRunningThread().stop();
                 try {
-@@ -1812,7 +1812,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
-        return "Folia"; // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Kaiiju"; // Kaiiju - Kaiiju > // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 23556931a812ed9b2dac5b4b4712961c2d9aa025..20c9e368bd4cb67591447395cf3c775e145a0ba5 100644
+index 4a8aafd341fdad4b5ae326c4759b3381f5061fb5..caf1237491649205f7b3c7ea4fe1d31d567bbafe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
 import javax.annotation.Nonnull; // Paper
 
 public final class CraftServer implements Server {
-    private final String serverName = "Folia"; // Folia // Paper
-+    private final String serverName = "Kaiiju"; // Kaiiju // Folia // Paper
+-    private final String serverName = "Purpur"; // Paper // Purpur
+    private final String serverName = "Kaiiju"; // Paper // Purpur // Kaiiju
     private final String serverVersion;
     private final String bukkitVersion = Versioning.getBukkitVersion();
     private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index fae85d064bcea3589a69483ec6ac6c4cca73ad9a..895945b56fb75cf4ac0429b1d9263a78c2d523a1 100644
+index 78ac748859e21a61140e9bff67e4527a8d35b4b6..5e14153433f5c7854a357aad4776b2aad4cd6fa0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -920,7 +920,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -883,7 +883,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
             return EntityCategory.WATER;
         }
 
-        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot.");
-+        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Kaiiju."); // Kaiiju
+-        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Purpur."); // Purpur
+        throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Kaiiju."); // Purpur // Kaiiju
     }
 
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index eb84a8dd97f92de4a7dd3826d9e124a442cba565..e24d653fafcd88e01786b77539c506bcf3751c2c 100644
+index 5402098dce0d64d3dceea51f248d7d366850a74f..2b7a67c339994c34296f7057ffc8822b4aa0036b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -501,7 +501,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -504,7 +504,7 @@ public class CraftScheduler implements BukkitScheduler {
                 this.parsePending();
             } else {
-                 // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
-                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Paper"); // Paper
-+                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Kaiiju"); // Paper // Kaiiju
+                 //this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
+-                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Purpur"); // Paper // Purpur
+                task.getOwner().getLogger().log(Level.SEVERE, "Unexpected Async Task in the Sync Scheduler. Report this to Kaiiju"); // Paper // Purpur // Kaiiju
                 // We don't need to parse pending
                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
             }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index e9b6ca3aa25e140467ae866d572483050ea3fa0e..5df2b0fceebaaa863f4f143c8f29e808b7f0c49b 100644
+index fb87620c742ff7912f5e8ccd2a7930dd605576d9..0f56013165cd61023b4f30a4da424b701e14a8e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {
     public static String getBukkitVersion() {
         String result = "Unknown-Version";
 
-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/dev.folia/folia-api/pom.properties"); // Folia
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/dev.kaiijumc.kaiiju/kaiiju-api/pom.properties"); // Folia // Kaiiju
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Purpur
+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/dev.kaiijumc.kaiiju/kaiiju-api/pom.properties"); // Purpur // Kaiiju
         Properties properties = new Properties();
 
         if (stream != null) {
+diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+index c7c0ed8dfe58c841faf684a1fe228eeda6cd57b7..410ce2dc98c48871d2ddfb0195f2885adc18cba8 100644
+--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+@@ -227,7 +227,7 @@ public class PurpurConfig {
+         deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
+     }
+ 
+-    public static String serverModName = "Purpur";
+    public static String serverModName = "Kaiiju"; // Kaiiju
+     private static void serverModName() {
+         serverModName = getString("settings.server-mod-name", serverModName);
+     }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..9c1477cfa1a8074c4b3b8a365bb03c44eaa62972 100644
+index a810bfd3b8d6bd4d8f2ef8797e4281ae4fe8a67f..7e92d77edb448f2ec818bf4b876d3df56d6362cc 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                 if (isLongTimeout) {
                 // Paper end
                 log.log( Level.SEVERE, "------------------------------" );
-                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
-+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Kaiiju bug." ); // Paper // Kaiiju
+-                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
+                log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Kaiiju bug." ); // Paper // Purpur // Kaiiju
                 log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
                 log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
                 log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
                 log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
-                log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" );
-+                log.log( Level.SEVERE, "If you are unsure or still think this is a Kaiiju bug, please report this to https://github.com/KaiijuMC/Kaiiju/issues" ); // Kaiiju
+-                log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
+                log.log( Level.SEVERE, "If you are unsure or still think this is a Kaiiju bug, please report this to https://github.com/KaiijuMC/Kaiiju/issues" ); // Purpur // Kaiiju
                 log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
-                log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() );
-+                log.log( Level.SEVERE, "Kaiiju version: " + Bukkit.getServer().getVersion() ); // Kaiiju
+-                log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
+                log.log( Level.SEVERE, "Kaiiju version: " + Bukkit.getServer().getVersion() ); // Purpur // Kaiiju
                 //
                 if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                 {
@@ -231,14 +231,14 @@ index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..9c1477cfa1a8074c4b3b8a365bb03c44
                 // Paper end
                 } else
                 {
-                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---");
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO KAIIJU - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Kaiiju
+-                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO KAIIJU - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Kaiiju
                     log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
                 }
                 // Paper end - Different message for short timeout
                 log.log( Level.SEVERE, "------------------------------" );
-                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Kaiiju!):" ); // Paper // Kaiiju
+-                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
+                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Kaiiju!):" ); // Paper // Purpur // Kaiiju
                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
                 this.dumpTickingInfo(); // Paper - log detailed tick information
                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
@@ -246,8 +246,8 @@ index 98fba0288be9ed2cb18ffba5cf81148157dd4fcf..9c1477cfa1a8074c4b3b8a365bb03c44
                     WatchdogThread.dumpThread( thread, log );
                 }
                 } else {
-                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH ---");
-+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO KAIIJU - THIS IS NOT A BUG OR A CRASH ---"); // Kaiiju
+-                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
+                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO KAIIJU - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Kaiiju
                 }
 
                 log.log( Level.SEVERE, "------------------------------" );
--- a/patches/server/0002-Kaiiju-Configuration.patch
+++ b/patches/server/0002-Kaiiju-Configuration.patch
@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
 Date: Fri, 10 Feb 2023 05:53:10 +0200
-Subject: [PATCH] Empty configuration
+Subject: [PATCH] Kaiiju Configuration


 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027
+index 0000000000000000000000000000000000000000..ef48d534d239fc5fcfd1b0500cc7868c1cf63142
 --- /dev/null
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -0,0 +1,195 @@
+@@ -0,0 +1,194 @@
 +package dev.kaiijumc.kaiiju;
 +
 +import com.google.common.base.Throwables;
@@ -38,8 +38,7 @@ index 0000000000000000000000000000000000000000..7da7e0aeb5eac9ac73a3570e716f1ceb
 +    protected static final String HEADER = "This is the main configuration file for Kaiiju.\n"
 +            + "Some options may impact gameplay, so use with caution.\n"
 +            + "If you need help or have any questions related to Kaiiju,\n"
-+            + "Join our Discord server: https://discord.com/invite/qagZRAepb7\n"
-+            + "Documentation: https://github.com/KaiijuMC/Kaiiju/wiki/Configuration";
+            + "Join our Discord server: https://discord.com/invite/qagZRAepb7";
 +    protected static File CONFIG_FILE;
 +    public static YamlConfiguration config;
 +
@@ -205,9 +204,10 @@ index 0000000000000000000000000000000000000000..7da7e0aeb5eac9ac73a3570e716f1ceb
 +        return builder.build();
 +    }
 +}
+\ No newline at end of file
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..87ca934473f3b9553c1b9b3ed60e0fa07838c711
+index 0000000000000000000000000000000000000000..dd4c3ca77acb3aeefc69b8eb948b8b202ff87a19
 --- /dev/null
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
@@ -0,0 +1,125 @@
@@ -336,12 +336,13 @@ index 0000000000000000000000000000000000000000..87ca934473f3b9553c1b9b3ed60e0fa0
 +        return value.isEmpty() ? fallback : value;
 +    }
 +}
+\ No newline at end of file
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java b/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6fac162e0ec057af9f3336314d5663554cef0490
+index 0000000000000000000000000000000000000000..0dde8879856f8882f2840b4b8bfb5aa0b3f06b91
 --- /dev/null
 +++ b/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,68 @@
 +package dev.kaiijumc.kaiiju.command;
 +
 +import dev.kaiijumc.kaiiju.KaiijuConfig;
@@ -380,24 +381,26 @@ index 0000000000000000000000000000000000000000..6fac162e0ec057af9f3336314d566355
 +    @Override
 +    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
 +        if (!testPermission(sender)) return true;
+        String prefix = ChatColor.of(Color.decode("#F25DF6")) + "Kaiiju » " + ChatColor.RESET;
 +
 +        if (args.length != 1) {
-+            sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
+            sender.sendMessage(prefix + ChatColor.RED + "Usage: " + usageMessage);
 +            return false;
 +        }
 +
 +        if (args[0].equalsIgnoreCase("reload")) {
-+            Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues.");
-+            Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
+            Command.broadcastCommandMessage(sender, prefix + ChatColor.RED + "Please note that this command is not supported and may cause issues.");
+            Command.broadcastCommandMessage(sender, prefix + ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
 +
 +            MinecraftServer console = MinecraftServer.getServer();
 +            KaiijuConfig.reload((File) console.options.valueOf("kaiiju-settings"));
 +            for (ServerLevel level : console.getAllLevels()) {
 +                level.kaiijuConfig.reload();
+                level.resetBreedingCooldowns();
 +            }
 +            console.server.reloadCount++;
 +
-+            Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Kaiiju config reload complete.");
+            Command.broadcastCommandMessage(sender, prefix + ChatColor.GREEN + "Kaiiju config reload complete.");
 +        } else if (args[0].equalsIgnoreCase("version")) {
 +            Command verCmd = org.bukkit.Bukkit.getServer().getCommandMap().getCommand("version");
 +            if (verCmd != null) {
@@ -410,13 +413,13 @@ index 0000000000000000000000000000000000000000..6fac162e0ec057af9f3336314d566355
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 78ada86028bac06b62a7d70776a29705a3b11a06..ee75d828174ac1c84931bc087472fefd76073bdb 100644
+index fd1b0564d2d2b45128e6f2556fb93ee56bd683b5..948ae5f96b1d54e69b49f6314d11078f197c946e 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -218,6 +218,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
-         io.papermc.paper.command.PaperCommands.registerCommands(this);
-         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
+@@ -227,6 +227,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         }
+         org.purpurmc.purpur.PurpurConfig.registerCommands();
+         // Purpur end
 +        // Kaiiju start
 +        try {
 +            dev.kaiijumc.kaiiju.KaiijuConfig.init((java.io.File) options.valueOf("kaiiju-settings"));
@@ -430,57 +433,56 @@ index 78ada86028bac06b62a7d70776a29705a3b11a06..ee75d828174ac1c84931bc087472fefd
         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
         // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8cf4428d8140fd03f0ad8fa1d148a04d8caefda8..fb71843793e699b2ccfaa3b7e4c2bb7d4826a706 100644
+index a9289072b048095330ea32d7c965e8dda61a36fc..bffd82b3d89e12f2c3d6a7e89f5a8ecd12dedc34 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     // Paper end
+@@ -174,6 +174,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
 
     public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
+     public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
 +    public final dev.kaiijumc.kaiiju.KaiijuWorldConfig kaiijuConfig; // Kaiiju
-+
+ 
     public final co.aikar.timings.WorldTimingsHandler timings; // Paper
     public static BlockPos lastPhysicsProblem; // Spigot
-     private org.spigotmc.TickLimiter entityLimiter;
-@@ -293,6 +295,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
+@@ -330,6 +331,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
         this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
         this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
+         this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
 +        this.kaiijuConfig = new dev.kaiijumc.kaiiju.KaiijuWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Kaiiju
+         this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
         this.generator = gen;
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
- 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 20c9e368bd4cb67591447395cf3c775e145a0ba5..f421a150a7448362572c476fd50718f0c879e43d 100644
+index caf1237491649205f7b3c7ea4fe1d31d567bbafe..5fd8e45d9a982e4f6aad06440110bc3c9d00bd99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1097,6 +1097,7 @@ public final class CraftServer implements Server {
- 
+@@ -1032,6 +1032,7 @@ public final class CraftServer implements Server {
         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
         this.console.paperConfigurations.reloadConfigs(this.console);
+         org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
 +        dev.kaiijumc.kaiiju.KaiijuConfig.init((File) console.options.valueOf("kaiiju-settings")); // Kaiiju
         for (ServerLevel world : this.console.getAllLevels()) {
             // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1112,6 +1113,7 @@ public final class CraftServer implements Server {
-                 }
+@@ -1048,6 +1049,7 @@ public final class CraftServer implements Server {
             }
             world.spigotConfig.init(); // Spigot
+             world.purpurConfig.init(); // Purpur
 +            world.kaiijuConfig.init(); // Kaiiju
         }
 
         Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1127,6 +1129,7 @@ public final class CraftServer implements Server {
-         this.reloadData();
+@@ -1064,6 +1066,7 @@ public final class CraftServer implements Server {
         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
         io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
+         org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
 +        dev.kaiijumc.kaiiju.KaiijuConfig.registerCommands(); // Kaiiju
         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
-@@ -2907,6 +2910,13 @@ public final class CraftServer implements Server {
-             return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
+@@ -2885,6 +2888,13 @@ public final class CraftServer implements Server {
         }
+         // Purpur end
 
 +        // Kaiiju start
 +        @Override
@@ -493,12 +495,12 @@ index 20c9e368bd4cb67591447395cf3c775e145a0ba5..f421a150a7448362572c476fd50718f0
         public void restart() {
             org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index daed278d1bcf84ee42749f24e311b22b70015d79..1f194f5324ab5efc5ae11d248dd09f875624559c 100644
+index 576cd8e20982bb20d10213b6c7a229428eec1c2f..190b4bc55d8b1e9983f7b77fd3545a59fa39e6f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -173,6 +173,14 @@ public class Main {
-                         .describedAs("Jar file");
-                 // Paper end
+@@ -180,6 +180,14 @@ public class Main {
+                         .describedAs("Yml file");
+                 // Purpur end
 
 +                // Purpur Start
 +                acceptsAll(asList("kaiiju", "kaiiju-settings"), "File for kaiiju settings")
--- a/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch
+++ b/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
+Date: Fri, 10 Feb 2023 20:03:58 +0200
+Subject: [PATCH] Kaiiju RegionFormat Configuration
+
+
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+index ef48d534d239fc5fcfd1b0500cc7868c1cf63142..328fbed775c26faa9a87171bfda68d8ee977a889 100644
+--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+@@ -191,4 +191,16 @@ public class KaiijuConfig {
+         }
+         return builder.build();
+     }
+
+    public static List<String> regionFormatList = Arrays.asList("ANVIL");
+    public static String regionFormatName = "ANVIL";
+
+    private static void regionFormatSettings() {
+        regionFormatName = getString("region-format.format", regionFormatName).toUpperCase();
+        if (!regionFormatList.contains(regionFormatName)) {
+            Bukkit.getLogger().log(Level.SEVERE, "Unknown region format in kaiiju.yml: " + regionFormatName);
+            Bukkit.getLogger().log(Level.SEVERE, "Falling back to ANVIL region file format.");
+            regionFormatName = "ANVIL";
+        }
+    }
+ }
+\ No newline at end of file
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 40b4bd2f1a61c2d9a59c9c09b72713401969460b..b9998c288c4e8b6a244722915e44250b6550fd7e 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -855,7 +855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             // Paper start - rewrite chunk system
+             worldserver.save((ProgressListener) null, flush, worldserver.noSave && !force, close);
+             if (flush) {
+-                MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", worldserver.getChunkSource().chunkMap.getStorageName());
+                MinecraftServer.LOGGER.info("ThreadedChunkStorage ({}): All chunks are saved", worldserver.getChunkSource().chunkMap.getStorageName()); // Kaiiju
+             }
+             // Paper end - rewrite chunk system
+         }
+@@ -879,7 +879,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                 //MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", worldserver2.getChunkSource().chunkMap.getStorageName()); // Paper - move up
+             }
+ 
+-            MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
+            MinecraftServer.LOGGER.info("ThreadedChunkStorage: All dimensions are saved"); // Kaiiju
+         }
+ 
+         return flag3;
--- a/patches/server/0003-Region-format-configuration.patch
+++ b/patches/server/0003-Region-format-configuration.patch
@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Fri, 10 Feb 2023 20:03:58 +0200
-Subject: [PATCH] Region format configuration
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027..f08bcc9ae1770fa847d8a5e873a554bef5485100 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -192,4 +192,7 @@ public class KaiijuConfig {
-         }
-         return builder.build();
-     }
-+
-+    private static void regionFormatSettings() {
-+    }
- }
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 87ca934473f3b9553c1b9b3ed60e0fa07838c711..a6e7af5f4148e067660e9f5beeacde3a59a1de9c 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -1,12 +1,15 @@
- package dev.kaiijumc.kaiiju;
- 
-+import dev.kaiijumc.kaiiju.region.RegionFileFormat;
- import org.apache.commons.lang.BooleanUtils;
- import org.bukkit.World;
- import org.bukkit.configuration.ConfigurationSection;
- 
-+import java.util.Arrays;
- import java.util.List;
- import java.util.Map;
- import java.util.function.Predicate;
-+import java.util.logging.Level;
- 
- import static dev.kaiijumc.kaiiju.KaiijuConfig.log;
- 
-@@ -122,4 +125,22 @@ public class KaiijuWorldConfig {
-         final Map<String, Object> value = getMap("world-settings." + worldName + "." + path, null);
-         return value.isEmpty() ? fallback : value;
-     }
-+
-+    public RegionFileFormat regionFormatName = RegionFileFormat.ANVIL;
-+    public int regionFormatLinearCompressionLevel = 1;
-+
-+    private void regionFormatSettings() {
-+        regionFormatName = RegionFileFormat.fromString(getString("region-format.format", regionFormatName.name()));
-+        if (regionFormatName.equals(RegionFileFormat.INVALID)) {
-+            log(Level.SEVERE, "Unknown region format in kaiiju.yml: " + regionFormatName);
-+            log(Level.SEVERE, "Falling back to ANVIL region file format.");
-+            regionFormatName = RegionFileFormat.ANVIL;
-+        }
-+        regionFormatLinearCompressionLevel = getInt("region-format.linear.compression-level", regionFormatLinearCompressionLevel);
-+        if (regionFormatLinearCompressionLevel > 23 || regionFormatLinearCompressionLevel < 1) {
-+            log(Level.SEVERE, "Linear region compression level should be between 1 and 22 in kaiiju.yml: " + regionFormatLinearCompressionLevel);
-+            log(Level.SEVERE, "Falling back to compression level 1.");
-+            regionFormatLinearCompressionLevel = 1;
-+        }
-+    }
- }
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/region/RegionFileFormat.java b/src/main/java/dev/kaiijumc/kaiiju/region/RegionFileFormat.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..7164d9cd03186f0657783f83de3d6435cda2b17e
--- /dev/null
-+++ b/src/main/java/dev/kaiijumc/kaiiju/region/RegionFileFormat.java
-@@ -0,0 +1,16 @@
-+package dev.kaiijumc.kaiiju.region;
-+
-+public enum RegionFileFormat {
-+    ANVIL,
-+    LINEAR,
-+    INVALID;
-+
-+    public static RegionFileFormat fromString(String format) {
-+        for (RegionFileFormat rff : values()) {
-+            if (rff.name().equalsIgnoreCase(format)) {
-+                return rff;
-+            }
-+        }
-+        return RegionFileFormat.INVALID;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7e5645d9cb64ce17f60c85619f5640c8de4b1e86..bc9204d2c925437e9ff5c5d62d9faf38c2938e48 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -893,7 +893,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             // Paper start - rewrite chunk system
-             worldserver.save((ProgressListener) null, flush, worldserver.noSave && !force, close);
-             if (flush) {
-                MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", worldserver.getChunkSource().chunkMap.getStorageName());
-+                MinecraftServer.LOGGER.info("ThreadedChunkStorage ({}): All chunks are saved", worldserver.getChunkSource().chunkMap.getStorageName()); // Kaiiju
-             }
-             // Paper end - rewrite chunk system
-         }
-@@ -917,7 +917,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                 //MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", worldserver2.getChunkSource().chunkMap.getStorageName()); // Paper - move up
-             }
- 
-            MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
-+            MinecraftServer.LOGGER.info("ThreadedChunkStorage: All dimensions are saved"); // Kaiiju
-         }
- 
-         return flag3;
--- a/patches/server/0004-Kaiiju-RegionFormat-Linear.patch
+++ b/patches/server/0004-Kaiiju-RegionFormat-Linear.patch
--- a/patches/server/0005-Kaiiju-Lobotomize-Configuration.patch
+++ b/patches/server/0005-Kaiiju-Lobotomize-Configuration.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
+Date: Sat, 11 Feb 2023 02:10:20 +0200
+Subject: [PATCH] Kaiiju Lobotomize Configuration
+
+
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+index dd4c3ca77acb3aeefc69b8eb948b8b202ff87a19..ac4440f8d2bd30e3e074ef797d5138b64996fcbb 100644
+--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+@@ -122,4 +122,7 @@ public class KaiijuWorldConfig {
+         final Map<String, Object> value = getMap("world-settings." + worldName + "." + path, null);
+         return value.isEmpty() ? fallback : value;
+     }
+-}
+\ No newline at end of file
+
+    private void lobotomizeSettings() {
+    }
+}
--- a/patches/server/0005-Network-configuration.patch
+++ b/patches/server/0005-Network-configuration.patch
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 16 Feb 2023 01:38:59 +0200
-Subject: [PATCH] Network configuration
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index b7f43cce80742aa0cd523e930772ff84946f3eef..fa829cef4033625470dfae29ddf777e6c5ab8c55 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -203,4 +203,7 @@ public class KaiijuConfig {
-         else
-             linearFlushThreads = Math.max(linearFlushThreads, 1);
-     }
-+
-+    private static void networkSettings() {
-+    }
- }
--- a/patches/server/0006-Kaiiju-Lobotomize-Animal.patch
+++ b/patches/server/0006-Kaiiju-Lobotomize-Animal.patch
@@ -0,0 +1,357 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
+Date: Sat, 11 Feb 2023 06:29:15 +0200
+Subject: [PATCH] Kaiiju Lobotomize Animal
+
+Inspired by "Lobotomized animals" by @KioProject123
+Checks might be a nuisance to performance.
+
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+index ac4440f8d2bd30e3e074ef797d5138b64996fcbb..d28f05943ef25aad1d5a0d4d3f72b991a3caaa5f 100644
+--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+@@ -123,6 +123,17 @@ public class KaiijuWorldConfig {
+         return value.isEmpty() ? fallback : value;
+     }
+ 
+    public boolean lobotomizeAnimalEnabled = false;
+    public int lobotomizeAnimalCheckInterval = 100;
+    public boolean lobotomizeAnimalCheckCanJump = true;
+    public boolean lobotomizeAnimalLookAtPlayer = false;
+    public boolean lobotomizeAnimalFloat = true;
+
+     private void lobotomizeSettings() {
+        lobotomizeAnimalEnabled = getBoolean("lobotomize.animal.enabled", lobotomizeAnimalEnabled);
+        lobotomizeAnimalCheckInterval = getInt("lobotomize.animal.check-interval", lobotomizeAnimalCheckInterval);
+        lobotomizeAnimalCheckCanJump = getBoolean("lobotomize.animal.check-can-jump", lobotomizeAnimalCheckCanJump);
+        lobotomizeAnimalLookAtPlayer = getBoolean("lobotomize.animal.look-at-player", lobotomizeAnimalLookAtPlayer);
+        lobotomizeAnimalFloat = getBoolean("lobotomize.animal.float", lobotomizeAnimalFloat);
+     }
+ }
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/entity/Lobotomized.java b/src/main/java/dev/kaiijumc/kaiiju/entity/Lobotomized.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..805df3e27cfbbdf3525c96942afca12d50abc350
+--- /dev/null
+++ b/src/main/java/dev/kaiijumc/kaiiju/entity/Lobotomized.java
+@@ -0,0 +1,73 @@
+package dev.kaiijumc.kaiiju.entity;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+
+public class Lobotomized {
+    private boolean isLobotomized = false;
+    private int notLobotomizedCount = 0;
+
+    public boolean isLobotomized() {
+        return this.isLobotomized;
+    }
+
+    public void setLobotomized(boolean b) {
+        this.isLobotomized = b;
+    }
+
+    public boolean checkLobotomized(LivingEntity entity) {
+        Level level = entity.getLevel();
+        int interval = level.kaiijuConfig.lobotomizeAnimalCheckInterval;
+        if (this.notLobotomizedCount > 3) {
+            // check half as often if not lobotomized for the last 3+ consecutive checks
+            interval *= 2;
+        }
+        if ((entity.getId() + entity.tickCount) % interval == 0) {
+            this.isLobotomized = entity.isOnGround() && !canTravelFrom(entity, level, entity.getBbHeight() <= 1.0F);
+
+            if (this.isLobotomized) {
+                this.notLobotomizedCount = 0;
+            } else {
+                this.notLobotomizedCount++;
+            }
+        }
+        return this.isLobotomized;
+    }
+
+    private boolean canTravelFrom(LivingEntity entity, Level level, boolean ignoreTop) {
+        BlockPos pos = new BlockPos(entity.getX(), entity.getY() + 0.5D, entity.getZ());
+        return canTravelTo(entity, pos.east(), level, ignoreTop)
+            || canTravelTo(entity, pos.west(), level, ignoreTop)
+            || canTravelTo(entity, pos.north(), level, ignoreTop)
+            || canTravelTo(entity, pos.south(), level, ignoreTop);
+    }
+
+    private boolean canTravelTo(LivingEntity entity, BlockPos pos, Level level, boolean ignoreTop) {
+        BlockState top;
+        // Check if mob can jump over block
+        if (level.kaiijuConfig.lobotomizeAnimalCheckCanJump && canJump(entity, level, ignoreTop)) {
+            top = level.getBlockStateIfLoaded(pos.above());
+            if (top == null) return false;
+            if (top.isPathfindable(level, pos, net.minecraft.world.level.pathfinder.PathComputationType.LAND)) {
+                if (ignoreTop) return true;
+                net.minecraft.world.level.block.state.BlockState above = level.getBlockState(pos.above(2));
+                if (above.isPathfindable(level, pos, net.minecraft.world.level.pathfinder.PathComputationType.LAND)) return true;
+            }
+        }
+        BlockState bottom = level.getBlockStateIfLoaded(pos);
+        if (bottom == null) return false; // Chunk not loaded
+        if (!bottom.isPathfindable(level, pos, PathComputationType.LAND)) return false;
+        if (ignoreTop) return true;
+        top = level.getBlockState(pos.above());
+        return top.isPathfindable(level, pos, PathComputationType.LAND);
+    }
+
+    private boolean canJump(LivingEntity entity, Level level, boolean ignoreTop) {
+        BlockPos pos = new BlockPos(entity.getX(), entity.getY() + 2.5D, entity.getZ());
+        net.minecraft.world.level.block.Block above = level.getBlockIfLoaded(pos);
+        return !above.hasCollision;
+    }
+}
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index b2e4b5c463ceb19356da18e7fc52d20801b674cd..32ea0b1542ef374db3290e01978d7965715b9de6 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -308,6 +308,8 @@ public abstract class LivingEntity extends Entity {
+         this.brain = this.makeBrain(new Dynamic(dynamicopsnbt, (Tag) dynamicopsnbt.createMap((Map) ImmutableMap.of(dynamicopsnbt.createString("memories"), (Tag) dynamicopsnbt.emptyMap()))));
+     }
+ 
+    public boolean isLobotomized() { return false; } // Kaiiju
+
+     protected void initAttributes() {}// Purpur
+ 
+     public Brain<?> getBrain() {
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
+index 7093c62be53fe99ed9880fc8ddaa07440fe4f715..2acbb26af2c24b2f4c569d55e8ba44a068fd9d86 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java
+@@ -16,6 +16,7 @@ public class FloatGoal extends Goal {
+ 
+     @Override
+     public boolean canUse() {
+        if (!this.mob.getLevel().kaiijuConfig.lobotomizeAnimalFloat && this.mob.isLobotomized()) return false; // Kaiiju
+         return this.mob.isInWater() && this.mob.getFluidHeight(FluidTags.WATER) > this.mob.getFluidJumpThreshold() || this.mob.isInLava();
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowParentGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowParentGoal.java
+index a668d5263586f955a5656ac66bcc7fe8cc51fe00..c195e60a7773f106775cded4f1c3ed51a69ca2f5 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowParentGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowParentGoal.java
+@@ -21,6 +21,7 @@ public class FollowParentGoal extends Goal {
+ 
+     @Override
+     public boolean canUse() {
+        if (this.animal.isLobotomized()) return false; // Kaiiju
+         if (this.animal.getAge() >= 0) {
+             return false;
+         } else {
+@@ -51,6 +52,7 @@ public class FollowParentGoal extends Goal {
+ 
+     @Override
+     public boolean canContinueToUse() {
+        if (this.animal.isLobotomized()) return false; // Kaiiju
+         if (this.animal.getAge() >= 0) {
+             return false;
+         } else if (!this.parent.isAlive()) {
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java
+index 8b189d7587303263efa1790066e5a83edd45f9d7..1304fc96834e4ce7156076fd893993a0aa75cbbc 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.java
+@@ -48,6 +48,7 @@ public class LookAtPlayerGoal extends Goal {
+ 
+     @Override
+     public boolean canUse() {
+        if (!mob.getLevel().kaiijuConfig.lobotomizeAnimalLookAtPlayer && this.mob.isLobotomized()) return false; // Kaiiju
+         if (this.mob.getRandom().nextFloat() >= this.probability) {
+             return false;
+         } else {
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/PanicGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/PanicGoal.java
+index 268b7457c2a93af6d36c1c5f623c5856f94a7af1..f1469e424f7bdf4e5813f250c0eae673db0b9049 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/PanicGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/PanicGoal.java
+@@ -29,6 +29,7 @@ public class PanicGoal extends Goal {
+ 
+     @Override
+     public boolean canUse() {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         if (!this.shouldPanic()) {
+             return false;
+         } else {
+@@ -81,6 +82,7 @@ public class PanicGoal extends Goal {
+ 
+     @Override
+     public boolean canContinueToUse() {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         // CraftBukkit start - introduce a temporary timeout hack until this is fixed properly
+         if ((this.mob.tickCount - this.mob.lastHurtByMobTimestamp) > 100) {
+             this.mob.setLastHurtByMob((LivingEntity) null);
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java
+index 216929c838446c3c14d9b9906ffa625ef35fcbc8..3ea2e7c44018ec63b8f17fd3e5e3a23e2b1f72e4 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java
+@@ -35,6 +35,7 @@ public class RandomStrollGoal extends Goal {
+ 
+     @Override
+     public boolean canUse() {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         if (this.mob.isVehicle()) {
+             return false;
+         } else {
+@@ -68,6 +69,7 @@ public class RandomStrollGoal extends Goal {
+ 
+     @Override
+     public boolean canContinueToUse() {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         return !this.mob.getNavigation().isDone() && !this.mob.isVehicle();
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
+index 2cbc9adc8e417def48be03d08174a5833068ec65..3234d5bf3b9ae01dbe8e26a0a3f21ff875fe6769 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
+@@ -43,6 +43,7 @@ public class TemptGoal extends Goal {
+ 
+     @Override
+     public boolean canUse() {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         if (this.calmDown > 0) {
+             --this.calmDown;
+             return false;
+@@ -67,6 +68,7 @@ public class TemptGoal extends Goal {
+ 
+     @Override
+     public boolean canContinueToUse() {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         if (this.canScare()) {
+             if (this.mob.distanceToSqr((Entity) this.player) < 36.0D) {
+                 if (this.player.distanceToSqr(this.px, this.py, this.pz) > 0.010000000000000002D) {
+diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+index 2f2d9bb31194618ef5bba39cd1cbe7c4919e82c5..0d8f1f063b76357374022e4496ce0646757b150e 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+@@ -197,6 +197,7 @@ public abstract class PathNavigation {
+     // Paper end
+ 
+     public boolean moveTo(Entity entity, double speed) {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         // Paper start - Pathfinding optimizations
+         if (this.pathfindFailures > 10 && this.path == null && net.minecraft.server.MinecraftServer.currentTick < this.lastFailure + 40) {
+             return false;
+@@ -217,6 +218,7 @@ public abstract class PathNavigation {
+     }
+ 
+     public boolean moveTo(@Nullable Path path, double speed) {
+        if (this.mob.isLobotomized()) return false; // Kaiiju
+         if (path == null) {
+             this.path = null;
+             return false;
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
+index 2ac88f06ebb79e515cd9934ac1e3e2c8003d9e3c..d89c0db4c4173d8558dc4f8b15ddb5815ef7c09e 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
+@@ -13,7 +13,6 @@ import net.minecraft.tags.BlockTags;
+ import net.minecraft.util.RandomSource;
+ import net.minecraft.world.InteractionHand;
+ import net.minecraft.world.InteractionResult;
+-import net.minecraft.world.damagesource.DamageSource;
+ import net.minecraft.world.entity.AgeableMob;
+ import net.minecraft.world.entity.EntityType;
+ import net.minecraft.world.entity.ExperienceOrb;
+@@ -39,6 +38,7 @@ public abstract class Animal extends AgeableMob {
+     @Nullable
+     public UUID loveCause;
+     public ItemStack breedItem; // CraftBukkit - Add breedItem variable
+    protected dev.kaiijumc.kaiiju.entity.Lobotomized lobotomized = new dev.kaiijumc.kaiiju.entity.Lobotomized(); // Kaiiju
+     public abstract int getPurpurBreedTime(); // Purpur
+ 
+     protected Animal(EntityType<? extends Animal> type, Level world) {
+@@ -74,8 +74,32 @@ public abstract class Animal extends AgeableMob {
+             }
+         }
+ 
+        this.lobotomized.checkLobotomized(this); // Kaiiju
+     }
+ 
+    // Kaiiju start
+    @Override
+    public void travel(net.minecraft.world.phys.Vec3 vec3) {
+        if (!this.isLobotomized() || net.minecraft.server.MinecraftServer.currentTick % 100 == 0) {
+            super.travel(vec3);
+        }
+    }
+
+    @Override
+    public boolean isCollidable(boolean ignoreClimbing) {
+        if (!this.isLobotomized() || net.minecraft.server.MinecraftServer.currentTick % 20 == 0) {
+            return super.isCollidable(ignoreClimbing);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isLobotomized() {
+        if (!this.level.kaiijuConfig.lobotomizeAnimalEnabled) return false;
+        return this.lobotomized.isLobotomized();
+    }
+    // Kaiiju end
+
+     /* CraftBukkit start
+     // Function disabled as it has no special function anymore after
+     // setSitting is disabled.
+@@ -102,6 +126,7 @@ public abstract class Animal extends AgeableMob {
+         if (this.loveCause != null) {
+             nbt.putUUID("LoveCause", this.loveCause);
+         }
+        nbt.putBoolean("Kaiiju.Lobotomized", this.lobotomized.isLobotomized()); // Kaiiju
+ 
+     }
+ 
+@@ -115,6 +140,13 @@ public abstract class Animal extends AgeableMob {
+         super.readAdditionalSaveData(nbt);
+         this.inLove = nbt.getInt("InLove");
+         this.loveCause = nbt.hasUUID("LoveCause") ? nbt.getUUID("LoveCause") : null;
+        // Kaiiju start
+        boolean isLobotomized = nbt.getBoolean("Kaiiju.Lobotomized");
+        this.lobotomized.setLobotomized(isLobotomized);
+        if (isLobotomized) {
+            this.onGround = true;
+        }
+        // Kaiiju end
+     }
+ 
+     public static boolean checkAnimalSpawnRules(EntityType<? extends Animal> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource random) {
+diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+index 87bd7991a81a2e30ecfccb60e614d7f13acd3744..1c2db953155498606f1e052580e7aa9ca846a53c 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+@@ -1047,6 +1047,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ 
+         @Override
+         public boolean canBeeUse() {
+            if (Bee.this.isLobotomized()) return false; // Kaiiju
+             return Bee.this.remainingCooldownBeforeLocatingNewHive == 0 && !Bee.this.hasHive() && Bee.this.wantsToEnterHive();
+         }
+ 
+@@ -1113,6 +1114,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ 
+         @Override
+         public boolean canBeeUse() {
+            if (Bee.this.isLobotomized()) return false; // Kaiiju
+             return Bee.this.hivePos != null && !Bee.this.hasRestriction() && Bee.this.wantsToEnterHive() && !this.hasReachedTarget(Bee.this.hivePos) && Bee.this.level.getBlockState(Bee.this.hivePos).is(BlockTags.BEEHIVES);
+         }
+ 
+@@ -1229,6 +1231,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ 
+         @Override
+         public boolean canBeeUse() {
+            if (Bee.this.isLobotomized()) return false; // Kaiiju
+             return Bee.this.savedFlowerPos != null && !Bee.this.hasRestriction() && this.wantsToGoToKnownFlower() && Bee.this.isFlowerValid(Bee.this.savedFlowerPos) && !Bee.this.closerThan(Bee.this.savedFlowerPos, 2);
+         }
+ 
+@@ -1281,6 +1284,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ 
+         @Override
+         public boolean canBeeUse() {
+            if (Bee.this.isLobotomized()) return false; // Kaiiju
+             return Bee.this.getCropsGrownSincePollination() >= 10 ? false : (Bee.this.random.nextFloat() < 0.3F ? false : Bee.this.hasNectar() && Bee.this.isHiveValid());
+         }
+ 
--- a/patches/server/0006-Send-null-entity-packets.patch
+++ b/patches/server/0006-Send-null-entity-packets.patch
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 16 Feb 2023 01:49:54 +0200
-Subject: [PATCH] Send null entity packets
-
-This is from Purpur. Don't send null entity packets.
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index fa829cef4033625470dfae29ddf777e6c5ab8c55..47e23a196ae5e44600a64184b69141c00235baca 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -203,7 +203,10 @@ public class KaiijuConfig {
-         else
-             linearFlushThreads = Math.max(linearFlushThreads, 1);
-     }
-+    
-+    public static boolean sendNullEntityPackets = true;
- 
-     private static void networkSettings() {
-+        sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 81d0b2933040a451441f660f9e46199ae3b111e3..cdbc4be679d7e096c1005eaf84b74c4877479c43 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -201,6 +201,11 @@ public class ServerEntity {
-                         flag4 = true;
-                         flag5 = true;
-                     }
-+                    // Kaiiju start - Don't send null move entity packets
-+                    if (!dev.kaiijumc.kaiiju.KaiijuConfig.sendNullEntityPackets && isNullMovePacket(packet1)) {
-+                        packet1 = null;
-+                    }
-+                    // Kaiiju end
-                 }
- 
-                 if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
-@@ -273,6 +278,20 @@ public class ServerEntity {
-         });
-     }
- 
-+    // Kaiiju start - Don't send null move entity packets
-+    private boolean isNullMovePacket(Packet<?> packet) {
-+        if (packet instanceof ClientboundMoveEntityPacket move) {
-+            if (packet instanceof ClientboundMoveEntityPacket.Pos)
-+                return move.getXa() == 0 && move.getYa() == 0 && move.getZa() == 0;
-+            if (packet instanceof ClientboundMoveEntityPacket.PosRot)
-+                return move.getXa() == 0 && move.getYa() == 0 && move.getZa() == 0 && move.getyRot() == 0 && move.getxRot() == 0;
-+            if (packet instanceof ClientboundMoveEntityPacket.Rot)
-+                return move.getyRot() == 0 && move.getxRot() == 0;
-+        }
-+        return false;
-+    }
-+    // Kaiiju end
-+
-     public void removePairing(ServerPlayer player) {
-         this.entity.stopSeenByPlayer(player);
-         player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
--- a/patches/server/0007-Alternate-Keepalive.patch
+++ b/patches/server/0007-Alternate-Keepalive.patch
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Fri, 31 Mar 2023 01:52:44 +0300
-Subject: [PATCH] Alternate Keepalive
-
-Don't kick players because 1 keepalive is lost.
-This patch is from Purpur.
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 47e23a196ae5e44600a64184b69141c00235baca..95b53b50606ea0ad47f407bebbb9e2bd445c0e66 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -205,8 +205,10 @@ public class KaiijuConfig {
-     }
-     
-     public static boolean sendNullEntityPackets = true;
-+    public static boolean alternateKeepAlive = false;
- 
-     private static void networkSettings() {
-         sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
-+        alternateKeepAlive = getBoolean("network.alternate-keepalive", alternateKeepAlive);
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b2feaea169fa9d3977c3dfdfdf3dea9283f5d854..1ab0d3e0653028b7d93177c28c1f532d8b10b1b1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -263,6 +263,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-     private long keepAliveTime = Util.getMillis();
-     private boolean keepAlivePending;
-     private long keepAliveChallenge;
-+    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Kaiiju
-     // CraftBukkit start - multithreaded fields
-     private final AtomicInteger chatSpamTickCount = new AtomicInteger();
-     private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
-@@ -355,6 +356,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-         long currentTime = Util.getMillis();
-         long elapsedTime = currentTime - this.keepAliveTime;
- 
-+        // Kaiiju start
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.alternateKeepAlive) {
-+            if (elapsedTime >= 1000L) { // 1 second
-+                if (!processedDisconnect && keepAlives.size() * 1000L >= KEEPALIVE_LIMIT) {
-+                    LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName());
-+                    disconnect(Component.translatable("disconnect.timeout"), org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT);
-+                } else {
-+                    keepAliveTime = currentTime; // hijack this field for 1 second intervals
-+                    keepAlives.add(currentTime); // currentTime is ID
-+                    send(new ClientboundKeepAlivePacket(currentTime));
-+                }
-+            }
-+        } else
-+        // Kaiiju end
-         if (this.keepAlivePending) {
-             if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
-                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3523,6 +3538,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-     @Override
-     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
-+        // Kaiiju start
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.alternateKeepAlive) {
-+            long id = packet.getId();
-+            if (keepAlives.size() > 0 && keepAlives.contains(id)) {
-+                int ping = (int) (Util.getMillis() - id);
-+                player.latency = (player.latency * 3 + ping) / 4;
-+                keepAlives.clear(); // we got a valid response, lets roll with it and forget the rest
-+            }
-+        } else
-+        // Kaiiju end
-         //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread
-         if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
-             int i = (int) (Util.getMillis() - this.keepAliveTime);
--- a/patches/server/0007-Kaiiju-Lobotomize-Villager.patch
+++ b/patches/server/0007-Kaiiju-Lobotomize-Villager.patch
@@ -0,0 +1,158 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kugge <sofiane.djerbi38@gmail.com>
+Date: Mon, 13 Feb 2023 00:53:40 +0100
+Subject: [PATCH] Kaiiju Lobotomize Villager
+
+
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+index d28f05943ef25aad1d5a0d4d3f72b991a3caaa5f..91034f553193381c470544ff068d4d7cfb82cc50 100644
+--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
+@@ -128,6 +128,11 @@ public class KaiijuWorldConfig {
+     public boolean lobotomizeAnimalCheckCanJump = true;
+     public boolean lobotomizeAnimalLookAtPlayer = false;
+     public boolean lobotomizeAnimalFloat = true;
+    public boolean lobotomizeVillagerEnabled = false;
+    public int lobotomizeVillagerCheckInterval = 100;
+    public boolean lobotomizeVillagerCheckCanJump = true;
+    public boolean lobotomizeVillagerCheckOnBed = true;
+    public boolean lobotomizeVillagerCheckActionBlock = true;
+ 
+     private void lobotomizeSettings() {
+         lobotomizeAnimalEnabled = getBoolean("lobotomize.animal.enabled", lobotomizeAnimalEnabled);
+@@ -135,5 +140,10 @@ public class KaiijuWorldConfig {
+         lobotomizeAnimalCheckCanJump = getBoolean("lobotomize.animal.check-can-jump", lobotomizeAnimalCheckCanJump);
+         lobotomizeAnimalLookAtPlayer = getBoolean("lobotomize.animal.look-at-player", lobotomizeAnimalLookAtPlayer);
+         lobotomizeAnimalFloat = getBoolean("lobotomize.animal.float", lobotomizeAnimalFloat);
+        lobotomizeVillagerEnabled = getBoolean("lobotomize.villager.enabled", lobotomizeVillagerEnabled);
+        lobotomizeVillagerCheckInterval = getInt("lobotomize.villager.check-interval", lobotomizeVillagerCheckInterval);
+        lobotomizeVillagerCheckCanJump = getBoolean("lobotomize.villager.check-can-jump", lobotomizeVillagerCheckCanJump);
+        lobotomizeVillagerCheckOnBed = getBoolean("lobotomize.villager.check-on-bed", lobotomizeVillagerCheckOnBed);
+        lobotomizeVillagerCheckActionBlock = getBoolean("lobotomize.villager.check-action-block", lobotomizeVillagerCheckActionBlock);
+     }
+ }
+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 aed1d9ccffe471b6c2a1d52d2d3d097f6431318b..0227e8d4f810c6fb90779cb3d257ca04ec927b79 100644
+--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
+@@ -200,14 +200,14 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+     }
+ 
+     private boolean checkLobotomized() {
+-        int interval = this.level.purpurConfig.villagerLobotomizeCheckInterval;
+        int interval = this.level.kaiijuConfig.lobotomizeVillagerCheckInterval; // Kaiiju
+         if (this.notLobotomizedCount > 3) {
+             // check half as often if not lobotomized for the last 3+ consecutive checks
+             interval *= 2;
+         }
+-        if (this.level.getGameTime() % interval == 0) {
+        if ((this.getId() + this.tickCount) % interval == 0) { // Kaiiju - Avoid check lags
+             // offset Y for short blocks like dirt_path/farmland
+-            this.isLobotomized = !canTravelFrom(new BlockPos(getX(), getY() + 0.0625D, getZ()));
+            this.isLobotomized = needLobotomy(); // Kaiiju - Override
+ 
+             if (this.isLobotomized) {
+                 this.notLobotomizedCount = 0;
+@@ -219,9 +219,76 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+     }
+ 
+     private boolean canTravelFrom(BlockPos pos) {
+-        return canTravelTo(pos.east()) || canTravelTo(pos.west()) || canTravelTo(pos.north()) || canTravelTo(pos.south());
+        return canInteractAt(pos.east()) || canInteractAt(pos.west()) || canInteractAt(pos.north()) || canInteractAt(pos.south()); // Kaiiju
+     }
+ 
+    // Kaiiju start - Customize canTravelTo checks
+    private boolean needLobotomy() {
+        if (this.isSleeping()) return false;
+        if (this.level.kaiijuConfig.lobotomizeVillagerCheckOnBed && isOnBed()) return false;
+        return !canTravelFrom(new BlockPos(getX(), getY() + 0.5D, getZ()));
+    }
+
+    private boolean canInteractAt(BlockPos pos) {
+        net.minecraft.world.level.block.state.BlockState top = null;
+        // Check if mob can jump over block
+        if (this.level.kaiijuConfig.lobotomizeVillagerCheckCanJump && this.canJump()) {
+            top = this.level.getBlockStateIfLoaded(pos.above());
+            if (top == null) return false;
+            if (top.isPathfindable(level, pos, net.minecraft.world.level.pathfinder.PathComputationType.LAND)) {
+                net.minecraft.world.level.block.state.BlockState above = this.level.getBlockState(pos.above(2));
+                if (above.isPathfindable(level, pos, net.minecraft.world.level.pathfinder.PathComputationType.LAND)) return true;
+            }
+        }
+        // Otherwise, check if mob can interact with bottom block
+        net.minecraft.world.level.block.state.BlockState bottom = this.level.getBlockStateIfLoaded(pos);
+        if (bottom == null) return false;
+        net.minecraft.world.level.block.Block bottomBlock = bottom.getBlock();
+        if (isTallBlock(bottomBlock)) return false;
+        if (this.level.kaiijuConfig.lobotomizeVillagerCheckActionBlock && isInteractiveBlock(bottomBlock, this.getVillagerData().getProfession())) return true;
+        // If he can't interact, check if he can travel
+        if (!bottom.isPathfindable(level, pos, net.minecraft.world.level.pathfinder.PathComputationType.LAND)) return false;
+        if (top == null) top = this.level.getBlockState(pos.above());
+        return top.isPathfindable(level, pos, net.minecraft.world.level.pathfinder.PathComputationType.LAND);
+    }
+
+    private boolean canJump() {
+        BlockPos pos = new BlockPos(getX(), getY() + 2.5D, getZ());
+        net.minecraft.world.level.block.Block above = this.level.getBlockIfLoaded(pos);
+        return !above.hasCollision;
+    }
+
+    private boolean isOnBed() {
+        BlockPos pos = new BlockPos(getX(), getY() - 0.5D, getZ());
+        net.minecraft.world.level.block.Block below = this.level.getBlockIfLoaded(pos);
+        return below instanceof net.minecraft.world.level.block.BedBlock;
+    }
+
+    private static boolean isInteractiveBlock(net.minecraft.world.level.block.Block block, VillagerProfession profession) {
+        if (block instanceof net.minecraft.world.level.block.BedBlock) return true;
+        if (profession == VillagerProfession.NITWIT) return false;
+        return (block instanceof net.minecraft.world.level.block.BlastFurnaceBlock && profession != VillagerProfession.ARMORER) ||
+               (block instanceof net.minecraft.world.level.block.SmokerBlock && profession != VillagerProfession.BUTCHER) ||
+               (block instanceof net.minecraft.world.level.block.CartographyTableBlock && profession != VillagerProfession.CARTOGRAPHER) ||
+               (block instanceof net.minecraft.world.level.block.BrewingStandBlock && profession != VillagerProfession.CLERIC) ||
+               (block instanceof net.minecraft.world.level.block.ComposterBlock && profession != VillagerProfession.FARMER) ||
+               (block instanceof net.minecraft.world.level.block.BarrelBlock && profession != VillagerProfession.FISHERMAN) ||
+               (block instanceof net.minecraft.world.level.block.FletchingTableBlock && profession != VillagerProfession.FLETCHER) ||
+               (block instanceof net.minecraft.world.level.block.CauldronBlock && profession != VillagerProfession.LEATHERWORKER) ||
+               (block instanceof net.minecraft.world.level.block.LecternBlock && profession != VillagerProfession.LIBRARIAN) ||
+               (block instanceof net.minecraft.world.level.block.StonecutterBlock && profession != VillagerProfession.MASON) ||
+               (block instanceof net.minecraft.world.level.block.LoomBlock && profession != VillagerProfession.SHEPHERD) ||
+               (block instanceof net.minecraft.world.level.block.SmithingTableBlock && profession != VillagerProfession.TOOLSMITH) ||
+               (block instanceof net.minecraft.world.level.block.GrindstoneBlock && profession != VillagerProfession.WEAPONSMITH);
+    }
+
+    private static boolean isTallBlock(net.minecraft.world.level.block.Block block) {
+        return block instanceof net.minecraft.world.level.block.FenceBlock ||
+               block instanceof net.minecraft.world.level.block.FenceGateBlock ||
+               block instanceof net.minecraft.world.level.block.WallBlock;
+    }
+    // Kaiiju end
+
+     private boolean canTravelTo(BlockPos pos) {
+         net.minecraft.world.level.block.state.BlockState state = this.level.getBlockStateIfLoaded(pos);
+         if (state == null) {
+@@ -337,7 +404,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+     protected void mobTick(boolean inactive) {
+         //this.level.getProfiler().push("villagerBrain"); // Purpur
+         // Purpur start
+-        if (this.level.purpurConfig.villagerLobotomizeEnabled) {
+        if (this.level.kaiijuConfig.lobotomizeVillagerEnabled) { // Kaiiju - Override
+             // treat as inactive if lobotomized
+             inactive = inactive || checkLobotomized();
+         } else {
+@@ -647,6 +714,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+         if (this.assignProfessionWhenSpawned) {
+             nbt.putBoolean("AssignProfessionWhenSpawned", true);
+         }
+        nbt.putBoolean("Kaiiju.Lobotomized", this.isLobotomized()); // Kaiiju
+ 
+     }
+ 
+@@ -687,6 +755,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+         if (nbt.contains("AssignProfessionWhenSpawned")) {
+             this.assignProfessionWhenSpawned = nbt.getBoolean("AssignProfessionWhenSpawned");
+         }
+        this.isLobotomized = nbt.getBoolean("Kaiiju.Lobotomized"); // Kaiiju
+ 
+     }
+ 
--- a/patches/server/0008-Optimization-Configuration.patch
+++ b/patches/server/0008-Optimization-Configuration.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: kugge <sofiane.djerbi38@gmail.com>
-Date: Wed, 21 Jun 2023 17:26:24 +0200
-Subject: [PATCH] Optimization Configuration
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 95b53b50606ea0ad47f407bebbb9e2bd445c0e66..8aab072a21b0775338b8235a84f5f675f385cf37 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -211,4 +211,7 @@ public class KaiijuConfig {
-         sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
-         alternateKeepAlive = getBoolean("network.alternate-keepalive", alternateKeepAlive);
-     }
-+
-+    private static void optimizationSettings() {
-+    }
- }
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index a6e7af5f4148e067660e9f5beeacde3a59a1de9c..6bd14857e0b0ef233f17f1a6e3e0fb313d59f641 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -143,4 +143,7 @@ public class KaiijuWorldConfig {
-             regionFormatLinearCompressionLevel = 1;
-         }
-     }
-+
-+    private void optimizationSettings() {
-+    }
- }
--- a/patches/server/0009-Gameplay-Configuration.patch
+++ b/patches/server/0009-Gameplay-Configuration.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sat, 8 Apr 2023 23:32:34 +0300
-Subject: [PATCH] Gameplay Configuration
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 8aab072a21b0775338b8235a84f5f675f385cf37..46ae5b84ee5b87b0ed0b93e920689e44288a50d2 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -214,4 +214,7 @@ public class KaiijuConfig {
- 
-     private static void optimizationSettings() {
-     }
-+
-+    private static void gameplaySettings() {
-+    }
- }
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 6bd14857e0b0ef233f17f1a6e3e0fb313d59f641..05f9c01131e78927d88f1170c3eda4adf25ac8ba 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -146,4 +146,7 @@ public class KaiijuWorldConfig {
- 
-     private void optimizationSettings() {
-     }
-+
-+    private void gameplaySettings() {
-+    }
- }
--- a/patches/server/0010-Shulker-drop-contents-when-destroyed.patch
+++ b/patches/server/0010-Shulker-drop-contents-when-destroyed.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Sat, 8 Apr 2023 23:38:13 +0300
-Subject: [PATCH] Shulker drop contents when destroyed
-
-Don't drop shulker contents when shulker items are destroyed (by cactus,
-lava..)
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 05f9c01131e78927d88f1170c3eda4adf25ac8ba..55dcbb48450b24f80e0a04bedeb54f64e94ebb9e 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -144,7 +144,10 @@ public class KaiijuWorldConfig {
-         }
-     }
- 
-+    public boolean shulkerBoxDropContentsWhenDestroyed = true;
-+
-     private void optimizationSettings() {
-+        shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-     }
- 
-     private void gameplaySettings() {
-diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index ebee8de2ed831755b6fd154f6cc77ac993839bb9..ce5faefe3b67087509833800f0472f14131f2011 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -288,7 +288,7 @@ public class BlockItem extends Item {
- 
-     @Override
-     public void onDestroyed(ItemEntity entity) {
-        if (this.block instanceof ShulkerBoxBlock) {
-+        if (this.block instanceof ShulkerBoxBlock && entity.level().kaiijuConfig.shulkerBoxDropContentsWhenDestroyed) { // Kaiiju
-             ItemStack itemstack = entity.getItem();
-             CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack);
- 
--- a/patches/server/0011-Server-mod-name.patch
+++ b/patches/server/0011-Server-mod-name.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 9 Apr 2023 17:06:46 +0300
-Subject: [PATCH] Server mod name
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 46ae5b84ee5b87b0ed0b93e920689e44288a50d2..778de435ca3c13ccc2f2d86030e3529436a2d945 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -215,6 +215,9 @@ public class KaiijuConfig {
-     private static void optimizationSettings() {
-     }
- 
-+    public static String serverModName = "Kaiiju";
-+
-     private static void gameplaySettings() {
-+        serverModName = getString("gameplay.server-mod-name", serverModName);
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bc9204d2c925437e9ff5c5d62d9faf38c2938e48..5168d16b7e9ed08bdedd0e386f9671a63b6859be 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1812,7 +1812,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     @DontObfuscate
-     public String getServerModName() {
-        return "Kaiiju"; // Kaiiju - Kaiiju > // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return dev.kaiijumc.kaiiju.KaiijuConfig.serverModName; // Kaiiju - Kaiiju > // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-     }
- 
-     public SystemReport fillSystemReport(SystemReport details) {
--- a/patches/server/0012-Crash-on-broken-symlink.patch
+++ b/patches/server/0012-Crash-on-broken-symlink.patch
@@ -1,227 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Fri, 14 Apr 2023 02:12:58 +0200
-Subject: [PATCH] Crash on broken symlink
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 55dcbb48450b24f80e0a04bedeb54f64e94ebb9e..f3f824d0ab1a2a72825c40b67192386479a0b34c 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -127,6 +127,7 @@ public class KaiijuWorldConfig {
-     }
- 
-     public RegionFileFormat regionFormatName = RegionFileFormat.ANVIL;
-+    public boolean linearCrashOnBrokenSymlink = true;
-     public int regionFormatLinearCompressionLevel = 1;
- 
-     private void regionFormatSettings() {
-@@ -142,6 +143,7 @@ public class KaiijuWorldConfig {
-             log(Level.SEVERE, "Falling back to compression level 1.");
-             regionFormatLinearCompressionLevel = 1;
-         }
-+        linearCrashOnBrokenSymlink = getBoolean("region-format.linear.crash-on-broken-symlink", linearCrashOnBrokenSymlink);
-     }
- 
-     public boolean shulkerBoxDropContentsWhenDestroyed = true;
-diff --git a/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java b/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java
-index abf5e2a06af9853b58ac9107cd6e9787c4185c66..389c68c0becd2f69dc1004d0b383f1a8784214c0 100644
--- a/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java
-+++ b/src/main/java/io/papermc/paper/world/ThreadedWorldUpgrader.java
-@@ -87,10 +87,11 @@ public class ThreadedWorldUpgrader {
-         // Kaiiju start
-         dev.kaiijumc.kaiiju.region.RegionFileFormat formatName = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().kaiijuConfig.regionFormatName;
-         int linearCompression = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().kaiijuConfig.regionFormatLinearCompressionLevel;
-+        boolean linearCrashOnBrokenSymlink = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().kaiijuConfig.linearCrashOnBrokenSymlink;
-         LOGGER.info("Using format " + formatName + " (" + linearCompression + ")");
-         // Kaiiju end
-         final WorldInfo info = new WorldInfo(() -> worldPersistentData,
-                new ChunkStorage(formatName, linearCompression, regionFolder.toPath(), this.dataFixer, false), this.removeCaches, this.dimensionType, this.generatorKey); // Kaiiju
-+                new ChunkStorage(formatName, linearCompression, linearCrashOnBrokenSymlink, regionFolder.toPath(), this.dataFixer, false), this.removeCaches, this.dimensionType, this.generatorKey); // Kaiiju
- 
-         long expectedChunks = (long)regionFiles.length * (32L * 32L);
- 
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c4d28d887b4cc71dc713b1e3f46bc80f4484a95d..f50507ab85282d261985ce9b186581f5a7a50f79 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -269,7 +269,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     // Paper end
- 
-     public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
-        super(world.getLevel().kaiijuConfig.regionFormatName, world.getLevel().kaiijuConfig.regionFormatLinearCompressionLevel, session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync); // Kaiiju
-+        super(world.getLevel().kaiijuConfig.regionFormatName, world.getLevel().kaiijuConfig.regionFormatLinearCompressionLevel, world.getLevel().kaiijuConfig.linearCrashOnBrokenSymlink, session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync); // Kaiiju
-         // Paper - rewrite chunk system
-         this.tickingGenerated = new AtomicInteger();
-         //this.playerMap = new PlayerMap(); // Folia - region threading
-@@ -314,7 +314,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         this.lightEngine = new ThreadedLevelLightEngine(chunkProvider, this, this.level.dimensionType().hasSkyLight(), null, null); // Paper - rewrite chunk system
-         this.distanceManager = new ChunkMap.ChunkDistanceManager(executor, mainThreadExecutor);
-         this.overworldDataStorage = persistentStateManagerFactory;
-        this.poiManager = new PoiManager(this.level.kaiijuConfig.regionFormatName, this.level.kaiijuConfig.regionFormatLinearCompressionLevel, path.resolve("poi"), dataFixer, dsync, iregistrycustom, world); // Kaiiju
-+        this.poiManager = new PoiManager(this.level.kaiijuConfig.regionFormatName, this.level.kaiijuConfig.regionFormatLinearCompressionLevel, this.level.kaiijuConfig.linearCrashOnBrokenSymlink, path.resolve("poi"), dataFixer, dsync, iregistrycustom, world); // Kaiiju
-         this.setViewDistance(viewDistance);
-         // Paper start
-         this.dataRegionManager = new io.papermc.paper.chunk.SingleThreadChunkRegionManager(this.level, 2, (1.0 / 3.0), 1, 6, "Data", DataRegionData::new, DataRegionSectionData::new);
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e6e985e8e2c7cccb2c3395ae3fbc30072e1d48f0..ad896c8a3060f5c8d85a8b5707317de646bf9cae 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -453,8 +453,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
- 
-     private static final class EntityRegionFileStorage extends net.minecraft.world.level.chunk.storage.RegionFileStorage {
- 
-        public EntityRegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path directory, boolean dsync) { // Kaiiju
-            super(format, linearCompression, directory, dsync); // Kaiiju
-+        public EntityRegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, boolean linearCrashOnBrokenSymlink, Path directory, boolean dsync) { // Kaiiju
-+            super(format, linearCompression, linearCrashOnBrokenSymlink, directory, dsync); // Kaiiju
-         }
- 
-         protected void write(ChunkPos pos, net.minecraft.nbt.CompoundTag nbt) throws IOException {
-@@ -693,7 +693,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         // CraftBukkit end
-         boolean flag2 = minecraftserver.forceSynchronousWrites();
-         DataFixer datafixer = minecraftserver.getFixerUpper();
-        this.entityStorage = new EntityRegionFileStorage(this.getLevel().kaiijuConfig.regionFormatName, this.getLevel().kaiijuConfig.regionFormatLinearCompressionLevel, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), flag2); // Paper - rewrite chunk system  //EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver); // Kaiiju
-+        this.entityStorage = new EntityRegionFileStorage(this.getLevel().kaiijuConfig.regionFormatName, this.getLevel().kaiijuConfig.regionFormatLinearCompressionLevel, this.getLevel().kaiijuConfig.linearCrashOnBrokenSymlink, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), flag2); // Paper - rewrite chunk system  //EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver); // Kaiiju
- 
-         // this.entityManager = new PersistentEntitySectionManager<>(Entity.class, new ServerLevel.EntityCallbacks(), entitypersistentstorage, this.entitySliceManager); // Paper // Paper - rewrite chunk system
-         StructureTemplateManager structuretemplatemanager = minecraftserver.getStructureManager();
-diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
-index ac35e7eb8cb5f19391a18eb9d6b5ba26769ce2f6..a9c6ca7c621bb2431bcf0ae879b192f748bf931b 100644
--- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
-+++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
-@@ -120,7 +120,8 @@ public class WorldUpgrader {
-                 String worldName = this.levelStorage.getLevelId();
-                 dev.kaiijumc.kaiiju.region.RegionFileFormat formatName = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().kaiijuConfig.regionFormatName;
-                 int linearCompression = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().kaiijuConfig.regionFormatLinearCompressionLevel;
-                builder1.put(resourcekey1, new ChunkStorage(formatName, linearCompression, path.resolve("region"), this.dataFixer, true));
-+                boolean linearCrashOnBrokenSymlink = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getWorld(worldName)).getHandle().kaiijuConfig.linearCrashOnBrokenSymlink;
-+                builder1.put(resourcekey1, new ChunkStorage(formatName, linearCompression, linearCrashOnBrokenSymlink, path.resolve("region"), this.dataFixer, true));
-                 // Kaiiju end
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-index 187ff795192c7eb56dffafa1ff6fa3068ac341c3..b9cf3b9f2cdb554d267c6dc3436e011c7e607228 100644
--- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-@@ -59,8 +59,8 @@ public class PoiManager extends SectionStorage<PoiSection> {
-     // Paper end - rewrite chunk system
- 
- 
-    public PoiManager(dev.kaiijumc.kaiiju.region.RegionFileFormat formatName, int linearCompression, Path path, DataFixer dataFixer, boolean dsync, RegistryAccess registryManager, LevelHeightAccessor world) { // Kaiiju
-        super(formatName, linearCompression, path, PoiSection::codec, PoiSection::new, dataFixer, DataFixTypes.POI_CHUNK, dsync, registryManager, world); // Kaiiju
-+    public PoiManager(dev.kaiijumc.kaiiju.region.RegionFileFormat formatName, int linearCompression, boolean linearCrashOnBrokenSymlink, Path path, DataFixer dataFixer, boolean dsync, RegistryAccess registryManager, LevelHeightAccessor world) { // Kaiiju
-+        super(formatName, linearCompression, linearCrashOnBrokenSymlink, path, PoiSection::codec, PoiSection::new, dataFixer, DataFixTypes.POI_CHUNK, dsync, registryManager, world); // Kaiiju
-         this.world = (net.minecraft.server.level.ServerLevel)world; // Paper - rewrite chunk system
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-index 1d880f27dd147da683fc30ed6f1bfa43ecdb7d93..41598adf6d49a44bcaadfff3797221460a6d93ba 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-@@ -37,11 +37,11 @@ public class ChunkStorage implements AutoCloseable {
-     public final RegionFileStorage regionFileCache;
-     // Paper end - async chunk loading
- 
-    public ChunkStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path directory, DataFixer dataFixer, boolean dsync) { // Kaiiju
-+    public ChunkStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, boolean linearCrashOnBrokenSymlink, Path directory, DataFixer dataFixer, boolean dsync) { // Kaiiju
-         this.fixerUpper = dataFixer;
-         // Paper start - async chunk io
-         // remove IO worker
-        this.regionFileCache = new RegionFileStorage(format, linearCompression, directory, dsync, true); // Paper - nuke IOWorker // Paper
-+        this.regionFileCache = new RegionFileStorage(format, linearCompression, linearCrashOnBrokenSymlink, directory, dsync, true); // Paper - nuke IOWorker // Paper
-         // Paper end - async chunk io
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index e91e8aef8b63ea9d94e0ecb3e4a62655a8c77ce1..bbc6a0c70cbafbfa411ab418e4fec11ad101ae91 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -20,6 +20,7 @@ import net.minecraft.world.level.ChunkPos;
- 
- public class RegionFileStorage implements AutoCloseable {
- 
-+    private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Kaiiju
-     public static final String ANVIL_EXTENSION = ".mca";
-     private static final int MAX_CACHE_SIZE = 256;
-     public final Long2ObjectLinkedOpenHashMap<dev.kaiijumc.kaiiju.region.AbstractRegionFile> regionCache = new Long2ObjectLinkedOpenHashMap(); // Kaiiju
-@@ -28,6 +29,7 @@ public class RegionFileStorage implements AutoCloseable {
-     // Kaiiju start - Per world chunk format
-     public final dev.kaiijumc.kaiiju.region.RegionFileFormat format;
-     public final int linearCompression;
-+    public final boolean linearCrashOnBrokenSymlink;
-     // Kaiiju end
-     private final boolean isChunkData; // Paper
- 
-@@ -60,14 +62,15 @@ public class RegionFileStorage implements AutoCloseable {
-     }
-     // Paper end - cache regionfile does not exist state
- 
-    protected RegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path directory, boolean dsync) { // Paper - protected constructor
-+    protected RegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, boolean linearCrashOnBrokenSymlink, Path directory, boolean dsync) { // Paper - protected constructor
-         // Paper start - add isChunkData param
-        this(format, linearCompression, directory, dsync, false);
-+        this(format, linearCompression, linearCrashOnBrokenSymlink, directory, dsync, false);
-     }
-    RegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path directory, boolean dsync, boolean isChunkData) { // Kaiiju
-+    RegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, boolean linearCrashOnBrokenSymlink, Path directory, boolean dsync, boolean isChunkData) { // Kaiiju
-         // Kaiiju start
-         this.format = format;
-         this.linearCompression = linearCompression;
-+        this.linearCrashOnBrokenSymlink = linearCrashOnBrokenSymlink;
-         // Kaiiju end
-         this.isChunkData = isChunkData;
-         // Paper end - add isChunkData param
-@@ -111,6 +114,20 @@ public class RegionFileStorage implements AutoCloseable {
-         return regionfile != null ? regionfile.hasChunk(pos) : false;
-     }
- 
-+    // Kaiiju start
-+    private void guardAgainstBrokenSymlinks(Path path) throws IOException {
-+        if (!linearCrashOnBrokenSymlink) return;
-+        if (!this.format.equals("LINEAR")) return;
-+        if (!java.nio.file.Files.isSymbolicLink(path)) return;
-+        Path link = java.nio.file.Files.readSymbolicLink(path);
-+        if (!java.nio.file.Files.exists(link) || !java.nio.file.Files.isReadable(link)) {
-+            LOGGER.error("Linear region file {} is a broken symbolic link, crashing to prevent data loss", path);
-+            net.minecraft.server.MinecraftServer.getServer().halt(false);
-+            throw new IOException("Linear region file " + path + " is a broken symbolic link, crashing to prevent data loss");
-+        }
-+    }
-+    // Kaiiju end
-+
-     public synchronized dev.kaiijumc.kaiiju.region.AbstractRegionFile getRegionFile(ChunkPos chunkcoordintpair, boolean existingOnly) throws IOException { // CraftBukkit // Kaiiju
-         return this.getRegionFile(chunkcoordintpair, existingOnly, false);
-     }
-@@ -146,6 +163,7 @@ public class RegionFileStorage implements AutoCloseable {
-             if (existingOnly) {
-                 Path anvil = path.resolve("r." + j + "." + chunkcoordintpair.getRegionZ() + ".mca");
-                 Path linear = path.resolve("r." + j + "." + chunkcoordintpair.getRegionZ() + ".linear");
-+                guardAgainstBrokenSymlinks(linear);
-                 if (java.nio.file.Files.exists(anvil)) path1 = anvil;
-                 else if (java.nio.file.Files.exists(linear)) path1 = linear;
-                 else {
-@@ -161,6 +179,7 @@ public class RegionFileStorage implements AutoCloseable {
-                 };
-                 path1 = path.resolve("r." + j + "." + chunkcoordintpair.getRegionZ() + "." + extension);
-                 // Kaiiju end
-+                guardAgainstBrokenSymlinks(path1); // Kaiiju - Crash on broken symlink
-                 this.createRegionFile(regionPos);
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 9394d191c56aab78e63fd3f283efedd69384e323..dcfe4a285cc5865be3b0c1b8104b722895135dd0 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
-@@ -47,8 +47,8 @@ public class SectionStorage<R> extends RegionFileStorage implements AutoCloseabl
-     public final RegistryAccess registryAccess; // Paper - rewrite chunk system
-     protected final LevelHeightAccessor levelHeightAccessor;
- 
-    public SectionStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path path, Function<Runnable, Codec<R>> codecFactory, Function<Runnable, R> factory, DataFixer dataFixer, DataFixTypes dataFixTypes, boolean dsync, RegistryAccess dynamicRegistryManager, LevelHeightAccessor world) { // Kaiiju
-        super(format, linearCompression, path, dsync); // Paper - remove mojang I/O thread // Kaiiju
-+    public SectionStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, boolean linearCrashOnBrokenSymlink, Path path, Function<Runnable, Codec<R>> codecFactory, Function<Runnable, R> factory, DataFixer dataFixer, DataFixTypes dataFixTypes, boolean dsync, RegistryAccess dynamicRegistryManager, LevelHeightAccessor world) { // Kaiiju
-+        super(format, linearCompression, linearCrashOnBrokenSymlink, path, dsync); // Paper - remove mojang I/O thread // Kaiiju
-         this.codec = codecFactory;
-         this.factory = factory;
-         this.fixerUpper = dataFixer;
--- a/patches/server/0013-Toggle-void-trading.patch
+++ b/patches/server/0013-Toggle-void-trading.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 23 Apr 2023 15:34:30 +0300
-Subject: [PATCH] Toggle void trading
-
-Don't close trading windows when the villager is unloaded.
-You should set chunk-unloads to 0s in paper config file to enable void
-trading. Or use Kaiivoid plugin.
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index f3f824d0ab1a2a72825c40b67192386479a0b34c..95ed6cb7b94797187d1011cab344e187b39d9193 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -152,6 +152,9 @@ public class KaiijuWorldConfig {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-     }
- 
-+    public boolean fixVoidTrading = true;
-+
-     private void gameplaySettings() {
-+        fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading);
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ad896c8a3060f5c8d85a8b5707317de646bf9cae..0df4672abb5e87587da8712b6febf6312e241cda 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2865,7 +2865,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             // Spigot Start
-             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
-                 // Paper start
-                if (entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) {
-+                if (entity.level().kaiijuConfig.fixVoidTrading && entity.getBukkitEntity() instanceof org.bukkit.inventory.Merchant merchant && merchant.getTrader() != null) { // Kaiiju
-                     merchant.getTrader().closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED);
-                 }
-                 // Paper end
--- a/patches/server/0014-Toggle-optimize-hoppers.patch
+++ b/patches/server/0014-Toggle-optimize-hoppers.patch
@@ -1,219 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 27 Apr 2023 03:49:08 +0300
-Subject: [PATCH] Toggle optimize hoppers
-
-Paper optimize hoppers patch break a lot of technical redstone farms because of piston updates. (Example: twiti888 wood farm)
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 95ed6cb7b94797187d1011cab344e187b39d9193..6d7356cc07da58b1cef8d8963e790251d765de2c 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -147,9 +147,11 @@ public class KaiijuWorldConfig {
-     }
- 
-     public boolean shulkerBoxDropContentsWhenDestroyed = true;
-+    public boolean optimizeHoppers = true;
- 
-     private void optimizationSettings() {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-+        optimizeHoppers = getBoolean("optimization.optimize-hoppers", optimizeHoppers);
-     }
- 
-     public boolean fixVoidTrading = true;
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 4825a74ce4893dafdb70ae1badf3d2e1930d01a1..762b763f271c3208b4f8a7e346897207ec5beb6c 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -401,49 +401,51 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-             if (HopperBlockEntity.isFullContainer(iinventory1, enumdirection)) {
-                 return false;
-             } else {
-+                // Kaiiju start - Toggle paper broken redstone
-                 // Paper start - replace logic; MAKE SURE TO CHECK FOR DIFFS ON UPDATES
-                return hopperPush(world, iinventory1, enumdirection, hopper);
-                // for (int i = 0; i < iinventory.getContainerSize(); ++i) {
-                //     if (!iinventory.getItem(i).isEmpty()) {
-                //         ItemStack itemstack = iinventory.getItem(i).copy();
-                //         // ItemStack itemstack1 = addItem(iinventory, iinventory1, iinventory.removeItem(i, 1), enumdirection);
-
-                //         // CraftBukkit start - Call event when pushing items into other inventories
-                //         CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, world.spigotConfig.hopperAmount)); // Spigot
-
-                //         Inventory destinationInventory;
-                //        // Have to special case large chests as they work oddly
-                //         if (iinventory1 instanceof CompoundContainer) {
-                //             destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) iinventory1);
-                //         } else if (iinventory1.getOwner() != null) {
-                //             destinationInventory = iinventory1.getOwner().getInventory();
-                //         } else {
-                //             destinationInventory = new CraftInventory(iinventory);
-                //         }
-
-                //         InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
-                //         world.getCraftServer().getPluginManager().callEvent(event);
-                //         if (event.isCancelled()) {
-                //             hopper.setItem(i, itemstack);
-                //             hopper.setCooldown(world.spigotConfig.hopperTransfer); // Spigot
-                //             return false;
-                //         }
-                //         int origCount = event.getItem().getAmount(); // Spigot
-                //         ItemStack itemstack1 = HopperBlockEntity.addItem(iinventory, iinventory1, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
-+                if (world.kaiijuConfig.optimizeHoppers) return hopperPush(world, iinventory1, enumdirection, hopper);
-+                for (int i = 0; i < iinventory.getContainerSize(); ++i) {
-+                    if (!iinventory.getItem(i).isEmpty()) {
-+                        ItemStack itemstack = iinventory.getItem(i).copy();
-+                        // ItemStack itemstack1 = addItem(iinventory, iinventory1, iinventory.removeItem(i, 1), enumdirection);
-+
-+                        // CraftBukkit start - Call event when pushing items into other inventories
-+                        CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, world.spigotConfig.hopperAmount)); // Spigot
-+
-+                        Inventory destinationInventory;
-+                       // Have to special case large chests as they work oddly
-+                        if (iinventory1 instanceof CompoundContainer) {
-+                            destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) iinventory1);
-+                        } else if (iinventory1.getOwner() != null) {
-+                            destinationInventory = iinventory1.getOwner().getInventory();
-+                        } else {
-+                            destinationInventory = new CraftInventory(iinventory);
-+                        }
-+
-+                        InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
-+                        world.getCraftServer().getPluginManager().callEvent(event);
-+                        if (event.isCancelled()) {
-+                            hopper.setItem(i, itemstack);
-+                            hopper.setCooldown(world.spigotConfig.hopperTransfer); // Spigot
-+                            return false;
-+                        }
-+                        int origCount = event.getItem().getAmount(); // Spigot
-+                        ItemStack itemstack1 = HopperBlockEntity.addItem(iinventory, iinventory1, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
-                         // CraftBukkit end
- 
-                //         if (itemstack1.isEmpty()) {
-                //             iinventory1.setChanged();
-                //             return true;
-                //         }
-+                        if (itemstack1.isEmpty()) {
-+                            iinventory1.setChanged();
-+                            return true;
-+                        }
- 
-                //         itemstack.shrink(origCount - itemstack1.getCount()); // Spigot
-                //         iinventory.setItem(i, itemstack);
-                //     }
-                // }
-+                        itemstack.shrink(origCount - itemstack1.getCount()); // Spigot
-+                        iinventory.setItem(i, itemstack);
-+                    }
-+                }
- 
-                // return false;
-+                return false;
-                 // Paper end
-+                // Kaiiju end
-             }
-         }
-     }
-@@ -467,6 +469,12 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-         if (iinventory != null) {
-             Direction enumdirection = Direction.DOWN;
- 
-+            // Kaiiju start - toggle paper broken redstone
-+            if (!world.kaiijuConfig.optimizeHoppers)
-+            return HopperBlockEntity.isEmptyContainer(iinventory, enumdirection) ? false : HopperBlockEntity.getSlots(iinventory, enumdirection).anyMatch((i) -> {
-+                return HopperBlockEntity.a(hopper, iinventory, i, enumdirection, world); // Spigot
-+            });
-+            // Kaiiju end
-             // Paper start - optimize hoppers and remove streams
-             worldData.skipPullModeEventFire = worldData.skipHopperEvents; // Folia - region threading
-             return !HopperBlockEntity.isEmptyContainer(iinventory, enumdirection) && anyMatch(iinventory, enumdirection, (item, i) -> {
-@@ -499,48 +507,50 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-     private static boolean a(Hopper ihopper, Container iinventory, int i, Direction enumdirection, Level world) { // Spigot
-         ItemStack itemstack = iinventory.getItem(i);
- 
-+        // Kaiiju start - toggle paper broken redstone
-         // Paper start - replace pull logic; MAKE SURE TO CHECK FOR DIFFS WHEN UPDATING
-         if (!itemstack.isEmpty() && HopperBlockEntity.canTakeItemFromContainer(ihopper, iinventory, itemstack, i, enumdirection)) { // If this logic changes, update above. this is left unused incase reflective plugins
-            return hopperPull(world, ihopper, iinventory, itemstack, i);
-            // ItemStack itemstack1 = itemstack.copy();
-            // // ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.removeItem(i, 1), (EnumDirection) null);
-            // // CraftBukkit start - Call event on collection of items from inventories into the hopper
-            // CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, world.spigotConfig.hopperAmount)); // Spigot
-
-            // Inventory sourceInventory;
-            // // Have to special case large chests as they work oddly
-            // if (iinventory instanceof CompoundContainer) {
-            //     sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) iinventory);
-            // } else if (iinventory.getOwner() != null) {
-            //     sourceInventory = iinventory.getOwner().getInventory();
-            // } else {
-            //     sourceInventory = new CraftInventory(iinventory);
-            // }
-
-            // InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory, oitemstack.clone(), ihopper.getOwner().getInventory(), false);
-
-            // Bukkit.getServer().getPluginManager().callEvent(event);
-            // if (event.isCancelled()) {
-            //     iinventory.setItem(i, itemstack1);
-
-                // if (ihopper instanceof HopperBlockEntity) {
-                //     ((HopperBlockEntity) ihopper).setCooldown(world.spigotConfig.hopperTransfer); // Spigot
-                // }
-
-                // return false;
-            // }
-            // int origCount = event.getItem().getAmount(); // Spigot
-            // ItemStack itemstack2 = HopperBlockEntity.addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
-            // // CraftBukkit end
-
-            // if (itemstack2.isEmpty()) {
-            //     iinventory.setChanged();
-            //     return true;
-            // }
-
-            // itemstack1.shrink(origCount - itemstack2.getCount()); // Spigot
-            // iinventory.setItem(i, itemstack1);
-+            if (world.kaiijuConfig.optimizeHoppers) return hopperPull(world, ihopper, iinventory, itemstack, i);
-+            ItemStack itemstack1 = itemstack.copy();
-+            // ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.removeItem(i, 1), (EnumDirection) null);
-+            // CraftBukkit start - Call event on collection of items from inventories into the hopper
-+            CraftItemStack oitemstack = CraftItemStack.asCraftMirror(iinventory.removeItem(i, world.spigotConfig.hopperAmount)); // Spigot
-+
-+            Inventory sourceInventory;
-+            // Have to special case large chests as they work oddly
-+            if (iinventory instanceof CompoundContainer) {
-+                sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((CompoundContainer) iinventory);
-+            } else if (iinventory.getOwner() != null) {
-+                sourceInventory = iinventory.getOwner().getInventory();
-+            } else {
-+                sourceInventory = new CraftInventory(iinventory);
-+            }
-+
-+            InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory, oitemstack.clone(), ihopper.getOwner().getInventory(), false);
-+
-+            Bukkit.getServer().getPluginManager().callEvent(event);
-+            if (event.isCancelled()) {
-+                iinventory.setItem(i, itemstack1);
-+
-+                if (ihopper instanceof HopperBlockEntity) {
-+                    ((HopperBlockEntity) ihopper).setCooldown(world.spigotConfig.hopperTransfer); // Spigot
-+                }
-+
-+                return false;
-+            }
-+            int origCount = event.getItem().getAmount(); // Spigot
-+            ItemStack itemstack2 = HopperBlockEntity.addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
-+            // CraftBukkit end
-+
-+            if (itemstack2.isEmpty()) {
-+                iinventory.setChanged();
-+                return true;
-+            }
-+
-+            itemstack1.shrink(origCount - itemstack2.getCount()); // Spigot
-+            iinventory.setItem(i, itemstack1);
-             // Paper end
-+            // Kaiiju end
-         }
- 
-         return false;
--- a/patches/server/0015-Toggle-tick-level-when-empty.patch
+++ b/patches/server/0015-Toggle-tick-level-when-empty.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 4 May 2023 19:53:33 +0300
-Subject: [PATCH] Toggle tick level when empty
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 6d7356cc07da58b1cef8d8963e790251d765de2c..601b9867d839f4928ba993ee8f00df9c330a0fe3 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -148,10 +148,12 @@ public class KaiijuWorldConfig {
- 
-     public boolean shulkerBoxDropContentsWhenDestroyed = true;
-     public boolean optimizeHoppers = true;
-+    public boolean tickWhenEmpty = true;
- 
-     private void optimizationSettings() {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-         optimizeHoppers = getBoolean("optimization.optimize-hoppers", optimizeHoppers);
-+        tickWhenEmpty = getBoolean("optimization.tick-when-empty", tickWhenEmpty);
-     }
- 
-     public boolean fixVoidTrading = true;
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0df4672abb5e87587da8712b6febf6312e241cda..1818c5ae88c331fb900470436f72049165c9e9f4 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -825,7 +825,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         timings.doSounds.stopTiming(); // Spigot
-         regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking
-         gameprofilerfiller.pop();
-        boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
-+        boolean flag = kaiijuConfig.tickWhenEmpty || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players // Kaiiju - i don't think so
- 
-         if (flag) {
-             this.resetEmptyTime();
--- a/patches/server/0016-Toggle-break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0016-Toggle-break-redstone-on-top-of-trap-doors-early.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 7 May 2023 20:04:06 +0300
-Subject: [PATCH] Toggle break redstone on top of trap doors early
-
-That patch break vanilla mechanics such as portal slicing.
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 601b9867d839f4928ba993ee8f00df9c330a0fe3..e7ee85b09aa4438868e068551280b13e84cdfdb8 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -157,8 +157,10 @@ public class KaiijuWorldConfig {
-     }
- 
-     public boolean fixVoidTrading = true;
-+    public boolean breakRedstoneOnTopOfTrapDoorsEarly = true;
- 
-     private void gameplaySettings() {
-         fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading);
-+        breakRedstoneOnTopOfTrapDoorsEarly = getBoolean("gameplay.break-redstone-on-top-of-trap-doors-early", breakRedstoneOnTopOfTrapDoorsEarly);
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
-index b9e3c9cd709d42bced85436720ccc7b9c7e49552..5e6d64408a5da3f337d32bb8ac5ac2532b04490c 100644
--- a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
-@@ -125,6 +125,7 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
-                 }
-                 // CraftBukkit end
-                 boolean open = (Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1; // Paper - break redstone on trapdoors early
-+                if (world.kaiijuConfig.breakRedstoneOnTopOfTrapDoorsEarly) { // Kaiiju - trigger break redstone on trapdoors early
-                 // Paper start - break redstone on trapdoors early
-                 // note: this must run before any state for this block/its neighborus are written to the world
-                 // we allow the redstone event to fire so that plugins can block
-@@ -143,6 +144,7 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
-                     }
-                 }
-                 // Paper end - break redstone on trapdoors early
-+                } // Kaiiju  - trigger break redstone on trapdoors early
-                 if (open) { // Paper - break redstone on trapdoors early
-                     state = (BlockState) state.setValue(TrapDoorBlock.OPEN, flag1);
-                     this.playSound((Player) null, world, pos, flag1);
--- a/patches/server/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -1,139 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Wed, 10 May 2023 16:30:38 +0300
-Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight
-
-This has been benchmarked on a huge gold farm.
-Resulting in significative performance improvements.
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f636bdf1075fa784ce7ee25478d4d94bacb05677..2da522f89a7c44208ca1ba9139efe723a519fabc 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3661,7 +3661,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
- 
-             // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
-            return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
-+            return !(vec3d1.distanceToSqr(vec3d) > 128D * 128D) && this.level().rayTraceDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.BlockHitResult.Type.MISS; // Paper - use distanceToSqr // Kaiiju - Pufferfish - Strip raytracing
-         }
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 0e8746759752b692668886370181aa5db1fd0bb0..5e2f5e9c21009a71f671955df7a4135ce5cf5b08 100644
--- a/src/main/java/net/minecraft/world/level/BlockGetter.java
-+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -68,6 +68,17 @@ public interface BlockGetter extends LevelHeightAccessor {
-         });
-     }
- 
-+    // Kaiiju start - Pufferfish - broken down variant of below rayTraceBlock, used by World#rayTraceDirect
-+    @Nullable
-+    default net.minecraft.world.phys.BlockHitResult.Type rayTraceBlockDirect(Vec3 vec3d, Vec3 vec3d1, BlockPos blockposition, BlockState iblockdata, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) {
-+        if (iblockdata.isAir()) return null;
-+        VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(iblockdata, this, blockposition, voxelshapecoll);
-+        net.minecraft.world.phys.BlockHitResult movingobjectpositionblock = this.clipWithInteractionOverride(vec3d, vec3d1, blockposition, voxelshape, iblockdata);
-+
-+        return movingobjectpositionblock == null ? null : movingobjectpositionblock.getType();
-+    }
-+    // Kaiiju end
-+
-     // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
-     default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
-             // Paper start - Prevent raytrace from loading chunks
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fb71843793e699b2ccfaa3b7e4c2bb7d4826a706..42727a50ae11cd4d4aa65eb57638bfb164f1e4ac 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -432,6 +432,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return null;
-     }
- 
-+    // Kaiiju start - Pufferfish - broken down method of raytracing for EntityLiving#hasLineOfSight, replaces IBlockAccess#rayTrace(RayTrace)
-+    public net.minecraft.world.phys.BlockHitResult.Type rayTraceDirect(net.minecraft.world.phys.Vec3 vec3d, net.minecraft.world.phys.Vec3 vec3d1, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) {
-+        // most of this code comes from IBlockAccess#a(RayTrace, BiFunction, Function), but removes the needless functions
-+        if (vec3d.equals(vec3d1)) {
-+            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+        }
-+
-+        double endX = Mth.lerp(-1.0E-7D, vec3d1.x, vec3d.x);
-+        double endY = Mth.lerp(-1.0E-7D, vec3d1.y, vec3d.y);
-+        double endZ = Mth.lerp(-1.0E-7D, vec3d1.z, vec3d.z);
-+
-+        double startX = Mth.lerp(-1.0E-7D, vec3d.x, vec3d1.x);
-+        double startY = Mth.lerp(-1.0E-7D, vec3d.y, vec3d1.y);
-+        double startZ = Mth.lerp(-1.0E-7D, vec3d.z, vec3d1.z);
-+
-+        int currentX = Mth.floor(startX);
-+        int currentY = Mth.floor(startY);
-+        int currentZ = Mth.floor(startZ);
-+
-+        BlockPos.MutableBlockPos currentBlock = new BlockPos.MutableBlockPos(currentX, currentY, currentZ);
-+
-+        LevelChunk chunk = this.getChunkIfLoaded(currentBlock);
-+        if (chunk == null) {
-+            return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+        }
-+
-+        net.minecraft.world.phys.BlockHitResult.Type initialCheck = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll);
-+
-+        if (initialCheck != null) {
-+            return initialCheck;
-+        }
-+
-+        double diffX = endX - startX;
-+        double diffY = endY - startY;
-+        double diffZ = endZ - startZ;
-+
-+        int xDirection = Mth.sign(diffX);
-+        int yDirection = Mth.sign(diffY);
-+        int zDirection = Mth.sign(diffZ);
-+
-+        double normalizedX = xDirection == 0 ? Double.MAX_VALUE : (double) xDirection / diffX;
-+        double normalizedY = yDirection == 0 ? Double.MAX_VALUE : (double) yDirection / diffY;
-+        double normalizedZ = zDirection == 0 ? Double.MAX_VALUE : (double) zDirection / diffZ;
-+
-+        double normalizedXDirection = normalizedX * (xDirection > 0 ? 1.0D - Mth.frac(startX) : Mth.frac(startX));
-+        double normalizedYDirection = normalizedY * (yDirection > 0 ? 1.0D - Mth.frac(startY) : Mth.frac(startY));
-+        double normalizedZDirection = normalizedZ * (zDirection > 0 ? 1.0D - Mth.frac(startZ) : Mth.frac(startZ));
-+
-+        net.minecraft.world.phys.BlockHitResult.Type result;
-+
-+        do {
-+            if (normalizedXDirection > 1.0D && normalizedYDirection > 1.0D && normalizedZDirection > 1.0D) {
-+                return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+            }
-+
-+            if (normalizedXDirection < normalizedYDirection) {
-+                if (normalizedXDirection < normalizedZDirection) {
-+                    currentX += xDirection;
-+                    normalizedXDirection += normalizedX;
-+                } else {
-+                    currentZ += zDirection;
-+                    normalizedZDirection += normalizedZ;
-+                }
-+            } else if (normalizedYDirection < normalizedZDirection) {
-+                currentY += yDirection;
-+                normalizedYDirection += normalizedY;
-+            } else {
-+                currentZ += zDirection;
-+                normalizedZDirection += normalizedZ;
-+            }
-+
-+            currentBlock.set(currentX, currentY, currentZ);
-+            if (chunk.getPos().x != currentBlock.getX() >> 4 || chunk.getPos().z != currentBlock.getZ() >> 4) {
-+                chunk = this.getChunkIfLoaded(currentBlock);
-+                if (chunk == null) {
-+                    return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+                }
-+            }
-+            result = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll);
-+        } while (result == null);
-+
-+        return result;
-+    }
-+    // Kaiiju end
-+
-     public boolean isInWorldBounds(BlockPos pos) {
-         return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
-     }
--- a/patches/server/0018-Add-SIMD-utilities.patch
+++ b/patches/server/0018-Add-SIMD-utilities.patch
@@ -1,141 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 11 May 2023 05:02:40 +0300
-Subject: [PATCH] Add SIMD utilities
-
-Patch from Pufferfish
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 164678d8c7f0a0a66adc957a86849fa927b7cb73..a151ca3a0803a5e653674e51e8d41a2f38b1f3df 100644
--- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -68,6 +68,12 @@ dependencies {
- }
- 
- val craftbukkitPackageVersion = "1_20_R1" // Paper
-+// Kaiiju start - Pufferfish - SIMD utilities
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Kaiiju end
- tasks.jar {
-     archiveClassifier.set("dev")
- 
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..586b4cd007b3b106966524e2697edddf88e3ac9d
--- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -0,0 +1,59 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import org.bukkit.Bukkit;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import jdk.incubator.vector.FloatVector;
-+import jdk.incubator.vector.IntVector;
-+import jdk.incubator.vector.VectorSpecies;
-+
-+/**
-+ * Basically, java is annoying and we have to push this out to its own class.
-+ */
-+public class SIMDChecker {
-+
-+	public static boolean canEnable(Logger logger) {
-+		try {
-+			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
-+				return false;
-+			} else {
-+				SIMDDetection.testRun = true;
-+
-+				VectorSpecies<Integer> ISPEC = IntVector.SPECIES_PREFERRED;
-+				VectorSpecies<Float> FSPEC = FloatVector.SPECIES_PREFERRED;
-+
-+				logger.log(Level.INFO, "Max SIMD vector size on this system is " + ISPEC.vectorBitSize() + " bits (int)");
-+				logger.log(Level.INFO, "Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)");
-+
-+				if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) {
-+					logger.log(Level.WARNING, "SIMD is not properly supported on this system!");
-+					return false;
-+				}
-+
-+				return true;
-+			}
-+		} catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
-+		return false;
-+	}
-+
-+    public static void simdWarning() {
-+		// Attempt to detect vectorization
-+		try {
-+			SIMDDetection.isEnabled = SIMDDetection.canEnable(Bukkit.getLogger());
-+			SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19;
-+		} catch (NoClassDefFoundError | Exception ignored) {
-+			ignored.printStackTrace();
-+		}
-+
-+		if (SIMDDetection.isEnabled) {
-+			Bukkit.getLogger().info("SIMD operations detected as functional. Will replace some operations with faster versions.");
-+		} else if (SIMDDetection.versionLimited) {
-+			Bukkit.getLogger().warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, Java 18, and Java 19.");
-+		} else {
-+			Bukkit.getLogger().warning("SIMD operations are available for your server, but are not configured!");
-+			Bukkit.getLogger().warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
-+			Bukkit.getLogger().warning("If you have already added this flag, then SIMD operations are not supported on your JVM or CPU.");
-+			Bukkit.getLogger().warning("Debug: Java: " + System.getProperty("java.version") + ", test run: " + SIMDDetection.testRun);
-+		}
-+    }
-+}
-\ No newline at end of file
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..758fa97304a32bf17935c86dc03cbf50606935d8
--- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
-@@ -0,0 +1,32 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.util.logging.Logger;
-+
-+public class SIMDDetection {
-+
-+	public static boolean isEnabled = false;
-+	public static boolean versionLimited = false;
-+	public static boolean testRun = false;
-+
-+	public static boolean canEnable(Logger logger) {
-+		try {
-+			return SIMDChecker.canEnable(logger);
-+		} catch (NoClassDefFoundError | Exception ignored) {
-+			return false;
-+		}
-+	}
-+
-+	public static int getJavaVersion() {
-+		// https://stackoverflow.com/a/2591122
-+		String version = System.getProperty("java.version");
-+		if(version.startsWith("1.")) {
-+			version = version.substring(2, 3);
-+		} else {
-+			int dot = version.indexOf(".");
-+			if(dot != -1) { version = version.substring(0, dot); }
-+		}
-+		version = version.split("-")[0]; // Azul is stupid
-+		return Integer.parseInt(version);
-+	}
-+
-+}
-\ No newline at end of file
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ee75d828174ac1c84931bc087472fefd76073bdb..991e4c19763a34a6fead88363e007c2d11aad836 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -225,6 +225,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             DedicatedServer.LOGGER.error("Unable to load server configuration", e);
-             return false;
-         }
-+        gg.pufferfish.pufferfish.simd.SIMDChecker.simdWarning();
-         dev.kaiijumc.kaiiju.KaiijuConfig.registerCommands();
-         // Kaiiju end
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
--- a/patches/server/0019-Toggle-shared-random-for-players.patch
+++ b/patches/server/0019-Toggle-shared-random-for-players.patch
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 11 May 2023 17:12:34 +0300
-Subject: [PATCH] Toggle shared random for players
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 778de435ca3c13ccc2f2d86030e3529436a2d945..cac747a46cccf8b115917a72340e9b81e7a437c9 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -216,8 +216,10 @@ public class KaiijuConfig {
-     }
- 
-     public static String serverModName = "Kaiiju";
-+    public static boolean sharedRandomForPlayers = true;
- 
-     private static void gameplaySettings() {
-         serverModName = getString("gameplay.server-mod-name", serverModName);
-+        sharedRandomForPlayers = getBoolean("gameplay.shared-random-for-players", sharedRandomForPlayers);
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ee15661227754149164893d6acf678d13b2e1b27..0c50b516d0ff1c2812a877b57148f01861f8027f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -566,6 +566,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         this.bb = Entity.INITIAL_AABB;
-         this.stuckSpeedMultiplier = Vec3.ZERO;
-         this.nextStep = 1.0F;
-+        // Kaiiju start - Toggle shared random for players
-+        if (!dev.kaiijumc.kaiiju.KaiijuConfig.sharedRandomForPlayers && this instanceof Player)
-+            this.random = RandomSource.create();
-+        else
-+        // Kaiiju end
-         this.random = SHARED_RANDOM; // Paper
-         this.remainingFireTicks = -this.getFireImmuneTicks();
-         this.fluidHeight = new Object2DoubleArrayMap(2);
--- a/patches/server/0020-Kick-player-instead-of-crashing.patch
+++ b/patches/server/0020-Kick-player-instead-of-crashing.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 14 May 2023 18:50:57 +0300
-Subject: [PATCH] Kick player instead of crashing
-
-
-diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-index c5df121d6194a97b20dc390698991b9c72dba538..9990fccc741a139c57528f70157ae63dbe3fd8e8 100644
--- a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-+++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
-@@ -485,7 +485,12 @@ public class RegionizedPlayerChunkLoader {
-                     new ChunkPos(chunkX, chunkZ), new MutableObject<>(), false, true); // unloaded, loaded
-                 return;
-             }
-            throw new IllegalStateException();
-+            // Kaiiju - Kick player instead of crashing
-+            String errorMsg = "Already sent chunk [" + chunkX + ", " + chunkZ + "] in world " + this.world;
-+            this.player.getBukkitEntity().kickPlayer(errorMsg);
-+            org.bukkit.Bukkit.getLogger().severe(errorMsg);
-+            // throw new IllegalStateException();
-+            // Kaiiju end
-         }
- 
-         private void sendUnloadChunk(final int chunkX, final int chunkZ) {
-diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 18f438eec03cabc1614ab807081cff6b18fb09a8..df3869d7aee9c1c880319251b40879c8802c72b4 100644
--- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -129,7 +129,12 @@ public class ChunkHolder {
- 
-     public void addPlayer(ServerPlayer player) {
-         if (!this.playersSentChunkTo.add(player)) {
-            throw new IllegalStateException("Already sent chunk " + this.pos + " in world '" + this.chunkMap.level.getWorld().getName() + "' to player " + player);
-+            // Kaiiju start - Kick player instead of crashing
-+            String errorMsg = "Already sent chunk " + this.pos + " in world " + this.chunkMap.level.getWorld().getName();
-+            player.getBukkitEntity().kickPlayer(errorMsg);
-+            org.bukkit.Bukkit.getLogger().severe(errorMsg);
-+            //throw new IllegalStateException("Already sent chunk " + this.pos + " in world '" + this.chunkMap.level.getWorld().getName() + "' to player " + player);
-+            // Kaiiju end
-         }
-     }
- 
--- a/patches/server/0021-Toggle-fix-TripWire-state-inconsistency.patch
+++ b/patches/server/0021-Toggle-fix-TripWire-state-inconsistency.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 18 May 2023 15:50:40 +0300
-Subject: [PATCH] Toggle fix TripWire state inconsistency
-
-This allow string duplication
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index e7ee85b09aa4438868e068551280b13e84cdfdb8..8d7821d8b1a3615eaef1073d9dab690559b85f81 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -158,9 +158,11 @@ public class KaiijuWorldConfig {
- 
-     public boolean fixVoidTrading = true;
-     public boolean breakRedstoneOnTopOfTrapDoorsEarly = true;
-+    public boolean fixTripWireStateInconsistency = true;
- 
-     private void gameplaySettings() {
-         fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading);
-         breakRedstoneOnTopOfTrapDoorsEarly = getBoolean("gameplay.break-redstone-on-top-of-trap-doors-early", breakRedstoneOnTopOfTrapDoorsEarly);
-+        fixTripWireStateInconsistency = getBoolean("gameplay.fix-tripwire-state-inconsistency", fixTripWireStateInconsistency);
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index cb2ff8d94308c637a498d2737f86f6af4c9c1b83..84c407dfd19924d12f1c25addbb613e607445fd9 100644
--- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-@@ -78,7 +78,7 @@ public class TripWireBlock extends Block {
-     public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
-         if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating
-         if (!moved && !state.is(newState.getBlock())) {
-            this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), true); // Paper - fix state inconsistency
-+            this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), world.kaiijuConfig.fixTripWireStateInconsistency); // Paper - fix state inconsistency // Kaiiju - Toggle this
-         }
-     }
- 
--- a/patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch
+++ b/patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch
@@ -1,370 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Sun, 21 May 2023 15:55:04 +0200
-Subject: [PATCH] Entity ticking throttling & removal to prevent lag.
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index a151ca3a0803a5e653674e51e8d41a2f38b1f3df..30da22816eecfce179d365fa4de2b979438a302a 100644
--- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -23,6 +23,7 @@ dependencies {
-     implementation("com.github.luben:zstd-jni:1.5.4-1")
-     implementation("org.lz4:lz4-java:1.8.0")
-     // Kaiiju end
-+    implementation("io.github.classgraph:classgraph:4.8.158") // Kaiiju - Entity throttling & Removal
-     // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..887ea85ca2a03796bfa5bf62f27d1a7abd7fbc29
--- /dev/null
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityLimits.java
-@@ -0,0 +1,139 @@
-+package dev.kaiijumc.kaiiju;
-+
-+import java.io.File;
-+import java.io.IOException;
-+import java.util.Map;
-+import java.util.HashMap;
-+import java.util.logging.Level;
-+
-+import com.google.common.base.Throwables;
-+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-+import io.github.classgraph.ClassGraph;
-+import io.github.classgraph.ClassInfo;
-+import io.github.classgraph.ScanResult;
-+import org.slf4j.Logger;
-+
-+import com.mojang.logging.LogUtils;
-+import net.minecraft.world.entity.Entity;
-+import org.bukkit.Bukkit;
-+import org.bukkit.configuration.InvalidConfigurationException;
-+import org.bukkit.configuration.file.YamlConfiguration;
-+
-+@SuppressWarnings("unused")
-+public class KaiijuEntityLimits {
-+    private static final Logger LOGGER = LogUtils.getLogger();
-+
-+    protected static final String HEADER =
-+        "Per region entity limits for Kaiiju.\n"
-+        + "If there are more of particular entity type in a region than limit, entity ticking will be throttled.\n"
-+        + "Example: for Wither limit 100 & 300 Withers in a region -> 100 Withers tick every tick & every Wither ticks every 3 ticks.\n"
-+        + "Available entities: GlowSquid, Ambient, Bat, Animal, Bee, Cat, Chicken, Cod, Cow, Dolphin, Fish, FishSchool, Fox, Golem, IronGolem, "
-+        + "MushroomCow, Ocelot, Panda, Parrot, Perchable, Pig, PolarBear, PufferFish, Rabbit, Salmon, Sheep, Snowman, Squid, TropicalFish, Turtle, "
-+        + "WaterAnimal, Wolf, Allay, Axolotl, Camel, Frog, Tadpole, Goat, Horse, HorseAbstract, HorseChestedAbstract, HorseDonkey, HorseMule, "
-+        + "HorseSkeleton, HorseZombie, Llama, LlamaTrader, Sniffer, EnderCrystal, EnderDragon, Wither, ArmorStand, Hanging, ItemFrame, Leash, "
-+        + "Painting, GlowItemFrame, FallingBlock, Item, TNTPrimed, Blaze, CaveSpider, Creeper, Drowned, Enderman, Endermite, Evoker, Ghast, "
-+        + "GiantZombie, Guardian, GuardianElder, IllagerAbstract, IllagerIllusioner, IllagerWizard, MagmaCube, Monster, MonsterPatrolling, Phantom, "
-+        + "PigZombie, Pillager, Ravager, Shulker, Silverfish, Skeleton, SkeletonAbstract, SkeletonStray, SkeletonWither, Slime, Spider, Strider, Vex, "
-+        + "Vindicator, Witch, Zoglin, Zombie, ZombieHusk, ZombieVillager, Hoglin, Piglin, PiglinAbstract, PiglinBrute, Warden, Villager, "
-+        + "VillagerTrader, Arrow, DragonFireball, Egg, EnderPearl, EnderSignal, EvokerFangs, Fireball, FireballFireball, Fireworks, FishingHook, "
-+        + "LargeFireball, LlamaSpit, Potion, Projectile, ProjectileThrowable, ShulkerBullet, SmallFireball, Snowball, SpectralArrow, ThrownExpBottle, "
-+        + "ThrownTrident, TippedArrow, WitherSkull, Raider, ChestBoat, Boat, MinecartAbstract, MinecartChest, MinecartCommandBlock, MinecartContainer, "
-+        + "MinecartFurnace, MinecartHopper, MinecartMobSpawner, MinecartRideable, MinecartTNT\n";
-+    protected static File ENTITY_LIMITS_FILE;
-+    public static YamlConfiguration entityLimitsConfig;
-+
-+    protected static Map<Class<? extends Entity>, EntityLimit> entityLimits;
-+
-+    static final String ENTITY_PREFIX = "Entity";
-+
-+    public static void init(File entityLimitsFile) {
-+        init(entityLimitsFile, true);
-+    }
-+
-+    public static void reload(File entityLimitsFile) {
-+        init(entityLimitsFile, false);
-+    }
-+
-+    private static void init(File entityLimitsFile, boolean setup) {
-+        ENTITY_LIMITS_FILE = entityLimitsFile;
-+        entityLimitsConfig = new YamlConfiguration();
-+
-+        if (entityLimitsFile.exists()) {
-+            try {
-+                entityLimitsConfig.load(ENTITY_LIMITS_FILE);
-+            } catch (InvalidConfigurationException ex) {
-+                Bukkit.getLogger().log(Level.SEVERE, "Could not load kaiiju_entity_limits.yml, please correct your syntax errors", ex);
-+                throw Throwables.propagate(ex);
-+            } catch (IOException ignore) {}
-+        } else {
-+            if (setup) {
-+                entityLimitsConfig.options().header(HEADER);
-+                entityLimitsConfig.options().copyDefaults(true);
-+                entityLimitsConfig.set("Wither.limit", 1000);
-+                entityLimitsConfig.set("Wither.removal", 5000);
-+                entityLimitsConfig.set("Axolotl.limit", 1000);
-+                entityLimitsConfig.set("Axolotl.removal", 5000);
-+                try {
-+                    entityLimitsConfig.save(ENTITY_LIMITS_FILE);
-+                } catch (IOException ex) {
-+                    Bukkit.getLogger().log(Level.SEVERE, "Could not save " + ENTITY_LIMITS_FILE, ex);
-+                }
-+            }
-+        }
-+
-+        entityLimits = new Object2ObjectOpenHashMap<>();
-+        try (ScanResult scanResult = new ClassGraph().enableAllInfo().acceptPackages("net.minecraft.world.entity").scan()) {
-+            Map<String, ClassInfo> entityClasses = new HashMap<>();
-+            for (ClassInfo classInfo : scanResult.getAllClasses()) {
-+                Class<?> entityClass = Class.forName(classInfo.getName());
-+                if (Entity.class.isAssignableFrom(entityClass)) {
-+                    String entityName = extractEntityName(entityClass.getSimpleName());
-+                    entityClasses.put(entityName, classInfo);
-+                }
-+            }
-+
-+            for (String key : entityLimitsConfig.getKeys(false)) {
-+                if (!entityClasses.containsKey(key)) {
-+                    LOGGER.error("Unknown entity '" + key + "' in kaiiju-entity-limits.yml, skipping");
-+                    continue;
-+                }
-+                int limit = entityLimitsConfig.getInt(key + ".limit");
-+                int removal = entityLimitsConfig.getInt(key + ".removal");
-+
-+                if (limit < 1) {
-+                    LOGGER.error(key + " has a limit less than the minimum of 1, ignoring");
-+                    continue;
-+                }
-+                if (removal <= limit && removal != -1) {
-+                    LOGGER.error(key + " has a removal limit that is less than or equal to its limit, setting removal to limit * 10");
-+                    removal = limit * 10;
-+                }
-+
-+                entityLimits.put((Class<? extends Entity>) Class.forName(entityClasses.get(key).getName()), new EntityLimit(limit, removal));
-+            }
-+        } catch (ClassNotFoundException e) {
-+            e.printStackTrace();
-+        }
-+    }
-+
-+    public static EntityLimit getEntityLimit(Entity entity) {
-+        return entityLimits.get(entity.getClass());
-+    }
-+
-+    private static String extractEntityName(String input) {
-+        int prefixLength = ENTITY_PREFIX.length();
-+
-+        if (input.length() <= prefixLength || !input.startsWith(ENTITY_PREFIX)) {
-+            return input;
-+        } else {
-+            return input.substring(prefixLength);
-+        }
-+    }
-+
-+    public record EntityLimit(int limit, int removal) {
-+        @Override
-+        public String toString() {
-+            return "EntityLimit{limit=" + limit + ", removal=" + removal + "}";
-+        }
-+    }
-+}
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..eb690efacf083e4ff3e321578b12c534e6a40196
--- /dev/null
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuEntityThrottler.java
-@@ -0,0 +1,84 @@
-+package dev.kaiijumc.kaiiju;
-+
-+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-+import net.minecraft.world.entity.Entity;
-+import io.papermc.paper.threadedregions.RegionizedWorldData;
-+
-+public class KaiijuEntityThrottler {
-+    private static class TickInfo {
-+        int currentTick;
-+        int continueFrom;
-+        int toTick;
-+        int toRemove;
-+    }
-+
-+    public static class EntityThrottlerReturn {
-+        public boolean skip;
-+        public boolean remove;
-+    }
-+
-+    private final Object2ObjectOpenHashMap<KaiijuEntityLimits.EntityLimit, TickInfo> entityLimitTickInfoMap = new Object2ObjectOpenHashMap<>();
-+
-+    public void tickLimiterStart() {
-+        for (TickInfo tickInfo : entityLimitTickInfoMap.values()) {
-+            tickInfo.currentTick = 0;
-+        }
-+    }
-+
-+    public EntityThrottlerReturn tickLimiterShouldSkip(Entity entity) {
-+        EntityThrottlerReturn retVal = new EntityThrottlerReturn();
-+        if (entity.isRemoved()) return retVal;
-+        KaiijuEntityLimits.EntityLimit entityLimit = KaiijuEntityLimits.getEntityLimit(entity);
-+
-+        if (entityLimit != null) {
-+            TickInfo tickInfo = entityLimitTickInfoMap.computeIfAbsent(entityLimit, el -> {
-+                TickInfo newTickInfo = new TickInfo();
-+                newTickInfo.toTick = entityLimit.limit();
-+                return newTickInfo;
-+            });
-+
-+            tickInfo.currentTick++;
-+            if (tickInfo.currentTick <= tickInfo.toRemove && entityLimit.removal() > 0) {
-+                retVal.skip = false;
-+                retVal.remove = true;
-+                return retVal;
-+            }
-+
-+            if (tickInfo.currentTick < tickInfo.continueFrom) {
-+                retVal.skip = true;
-+                return retVal;
-+            }
-+            if (tickInfo.currentTick - tickInfo.continueFrom < tickInfo.toTick) {
-+                retVal.skip = false;
-+                return retVal;
-+            }
-+            retVal.skip = true;
-+            return retVal;
-+        } else {
-+            retVal.skip = false;
-+            return retVal;
-+        }
-+    }
-+
-+    public void tickLimiterFinish(RegionizedWorldData regionizedWorldData) {
-+        for (var entry : entityLimitTickInfoMap.entrySet()) {
-+            KaiijuEntityLimits.EntityLimit entityLimit = entry.getKey();
-+            TickInfo tickInfo = entry.getValue();
-+
-+            int additionals = 0;
-+            int nextContinueFrom = tickInfo.continueFrom + tickInfo.toTick;
-+            if (nextContinueFrom >= tickInfo.currentTick) {
-+                additionals = entityLimit.limit() - (tickInfo.currentTick - tickInfo.continueFrom);
-+                nextContinueFrom = 0;
-+            }
-+            tickInfo.continueFrom = nextContinueFrom;
-+            tickInfo.toTick = entityLimit.limit() + additionals;
-+
-+            if (tickInfo.toRemove == 0 && tickInfo.currentTick > entityLimit.removal()) {
-+                tickInfo.toRemove = tickInfo.currentTick - entityLimit.removal();
-+            } else if (tickInfo.toRemove != 0) {
-+                tickInfo.toRemove = 0;
-+            }
-+        }
-+    }
-+}
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 8d7821d8b1a3615eaef1073d9dab690559b85f81..816db23fa64aab69e3034484c00645ebd0479978 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -149,11 +149,13 @@ public class KaiijuWorldConfig {
-     public boolean shulkerBoxDropContentsWhenDestroyed = true;
-     public boolean optimizeHoppers = true;
-     public boolean tickWhenEmpty = true;
-+    public boolean enableEntityThrottling = false;
- 
-     private void optimizationSettings() {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-         optimizeHoppers = getBoolean("optimization.optimize-hoppers", optimizeHoppers);
-         tickWhenEmpty = getBoolean("optimization.tick-when-empty", tickWhenEmpty);
-+        enableEntityThrottling = getBoolean("optimization.enable-entity-throttling", enableEntityThrottling);
-     }
- 
-     public boolean fixVoidTrading = true;
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java b/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java
-index 6fac162e0ec057af9f3336314d5663554cef0490..efecc7e132c67577577c99bfcf98e2b4ddae14ab 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/command/KaiijuCommand.java
-@@ -1,6 +1,7 @@
- package dev.kaiijumc.kaiiju.command;
- 
- import dev.kaiijumc.kaiiju.KaiijuConfig;
-+import dev.kaiijumc.kaiiju.KaiijuEntityLimits;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerLevel;
- import net.md_5.bungee.api.ChatColor;
-@@ -48,6 +49,7 @@ public class KaiijuCommand extends Command {
- 
-             MinecraftServer console = MinecraftServer.getServer();
-             KaiijuConfig.reload((File) console.options.valueOf("kaiiju-settings"));
-+            KaiijuEntityLimits.reload((File) console.options.valueOf("kaiiju-entity-limits"));
-             for (ServerLevel level : console.getAllLevels()) {
-                 level.kaiijuConfig.reload();
-             }
-diff --git a/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java b/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java
-index 65c4e158d81ac5c5788cf4dcb379061aebd23dcd..223bf699d76e53b131b47256df288db60141fd9e 100644
--- a/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java
-+++ b/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java
-@@ -296,6 +296,7 @@ public final class RegionizedWorldData {
-     private final ReferenceList<Entity> allEntities = new ReferenceList<>();
-     private final IteratorSafeOrderedReferenceSet<Entity> entityTickList = new IteratorSafeOrderedReferenceSet<>();
-     private final IteratorSafeOrderedReferenceSet<Mob> navigatingMobs = new IteratorSafeOrderedReferenceSet<>();
-+    public final dev.kaiijumc.kaiiju.KaiijuEntityThrottler entityThrottler = new dev.kaiijumc.kaiiju.KaiijuEntityThrottler(); // Kaiiju
- 
-     // block ticking
-     private final ObjectLinkedOpenHashSet<BlockEventData> blockEvents = new ObjectLinkedOpenHashSet<>();
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 991e4c19763a34a6fead88363e007c2d11aad836..24a2d3f496727790f63cb66a2534d4423555fa3c 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -225,6 +225,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             DedicatedServer.LOGGER.error("Unable to load server configuration", e);
-             return false;
-         }
-+        try {
-+            dev.kaiijumc.kaiiju.KaiijuEntityLimits.init((java.io.File) options.valueOf("kaiiju-entity-limits"));
-+        } catch (Exception e) {
-+            DedicatedServer.LOGGER.error("Unable to load entity limits", e);
-+            return false;
-+        }
-         gg.pufferfish.pufferfish.simd.SIMDChecker.simdWarning();
-         dev.kaiijumc.kaiiju.KaiijuConfig.registerCommands();
-         // Kaiiju end
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1818c5ae88c331fb900470436f72049165c9e9f4..7115a481bc8805333aa36af334132f98da9d8742 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -849,6 +849,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                 } // Folia end - region threading
-             }
- 
-+            if (kaiijuConfig.enableEntityThrottling) regionizedWorldData.entityThrottler.tickLimiterStart(); // Kaiiju
-             org.spigotmc.ActivationRange.activateEntities(this); // Spigot
-             timings.entityTick.startTiming(); // Spigot
-             regionizedWorldData.forEachTickingEntity((entity) -> { // Folia - regionised ticking
-@@ -871,6 +872,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                                 entity.stopRiding();
-                             }
- 
-+                            // Kaiiju start
-+                            if (kaiijuConfig.enableEntityThrottling) {
-+                                dev.kaiijumc.kaiiju.KaiijuEntityThrottler.EntityThrottlerReturn throttle = regionizedWorldData.entityThrottler.tickLimiterShouldSkip(entity);
-+                                if (throttle.remove && !entity.hasCustomName()) entity.remove(Entity.RemovalReason.DISCARDED);
-+                                if (throttle.skip) return;
-+                            }
-+                            // Kaiiju end
-                             gameprofilerfiller.push("tick");
-                             this.guardEntityTick(this::tickNonPassenger, entity);
-                             gameprofilerfiller.pop();
-@@ -878,6 +886,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-                     }
-                 }
-             });
-+            if (kaiijuConfig.enableEntityThrottling) regionizedWorldData.entityThrottler.tickLimiterFinish(regionizedWorldData); // Kaiiju
-             timings.entityTick.stopTiming(); // Spigot
-             timings.tickEntities.stopTiming(); // Spigot
-             gameprofilerfiller.pop();
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1f194f5324ab5efc5ae11d248dd09f875624559c..641d27bdc711f5d1cdf39637f8ad032d46575216 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -179,6 +179,11 @@ public class Main {
-                     .ofType(File.class)
-                     .defaultsTo(new File("kaiiju.yml"))
-                     .describedAs("Yml file");
-+                acceptsAll(asList("kaiiju", "kaiiju-entity-limits"), "File for kaiiju's entity limits")
-+                    .withRequiredArg()
-+                    .ofType(File.class)
-+                    .defaultsTo(new File("kaiiju-entity-limits.yml"))
-+                    .describedAs("Yml file");
-                 // Purpur end
- 
-                 // Paper start
--- a/patches/server/0023-Toggle-safe-teleportation.patch
+++ b/patches/server/0023-Toggle-safe-teleportation.patch
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Thu, 18 May 2023 20:05:49 +0300
-Subject: [PATCH] Toggle safe teleportation
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 816db23fa64aab69e3034484c00645ebd0479978..7c6c74f95c2534624a928ccf6b0a4b9d2a5486ad 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -161,10 +161,12 @@ public class KaiijuWorldConfig {
-     public boolean fixVoidTrading = true;
-     public boolean breakRedstoneOnTopOfTrapDoorsEarly = true;
-     public boolean fixTripWireStateInconsistency = true;
-+    public boolean safeTeleporting = true;
- 
-     private void gameplaySettings() {
-         fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading);
-         breakRedstoneOnTopOfTrapDoorsEarly = getBoolean("gameplay.break-redstone-on-top-of-trap-doors-early", breakRedstoneOnTopOfTrapDoorsEarly);
-         fixTripWireStateInconsistency = getBoolean("gameplay.fix-tripwire-state-inconsistency", fixTripWireStateInconsistency);
-+        safeTeleporting = getBoolean("gameplay.safe-teleportation", safeTeleporting);
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0c50b516d0ff1c2812a877b57148f01861f8027f..b971f35b69a930dddcf603207f524dc95e09f0fd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3943,6 +3943,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     protected boolean tryEndPortal() {
-         io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
-+        if (!this.level.kaiijuConfig.safeTeleporting && !(this instanceof net.minecraft.world.entity.player.Player)) return false; // Kaiiju - Unsafe teleportation
-         BlockPos pos = this.portalBlock;
-         ServerLevel world = this.portalWorld;
-         this.portalBlock = null;
-diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 41d7cff39fc37955877668337689b4b26cd8c7cf..fe21ef0a2c451564694de915f6f4e61dbfeed712 100644
--- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-@@ -53,6 +53,13 @@ public class EndPortalBlock extends BaseEntityBlock {
-                 // return; // CraftBukkit - always fire event in case plugins wish to change it
-             }
- 
-+            // Kaiiju start - Unsafe teleportation
-+            if (!entity.level().kaiijuConfig.safeTeleporting && !(entity instanceof net.minecraft.world.entity.player.Player)) {
-+                entity.endPortalLogicAsync();
-+                return;
-+            }
-+            // Kaiiju end
-+
-             // Paper start - move all of this logic into portal tick
-             entity.portalWorld = ((ServerLevel)world);
-             entity.portalBlock = pos.immutable();
--- a/patches/server/0024-Toggle-sand-duplication.patch
+++ b/patches/server/0024-Toggle-sand-duplication.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 28 May 2023 01:51:52 +0300
-Subject: [PATCH] Toggle sand duplication
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 7c6c74f95c2534624a928ccf6b0a4b9d2a5486ad..9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -162,11 +162,13 @@ public class KaiijuWorldConfig {
-     public boolean breakRedstoneOnTopOfTrapDoorsEarly = true;
-     public boolean fixTripWireStateInconsistency = true;
-     public boolean safeTeleporting = true;
-+    public boolean sandDuplication = false;
- 
-     private void gameplaySettings() {
-         fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading);
-         breakRedstoneOnTopOfTrapDoorsEarly = getBoolean("gameplay.break-redstone-on-top-of-trap-doors-early", breakRedstoneOnTopOfTrapDoorsEarly);
-         fixTripWireStateInconsistency = getBoolean("gameplay.fix-tripwire-state-inconsistency", fixTripWireStateInconsistency);
-         safeTeleporting = getBoolean("gameplay.safe-teleportation", safeTeleporting);
-+        sandDuplication = getBoolean("gameplay.sand-duplication", sandDuplication);
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 34b3541603b8cca16c7d62f3981d7ce3e8be0dbe..87d08f4d5bdec0ef96c0e4a91a2f595d2b0f0026 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -133,7 +133,7 @@ public class FallingBlockEntity extends Entity {
-     @Override
-     public void tick() {
-         // Paper start - fix sand duping
-        if (this.isRemoved()) {
-+        if (!this.level().kaiijuConfig.sandDuplication && this.isRemoved()) { // Kaiiju - Toggle sand duplication
-             return;
-         }
-         // Paper end - fix sand duping
-@@ -150,7 +150,7 @@ public class FallingBlockEntity extends Entity {
-             this.move(MoverType.SELF, this.getDeltaMovement());
- 
-             // Paper start - fix sand duping
-            if (this.isRemoved()) {
-+            if (!this.level().kaiijuConfig.sandDuplication && this.isRemoved()) { // Kaiiju - Toggle sand duplication
-                 return;
-             }
-             // Paper end - fix sand duping
--- a/patches/server/0025-Vanilla-end-portal-teleportation.patch
+++ b/patches/server/0025-Vanilla-end-portal-teleportation.patch
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Fri, 19 May 2023 03:38:03 +0300
-Subject: [PATCH] Vanilla end portal teleportation
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b971f35b69a930dddcf603207f524dc95e09f0fd..03895d35c02ff9422aaa0177eb0aa40e03fdc925 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4029,12 +4029,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                         targetPos, 16, // load 16 blocks to be safe from block physics
-                         ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH,
-                         (chunks) -> {
-                            ServerLevel.makeObsidianPlatform(destination, null, targetPos);
-+                            //ServerLevel.makeObsidianPlatform(destination, null, targetPos); // Kaiiju - Vanilla end teleportation - moved down
- 
-+                            // Kaiiju start - Vanilla end teleportation
-+                            Vec3 finalPos;
-+                            if (this instanceof Player) finalPos = Vec3.atBottomCenterOf(targetPos.below());
-+                            else finalPos = Vec3.atBottomCenterOf(targetPos);
-+                            // Kaiiju end
-                             // the portal obsidian is placed at targetPos.y - 2, so if we want to place the entity
-                             // on the obsidian, we need to spawn at targetPos.y - 1
-                             portalInfoCompletable.complete(
-                                new PortalInfo(Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, 90.0f, 0.0f, destination, null)
-+                                new PortalInfo(finalPos, this.getDeltaMovement(), 90.0f, 0.0f, destination, null) // Kaiiju - Vanilla end teleportation
-                             );
-                         }
-                     );
-@@ -4221,6 +4226,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         if (!this.canPortalAsync(takePassengers)) {
-             return false;
-         }
-+        // Kaiiju start - sync end platform spawning & entity teleportation
-+        final java.util.function.Consumer<Entity> tpComplete = type == PortalType.END && destination.getTypeKey() == LevelStem.END ?
-+              e -> ServerLevel.makeObsidianPlatform(destination, null, ServerLevel.END_SPAWN_POINT) : teleportComplete;
-+        // Kaiiju end
- 
-         Vec3 initialPosition = this.position();
-         ChunkPos initialPositionChunk = new ChunkPos(
-@@ -4279,7 +4288,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-             // place
-             passengerTree.root.placeInAsync(
-                 originWorld, destination, Entity.TELEPORT_FLAG_LOAD_CHUNK | (takePassengers ? Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS : 0L),
-                passengerTree, teleportComplete
-+                passengerTree, tpComplete // Kaiiju - vanilla end teleportation
-             );
-         });
- 
--- a/patches/server/0026-Swap-distanceToSqr-and-target-test.patch
+++ b/patches/server/0026-Swap-distanceToSqr-and-target-test.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Sat, 17 Jun 2023 19:52:29 +0300
-Subject: [PATCH] Swap distanceToSqr and target test
-
-
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index b1a6a66ed02706c1adc36dcedfa415f5a24a25a0..97a5eca200fd606d6102e40f9b8c32c2e7652cf9 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -99,9 +99,9 @@ public interface EntityGetter {
-         Player player = null;
- 
-         for(Player player2 : this.getLocalPlayers()) { // Folia - region threading
-            if (targetPredicate == null || targetPredicate.test(player2)) {
-+            if (true || targetPredicate == null || targetPredicate.test(player2)) { // Kaiiju - Move this down
-                 double e = player2.distanceToSqr(x, y, z);
-                if ((maxDistance < 0.0D || e < maxDistance * maxDistance) && (d == -1.0D || e < d)) {
-+                if ((maxDistance < 0.0D || e < maxDistance * maxDistance) && (d == -1.0D || e < d) && (targetPredicate == null || targetPredicate.test(player2))) { // Kaiiju
-                     d = e;
-                     player = player2;
-                 }
-@@ -147,9 +147,10 @@ public interface EntityGetter {
-     // Paper start
-     default boolean hasNearbyAlivePlayerThatAffectsSpawning(double x, double y, double z, double range) {
-         for (Player player : this.getLocalPlayers()) { // Folia - region threading
-            if (EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) { // combines NO_SPECTATORS and LIVING_ENTITY_STILL_ALIVE with an "affects spawning" check
-+            if (true || EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) { // combines NO_SPECTATORS and LIVING_ENTITY_STILL_ALIVE with an "affects spawning" check // Kaiiju - Move this down
-                 double distanceSqr = player.distanceToSqr(x, y, z);
-                 if (range < 0.0D || distanceSqr < range * range) {
-+                    if (EntitySelector.PLAYER_AFFECTS_SPAWNING.test(player)) // Kaiiju
-                     return true;
-                 }
-             }
-@@ -199,9 +200,9 @@ public interface EntityGetter {
-         T livingEntity = null;
- 
-         for(T livingEntity2 : entityList) {
-            if (targetPredicate.test(entity, livingEntity2)) {
-+            if (true || targetPredicate.test(entity, livingEntity2)) { // Kaiiju - Move this down
-                 double e = livingEntity2.distanceToSqr(x, y, z);
-                if (d == -1.0D || e < d) {
-+                if ((d == -1.0D || e < d) && targetPredicate.test(entity, livingEntity2)) { // Kaiiju
-                     d = e;
-                     livingEntity = livingEntity2;
-                 }
--- a/patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch
+++ b/patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Sat, 17 Jun 2023 21:03:04 +0300
-Subject: [PATCH] Use Math.floor instead of fastfloor
-
-
-diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 38441121cf7cdc1d64ef9fc17ae76dc16fbf96f2..3f76e1bc0c08775353d22b7d928536aba9c8ad1d 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
-+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -164,13 +164,19 @@ public final class MCUtil {
-     }
- 
-     public static int fastFloor(double x) {
-        int truncated = (int)x;
-        return x < (double)truncated ? truncated - 1 : truncated;
-+        // Kaiiju start - Use Math.floor instead of fastfloor
-+        return (int)Math.floor(x); // Kaiiju
-+        //int truncated = (int)x;
-+        //return x < (double)truncated ? truncated - 1 : truncated;
-+        // Kaiiju end
-     }
- 
-     public static int fastFloor(float x) {
-        int truncated = (int)x;
-        return x < (double)truncated ? truncated - 1 : truncated;
-+        // Kaiiju start - Use Math.floor instead of fastfloor
-+        return (int)Math.floor(x); // Kaiiju
-+        //int truncated = (int)x;
-+        //return x < (double)truncated ? truncated - 1 : truncated;
-+        // Kaiiju end
-     }
- 
-     public static float normalizeYaw(float f) {
--- a/patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch
+++ b/patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 18 Jun 2023 18:10:19 +0300
-Subject: [PATCH] Allow user to enable moving into unloaded chunks
-
-
-diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index a00201eca053ef69b8d903fdb9538444baf85465..bb9f088e3b7b90ab38d794433fc5d30d39e12c76 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -415,14 +415,14 @@ public class WorldConfiguration extends ConfigurationPart {
-     public class Chunks extends Post {
-         @Override
-         public void postProcess() {
-            this.preventMovingIntoUnloadedChunks = true;
-+            //this.preventMovingIntoUnloadedChunks = true; // Kaiiju - Don't
-         }
-         // Folia end - region threading - force prevent moving into unloaded chunks
- 
-         public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
-         public int maxAutoSaveChunksPerTick = 24;
-         public int fixedChunkInhabitedTime = -1;
-        public boolean preventMovingIntoUnloadedChunks = false;
-+        public boolean preventMovingIntoUnloadedChunks = true; // Kaiiju - True not False
-         public Duration delayChunkUnloadsBy = Duration.of("10s");
-         public Reference2IntMap<EntityType<?>> entityPerChunkSaveLimit = Util.make(new Reference2IntOpenHashMap<>(BuiltInRegistries.ENTITY_TYPE.size()), map -> {
-             map.defaultReturnValue(-1);
--- a/patches/server/0029-Don-t-pathfind-outside-region.patch
+++ b/patches/server/0029-Don-t-pathfind-outside-region.patch
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Mon, 19 Jun 2023 01:49:00 +0300
-Subject: [PATCH] Don't pathfind outside region
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java b/src/main/java/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
-index 1ab77f3518d1df30f66ae44d7d4fa69e5b32d93a..98bf17441da3169d49de55fe89d79ebe250a2b7e 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/MoveToTargetSink.java
-@@ -107,7 +107,9 @@ public class MoveToTargetSink extends Behavior<Mob> {
- 
-     private boolean tryComputePath(Mob entity, WalkTarget walkTarget, long time) {
-         BlockPos blockPos = walkTarget.getTarget().currentBlockPosition();
-+        if (io.papermc.paper.util.TickThread.isTickThreadFor((ServerLevel) entity.level(), blockPos)) // Kaiiju - Don't pathfind outside region
-         this.path = entity.getNavigation().createPath(blockPos, 0);
-+        else this.path = null; // Kaiiju - Don't pathfind outside region
-         this.speedModifier = walkTarget.getSpeedModifier();
-         Brain<?> brain = entity.getBrain();
-         if (this.reachedTarget(entity, walkTarget)) {
--- a/patches/server/0030-Don-t-spam-recipe-changes-on-update.patch
+++ b/patches/server/0030-Don-t-spam-recipe-changes-on-update.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Mon, 19 Jun 2023 21:30:19 +0300
-Subject: [PATCH] Don't spam recipe changes on update
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..6c705189b84542db584039763821b222df03e5d1 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
-+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-@@ -147,7 +147,7 @@ public class PlayerAdvancements {
-                         if (advancement == null) {
-                             // CraftBukkit start
-                             if (entry.getKey().getNamespace().equals("minecraft")) {
-                                PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.playerSavePath);
-+                                //PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.playerSavePath); // Kaiiju - We already know, don't spam.
-                             }
-                             // CraftBukkit end
-                         } else {
-diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-index ea29e07a105f3ba6a878bdccf36e7eaf66280280..8bbb5feea4190344fd6b3a3ae9f1c3cae578b9a6 100644
--- a/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-+++ b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
-@@ -125,7 +125,7 @@ public class ServerRecipeBook extends RecipeBook {
-                 Optional<? extends Recipe<?>> optional = recipeManager.byKey(minecraftkey);
- 
-                 if (!optional.isPresent()) {
-                    ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", minecraftkey);
-+                    //ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", minecraftkey); // Kaiiju - We already know, don't spam.
-                 } else {
-                     handler.accept((Recipe) optional.get());
-                 }
--- a/patches/server/0031-Option-to-disable-vanish-api.patch
+++ b/patches/server/0031-Option-to-disable-vanish-api.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:14:47 +0200
-Subject: [PATCH] Option to disable vanish api
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index cac747a46cccf8b115917a72340e9b81e7a437c9..a3c15f1009dad095b9411242e2d0347a6141984b 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -212,7 +212,10 @@ public class KaiijuConfig {
-         alternateKeepAlive = getBoolean("network.alternate-keepalive", alternateKeepAlive);
-     }
- 
-+    public static boolean disableVanishApi = false;
-+
-     private static void optimizationSettings() {
-+        disableVanishApi = getBoolean("optimization.disable-vanish-api", disableVanishApi);
-     }
- 
-     public static String serverModName = "Kaiiju";
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f50507ab85282d261985ce9b186581f5a7a50f79..4fb7ee801173c3f4621d7f09fcefe7c24da5f001 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1350,7 +1350,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player);
- 
-                 // CraftBukkit start - respect vanish API
-                if (!io.papermc.paper.util.TickThread.isTickThreadFor(player) || !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Folia - region threading
-+                // Kaiiju start - don't respect vanish API >:D
-+                boolean canSee = true;
-+                if (!dev.kaiijumc.kaiiju.KaiijuConfig.disableVanishApi) canSee = player.getBukkitEntity().canSee(this.entity.getBukkitEntity());
-+                if (!io.papermc.paper.util.TickThread.isTickThreadFor(player) || !canSee) { // Folia - region threading
-+                // Kaiiju end
-                     flag = false;
-                 }
-                 // CraftBukkit end
--- a/patches/server/0032-Option-to-disable-player-stats.patch
+++ b/patches/server/0032-Option-to-disable-player-stats.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:17:57 +0200
-Subject: [PATCH] Option to disable player stats
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index a3c15f1009dad095b9411242e2d0347a6141984b..8c872b2ad341f0105275209201fda03706535161 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -213,9 +213,11 @@ public class KaiijuConfig {
-     }
- 
-     public static boolean disableVanishApi = false;
-+    public static boolean disablePlayerStats = false;
- 
-     private static void optimizationSettings() {
-         disableVanishApi = getBoolean("optimization.disable-vanish-api", disableVanishApi);
-+        disablePlayerStats = getBoolean("optimization.disable-player-stats", disablePlayerStats);
-     }
- 
-     public static String serverModName = "Kaiiju";
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c0ad878cd29e2f72b7899d9539031b15ccbf6193..53f5bf8e6660f25290d4e64aca9c2911921b9fed 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2138,6 +2138,7 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     public void awardStat(Stat<?> stat, int amount) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disablePlayerStats) return; // Kaiiju - Disable player stats
-         this.stats.increment(this, stat, amount);
-         this.level().getCraftServer().getScoreboardManager().getScoreboardScores(stat, this.getScoreboardName(), (scoreboardscore) -> { // CraftBukkit - Get our scores instead
-             scoreboardscore.add(amount);
--- a/patches/server/0033-Option-to-disable-achievements.patch
+++ b/patches/server/0033-Option-to-disable-achievements.patch
@@ -1,175 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:32:36 +0200
-Subject: [PATCH] Option to disable achievements
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7..31d66bb2fcf4bb7262df2d8006e307fee92660ea 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -150,12 +150,14 @@ public class KaiijuWorldConfig {
-     public boolean optimizeHoppers = true;
-     public boolean tickWhenEmpty = true;
-     public boolean enableEntityThrottling = false;
-+    public boolean disableAchievements = false;
- 
-     private void optimizationSettings() {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-         optimizeHoppers = getBoolean("optimization.optimize-hoppers", optimizeHoppers);
-         tickWhenEmpty = getBoolean("optimization.tick-when-empty", tickWhenEmpty);
-         enableEntityThrottling = getBoolean("optimization.enable-entity-throttling", enableEntityThrottling);
-+        disableAchievements = getBoolean("optimization.disable-achievements", disableAchievements);
-     }
- 
-     public boolean fixVoidTrading = true;
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42597d0816 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -792,7 +792,7 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     protected void onInsideBlock(BlockState state) {
-        CriteriaTriggers.ENTER_BLOCK.trigger(this, state);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.ENTER_BLOCK.trigger(this, state); // Kaiiju
-     }
- 
-     @Override
-@@ -839,9 +839,9 @@ public class ServerPlayer extends Player {
-             }
-         }
- 
-        CriteriaTriggers.TICK.trigger(this);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.TICK.trigger(this); // Kaiiju
-         if (this.levitationStartPos != null) {
-            CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime); // Kaiiju
-         }
- 
-         this.trackStartFallingPosition();
-@@ -916,7 +916,7 @@ public class ServerPlayer extends Player {
-             }
- 
-             if (this.tickCount % 20 == 0) {
-                CriteriaTriggers.LOCATION.trigger(this);
-+                if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.LOCATION.trigger(this); // Kaiiju
-             }
- 
-             // CraftBukkit start - initialize oldLevel, fire PlayerLevelChangeEvent, and tick client-sided world border
-@@ -945,7 +945,7 @@ public class ServerPlayer extends Player {
-     @Override
-     public void resetFallDistance() {
-         if (this.getHealth() > 0.0F && this.startingToFallPosition != null) {
-            CriteriaTriggers.FALL_FROM_HEIGHT.trigger(this, this.startingToFallPosition);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.FALL_FROM_HEIGHT.trigger(this, this.startingToFallPosition); // Kaiiju
-         }
- 
-         this.startingToFallPosition = null;
-@@ -964,7 +964,7 @@ public class ServerPlayer extends Player {
-             if (this.enteredLavaOnVehiclePosition == null) {
-                 this.enteredLavaOnVehiclePosition = this.position();
-             } else {
-                CriteriaTriggers.RIDE_ENTITY_IN_LAVA_TRIGGER.trigger(this, this.enteredLavaOnVehiclePosition);
-+                if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.RIDE_ENTITY_IN_LAVA_TRIGGER.trigger(this, this.enteredLavaOnVehiclePosition); // Kaiiju
-             }
-         }
- 
-@@ -1168,7 +1168,7 @@ public class ServerPlayer extends Player {
- 
-             this.handleTeamKill(s, s1, ObjectiveCriteria.TEAM_KILL);
-             this.handleTeamKill(s1, s, ObjectiveCriteria.KILLED_BY_TEAM);
-            CriteriaTriggers.PLAYER_KILLED_ENTITY.trigger(this, entityKilled, damageSource);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.PLAYER_KILLED_ENTITY.trigger(this, entityKilled, damageSource); // Kaiiju
-         }
-     }
- 
-@@ -1286,7 +1286,7 @@ public class ServerPlayer extends Player {
-         this.wonGame = false;
- 
-         this.respawn((player) -> {
-            CriteriaTriggers.CHANGED_DIMENSION.trigger(player, Level.END, Level.OVERWORLD);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.CHANGED_DIMENSION.trigger(player, Level.END, Level.OVERWORLD); // Kaiiju
-         }, true);
-     }
- 
-@@ -1787,14 +1787,14 @@ public class ServerPlayer extends Player {
-             maindimensionkey1 = resourcekey1;
-         }
-         // Paper end
-        CriteriaTriggers.CHANGED_DIMENSION.trigger(this, maindimensionkey, maindimensionkey1);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.CHANGED_DIMENSION.trigger(this, maindimensionkey, maindimensionkey1); // Kaiiju
-         if (maindimensionkey != resourcekey || maindimensionkey1 != resourcekey1) {
-            CriteriaTriggers.CHANGED_DIMENSION.trigger(this, resourcekey, resourcekey1);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.CHANGED_DIMENSION.trigger(this, resourcekey, resourcekey1); // Kaiiju
-         }
- 
-         if (maindimensionkey == Level.NETHER && maindimensionkey1 == Level.OVERWORLD && this.enteredNetherPosition != null) {
-             // CraftBukkit end
-            CriteriaTriggers.NETHER_TRAVEL.trigger(this, this.enteredNetherPosition);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.NETHER_TRAVEL.trigger(this, this.enteredNetherPosition); // Kaiiju
-         }
- 
-         if (maindimensionkey1 != Level.NETHER) { // CraftBukkit
-@@ -1872,7 +1872,7 @@ public class ServerPlayer extends Player {
-                 {
-                     Either<Player.BedSleepingProblem, Unit> either = super.startSleepInBed(blockposition, force).ifRight((unit) -> {
-                         this.awardStat(Stats.SLEEP_IN_BED);
-                        CriteriaTriggers.SLEPT_IN_BED.trigger(this);
-+                        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.SLEPT_IN_BED.trigger(this); // Kaiiju
-                     });
- 
-                     if (!this.serverLevel().canSleepThroughNights()) {
-@@ -2158,7 +2158,7 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     public void triggerRecipeCrafted(Recipe<?> recipe, List<ItemStack> ingredients) {
-        CriteriaTriggers.RECIPE_CRAFTED.trigger(this, recipe.getId(), ingredients);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.RECIPE_CRAFTED.trigger(this, recipe.getId(), ingredients); // Kaiiju
-     }
- 
-     @Override
-@@ -2287,14 +2287,14 @@ public class ServerPlayer extends Player {
-             this.levitationStartPos = this.position();
-         }
- 
-        CriteriaTriggers.EFFECTS_CHANGED.trigger(this, source);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.EFFECTS_CHANGED.trigger(this, source); // Kaiiju
-     }
- 
-     @Override
-     protected void onEffectUpdated(MobEffectInstance effect, boolean reapplyEffect, @Nullable Entity source) {
-         super.onEffectUpdated(effect, reapplyEffect, source);
-         this.connection.send(new ClientboundUpdateMobEffectPacket(this.getId(), effect));
-        CriteriaTriggers.EFFECTS_CHANGED.trigger(this, source);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.EFFECTS_CHANGED.trigger(this, source); // Kaiiju
-     }
- 
-     @Override
-@@ -2305,7 +2305,7 @@ public class ServerPlayer extends Player {
-             this.levitationStartPos = null;
-         }
- 
-        CriteriaTriggers.EFFECTS_CHANGED.trigger(this, (Entity) null);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.EFFECTS_CHANGED.trigger(this, (Entity) null); // Kaiiju
-     }
- 
-     @Override
-@@ -2865,7 +2865,7 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     protected void updateUsingItem(ItemStack stack) {
-        CriteriaTriggers.USING_ITEM.trigger(this, stack);
-+        if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.USING_ITEM.trigger(this, stack); // Kaiiju
-         super.updateUsingItem(stack);
-     }
- 
-@@ -2894,7 +2894,7 @@ public class ServerPlayer extends Player {
-         Entity entity = item.getOwner();
- 
-         if (entity != null) {
-            CriteriaTriggers.THROWN_ITEM_PICKED_UP_BY_PLAYER.trigger(this, item.getItem(), entity);
-+            if (!this.level().kaiijuConfig.disableAchievements) CriteriaTriggers.THROWN_ITEM_PICKED_UP_BY_PLAYER.trigger(this, item.getItem(), entity); // Kaiiju
-         }
- 
-     }
--- a/patches/server/0034-Option-to-disable-arm-swing-event.patch
+++ b/patches/server/0034-Option-to-disable-arm-swing-event.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:37:27 +0200
-Subject: [PATCH] Option to disable arm swing event
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 8c872b2ad341f0105275209201fda03706535161..9b118a6e22264c88c0460016822b1920631fff85 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -214,10 +214,12 @@ public class KaiijuConfig {
- 
-     public static boolean disableVanishApi = false;
-     public static boolean disablePlayerStats = false;
-+    public static boolean disableArmSwingEvent = false;
- 
-     private static void optimizationSettings() {
-         disableVanishApi = getBoolean("optimization.disable-vanish-api", disableVanishApi);
-         disablePlayerStats = getBoolean("optimization.disable-player-stats", disablePlayerStats);
-+        disableArmSwingEvent = getBoolean("optimization.disable-arm-swing-event", disableArmSwingEvent);
-     }
- 
-     public static String serverModName = "Kaiiju";
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ab0d3e0653028b7d93177c28c1f532d8b10b1b1..86e14f3d853d6134b7d7b3770107529de8ac2c91 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2656,6 +2656,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-         if (this.player.isImmobile()) return; // CraftBukkit
-         this.player.resetLastActionTime();
-+        if (!dev.kaiijumc.kaiiju.KaiijuConfig.disableArmSwingEvent) { // Kaiiju
-         // CraftBukkit start - Raytrace to look for 'rogue armswings'
-         float f1 = this.player.getXRot();
-         float f2 = this.player.getYRot();
-@@ -2678,6 +2679,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-         if (event.isCancelled()) return;
-         // CraftBukkit end
-+        } // Kaiiju
-         this.player.swing(packet.getHand());
-     }
- 
--- a/patches/server/0035-Option-to-disable-creatures-spawn-events.patch
+++ b/patches/server/0035-Option-to-disable-creatures-spawn-events.patch
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:47:57 +0200
-Subject: [PATCH] Option to disable creatures spawn events
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index 31d66bb2fcf4bb7262df2d8006e307fee92660ea..c9830912019079369268bfbf2c95de18ad598f52 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -151,6 +151,7 @@ public class KaiijuWorldConfig {
-     public boolean tickWhenEmpty = true;
-     public boolean enableEntityThrottling = false;
-     public boolean disableAchievements = false;
-+    public boolean disableCreaturesSpawnEvents = false;
- 
-     private void optimizationSettings() {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-@@ -158,6 +159,7 @@ public class KaiijuWorldConfig {
-         tickWhenEmpty = getBoolean("optimization.tick-when-empty", tickWhenEmpty);
-         enableEntityThrottling = getBoolean("optimization.enable-entity-throttling", enableEntityThrottling);
-         disableAchievements = getBoolean("optimization.disable-achievements", disableAchievements);
-+        disableCreaturesSpawnEvents = getBoolean("optimization.disable-creatures-spawn-events", disableCreaturesSpawnEvents);
-     }
- 
-     public boolean fixVoidTrading = true;
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index af35fd63b090aa3d89bc60cb9cb7694b5f502681..e5dded0363b14608e834e63e678563b1423d66e7 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -486,21 +486,29 @@ public class ServerChunkCache extends ChunkSource {
-                 chunkRange = (chunkRange > viewDistance) ? (byte)viewDistance : chunkRange;
-                 chunkRange = (chunkRange > DistanceManager.MOB_SPAWN_RANGE) ? DistanceManager.MOB_SPAWN_RANGE : chunkRange;
- 
-                com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event = new com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent(player.getBukkitEntity(), (byte)chunkRange);
-+                // Kaiiju start - disable creatures spawn events
-+                com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event = null;
-+                if (!this.level.kaiijuConfig.disableCreaturesSpawnEvents) {
-+                event = new com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent(player.getBukkitEntity(), (byte)chunkRange);
-+                // Kaiiju end
-                 event.callEvent();
-                 if (event.isCancelled() || event.getSpawnRadius() < 0) { // Folia - region threading
-                     player.lastEntitySpawnRadiusSquared = -1.0; player.playerNaturallySpawnedEvent = null;  // Folia - region threading
-                     regionizedWorldData.mobSpawnMap.remove(player); // Folia - region threading
-                     continue;
-                 }
-+                // Kaiiju start - disable creatures spawn events
-+                chunkRange = Math.min(event.getSpawnRadius(), 32);
-+                }
-+                // Kaiiju end
- 
-                int range = Math.min(event.getSpawnRadius(), 32); // limit to max view distance
-+                int range = chunkRange; // limit to max view distance // Kaiiju
-                 int chunkX = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getX());
-                 int chunkZ = io.papermc.paper.util.MCUtil.getChunkCoordinate(player.getZ());
- 
-                 regionizedWorldData.mobSpawnMap.addOrUpdate(player, chunkX, chunkZ, range); // Folia - region threading
-                 player.lastEntitySpawnRadiusSquared = (double)((range << 4) * (range << 4)); // used in anyPlayerCloseEnoughForSpawning
-                player.playerNaturallySpawnedEvent = event;
-+                if (!this.level.kaiijuConfig.disableCreaturesSpawnEvents) player.playerNaturallySpawnedEvent = event; // Kaiiju
-             }
-             // Paper end - optimize isOutisdeRange
-             LevelData worlddata = this.level.getLevelData();
--- a/patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch
+++ b/patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:52:00 +0200
-Subject: [PATCH] Option to disable dolphin swim to treasure
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index c9830912019079369268bfbf2c95de18ad598f52..e2fb7d7a7b3126d386b46442c115085d1974ac4e 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -152,6 +152,7 @@ public class KaiijuWorldConfig {
-     public boolean enableEntityThrottling = false;
-     public boolean disableAchievements = false;
-     public boolean disableCreaturesSpawnEvents = false;
-+    public boolean disableDolphinSwimToTreasure = false;
- 
-     private void optimizationSettings() {
-         shulkerBoxDropContentsWhenDestroyed = getBoolean("optimization.shulker-box-drop-contents-when-destroyed", shulkerBoxDropContentsWhenDestroyed);
-@@ -160,6 +161,7 @@ public class KaiijuWorldConfig {
-         enableEntityThrottling = getBoolean("optimization.enable-entity-throttling", enableEntityThrottling);
-         disableAchievements = getBoolean("optimization.disable-achievements", disableAchievements);
-         disableCreaturesSpawnEvents = getBoolean("optimization.disable-creatures-spawn-events", disableCreaturesSpawnEvents);
-+        disableDolphinSwimToTreasure = getBoolean("optimization.disable-dolphin-swim-to-treasure", disableDolphinSwimToTreasure);
-     }
- 
-     public boolean fixVoidTrading = true;
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 4ec6dc8ddcb940091956fdf014f43832db287d8d..770c3c26702d4136df6b8f891f4949f364b62a1b 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -164,7 +164,7 @@ public class Dolphin extends WaterAnimal {
-     protected void registerGoals() {
-         this.goalSelector.addGoal(0, new BreathAirGoal(this));
-         this.goalSelector.addGoal(0, new TryFindWaterGoal(this));
-        this.goalSelector.addGoal(1, new Dolphin.DolphinSwimToTreasureGoal(this));
-+        if (!this.level().kaiijuConfig.disableDolphinSwimToTreasure) this.goalSelector.addGoal(1, new Dolphin.DolphinSwimToTreasureGoal(this)); // Kaiiju
-         this.goalSelector.addGoal(2, new Dolphin.DolphinSwimWithPlayerGoal(this, 4.0D));
-         this.goalSelector.addGoal(4, new RandomSwimmingGoal(this, 1.0D, 10));
-         this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
--- a/patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch
+++ b/patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch
@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Xymb <xymb@endcrystal.me>
-Date: Thu, 22 Jun 2023 00:55:17 +0200
-Subject: [PATCH] Option to disable ensure tick thread checks
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 9b118a6e22264c88c0460016822b1920631fff85..95015955a8076bc903c012704b57b1b84286aaae 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -215,11 +215,13 @@ public class KaiijuConfig {
-     public static boolean disableVanishApi = false;
-     public static boolean disablePlayerStats = false;
-     public static boolean disableArmSwingEvent = false;
-+    public static boolean disableEnsureTickThreadChecks = false;
- 
-     private static void optimizationSettings() {
-         disableVanishApi = getBoolean("optimization.disable-vanish-api", disableVanishApi);
-         disablePlayerStats = getBoolean("optimization.disable-player-stats", disablePlayerStats);
-         disableArmSwingEvent = getBoolean("optimization.disable-arm-swing-event", disableArmSwingEvent);
-+        disableEnsureTickThreadChecks = getBoolean("optimization.disable-ensure-tick-thread-checks", disableEnsureTickThreadChecks);
-     }
- 
-     public static String serverModName = "Kaiiju";
-diff --git a/src/main/java/io/papermc/paper/util/TickThread.java b/src/main/java/io/papermc/paper/util/TickThread.java
-index cb453dd110fc37fae75257a4576512126207763e..492e6a512343001d3d772d2d8b427d2d84e89da5 100644
--- a/src/main/java/io/papermc/paper/util/TickThread.java
-+++ b/src/main/java/io/papermc/paper/util/TickThread.java
-@@ -46,6 +46,7 @@ public class TickThread extends Thread {
-      */
-     @Deprecated
-     public static void ensureTickThread(final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThread()) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
-@@ -53,6 +54,7 @@ public class TickThread extends Thread {
-     }
- 
-     public static void ensureTickThread(final ServerLevel world, final BlockPos pos, final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThreadFor(world, pos)) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
-@@ -60,6 +62,7 @@ public class TickThread extends Thread {
-     }
- 
-     public static void ensureTickThread(final ServerLevel world, final ChunkPos pos, final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThreadFor(world, pos)) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
-@@ -67,6 +70,7 @@ public class TickThread extends Thread {
-     }
- 
-     public static void ensureTickThread(final ServerLevel world, final int chunkX, final int chunkZ, final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThreadFor(world, chunkX, chunkZ)) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
-@@ -74,6 +78,7 @@ public class TickThread extends Thread {
-     }
- 
-     public static void ensureTickThread(final Entity entity, final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThreadFor(entity)) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
-@@ -81,6 +86,7 @@ public class TickThread extends Thread {
-     }
- 
-     public static void ensureTickThread(final ServerLevel world, final AABB aabb, final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThreadFor(world, aabb)) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
-@@ -88,6 +94,7 @@ public class TickThread extends Thread {
-     }
- 
-     public static void ensureTickThread(final ServerLevel world, final double blockX, final double blockZ, final String reason) {
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.disableEnsureTickThreadChecks) return; // Kaiiju
-         if (!isTickThreadFor(world, blockX, blockZ)) {
-             MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
-             throw new IllegalStateException(reason);
--- a/patches/server/0038-Don-t-kick-player-on-bad-packet.patch
+++ b/patches/server/0038-Don-t-kick-player-on-bad-packet.patch
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 2 Jul 2023 19:13:14 +0300
-Subject: [PATCH] Don't kick player on bad packet
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 95015955a8076bc903c012704b57b1b84286aaae..6df1720159383c2f536b40ded1092a437c1a20af 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -206,10 +206,12 @@ public class KaiijuConfig {
-     
-     public static boolean sendNullEntityPackets = true;
-     public static boolean alternateKeepAlive = false;
-+    public static boolean kickPlayerOnBadPacket = true;
- 
-     private static void networkSettings() {
-         sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
-         alternateKeepAlive = getBoolean("network.alternate-keepalive", alternateKeepAlive);
-+        kickPlayerOnBadPacket = getBoolean("network.kick-player-on-bad-packet", kickPlayerOnBadPacket);
-     }
- 
-     public static boolean disableVanishApi = false;
-diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index f6ccb6eab566b44c3460376d46df1f2cf3d7b19d..13e5aeb0c04d27408ffbc6b11582426a7f2eb0f0 100644
--- a/src/main/java/net/minecraft/network/Connection.java
-+++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -271,12 +271,18 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-                         ConnectionProtocol enumprotocol = this.getCurrentProtocol();
-                         Packet<?> packet = enumprotocol == ConnectionProtocol.LOGIN ? new ClientboundLoginDisconnectPacket(ichatmutablecomponent) : new ClientboundDisconnectPacket(ichatmutablecomponent);
- 
-+                        // Kaiiju start - Don't kick player on bad packet
-+                        if (dev.kaiijumc.kaiiju.KaiijuConfig.kickPlayerOnBadPacket
-+                            || throwable instanceof io.netty.channel.unix.Errors.NativeIoException) {
-+                        // Kaiiju end
-                         this.send((Packet) packet, PacketSendListener.thenRun(() -> {
-                             this.disconnect(ichatmutablecomponent);
-                         }));
-                         this.setReadOnly();
-+                        } // Kaiiju - Don't kick player on bad packet
-                     } else {
-                         Connection.LOGGER.debug("Double fault", throwable);
-+                        if (dev.kaiijumc.kaiiju.KaiijuConfig.kickPlayerOnBadPacket) // Kaiiju - Don't kick player on bad packet
-                         this.disconnect(ichatmutablecomponent);
-                     }
-                 }
--- a/patches/server/0039-Skip-event-if-no-listeners.patch
+++ b/patches/server/0039-Skip-event-if-no-listeners.patch
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: foss-mc <69294560+foss-mc@users.noreply.github.com>
-Date: Sat, 8 Jul 2023 01:31:10 +0300
-Subject: [PATCH] Skip event if no listeners
-
-
-diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..d0f6d4e6ab3a7a4bd6cb8e27c90c7c7300f204a5 100644
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-+++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -36,14 +36,21 @@ class PaperEventManager {
- 
-     // SimplePluginManager
-     public void callEvent(@NotNull Event event) {
-+        // Kaiiju start - Skip event of no listeners
-+        HandlerList handlers = event.getHandlers();
-+        RegisteredListener[] listeners = handlers.getRegisteredListeners();
-+        if (listeners.length == 0) return;
-+        // Kaiiju end
-         if (event.isAsynchronous() && this.server.isPrimaryThread()) {
-             throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
-         } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) {
-             throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
-         }
- 
-        HandlerList handlers = event.getHandlers();
-        RegisteredListener[] listeners = handlers.getRegisteredListeners();
-+        // Kaiiju start - Moved up
-+        //HandlerList handlers = event.getHandlers();
-+        //RegisteredListener[] listeners = handlers.getRegisteredListeners();
-+        // Kaiiju end
- 
-         for (RegisteredListener registration : listeners) {
-             if (!registration.getPlugin().isEnabled()) {
--- a/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch
+++ b/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch
@@ -1,75 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sat, 8 Jul 2023 03:31:04 +0300
-Subject: [PATCH] Teleport async if we cannot move entity off-main
-
-Entities with huge velocity (100k+ velocity anarchy travel exploit) might disappear / crash the server because they travel a region each tick.
-TODO: Entities with huge velocity still throw stacktraces because they are ticked in "null" regions.
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-index e2fb7d7a7b3126d386b46442c115085d1974ac4e..44f5540a6a5733cf6f10f6b04fc9611ac4e53685 100644
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
-@@ -169,6 +169,7 @@ public class KaiijuWorldConfig {
-     public boolean fixTripWireStateInconsistency = true;
-     public boolean safeTeleporting = true;
-     public boolean sandDuplication = false;
-+    public boolean teleportAsyncOnHighVelocity = false;
- 
-     private void gameplaySettings() {
-         fixVoidTrading = getBoolean("gameplay.fix-void-trading", fixVoidTrading);
-@@ -176,5 +177,6 @@ public class KaiijuWorldConfig {
-         fixTripWireStateInconsistency = getBoolean("gameplay.fix-tripwire-state-inconsistency", fixTripWireStateInconsistency);
-         safeTeleporting = getBoolean("gameplay.safe-teleportation", safeTeleporting);
-         sandDuplication = getBoolean("gameplay.sand-duplication", sandDuplication);
-+        teleportAsyncOnHighVelocity = getBoolean("gameplay.teleport-async-on-high-velocity", teleportAsyncOnHighVelocity);
-     }
- }
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 135573308662845ecc73fde1c620345e1f372538..812b2c216003b8decedef1353acab1b44d146e08 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1126,7 +1126,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                     }
-                 }
- 
-+                try { // Kaiiju - Teleport async if we cannot move entity off-main
-                 this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
-+                // Kaiiju start - Teleport async if we cannot move entity off-main
-+                } catch (IllegalStateException e) {
-+                    if (this.level().kaiijuConfig.teleportAsyncOnHighVelocity)
-+                    this.teleportAsync((ServerLevel) this.level(), this.position().add(vec3d1),
-+                                       this.getYRot(), this.getXRot(),
-+                                       null, PlayerTeleportEvent.TeleportCause.UNKNOWN,
-+                                       Entity.TELEPORT_FLAG_LOAD_CHUNK | Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS,
-+                                       null
-+                    );
-+                    else LOGGER.error("High velocity entity caused off-main setPos: ", e);
-+                }
-+                // Kaiiju end
-             }
- 
-             this.level().getProfiler().pop();
-@@ -3868,13 +3881,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         // check for same region
-         if (destination == this.level()) {
-             Vec3 currPos = this.position();
-            if (
-                destination.regioniser.getRegionAtUnsynchronised(
-                    io.papermc.paper.util.CoordinateUtils.getChunkX(currPos), io.papermc.paper.util.CoordinateUtils.getChunkZ(currPos)
-                ) == destination.regioniser.getRegionAtUnsynchronised(
-                    io.papermc.paper.util.CoordinateUtils.getChunkX(pos), io.papermc.paper.util.CoordinateUtils.getChunkZ(pos)
-                )
-            ) {
-+            // Kaiiju start - We shouldn't teleport when regions are null
-+            io.papermc.paper.threadedregions.ThreadedRegionizer.ThreadedRegion<io.papermc.paper.threadedregions.TickRegions.TickRegionData,
-+                                                                               io.papermc.paper.threadedregions.TickRegions.TickRegionSectionData>
-+            currRegion = destination.regioniser.getRegionAtUnsynchronised(io.papermc.paper.util.CoordinateUtils.getChunkX(currPos), io.papermc.paper.util.CoordinateUtils.getChunkZ(currPos));
-+            io.papermc.paper.threadedregions.ThreadedRegionizer.ThreadedRegion<io.papermc.paper.threadedregions.TickRegions.TickRegionData,
-+                                                                               io.papermc.paper.threadedregions.TickRegions.TickRegionSectionData>
-+            destRegion = destination.regioniser.getRegionAtUnsynchronised(io.papermc.paper.util.CoordinateUtils.getChunkX(pos), io.papermc.paper.util.CoordinateUtils.getChunkZ(pos));
-+            if (currRegion == destRegion && currRegion != null) {
-+            // Kaiiju end
-                 EntityTreeNode passengerTree = this.detachPassengers();
-                 // Note: The client does not accept position updates for controlled entities. So, we must
-                 // perform a lot of tracker updates here to make it all work out.
--- a/patches/server/0041-Add-back-worldborder-command.patch
+++ b/patches/server/0041-Add-back-worldborder-command.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 9 Jul 2023 19:17:40 +0300
-Subject: [PATCH] Add back worldborder command
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 681cd79ce24fe5d952e987d46e2fd8df07a0f8a1..68af43ed4d667648df0e45ffc899d3e4b7b1a69d 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -199,7 +199,7 @@ public class Commands {
-         TitleCommand.register(this.dispatcher);
-         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
-         WeatherCommand.register(this.dispatcher);
-        //WorldBorderCommand.register(this.dispatcher); // Folia - region threading - TODO later
-+        WorldBorderCommand.register(this.dispatcher); // Folia - region threading - TODO later // Kaiiju
-         if (JvmProfiler.INSTANCE.isAvailable()) {
-             JfrCommand.register(this.dispatcher);
-         }
--- a/patches/server/0042-Add-back-data-command.patch
+++ b/patches/server/0042-Add-back-data-command.patch
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Sun, 9 Jul 2023 19:18:42 +0300
-Subject: [PATCH] Add back data command
-
-
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 68af43ed4d667648df0e45ffc899d3e4b7b1a69d..44576310cc5b89c287b0ab7ba1a99d76b67f33dd 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -148,7 +148,7 @@ public class Commands {
-         ClearInventoryCommands.register(this.dispatcher, commandRegistryAccess);
-         //CloneCommands.register(this.dispatcher, commandRegistryAccess); // Folia - region threading - TODO
-         DamageCommand.register(this.dispatcher, commandRegistryAccess);
-        //DataCommands.register(this.dispatcher); // Folia - region threading - TODO
-+        DataCommands.register(this.dispatcher); // Folia - region threading - TODO // Kaiiju
-         //DataPackCommand.register(this.dispatcher); // Folia - region threading - TODO
-         //DebugCommand.register(this.dispatcher); // Folia - region threading - TODO
-         DefaultGameModeCommands.register(this.dispatcher);
--- a/patches/server/0043-Async-path-processing.patch
+++ b/patches/server/0043-Async-path-processing.patch
--- a/patches/server/0044-Improve-container-checking-with-a-bitset.patch
+++ b/patches/server/0044-Improve-container-checking-with-a-bitset.patch
@@ -1,458 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paul Sauve <paul@technove.co>
-Date: Tue, 1 Aug 2023 03:38:09 +0200
-Subject: [PATCH] Improve container checking with a bitset
-
-
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/structs/ItemListWithBitset.java b/src/main/java/dev/kaiijumc/kaiiju/structs/ItemListWithBitset.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ee32b7c4a1ae1e23149694ecba5ab7bd347d6ca6
--- /dev/null
-+++ b/src/main/java/dev/kaiijumc/kaiiju/structs/ItemListWithBitset.java
-@@ -0,0 +1,114 @@
-+package dev.kaiijumc.kaiiju.structs;
-+
-+
-+import net.minecraft.core.NonNullList;
-+import net.minecraft.world.item.ItemStack;
-+import org.apache.commons.lang.Validate;
-+import org.jetbrains.annotations.NotNull;
-+
-+import java.util.AbstractList;
-+import java.util.Arrays;
-+import java.util.List;
-+
-+public class ItemListWithBitset extends AbstractList<ItemStack> {
-+    public static ItemListWithBitset fromList(List<ItemStack> list) {
-+        if (list instanceof ItemListWithBitset ours) {
-+            return ours;
-+        }
-+        return new ItemListWithBitset(list);
-+    }
-+
-+    private static ItemStack[] createArray(int size) {
-+        ItemStack[] array = new ItemStack[size];
-+        Arrays.fill(array, ItemStack.EMPTY);
-+        return array;
-+    }
-+
-+    private final ItemStack[] items;
-+
-+    private long bitSet = 0;
-+    private final long allBits;
-+
-+    private static class OurNonNullList extends NonNullList<ItemStack> {
-+        protected OurNonNullList(List<ItemStack> delegate) {
-+            super(delegate, ItemStack.EMPTY);
-+        }
-+    }
-+
-+    public final NonNullList<ItemStack> nonNullList = new OurNonNullList(this);
-+
-+    private ItemListWithBitset(List<ItemStack> list) {
-+        this(list.size());
-+
-+        for (int i = 0; i < list.size(); i++) {
-+            this.set(i, list.get(i));
-+        }
-+    }
-+
-+    public ItemListWithBitset(int size) {
-+        Validate.isTrue(size < Long.BYTES * 8, "size is too large");
-+
-+        this.items = createArray(size);
-+        this.allBits = ((1L << size) - 1);
-+    }
-+
-+    public boolean isCompletelyEmpty() {
-+        return this.bitSet == 0;
-+    }
-+
-+    public boolean hasFullStacks() {
-+        return (this.bitSet & this.allBits) == allBits;
-+    }
-+
-+    @Override
-+    public ItemStack set(int index, @NotNull ItemStack itemStack) {
-+        ItemStack existing = this.items[index];
-+
-+        this.items[index] = itemStack;
-+
-+        if (itemStack == ItemStack.EMPTY) {
-+            this.bitSet &= ~(1L << index);
-+        } else {
-+            this.bitSet |= 1L << index;
-+        }
-+
-+        return existing;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public ItemStack get(int var0) {
-+        return this.items[var0];
-+    }
-+
-+    @Override
-+    public int size() {
-+        return this.items.length;
-+    }
-+
-+    @Override
-+    public void clear() {
-+        Arrays.fill(this.items, ItemStack.EMPTY);
-+    }
-+
-+    // these are unsupported for block inventories which have a static size
-+    @Override
-+    public void add(int var0, ItemStack var1) {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    @Override
-+    public ItemStack remove(int var0) {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    @Override
-+    public String toString() {
-+        return "ItemListWithBitset{" +
-+          "items=" + Arrays.toString(items) +
-+          ", bitSet=" + Long.toString(bitSet, 2) +
-+          ", allBits=" + Long.toString(allBits, 2) +
-+          ", size=" + this.items.length +
-+          '}';
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/CompoundContainer.java b/src/main/java/net/minecraft/world/CompoundContainer.java
-index 241fec02e6869c638d3a160819b32173a081467b..62848ca68f532fa14241320df76d180c13072c34 100644
--- a/src/main/java/net/minecraft/world/CompoundContainer.java
-+++ b/src/main/java/net/minecraft/world/CompoundContainer.java
-@@ -64,6 +64,23 @@ public class CompoundContainer implements Container {
-         this.container2 = second;
-     }
- 
-+    // Kaiiju start - airplane - improve container checking with a bitset
-+    @Override
-+   public boolean hasEmptySlot(net.minecraft.core.Direction enumdirection) {
-+        return this.container1.hasEmptySlot(null) || this.container2.hasEmptySlot(null);
-+    }
-+
-+    @Override
-+   public boolean isCompletelyFull(net.minecraft.core.Direction enumdirection) {
-+        return this.container1.isCompletelyFull(null) && this.container2.isCompletelyFull(null);
-+    }
-+
-+    @Override
-+    public boolean isCompletelyEmpty(net.minecraft.core.Direction enumdirection) {
-+        return this.container1.isCompletelyEmpty(null) && this.container2.isCompletelyEmpty(null);
-+    }
-+    // Kaiiju end
-+
-     @Override
-     public int getContainerSize() {
-         return this.container1.getContainerSize() + this.container2.getContainerSize();
-diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
-index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..ac1e21a4fc210424ea57c247d03914c54129de9c 100644
--- a/src/main/java/net/minecraft/world/Container.java
-+++ b/src/main/java/net/minecraft/world/Container.java
-@@ -13,6 +13,63 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
- // CraftBukkit end
- 
- public interface Container extends Clearable {
-+    // Kaiiju start - airplane - allow the inventory to override and optimize these frequent calls
-+    default boolean hasEmptySlot(@org.jetbrains.annotations.Nullable net.minecraft.core.Direction enumdirection) { // there is a slot with 0 items in it
-+        if (this instanceof WorldlyContainer worldlyContainer) {
-+            for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
-+                if (this.getItem(i).isEmpty()) {
-+                    return true;
-+                }
-+            }
-+        } else {
-+            int size = this.getContainerSize();
-+            for (int i = 0; i < size; i++) {
-+                if (this.getItem(i).isEmpty()) {
-+                    return true;
-+                }
-+            }
-+        }
-+        return false;
-+    }
-+
-+    default boolean isCompletelyFull(@org.jetbrains.annotations.Nullable net.minecraft.core.Direction enumdirection) { // every stack is maxed
-+        if (this instanceof WorldlyContainer worldlyContainer) {
-+            for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
-+                ItemStack itemStack = this.getItem(i);
-+                if (itemStack.getCount() < itemStack.getMaxStackSize()) {
-+                    return false;
-+                }
-+            }
-+        } else {
-+            int size = this.getContainerSize();
-+            for (int i = 0; i < size; i++) {
-+                ItemStack itemStack = this.getItem(i);
-+                if (itemStack.getCount() < itemStack.getMaxStackSize()) {
-+                    return false;
-+                }
-+            }
-+        }
-+        return true;
-+    }
-+
-+    default boolean isCompletelyEmpty(@org.jetbrains.annotations.Nullable net.minecraft.core.Direction enumdirection) {
-+        if (this instanceof WorldlyContainer worldlyContainer) {
-+            for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
-+                if (!this.getItem(i).isEmpty()) {
-+                    return false;
-+                }
-+            }
-+        } else {
-+            int size = this.getContainerSize();
-+            for (int i = 0; i < size; i++) {
-+                if (!this.getItem(i).isEmpty()) {
-+                    return false;
-+                }
-+            }
-+        }
-+        return true;
-+    }
-+    // Kaiiju end
- 
-     int LARGE_MAX_STACK_SIZE = 64;
-     int DEFAULT_DISTANCE_LIMIT = 8;
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 272095d7a09ab41227d741172735f66fd2798ce1..1f2e2d7726abd63bb46697697c91696387c819a2 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -28,6 +28,7 @@ import org.bukkit.inventory.InventoryHolder;
- public abstract class AbstractMinecartContainer extends AbstractMinecart implements ContainerEntity {
- 
-     private NonNullList<ItemStack> itemStacks;
-+    private dev.kaiijumc.kaiiju.structs.ItemListWithBitset itemStacksOptimized; // Kaiiju - airplane - implement ItemListWithBitset
-     @Nullable
-     public ResourceLocation lootTable;
-     public long lootTableSeed;
-@@ -89,12 +90,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
- 
-     protected AbstractMinecartContainer(EntityType<?> type, Level world) {
-         super(type, world);
-        this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.itemStacksOptimized = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
-+        this.itemStacks = this.itemStacksOptimized.nonNullList;
-+        // Kaiiju end
-     }
- 
-     protected AbstractMinecartContainer(EntityType<?> type, double x, double y, double z, Level world) {
-         super(type, world, x, y, z);
-        this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.itemStacksOptimized = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
-+        this.itemStacks = this.itemStacksOptimized.nonNullList;
-+        // Kaiiju end
-     }
- 
-     @Override
-@@ -156,6 +163,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     protected void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-         this.lootableData.loadNbt(nbt); // Paper
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.itemStacksOptimized = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
-+        this.itemStacks = this.itemStacksOptimized.nonNullList;
-+        // Kaiiju end
-         this.readChestVehicleSaveData(nbt);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index a71414397bd45ee7bcacfeef0041d80dfa25f114..67f69540e6c217070f8d2af8908d4eb6f2b5c1c1 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-@@ -31,6 +31,7 @@ import org.bukkit.entity.HumanEntity;
- public class ChestBlockEntity extends RandomizableContainerBlockEntity implements LidBlockEntity {
- 
-     private static final int EVENT_SET_OPEN_COUNT = 1;
-+    private dev.kaiijumc.kaiiju.structs.ItemListWithBitset optimizedItems; // Kaiiju - airplane - implement ItemListWithBitset
-     private NonNullList<ItemStack> items;
-     public final ContainerOpenersCounter openersCounter;
-     private final ChestLidController chestLidController;
-@@ -65,9 +66,14 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
-     }
-     // CraftBukkit end
- 
-+    private final boolean isNative = getClass().equals(ChestBlockEntity.class); // Kaiiju - airplane
-+
-     protected ChestBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
-         super(type, pos, state);
-        this.items = NonNullList.withSize(27, ItemStack.EMPTY);
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(27);
-+        this.items = this.optimizedItems.nonNullList;
-+        // Kaiiju end
-         this.openersCounter = new ContainerOpenersCounter() {
-             @Override
-             protected void onOpen(Level world, BlockPos pos, BlockState state) {
-@@ -98,6 +104,23 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
-         this.chestLidController = new ChestLidController();
-     }
- 
-+    // Kaiiju start - airplane - improve container checking with a bitset
-+    @Override
-+    public boolean hasEmptySlot(Direction enumdirection) {
-+        return isNative ? !this.optimizedItems.hasFullStacks() : super.hasEmptySlot(enumdirection);
-+    }
-+
-+    @Override
-+    public boolean isCompletelyFull(Direction enumdirection) {
-+        return isNative ? this.optimizedItems.hasFullStacks() && super.isCompletelyFull(enumdirection) : super.isCompletelyFull(enumdirection);
-+    }
-+
-+    @Override
-+    public boolean isCompletelyEmpty(Direction enumdirection) {
-+        return isNative && this.optimizedItems.isCompletelyEmpty() || super.isCompletelyEmpty(enumdirection);
-+    }
-+    // Kaiiju end
-+
-     public ChestBlockEntity(BlockPos pos, BlockState state) {
-         this(BlockEntityType.CHEST, pos, state);
-     }
-@@ -115,7 +138,10 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
-     @Override
-     public void load(CompoundTag nbt) {
-         super.load(nbt);
-        this.items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize());
-+        this.items = this.optimizedItems.nonNullList;
-+        // Kaiiju end
-         if (!this.tryLoadLootTable(nbt)) {
-             ContainerHelper.loadAllItems(nbt, this.items);
-         }
-@@ -187,7 +213,10 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
- 
-     @Override
-     protected void setItems(NonNullList<ItemStack> list) {
-        this.items = list;
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.optimizedItems = dev.kaiijumc.kaiiju.structs.ItemListWithBitset.fromList(list);
-+        this.items = this.optimizedItems.nonNullList;
-+        // Kaiiju end
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 762b763f271c3208b4f8a7e346897207ec5beb6c..a212a62bc2b43b55e9040e2de8360d6e55a7dd86 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -48,6 +48,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-     public static final int MOVE_ITEM_SPEED = 8;
-     public static final int HOPPER_CONTAINER_SIZE = 5;
-     private NonNullList<ItemStack> items;
-+    private dev.kaiijumc.kaiiju.structs.ItemListWithBitset optimizedItems; // Kaiiju - airplane - implement ItemListWithBitset
-     private int cooldownTime;
-     private long tickedGameTime;
- 
-@@ -83,14 +84,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
- 
-     public HopperBlockEntity(BlockPos pos, BlockState state) {
-         super(BlockEntityType.HOPPER, pos, state);
-        this.items = NonNullList.withSize(5, ItemStack.EMPTY);
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(5);
-+        this.items = this.optimizedItems.nonNullList;
-+        // Kaiiju end
-         this.cooldownTime = -1;
-     }
- 
-+    // Kaiiju start - airplane - improve container checking with a bitset
-+    @Override
-+    public boolean hasEmptySlot(Direction enumdirection) {
-+        return !this.optimizedItems.hasFullStacks();
-+    }
-+
-+    @Override
-+    public boolean isCompletelyFull(Direction enumdirection) {
-+        return this.optimizedItems.hasFullStacks() && super.isCompletelyFull(enumdirection);
-+    }
-+
-+    @Override
-+    public boolean isCompletelyEmpty(Direction enumdirection) {
-+        return this.optimizedItems.isCompletelyEmpty() || super.isCompletelyEmpty(enumdirection);
-+    }
-+    // Kaiiju end
-+
-     @Override
-     public void load(CompoundTag nbt) {
-         super.load(nbt);
-        this.items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize());
-+        this.items = this.optimizedItems.nonNullList;
-+        // Kaiiju end
-         if (!this.tryLoadLootTable(nbt)) {
-             ContainerHelper.loadAllItems(nbt, this.items);
-         }
-@@ -162,7 +186,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-                     flag = HopperBlockEntity.ejectItems(world, pos, state, (Container) blockEntity, blockEntity); // CraftBukkit
-                 }
- 
-                if (!blockEntity.inventoryFull()) {
-+                if (!blockEntity.optimizedItems.hasFullStacks() || !blockEntity.inventoryFull()) { // Kaiiju - airplane
-                     flag |= booleansupplier.getAsBoolean();
-                 }
- 
-@@ -455,11 +479,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-     }
- 
-     private static boolean isFullContainer(Container inventory, Direction direction) {
-        return allMatch(inventory, direction, STACK_SIZE_TEST); // Paper - no streams
-+        return inventory.isCompletelyFull(direction); // Kaiiju - airplane - use bitsets
-     }
- 
-     private static boolean isEmptyContainer(Container inv, Direction facing) {
-        return allMatch(inv, facing, IS_EMPTY_TEST);
-+        return inv.isCompletelyEmpty(facing); // Kaiiju - airplane - use bitsets
-     }
- 
-     public static boolean suckInItems(Level world, Hopper hopper) {
-@@ -649,7 +673,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
- 
-         if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
-             boolean flag = false;
-            boolean flag1 = to.isEmpty();
-+            boolean flag1 = to.isCompletelyEmpty(side); // Kaiiju - airplane - use bitsets
- 
-             if (itemstack1.isEmpty()) {
-                 // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
-@@ -844,7 +868,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
- 
-     @Override
-     protected void setItems(NonNullList<ItemStack> list) {
-        this.items = list;
-+        // Kaiiju start - airplane - use ItemListWithBitset
-+        this.optimizedItems = dev.kaiijumc.kaiiju.structs.ItemListWithBitset.fromList(list);
-+        this.items = this.optimizedItems.nonNullList;
-+        // Kaiiju end
-     }
- 
-     public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index 081691f9710ff1115e4308f79ed49fbc38941193..648e28c5fba5c62e65f83fbb5ebc8836ffb166a9 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -95,14 +95,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-     @Override
-     public boolean isEmpty() {
-         this.unpackLootTable((Player)null);
-        // Paper start
-        for (final ItemStack itemStack : this.getItems()) {
-            if (!itemStack.isEmpty()) {
-                return false;
-            }
-        }
-        return true;
-        // Paper end
-+        return this.isCompletelyEmpty(null); // Kaiiju - airplane - use super
-     }
- 
-     @Override
--- a/patches/todo/0012-Static-Distance-WIP.patch
+++ b/patches/todo/0012-Static-Distance-WIP.patch
@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
-Date: Wed, 19 Apr 2023 02:37:04 +0300
-Subject: [PATCH] Static Distance WIP
-
-
-diff --git a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
-index e77972c4c264100ffdd824bfa2dac58dbbc6d678..cddacd6d5bbe97641bd23f5c067012907d9c5c01 100644
--- a/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
-+++ b/src/main/java/io/papermc/paper/chunk/PlayerChunkLoader.java
-@@ -75,6 +75,17 @@ public final class PlayerChunkLoader {
-         return data.getTargetSendViewDistance();
-     }
- 
-+    // Kaiiju start - Static distance
-+    public static int getStaticDistance(final ServerPlayer player) {
-+        final ServerLevel level = (ServerLevel)player.level;
-+        final PlayerLoaderData data = level.chunkSource.chunkMap.playerChunkManager.getData(player);
-+        if (data == null) {
-+            return level.chunkSource.chunkMap.playerChunkManager.getTargetStaticDistance();
-+        }
-+        return data.getTargetSendViewDistance();
-+    }
-+    // Kaiiju end
-+
-     protected final ChunkMap chunkMap;
-     protected final Reference2ObjectLinkedOpenHashMap<ServerPlayer, PlayerLoaderData> playerMap = new Reference2ObjectLinkedOpenHashMap<>(512, 0.7f);
-     protected final ReferenceLinkedOpenHashSet<PlayerLoaderData> chunkSendQueue = new ReferenceLinkedOpenHashSet<>(512, 0.7f);
-@@ -132,6 +143,12 @@ public final class PlayerChunkLoader {
- 
-     // no throttling is applied below this VD for loading
- 
-+    // Kaiiju start - Static distance
-+    public final PlayerAreaMap staticMap;
-+    protected int rawStaticDistance = -1;
-+    // Kaiiju end
-+
-+
-     /**
-      * The chunks to be sent to players, provided they're send-ready. Send-ready means the chunk and its 1 radius neighbours are loaded.
-      */
-@@ -190,6 +207,12 @@ public final class PlayerChunkLoader {
-         return this.rawSendDistance == -1 ? this.getLoadDistance() : this.rawSendDistance;
-     }
- 
-+    // Kaiiju start - Static distance
-+    public int getTargetStaticDistance() {
-+        return this.rawStaticDistance == -1 ? this.getStaticDistance() : this.rawStaticDistance;
-+    }
-+    // Kaiiju end
-+
-     public void setTargetSendDistance(final int distance) {
-         this.setSendDistance(distance);
-     }
-@@ -231,6 +254,16 @@ public final class PlayerChunkLoader {
-         this.rawTickDistance = distance;
-     }
- 
-+    // Kaiiju start - Static distance
-+    public void setStaticDistance(final int distance) {
-+        this.rawStaticDistance = distance;
-+    }
-+
-+    public int getStaticDistance() {
-+        return this.rawStaticDistance;
-+    }
-+    // Kaiiju end
-+
-     /*
-       Players have 3 different types of view distance:
-       1. Sending view distance
-@@ -256,7 +289,13 @@ public final class PlayerChunkLoader {
- 
-     public PlayerChunkLoader(final ChunkMap chunkMap, final PooledLinkedHashSets<ServerPlayer> pooledHashSets) {
-         this.chunkMap = chunkMap;
-+        // Kaiiju start - Static distance
-         this.broadcastMap = new PlayerAreaMap(pooledHashSets,
-+                null,
-+                (ServerPlayer player, int rangeX, int rangeZ, int currPosX, int currPosZ, int prevPosX, int prevPosZ,
-+                 com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> newState) -> {});
-+        // Kaiiju end
-+        this.staticMap = new PlayerAreaMap(pooledHashSets,
-                 null,
-                 (ServerPlayer player, int rangeX, int rangeZ, int currPosX, int currPosZ, int prevPosX, int prevPosZ,
-                  com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> newState) -> {
-@@ -807,6 +846,7 @@ public final class PlayerChunkLoader {
-         protected int sendViewDistance = -1;
-         protected int loadViewDistance = -1;
-         protected int tickViewDistance = -1;
-+        protected int staticViewDistance = -1; // Kaiiju
- 
-         protected long nextChunkSendTarget;
- 
-@@ -932,6 +972,7 @@ public final class PlayerChunkLoader {
-             this.loader.loadMap.remove(this.player);
-             this.loader.loadTicketCleanup.remove(this.player);
-             this.loader.tickMap.remove(this.player);
-+            this.loader.staticMap.remove(this.player); // Kaiiju
-         }
- 
-         protected int getClientViewDistance() {