Update Paper

* apply patches that i can

* add a few

* add rest of patches

* reorder patches

* reorder patches

.github/workflows/build.yml

@@ -1,5 +1,10 @@
 name: Patch and Build
-on: [ push, pull_request ]
+
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+
 jobs:
   build:
     # Only run on PRs if the source branch is on someone else's repo
@@ -7,26 +12,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Git Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Cache Gradle
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/gradle.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Set up JDK
-        uses: actions/setup-java@v2.3.0
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Configure Git User Details
         run: git config --global user.email "actions@github.com" && git config --global user.name "Github Actions"
       - name: Apply Patches
-        run: ./gradlew applyPatches --stacktrace
+        run: ./gradlew applyPatches
       - name: Build
-        run: ./gradlew build --stacktrace
+        run: ./gradlew build

.gitignore

@@ -50,3 +50,5 @@ Scissors-Server
 Scissors-API
 
 !gradle/wrapper/gradle-wrapper.jar
+
+paper-api-generator

Jenkinsfile

@@ -3,22 +3,24 @@ pipeline {
     environment {
         GITHUB_BRANCH = "${BRANCH_NAME}"
     }
-    options {
-        buildDiscarder logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '5')
-    }
     stages {
         stage('applyPatches') {
             steps {
                 withGradle {
-                    sh './gradlew applyPatches --no-daemon'
+                    sh './gradlew applyPatches --no-daemon --refresh-dependencies'
                 }
             }
         }
         stage('paperclipJar') {
             steps {
                 withGradle {
-                    sh './gradlew createReobfPaperclipJar --no-daemon'
+                    sh './gradlew createMojmapBundlerJar --no-daemon --refresh-dependencies'
                 }
+                sh """
+                    #!/bin/sh
+                    BRANCH=\$(echo "\${BRANCH_NAME}" | sed 's/\\//_/g')
+                    mv \${WORKSPACE}/build/libs/Scissors-bundler-*.jar \${WORKSPACE}/build/libs/scissors-\${BRANCH}-\${BUILD_NUMBER}.jar
+                    """
             }
         }
         stage('test') {
@@ -31,7 +33,7 @@ pipeline {
     }
     post {
         always {
-            archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true
+            archiveArtifacts artifacts: 'build/libs/scissors-*.jar', fingerprint: true
             junit 'Scissors-Server/build/test-results/test/*.xml'
             junit 'Scissors-API/build/test-results/test/*.xml'
             cleanWs()

LICENSE.md

@@ -0,0 +1,21 @@
+Scissors inherits its licensing from upstream projects.
+
+As such, Scissors is licensed under the
+[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Paper and Spigot,
+who in turn inherits it from the original Bukkit and Craftbukkit projects.
+
+Any author who is _not_ listed below should be presumed to have released their work
+under the original [GPL](licenses/GPL.md) license.
+
+In the interest of promoting a better Minecraft platform for everyone, contributors
+may choose to release their code under the more permissive [MIT License](licenses/MIT.md).
+
+The authors listed below have chosen to release their code under that more permissive
+[MIT License](licenses/MIT.md). Any contributor who wants their name added below
+should submit a pull request to this project to add their name.
+
+```text
+Allink (allinkdev) <arclicious@vivaldi.net>
+Luna (LunaWasFlaggedAgain) <lunahatesgogle@gmail.com>
+Telesphoreo <me@telesphoreo.me>
+```

README.md

@@ -1,8 +1,14 @@
-# Scissors
+# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.20.6/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.20.6/)
 
 Scissors is a fork of Paper that aims to fix exploits possible in Creative Mode. Many of these exploits are ones that
 Paper's own team has either refused to fix or would have.
 
+## Links
+### [Scissors Download](https://ci.plex.us.org/job/Scissors)
+### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.6)
+### [Scissors Announcements](https://totalfreedom.tf/forums/scissors-announcements.55)
+### [Scissors General Discussion](https://totalfreedom.tf/forums/scissors-discussion.56/)
+
 ## Tasks
 ```
 Paperweight tasks

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-    id("io.papermc.paperweight.patcher") version "1.3.6"
+    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    id("io.papermc.paperweight.patcher") version "1.7.1"
 }
 
-val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"
+val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 repositories {
     mavenCentral()
@@ -15,9 +15,9 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
-    decompiler("net.minecraftforge:forgeflower:1.5.498.29")
-    paperclip("io.papermc:paperclip:3.0.2")
+    remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
+    decompiler("org.vineflower:vineflower:1.10.1")
+    paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
 }
 
 allprojects {
@@ -26,7 +26,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
 }
@@ -34,7 +34,7 @@ allprojects {
 subprojects {
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.release.set(21)
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -42,7 +42,10 @@ subprojects {
     tasks.withType<ProcessResources> {
         filteringCharset = Charsets.UTF_8.name()
     }
-
+    tasks.withType<Test> {
+        minHeapSize = "2g"
+        maxHeapSize = "4g"
+    }
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
@@ -62,6 +65,43 @@ paperweight {
 
             serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
             serverOutputDir.set(layout.projectDirectory.dir("Scissors-Server"))
+
+            patchTasks {
+                register("generatedApi") {
+                    isBareDirectory.set(true)
+                    upstreamDirPath.set("paper-api-generator/generated")
+                    patchDir.set(layout.projectDirectory.dir("patches/generatedApi"))
+                    outputDir.set(layout.projectDirectory.dir("paper-api-generator/generated"))
+                }
+            }
+        }
+    }
+}
+
+tasks.generateDevelopmentBundle {
+    apiCoordinates.set("me.totalfreedom.scissors:scissors-api")
+    libraryRepositories.set(
+        listOf(
+            "https://repo.maven.apache.org/maven2/",
+            paperMavenPublicUrl,
+            "https://repo.scissors.gg/repository/scissors-snapshot/",
+        )
+    )
+}
+
+allprojects {
+    // Publishing API:
+    // ./gradlew :Scissors-API:publish[ToMavenLocal]
+    publishing {
+        repositories {
+            maven {
+                name = "scissors-snapshots"
+                url = uri("https://repo.scissors.gg/repository/scissors-snapshot/")
+                credentials {
+                    username = System.getenv("scissorsUser")
+                    password = System.getenv("scissorsPassword")
+                }
+            }
         }
     }
 }

gradle.properties

@@ -1,9 +1,10 @@
 group=me.totalfreedom.scissors
-version=1.18.2-R0.1-SNAPSHOT
+version=1.20.6-R0.1-SNAPSHOT
 
-mcVersion=1.18.2
-paperRef=276d830d223ddf68611beacc248285ae5a4e8a1f
+mcVersion=1.20.6
+paperRef=e41d44fa873466064879ebed476d280932379a9c
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
+org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         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.

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,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

licenses/GPL.md

@@ -0,0 +1,675 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.

licenses/MIT.md

@@ -0,0 +1,23 @@
+The MIT License (MIT)
+=====================
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

patches/api/0001-Add-MasterBlockFireEvent.patch

@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Mon, 4 Jul 2022 16:44:35 +0100
+Subject: [PATCH] Add MasterBlockFireEvent
+
+
+diff --git a/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..812e6ae9f1c8eb9558e5109c522d3ce3a7deb35c
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
+@@ -0,0 +1,51 @@
++package me.totalfreedom.scissors.event.block;
++
++import org.bukkit.Location;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when a GameMasterBlock is fired (i.e. command block, structure block, jigsaw block)
++ */
++public class MasterBlockFireEvent extends Event implements Cancellable
++{
++
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled;
++    private final Location at;
++
++    public MasterBlockFireEvent(@NotNull Location at)
++    {
++        this.at = at;
++    }
++
++    public static @NotNull HandlerList getHandlerList()
++    {
++        return handlers;
++    }
++
++    public @NotNull Location getAt()
++    {
++        return this.at;
++    }
++
++    @Override
++    public @NotNull HandlerList getHandlers()
++    {
++        return handlers;
++    }
++
++    @Override
++    public boolean isCancelled()
++    {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancelled)
++    {
++        this.cancelled = cancelled;
++    }
++}

patches/api/0002-Add-spectator-teleport-event.patch

@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Tue, 5 Jul 2022 04:10:29 +0100
+Subject: [PATCH] Add spectator teleport event
+
+
+diff --git a/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..e4c9256c78f8b395aea86e9ea1a112f8e7426c1f
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
+@@ -0,0 +1,60 @@
++package me.totalfreedom.scissors.event.player;
++
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called whenever a spectator attempts to teleport to an entity
++ */
++public class SpectatorTeleportEvent extends Event implements Cancellable
++{
++    private static final HandlerList handlerList = new HandlerList();
++    private final Player player;
++    private final Entity target;
++    private boolean cancelled;
++
++    public SpectatorTeleportEvent(@NotNull Player player, @NotNull Entity target)
++    {
++        this.player = player;
++        this.target = target;
++    }
++
++    @NotNull
++    public Player getPlayer() {
++        return this.player;
++    }
++
++    @NotNull
++    public Entity getTarget() {
++        return this.target;
++    }
++
++    @Override
++    public boolean isCancelled()
++    {
++        return cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancelled)
++    {
++        this.cancelled = cancelled;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers()
++    {
++        return handlerList;
++    }
++
++    @NotNull
++    public static org.bukkit.event.HandlerList getHandlerList()
++    {
++        return handlerList;
++    }
++}

patches/api/0003-Add-Scissors-configuration-file.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Sun, 10 Jul 2022 10:12:04 +0100
+Subject: [PATCH] Add Scissors configuration file
+
+
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 30cbe3bdc7142769019765b03cc4fe1f9ba1ddb4..d1f5766f2b021df282b929457a27d09f7c21a21e 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2257,6 +2257,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         }
+         // Paper end
+ 
++        // Scissors start
++        @NotNull
++        public org.bukkit.configuration.file.YamlConfiguration getScissorsConfig() {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++        // Scissors end
++
+         /**
+          * Sends the component to the player
+          *

patches/api/0004-Add-command-block-player-edit-event.patch

@@ -0,0 +1,173 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Fri, 2 Jun 2023 20:42:02 +0100
+Subject: [PATCH] Add command block player edit event
+
+
+diff --git a/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..722f5839600954998cbbf799e68477d499d104c4
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java
+@@ -0,0 +1,77 @@
++package me.totalfreedom.scissors.event.block;
++
++import org.bukkit.block.CommandBlock;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when a command block is modified by a player
++ */
++public class CommandBlockPlayerEditEvent extends Event implements Cancellable
++{
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled;
++    private final Player player;
++    private final String oldCommand;
++    private String newCommand;
++    private final CommandBlock commandBlock;
++
++    public CommandBlockPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandBlock commandBlock)
++    {
++        this.player = player;
++        this.oldCommand = oldCommand;
++        this.newCommand = newCommand;
++        this.commandBlock = commandBlock;
++    }
++
++    public @NotNull String getNewCommand()
++    {
++        return this.newCommand;
++    }
++
++    public @NotNull String getOldCommand()
++    {
++        return this.oldCommand;
++    }
++
++    public void setNewCommand(@NotNull String newCommand)
++    {
++        this.newCommand = newCommand;
++    }
++
++    public @NotNull Player getPlayer()
++    {
++        return this.player;
++    }
++
++    public @NotNull CommandBlock getCommandBlock()
++    {
++        return this.commandBlock;
++    }
++
++    @Override
++    public boolean isCancelled()
++    {
++        return this.cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel)
++    {
++        this.cancelled = cancel;
++    }
++
++    @Override
++    public @NotNull HandlerList getHandlers()
++    {
++        return handlers;
++    }
++
++    public static @NotNull HandlerList getHandlerList()
++    {
++        return handlers;
++    }
++}
+diff --git a/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..4282f24deb87e52ee19a13b172ec80c6a6017e28
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java
+@@ -0,0 +1,78 @@
++package me.totalfreedom.scissors.event.block;
++
++import org.bukkit.block.CommandBlock;
++import org.bukkit.entity.Player;
++import org.bukkit.entity.minecart.CommandMinecart;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.Event;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when a command block is modified by a player
++ */
++public class CommandMinecartPlayerEditEvent extends Event implements Cancellable
++{
++    private static final HandlerList handlers = new HandlerList();
++    private boolean cancelled;
++    private final Player player;
++    private final String oldCommand;
++    private String newCommand;
++    private final CommandMinecart commandMinecart;
++
++    public CommandMinecartPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandMinecart commandMinecart)
++    {
++        this.player = player;
++        this.oldCommand = oldCommand;
++        this.newCommand = newCommand;
++        this.commandMinecart = commandMinecart;
++    }
++
++    public @NotNull String getNewCommand()
++    {
++        return this.newCommand;
++    }
++
++    public @NotNull String getOldCommand()
++    {
++        return this.oldCommand;
++    }
++
++    public void setNewCommand(@NotNull String newCommand)
++    {
++        this.newCommand = newCommand;
++    }
++
++    public @NotNull Player getPlayer()
++    {
++        return this.player;
++    }
++
++    public @NotNull CommandMinecart getCommandMinecart()
++    {
++        return this.commandMinecart;
++    }
++
++    @Override
++    public boolean isCancelled()
++    {
++        return this.cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel)
++    {
++        this.cancelled = cancel;
++    }
++
++    @Override
++    public @NotNull HandlerList getHandlers()
++    {
++        return handlers;
++    }
++
++    public static @NotNull HandlerList getHandlerList()
++    {
++        return handlers;
++    }
++}

patches/server/0001-Build-changes.patch

@@ -1,29 +1,28 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Telesphoreo <me@telesphoreo.me>
-Date: Tue, 19 Apr 2022 18:17:43 -0500
+Date: Fri, 14 Jun 2024 17:38:20 -0500
 Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0282e3b75470e1a68ea1fc228082483514ba432e..9e78384fdd5727143d3be5f189478ed701fbd0bd 100644
+index 4998aff0b7cb084dcda15c6a18bbe45e99b6000a..b0e9bf22d546110d995b5625ce8ed22501992679 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -9,8 +9,8 @@ plugins {
- }
+@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ val alsoShade: Configuration by configurations.creating
  
  dependencies {
 -    implementation(project(":paper-api"))
--    implementation(project(":paper-mojangapi"))
-+    implementation(project(":Scissors-API"))
-+    implementation("io.papermc.paper:paper-mojangapi:1.18.2-R0.1-SNAPSHOT") // Scissors
++    implementation(project(":Scissors-API")) // Scissors
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -56,11 +56,17 @@ tasks.jar {
+@@ -77,17 +77,25 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
-         val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
+         val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
          val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
 -        val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
++        // Scissors start
 +        var gitBranch: String;
 +        if (System.getenv("JENKINS_URL") == null)
 +        {
@@ -31,51 +30,75 @@ index 0282e3b75470e1a68ea1fc228082483514ba432e..9e78384fdd5727143d3be5f189478ed7
 +        } else {
 +            gitBranch = System.getenv("GITHUB_BRANCH")
 +        }
++        // Scissors end
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Version" to "git-Scissors-$implementationVersion",
+             "Implementation-Title" to "Paper",
+             "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Bukkit",
+-            "Specification-Title" to "Paper",
++            "Specification-Title" to "Scissors",
              "Specification-Version" to project.version,
-@@ -148,7 +154,7 @@ fun TaskContainer.registerRunTask(
+-            "Specification-Vendor" to "Paper Team",
+-            "Brand-Id" to "papermc:paper",
+-            "Brand-Name" to "Paper",
++            "Specification-Vendor" to "Scissors Team",
++            "Brand-Id" to "scissorsmc:scissors",
++            "Brand-Name" to "Scissors",
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper
+@@ -144,7 +152,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
 -    group = "paper"
-+    group = "paperweight"
++    group = "paperweight" // Scissors
      mainClass.set("org.bukkit.craftbukkit.Main")
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index da15a224b8b974e78b9d8d5f514229b3b2a5a63e..8ca2e2e3d2564ec0cc081ff52334484dd5561e5c 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1696,7 +1696,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
+index 4b002e8b75d117b726b0de274a76d3596fce015b..5ff11b9bcef76cb767f0b03ffc326d3f7a361371 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("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
++                Metrics metrics = new Metrics("Scissors", serverUUID, logFailedRequests, Bukkit.getLogger());
  
-     @DontObfuscate
-     public String getServerModName() {
--        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Scissors"; // Scissors - Scissors > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+                 metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
+                     String minecraftVersion = Bukkit.getVersion();
+@@ -607,11 +607,11 @@ public class Metrics {
+                 final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
+                 if (implVersion != null) {
+                     final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
+-                    paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
++                    paperVersion = "git-Scissors-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
+                 } else {
+                     paperVersion = "unknown";
                  }
+-                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
++                metrics.addCustomChart(new Metrics.SimplePie("scissors_version", () -> paperVersion));
  
-     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 8a248e34fce1e04de4460f98b7627df495c66af1..ebd5aeceb4ac1a6300bbfa70218421f0d91b7614 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
- 
- public final class CraftServer implements Server {
--    private final String serverName = "Paper"; // Paper
-+    private final String serverName = "Scissors"; // Scissors // Paper
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
+                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
+                     Map<String, Map<String, Integer>> map = new HashMap<>();
+diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..2fbb5fc19e6d7f3767c7c6eedcbc6af2b0877ae5 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("Scissors")
+                 .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/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..5e6cce78e7987b4aa1c0052262ab8c4563905372 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..741c76c4dfa0bb34cc23bd795c194bdea10418cc 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 {
@@ -83,7 +106,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..5e6cce78e7987b4aa1c0052262ab8c45
          String result = "Unknown-Version";
  
 -        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/me.totalfreedom.scissors/Scissors-API/pom.properties");
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/me.totalfreedom.scissors/Scissors-API/pom.properties"); // Scissors
          Properties properties = new Properties();
  
          if (stream != null) {

patches/server/0002-Return-null-when-a-show_entity-hover-event-s-UUID-is.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sat, 12 Mar 2022 19:34:59 -0700
-Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-index b31ff9d237f593e58b42b453632aa2c2af74f986..67feb4e688d049e9f74f0deabb1ec583336a29be 100644
---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
-+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -174,7 +174,14 @@ public class HoverEvent {
-             } else {
-                 JsonObject jsonObject = json.getAsJsonObject();
-                 EntityType<?> entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type")));
--                UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id"));
-+                // Scissors start
-+                UUID uUID;
-+                try {
-+                    uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id"));
-+                } catch (Exception ex) {
-+                    return null;
-+                }
-+                // Scissors end
-                 Component component = Component.Serializer.fromJson(jsonObject.get("name"));
-                 return new HoverEvent.EntityTooltipInfo(entityType, uUID, component);
-             }
-@@ -186,7 +193,14 @@ public class HoverEvent {
-                 CompoundTag compoundTag = TagParser.parseTag(text.getString());
-                 Component component = Component.Serializer.fromJson(compoundTag.getString("name"));
-                 EntityType<?> entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type")));
--                UUID uUID = UUID.fromString(compoundTag.getString("id"));
-+                // Scissors start
-+                UUID uUID;
-+                try {
-+                    uUID = UUID.fromString(compoundTag.getString("id"));
-+                } catch (Exception ex) {
-+                    return null;
-+                }
-+                // Scissors end
-                 return new HoverEvent.EntityTooltipInfo(entityType, uUID, component);
-             } catch (Exception var5) {
-                 return null;

patches/server/0002-UUID-validation.patch

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sun, 5 May 2024 12:16:30 -0500
+Subject: [PATCH] UUID validation
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
+index 1a958f994365eb8f2e010d703046fb73e04b66e4..d8de9ec38f5e5b10c177895728815d8659d0b601 100644
+--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
++++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
+@@ -171,7 +171,14 @@ public class HoverEvent {
+                 DynamicOps<JsonElement> dynamicOps = (DynamicOps<JsonElement>)(ops != null ? ops.withParent(JsonOps.INSTANCE) : JsonOps.INSTANCE);
+                 DataResult<Component> dataResult = ComponentSerialization.CODEC.parse(dynamicOps, JsonParser.parseString(compoundTag.getString("name")));
+                 EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type")));
+-                UUID uUID = UUID.fromString(compoundTag.getString("id"));
++                // Scissors start
++                UUID uUID;
++                try {
++                    uUID = UUID.fromString(compoundTag.getString("id"));
++                } catch (Exception ex) {
++                    return null;
++                }
++                // Scissors end
+                 return dataResult.map(textx -> new HoverEvent.EntityTooltipInfo(entityType, uUID, textx));
+             } catch (Exception var7) {
+                 return DataResult.error(() -> "Failed to parse tooltip: " + var7.getMessage());

patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 07:39:26 -0600
-Subject: [PATCH] Fixes invalid LootTables causing problems when applied to
- Minecart entities
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
-index 83dd3c254fd10e4596e454cc75c8e5e976b73ac0..1b2533bbbc62bcb0d00789312ba72a49f8f49f42 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
-@@ -16,7 +16,7 @@ public class PaperMinecartLootableInventory implements PaperLootableEntityInvent
- 
-     @Override
-     public org.bukkit.loot.LootTable getLootTable() {
--        return entity.lootTable != null && !entity.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.lootTable)) : null;
-+        return entity.lootTable != null && !entity.lootTable.getPath().isEmpty() && entity.lootTable.toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.lootTable)) : null; // Scissors - Validate length of loot tables before even trying
-     }
- 
-     @Override
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index 94dc68182ec5f6dc1294ad15523427836228086a..07075cea760562c901d4469a7f88271c3ffa30bb 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-@@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
- 
-     @Override
-     public org.bukkit.loot.LootTable getLootTable() {
--        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
-+        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() && tileEntityLootable.lootTable.toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null; // Scissors - Validate length of loot tables before even trying
-     }
- 
-     @Override
-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 8a07d5d25086d7544757bb86181fbe2b5e743d29..ef50d9747f2a027e356b05ad8d94ffb2fd4a423e 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -219,7 +219,7 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-         this.lootableData.loadNbt(nbt); // Paper
-         this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
-         if (nbt.contains("LootTable", 8)) {
--            this.lootTable = new ResourceLocation(nbt.getString("LootTable"));
-+            this.lootTable = ResourceLocation.tryParse(nbt.getString("LootTable")); // Scissors - Validate loot tables
-             this.lootTableSeed = nbt.getLong("LootTableSeed");
-         } if (true) { // Paper - always load the items, table may still remain
-             ContainerHelper.loadAllItems(nbt, this.itemStacks);

patches/server/0003-ResourceLocation-validation.patch

@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 17:48:49 -0500
+Subject: [PATCH] ResourceLocation validation
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+index 8b612b772ca87c852d0b108c2afd6785c261c9b9..e063562fdbe05882c4a81f9fb15141056c35ed8b 100644
+--- a/src/main/java/net/minecraft/world/entity/Mob.java
++++ b/src/main/java/net/minecraft/world/entity/Mob.java
+@@ -678,7 +678,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
+ 
+     @Override
+     public final ResourceKey<LootTable> getLootTable() {
+-        return this.lootTable == null ? this.getDefaultLootTable() : this.lootTable;
++        try {
++            return this.lootTable == null ? this.getDefaultLootTable() : this.lootTable;
++        } catch (Exception ex) {
++            return this.getDefaultLootTable();
++        }
+     }
+ 
+     protected ResourceKey<LootTable> getDefaultLootTable() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
+index 1f90f4b3f310b8cf5750c3a581be178f19b979d2..0c6aad363f99bd86393335b9df1e186a3198274f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
+@@ -38,7 +38,11 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
+     }
+ 
+     public static org.bukkit.loot.LootTable minecraftToBukkit(ResourceKey<LootTable> minecraft) {
+-        return (minecraft == null || minecraft.location().getPath().isEmpty()) ? null : Bukkit.getLootTable(CraftLootTable.minecraftToBukkitKey(minecraft)); // Paper - fix some NamespacedKey parsing
++        try {
++            return (minecraft == null || minecraft.location().getPath().isEmpty()) ? null : Bukkit.getLootTable(CraftLootTable.minecraftToBukkitKey(minecraft)); // Paper - fix some NamespacedKey parsing
++        } catch (Exception ex) {
++            return null;
++        }
+     }
+ 
+     public static NamespacedKey minecraftToBukkitKey(ResourceKey<LootTable> minecraft) {

patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 06:10:22 -0600
-Subject: [PATCH] Fixes log spam caused by invalid entities in beehives
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 483dc52c793d9f90a35b1d091dd8ce71115e4640..61097643950b1182e3751c6a4629cf5661dcf3b8 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.ListTag;
- import net.minecraft.nbt.NbtUtils;
- import net.minecraft.network.protocol.game.DebugPackets;
-+import net.minecraft.resources.ResourceLocation;
- import net.minecraft.sounds.SoundEvents;
- import net.minecraft.sounds.SoundSource;
- import net.minecraft.tags.BlockTags;
-@@ -367,6 +368,13 @@ public class BeehiveBlockEntity extends BlockEntity {
- 
-         for (int i = 0; i < nbttaglist.size(); ++i) {
-             CompoundTag nbttagcompound1 = nbttaglist.getCompound(i);
-+
-+            // Scissors start - Do not allow invalid entities from being used for bees
-+            if (!nbttagcompound1.contains("id") || !ResourceLocation.isValidResourceLocation(nbttagcompound1.getString("id")) || EntityType.byString(nbttagcompound1.getString("id")).isEmpty()) {
-+                continue;
-+            }
-+            // Scissor end
-+
-             BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks"));
- 
-             this.stored.add(tileentitybeehive_hivebee);

patches/server/0004-Fixes-log-spam.patch

@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sun, 5 May 2024 12:31:13 -0500
+Subject: [PATCH] Fixes log spam
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
+index d8de9ec38f5e5b10c177895728815d8659d0b601..d141a39f98f58c5d61e25cab89e742845ca8185b 100644
+--- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
++++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
+@@ -271,7 +271,7 @@ public class HoverEvent {
+                 DynamicOps<Tag> dynamicOps = (DynamicOps<Tag>)(ops != null ? ops.withParent(NbtOps.INSTANCE) : NbtOps.INSTANCE);
+                 return ItemStack.CODEC.parse(dynamicOps, compoundTag).map(HoverEvent.ItemStackInfo::new);
+             } catch (CommandSyntaxException var4) {
+-                return DataResult.error(() -> "Failed to parse item tag: " + var4.getMessage());
++                return null;
+             }
+         }
+     }
+diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
+index ee972fa1a2bc023ed18eaceae21c8c8244754e6a..4f92d9c5850156c2349371d801a96a477f1af96c 100644
+--- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
++++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
+@@ -385,7 +385,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity {
+ 
+         if (nbt.contains("Particle", 10)) {
+             ParticleTypes.CODEC.parse(registryops, nbt.get("Particle")).resultOrPartial((s) -> {
+-                AreaEffectCloud.LOGGER.warn("Failed to parse area effect cloud particle options: '{}'", s);
++                // Scissors - Don't log custom particle errors
+             }).ifPresent(this::setParticle);
+         }
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
+index a46bf73c608641bf1f00fd55242de71a0f2ee06e..06a4a1cb9e46b3981629f1f8c4a0028c407ce234 100644
+--- a/src/main/java/net/minecraft/world/entity/EntityType.java
++++ b/src/main/java/net/minecraft/world/entity/EntityType.java
+@@ -603,7 +603,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+             if (generation) entity.generation = true; // Paper - Don't fire sync event during generation
+             entity.load(nbt);
+         }, () -> {
+-            EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
++            // Scissors - Don't log invalid entities
+         });
+     }
+ 

patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 22 Apr 2022 00:59:00 -0500
-Subject: [PATCH] Fixes the Blank SkullOwner exploit
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 292ae4a68093b7d939a755e1062cee57da186ab1..4ae030580131252b849fd356717d0323c29cf773 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -7,6 +7,9 @@ import java.util.UUID;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.NbtUtils;
- import net.minecraft.world.level.block.entity.SkullBlockEntity;
-+// Scissors start
-+import org.apache.commons.lang3.StringUtils;
-+// Scissors end
- import org.bukkit.Bukkit;
- import org.bukkit.Material;
- import org.bukkit.OfflinePlayer;
-@@ -45,7 +48,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
- 
-         if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
-             this.setProfile(NbtUtils.readGameProfile(tag.getCompound(SKULL_OWNER.NBT)));
--        } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !tag.getString(SKULL_OWNER.NBT).isEmpty()) {
-+        // Scissors start
-+        } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !StringUtils.isBlank(tag.getString(SKULL_OWNER.NBT))) {
-+        // Scissors end
-             this.setProfile(new GameProfile(null, tag.getString(SKULL_OWNER.NBT)));
-         }
-     }

patches/server/0005-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sun, 5 May 2024 12:32:55 -0500
+Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities
+ with content in them
+
+
+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 9549eee0d92f322bd5232abd7e695213660c2e22..94a689e1adf24f6385dc97eb5cc3790c8e14da97 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+@@ -142,8 +142,14 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+     @Override
+     public void remove(Entity.RemovalReason entity_removalreason, EntityRemoveEvent.Cause cause) {
+         // CraftBukkit end
+-        if (!this.level().isClientSide && entity_removalreason.shouldDestroy()) {
+-            Containers.dropContents(this.level(), (Entity) this, (Container) this);
++        if (!this.level().isClientSide && entity_removalreason.shouldDestroy())
++        {
++            // Scissors start - Ignore errors thrown when trying to remove Minecart entities with content in them
++            try {
++                Containers.dropContents(this.level(), (Entity) this, (Container) this);
++            } catch (Exception ignored)
++            {}
++            // Scissors end
+         }
+ 
+         super.remove(entity_removalreason, cause); // CraftBukkit - add Bukkit remove cause

patches/server/0006-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sun, 5 May 2024 12:47:29 -0500
+Subject: [PATCH] Fixes Knowledge Books causing log spam when invalid data is
+ provided
+
+
+diff --git a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
+index 635936aaac2426de05f0450f10815b29b52ca617..0b122b281c195ca47e7eeb27be29bffd916a8535 100644
+--- a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
++++ b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
+@@ -38,9 +38,9 @@ public class KnowledgeBookItem extends Item {
+                 List<RecipeHolder<?>> list2 = new ArrayList<>(list.size());
+ 
+                 for (ResourceLocation resourceLocation : list) {
+-                    Optional<RecipeHolder<?>> optional = recipeManager.byKey(resourceLocation);
++                    Optional<RecipeHolder<?>> optional = recipeManager.byKey(ResourceLocation.tryParse(resourceLocation.getNamespace())); // Scissors - Validate resource location
+                     if (!optional.isPresent()) {
+-                        LOGGER.error("Invalid recipe: {}", resourceLocation);
++                        // Scissors - don't log errors caused by invalid recipes being provided
+                         return InteractionResultHolder.fail(itemStack);
+                     }
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
+index 20638aa593e0a6c78e4bfdb936e69f3d36e18f4e..00b877fb43a8793a0f07580be93d026b624ad011 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
+@@ -38,7 +38,12 @@ public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBo
+             for (int i = 0; i < pages.size(); i++) {
+                 ResourceLocation recipe = pages.get(i);
+ 
+-                this.addRecipe(CraftNamespacedKey.fromMinecraft(recipe));
++                // Scissors start - Don't add recipes with invalid namespaces
++                try {
++                    this.addRecipe(CraftNamespacedKey.fromMinecraft(recipe));
++                } catch (Exception ignored)
++                {}
++                // Scissors end
+             }
+         });
+     }

patches/server/0006-Ignore-null-air-bundle-items-in-CraftMetaBundle.patch

@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Sun, 13 Mar 2022 11:07:34 -0300
-Subject: [PATCH] Ignore null/air bundle items in CraftMetaBundle
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java
-index 8fd1e392258eba9dbe2194c024ad7e0ca3e43cf8..28be42594857f2d8320a035c1f8b95cdc300ddd5 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBundle.java
-@@ -49,7 +49,11 @@ public class CraftMetaBundle extends CraftMetaItem implements BundleMeta {
-                 for (int i = 0; i < list.size(); i++) {
-                     CompoundTag nbttagcompound1 = list.getCompound(i);
- 
--                    this.addItem(CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(nbttagcompound1)));
-+                    // Scissors start
-+                    CraftItemStack item = CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(nbttagcompound1));
-+                    if(item == null || item.getType().isAir()) continue;
-+                    this.addItem(item);
-+                    // Scissors end
-                 }
-             }
-         }

patches/server/0007-Add-Scissors-configuration-file-command.patch

@@ -0,0 +1,506 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 17:56:03 -0500
+Subject: [PATCH] Add Scissors configuration file & command
+
+
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index 7620c72a4c243cbeea245203ce03a97cbfa7d922..a05a348c299a68a61fabcbdcc689a89a81d1301f 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -25,6 +25,7 @@ package co.aikar.timings;
+ 
+ import com.google.common.collect.Sets;
+ import io.papermc.paper.adventure.PaperAdventure;
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.kyori.adventure.text.event.ClickEvent;
+ import net.kyori.adventure.text.format.NamedTextColor;
+ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+@@ -240,7 +241,8 @@ public class TimingsExport extends Thread {
+         parent.put("config", createObject(
+             pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
++            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
++            pair("scissors", mapAsJSON(ScissorsConfig.config, null)) // Scissors
+         ));
+ 
+         new TimingsExport(listeners, parent, history).start();
+diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..797677d892d83cf54d9a60af1e277b67ed3d6e95
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java
+@@ -0,0 +1,150 @@
++package me.totalfreedom.scissors;
++
++import com.google.common.base.Functions;
++import com.google.common.base.Joiner;
++import com.google.common.collect.ImmutableSet;
++import com.google.common.collect.Iterables;
++import com.google.common.collect.Lists;
++import net.minecraft.resources.ResourceLocation;
++import net.minecraft.server.MinecraftServer;
++import org.bukkit.Bukkit;
++import org.bukkit.ChatColor;
++import org.bukkit.Location;
++import org.bukkit.command.Command;
++import org.bukkit.command.CommandSender;
++
++import java.io.File;
++import java.util.*;
++import java.util.stream.Collectors;
++
++public class ScissorsCommand extends Command
++{
++
++    private static final String BASE_PERM = "bukkit.command.scissors.";
++    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("reload", "version").build();
++
++    public ScissorsCommand(String name)
++    {
++        super(name);
++        this.description = "Scissors related commands";
++        this.usageMessage = "/scissors [" + Joiner.on(" | ").join(SUBCOMMANDS) + "]";
++        this.setPermission("bukkit.command.scissors;" + Joiner.on(';').join(SUBCOMMANDS.stream().map(s -> BASE_PERM + s).collect(Collectors.toSet())));
++    }
++
++    private static boolean testPermission(CommandSender commandSender, String permission)
++    {
++        if (commandSender.hasPermission(BASE_PERM + permission) || commandSender.hasPermission("bukkit.command.scissors"))
++            return true;
++        commandSender.sendMessage(Bukkit.getPermissionMessage()); // Sorry, kashike
++        return false;
++    }
++
++    // Code from Mojang - copyright them
++    public static List<String> getListMatchingLast(CommandSender sender, String[] args, String... matches)
++    {
++        return getListMatchingLast(sender, args, Arrays.asList(matches));
++    }
++
++    public static boolean matches(String s, String s1)
++    {
++        return s1.regionMatches(true, 0, s, 0, s.length());
++    }
++
++    public static List<String> getListMatchingLast(CommandSender sender, String[] strings, Collection<?> collection)
++    {
++        String last = strings[strings.length - 1];
++        ArrayList<String> results = Lists.newArrayList();
++
++        if (!collection.isEmpty())
++        {
++            Iterator iterator = Iterables.transform(collection, Functions.toStringFunction()).iterator();
++
++            while (iterator.hasNext())
++            {
++                String s1 = (String) iterator.next();
++
++                if (matches(last, s1) && (sender.hasPermission(BASE_PERM + s1) || sender.hasPermission("bukkit.command.scissors")))
++                {
++                    results.add(s1);
++                }
++            }
++
++            if (results.isEmpty())
++            {
++                iterator = collection.iterator();
++
++                while (iterator.hasNext())
++                {
++                    Object object = iterator.next();
++
++                    if (object instanceof ResourceLocation && matches(last, ((ResourceLocation) object).getPath()))
++                    {
++                        results.add(String.valueOf(object));
++                    }
++                }
++            }
++        }
++
++        return results;
++    }
++
++    @Override
++    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException
++    {
++        if (args.length <= 1)
++            return getListMatchingLast(sender, args, SUBCOMMANDS);
++
++        return Collections.emptyList();
++    }
++    // end copy stuff
++
++    @Override
++    public boolean execute(CommandSender sender, String commandLabel, String[] args)
++    {
++        if (!testPermission(sender)) return true;
++
++        if (args.length == 0)
++        {
++            sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
++            return false;
++        }
++        if (SUBCOMMANDS.contains(args[0].toLowerCase(Locale.ENGLISH)))
++        {
++            if (!testPermission(sender, args[0].toLowerCase(Locale.ENGLISH))) return true;
++        }
++        switch (args[0].toLowerCase(Locale.ENGLISH))
++        {
++            case "reload":
++                doReload(sender);
++                break;
++            case "ver":
++                if (!testPermission(sender, "version"))
++                    break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
++            case "version":
++                Command ver = MinecraftServer.getServer().server.getCommandMap().getCommand("version");
++                if (ver != null)
++                {
++                    ver.execute(sender, commandLabel, new String[0]);
++                    break;
++                }
++                // else - fall through to default
++            default:
++                sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
++                return false;
++        }
++
++        return true;
++    }
++
++    private void doReload(CommandSender sender)
++    {
++        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.");
++
++        MinecraftServer console = MinecraftServer.getServer();
++        ScissorsConfig.init((File) console.options.valueOf("scissors-settings"));
++        console.server.reloadCount++;
++
++        Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Scissors config reload complete.");
++    }
++}
+diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..1ada5b7778f03815455cac1a4aad4411d0cae053
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+@@ -0,0 +1,224 @@
++package me.totalfreedom.scissors;
++
++
++import com.google.common.base.Throwables;
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.dedicated.DedicatedServer;
++import org.bukkit.Bukkit;
++import org.bukkit.command.Command;
++import org.bukkit.configuration.InvalidConfigurationException;
++import org.bukkit.configuration.file.YamlConfiguration;
++
++import java.io.File;
++import java.io.IOException;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.lang.reflect.Modifier;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
++import java.util.logging.Level;
++import java.util.regex.Pattern;
++
++// TODO - Migrate to new format
++public class ScissorsConfig
++{
++
++    private static final String HEADER = """
++            This is the main configuration file for Scissors.
++            As you can see, there's tons to configure. Some options may impact gameplay, so use
++            with caution, and make sure you know what each option does before configuring.
++
++            If you need help with the configuration or have any questions related to Scissors,
++            join us in our Discord.
++
++            Discord: https://discord.com/invite/mtVQcHn58h
++            Website: https://scissors.gg/\s
++            Docs: https://javadoc.scissors.gg/1.20.1/\s
++            """;
++    private static final Pattern SPACE = Pattern.compile(" ");
++    private static final Pattern NOT_NUMERIC = Pattern.compile("[^-\\d.]");
++    /*========================================================================*/
++    public static YamlConfiguration config;
++    static int version;
++    /*========================================================================*/
++    static Map<String, Command> commands;
++    private static File CONFIG_FILE;
++
++    public static void init(File configFile)
++    {
++        final File configFolder = (File) DedicatedServer.getServer().options.valueOf("scissors-settings" + "-directory");
++        final Path configFolderPath = configFolder.toPath();
++        final Path oldConfigFilePath = configFile.toPath();
++        final Path newConfigFilePath = configFolderPath.resolve(configFile.toPath());
++
++        if (configFile.exists())
++        {
++            try
++            {
++                Files.move(oldConfigFilePath, newConfigFilePath);
++            }
++            catch (IOException e)
++            {
++                throw new RuntimeException("Error migrating configuration file to new directory!", e);
++            }
++        }
++
++        CONFIG_FILE = newConfigFilePath.toFile();
++        config = new YamlConfiguration();
++        try
++        {
++            config.load(CONFIG_FILE);
++        }
++        catch (IOException ex)
++        {
++        }
++        catch (InvalidConfigurationException ex)
++        {
++            Bukkit.getLogger().log(Level.SEVERE, "Could not load scissors.yml, please correct your syntax errors", ex);
++            throw Throwables.propagate(ex);
++        }
++
++        commands = new HashMap<>();
++        commands.put("scissors", new ScissorsCommand("scissors"));
++
++        config.options().header(HEADER);
++        config.options().copyDefaults(true);
++
++        version = getInt("config-version", 5);
++        set("config-version", 5);
++        readConfig(ScissorsConfig.class, null);
++    }
++
++    protected static void logError(String s)
++    {
++        Bukkit.getLogger().severe(s);
++    }
++
++    protected static void fatal(String s)
++    {
++        throw new RuntimeException("Fatal scissors.yml config error: " + s);
++    }
++
++    public static void registerCommands()
++    {
++        for (Map.Entry<String, Command> entry : commands.entrySet())
++        {
++            MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Scissors", entry.getValue());
++        }
++    }
++
++    static void readConfig(Class<?> clazz, Object instance)
++    {
++        for (Method method : clazz.getDeclaredMethods())
++        {
++            if (Modifier.isPrivate(method.getModifiers()))
++            {
++                if (method.getParameterTypes().length == 0 && method.getReturnType() == Void.TYPE)
++                {
++                    try
++                    {
++                        method.setAccessible(true);
++                        method.invoke(instance);
++                    }
++                    catch (InvocationTargetException ex)
++                    {
++                        throw Throwables.propagate(ex.getCause());
++                    }
++                    catch (Exception ex)
++                    {
++                        Bukkit.getLogger().log(Level.SEVERE, "Error invoking " + method, ex);
++                    }
++                }
++            }
++        }
++        saveConfig();
++    }
++
++    static void saveConfig()
++    {
++        try
++        {
++            config.save(CONFIG_FILE);
++        }
++        catch (IOException ex)
++        {
++            Bukkit.getLogger().log(Level.SEVERE, "Could not save " + CONFIG_FILE, ex);
++        }
++    }
++
++    public static boolean runCommandsInBooks = false;
++
++    private static void runCommandsInBooks()
++    {
++        runCommandsInBooks = getBoolean("runCommandsInBooks", false);
++    }
++
++    // people still may want them to bypass permissions for warps
++    public static boolean commandSignsBypassPermissions = false;
++    private static void commandSignsBypassPermissions()
++    {
++        commandSignsBypassPermissions = getBoolean("commandSignsBypassPermissions", false);
++    }
++
++    public static boolean chatSignaturesEnabled = true;
++    private static void chatSignaturesEnabled()
++    {
++        chatSignaturesEnabled = getBoolean("chatSignaturesEnabled", true);
++    }
++
++    public static boolean excludePlayersFromNbtComponents = false;
++    private static void excludePlayersFromNbtComponents()
++    {
++        excludePlayersFromNbtComponents = getBoolean("excludePlayersFromNbtComponents", false);
++    }
++    public static int componentDepthLimit = 128;
++    private static void componentDepthLimit()
++    {
++        componentDepthLimit = getInt("componentDepthLimit", 128);
++    }
++
++
++    private static void set(String path, Object val)
++    {
++        config.set(path, val);
++    }
++
++    private static boolean getBoolean(String path, boolean def)
++    {
++        config.addDefault(path, def);
++        return config.getBoolean(path, config.getBoolean(path));
++    }
++
++    private static double getDouble(String path, double def)
++    {
++        config.addDefault(path, def);
++        return config.getDouble(path, config.getDouble(path));
++    }
++
++    private static float getFloat(String path, float def)
++    {
++        // TODO: Figure out why getFloat() always returns the default value.
++        return (float) getDouble(path, def);
++    }
++
++    private static int getInt(String path, int def)
++    {
++        config.addDefault(path, def);
++        return config.getInt(path, config.getInt(path));
++    }
++
++    private static <T> List getList(String path, T def)
++    {
++        config.addDefault(path, def);
++        return config.getList(path, config.getList(path));
++    }
++
++    private static String getString(String path, String def)
++    {
++        config.addDefault(path, def);
++        return config.getString(path, config.getString(path));
++    }
++}
+diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
+index 244a19ecd0234fa1d7a6ecfea20751595688605d..fdc76373fd458884a45312c6edf2915a811910eb 100644
+--- a/src/main/java/net/minecraft/server/Main.java
++++ b/src/main/java/net/minecraft/server/Main.java
+@@ -133,6 +133,7 @@ public class Main {
+             // Paper start - load config files early for access below if needed
+             org.bukkit.configuration.file.YamlConfiguration bukkitConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("bukkit-settings"));
+             org.bukkit.configuration.file.YamlConfiguration spigotConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("spigot-settings"));
++            org.bukkit.configuration.file.YamlConfiguration scissorsConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("scissors-settings")); // Scissors - TODO Change this
+             // Paper end - load config files early for access below if needed
+ 
+             if (optionset.has("initSettings")) { // CraftBukkit
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index ad967cc2283f902c76e48a59d59cf0dbdacbb5e3..0342ea47cb313e28027cb76e632a4d5b1565fc8d 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -234,6 +234,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+ 
++        // Scissors start
++        try {
++            me.totalfreedom.scissors.ScissorsConfig.init((java.io.File) options.valueOf("scissors-settings"));
++        } catch (Exception e) {
++            DedicatedServer.LOGGER.error("Unable to load server configuration", e);
++            return false;
++        }
++        me.totalfreedom.scissors.ScissorsConfig.registerCommands();
++        // Scissors end
++
+         this.setPvpAllowed(dedicatedserverproperties.pvp);
+         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
+         this.setMotd(dedicatedserverproperties.motd);
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 5db08432b6afd3639688830e717f40ceaf599248..f2497d08157d3007d20be7ab333ab7c4f282c414 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1055,6 +1055,7 @@ public final class CraftServer implements Server {
+         }
+ 
+         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
++        me.totalfreedom.scissors.ScissorsConfig.init(((File) console.options.valueOf("scissors-settings"))); // Scissors
+         this.console.paperConfigurations.reloadConfigs(this.console);
+         for (ServerLevel world : this.console.getAllLevels()) {
+             // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
+@@ -1087,6 +1088,7 @@ public final class CraftServer implements Server {
+         this.reloadData();
+         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+         io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
++        me.totalfreedom.scissors.ScissorsConfig.registerCommands(); // Scissors
+         this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
+         this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
+ 
+@@ -3053,6 +3055,14 @@ public final class CraftServer implements Server {
+             return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
+         }
+ 
++        // Scissors start
++        @Override
++        public YamlConfiguration getScissorsConfig()
++        {
++            return me.totalfreedom.scissors.ScissorsConfig.config;
++        }
++        // Scissors end
++
+         @Override
+         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 b86ba59158964f73abd6622341a9acb98a33fa44..6101ff98022e7c1ad253edb112a0bf87b139e62b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -169,6 +169,19 @@ public class Main {
+                         .defaultsTo(new File("paper.yml"))
+                         .describedAs("Yml file");
+ 
++                // Scissors start
++                acceptsAll(asList("scissors-dir", "scissors-settings-directory"), "Directory for Scissors settings")
++                    .withRequiredArg()
++                    .ofType(File.class)
++                    .defaultsTo(new File(io.papermc.paper.configuration.PaperConfigurations.CONFIG_DIR))
++                    .describedAs("Config directory");
++                acceptsAll(asList("scissors", "scissors-settings"), "File for Scissors settings")
++                    .withRequiredArg()
++                    .ofType(File.class)
++                    .defaultsTo(new File("scissors.yml"))
++                    .describedAs("YAML file");
++                // Scissors end
++
+                 acceptsAll(asList("add-plugin", "add-extra-plugin-jar"), "Specify paths to extra plugin jars to be loaded in addition to those in the plugins folder. This argument can be specified multiple times, once for each extra plugin jar path.")
+                         .withRequiredArg()
+                         .ofType(File.class)

patches/server/0007-Removes-useless-spammy-error-logging.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 07:47:20 -0600
-Subject: [PATCH] Removes useless spammy error logging
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 5607dc10dc1c9d2dbf4e3007890e5e89a175605e..bc30df2009cf0d8edf0040f6fe16587d109cebdb 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1769,6 +1769,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-         try {
-             blockParser = blockParser.parse(false);
-         } catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
-+            // Scissors - Don't log errors thrown by Brigadier when an error is thrown
-             return null;
-         }
- 
-@@ -1794,8 +1795,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                 resource = CraftNamespacedKey.fromMinecraft(key);
-             }
-         } catch (IllegalArgumentException ex) {
--            org.bukkit.Bukkit.getLogger().warning("Namespaced resource does not validate: " + key.toString());
--            ex.printStackTrace();
-+            // Scissors - Don't log errors thrown by invalid namespaces when an error is thrown
-         }
- 
-         return resource;

patches/server/0008-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 08:14:44 -0600
-Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities
- with content in them
-
-
-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 ef50d9747f2a027e356b05ad8d94ffb2fd4a423e..cd8ede69be1f728663a670085113d842ec0209af 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -192,7 +192,12 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     @Override
-     public void remove(Entity.RemovalReason reason) {
-         if (!this.level.isClientSide && reason.shouldDestroy()) {
--            Containers.dropContents(this.level, (Entity) this, (Container) this);
-+            // Scissors start - Ignore errors thrown when trying to remove minecart entities with content in them
-+            try {
-+                Containers.dropContents(this.level, (Entity) this, (Container) this);
-+            } catch (Exception ignored) {
-+            }
-+            // Scissors end
-         }
- 
-         super.remove(reason);

patches/server/0008-Reject-oversized-components-from-updating.patch

@@ -1,37 +1,40 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Mon, 28 Mar 2022 16:49:17 -0600
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 12:08:31 -0500
 Subject: [PATCH] Reject oversized components from updating
 
 
 diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
-index 8f4c83837d0b01a3dbca2607ea718c371db48ef4..fe2717679f84fbef1b8ff1f9a3c3bf0fba8965f1 100644
+index 3365aed2b67ae0e4dd0410f5190ba474f146139b..5dea669ed5da073dcdfe4cbbf5521a622242563b 100644
 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java
 +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
-@@ -37,8 +37,11 @@ public class ComponentUtils {
+@@ -1,6 +1,7 @@
+ package net.minecraft.network.chat;
+ 
+ import com.google.common.collect.Lists;
++import com.google.gson.JsonParser;
+ import com.mojang.brigadier.Message;
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
+ import com.mojang.datafixers.DataFixUtils;
+@@ -38,8 +39,9 @@ public class ComponentUtils {
      }
  
      public static MutableComponent updateForEntity(@Nullable CommandSourceStack source, Component text, @Nullable Entity sender, int depth) throws CommandSyntaxException {
-+        // Scissors start - Reject oversized components
-+        MutableComponent result;
-+
++        MutableComponent result; // Scissors
          if (depth > 100) {
 -            return text.copy();
-+            result = text.copy();
++            result = text.copy(); // Scissors
          } else {
-             MutableComponent mutableComponent = text instanceof ContextAwareComponent ? ((ContextAwareComponent)text).resolve(source, sender, depth + 1) : text.plainCopy();
- 
-@@ -46,8 +49,12 @@ public class ComponentUtils {
+             // Paper start - adventure; pass actual vanilla component
+             if (text instanceof io.papermc.paper.adventure.AdventureComponent adventureComponent) {
+@@ -52,8 +54,9 @@ public class ComponentUtils {
                  mutableComponent.append(updateForEntity(source, component, sender, depth + 1));
              }
  
 -            return mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth));
 +            result = mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth));
          }
-+
-+        // Would the resulting component exceed 65535 bytes when encoded as a string?
-+        return Component.Serializer.toJson(result).length() > 65535 ? new TextComponent("") : result;
-+        // Scissors end
++        return JsonParser.parseString(result.toString()).toString().length() > 65535 ? Component.empty() : result; // Scissors
      }
  
      private static Style resolveStyle(@Nullable CommandSourceStack source, Style style, @Nullable Entity sender, int depth) throws CommandSyntaxException {

patches/server/0009-Better-handling-of-invalid-JSON-components.patch

@@ -0,0 +1,133 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 12:15:48 -0500
+Subject: [PATCH] Better handling of invalid JSON components
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
+index 6dcade427f19771b08e04cfa036dedcfac30b5cd..3b075dcb6bda40b278296fc8750f2af90c13acc4 100644
+--- a/src/main/java/net/minecraft/network/chat/Component.java
++++ b/src/main/java/net/minecraft/network/chat/Component.java
+@@ -23,6 +23,8 @@ import java.util.List;
+ import java.util.Optional;
+ import java.util.UUID;
+ import javax.annotation.Nullable;
++
++import net.minecraft.ChatFormatting;
+ import net.minecraft.core.HolderLookup;
+ import net.minecraft.network.chat.contents.DataSource;
+ import net.minecraft.network.chat.contents.KeybindContents;
+@@ -311,6 +313,26 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+             return json == null ? null : Serializer.deserialize(json, registries);
+         }
+ 
++        // Scissors start
++        @Nullable
++        public static MutableComponent fromJsonSafe(String json, HolderLookup.Provider registries) {
++            try {
++                return fromJson(json, registries);
++            } catch (Exception ex) {
++                return Component.empty().append("** Invalid JSON Component **").withStyle(ChatFormatting.RED);
++            }
++        }
++
++        @Nullable
++        public static MutableComponent fromJsonSafe(JsonElement json, HolderLookup.Provider registries) {
++            try {
++                return fromJson(json, registries);
++            } catch (Exception ex) {
++                return Component.empty().append("** Invalid JSON Component **").withStyle(ChatFormatting.RED);
++            }
++        }
++        // Scissors end
++
+         @Nullable
+         public static MutableComponent fromJsonLenient(String json, HolderLookup.Provider registries) {
+             JsonReader jsonreader = new JsonReader(new StringReader(json));
+diff --git a/src/main/java/net/minecraft/network/chat/contents/NbtContents.java b/src/main/java/net/minecraft/network/chat/contents/NbtContents.java
+index df26c39a2bb20e2021b50211dce905483a77f4e6..0b85d5aef65fdb08c1c11f0ebb973078b57e5773 100644
+--- a/src/main/java/net/minecraft/network/chat/contents/NbtContents.java
++++ b/src/main/java/net/minecraft/network/chat/contents/NbtContents.java
+@@ -124,10 +124,10 @@ public class NbtContents implements ComponentContents {
+                 );
+                 return stream.flatMap(text -> {
+                     try {
+-                        MutableComponent mutableComponent = Component.Serializer.fromJson(text, source.registryAccess());
++                        MutableComponent mutableComponent = Component.Serializer.fromJsonSafe(text, source.registryAccess()); // Scissors
+                         return Stream.of(ComponentUtils.updateForEntity(source, mutableComponent, sender, depth));
+                     } catch (Exception var5x) {
+-                        LOGGER.warn("Failed to parse component: {}", text, var5x);
++                        // Scissors - don't log
+                         return Stream.of();
+                     }
+                 }).reduce((accumulator, current) -> accumulator.append(component).append(current)).orElseGet(Component::empty);
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 7ef9f67d27cc240191dd5d07e8dcf5fbdebe1049..6ee2d11e4f3fbc8424a2ffbe6a7ebd1832a25503 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -2602,12 +2602,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+                     this.setRot(this.getYRot(), this.getXRot());
+                     if (nbt.contains("CustomName", 8)) {
+                         String s = nbt.getString("CustomName");
+-
+-                        try {
+-                            this.setCustomName(Component.Serializer.fromJson(s, this.registryAccess()));
+-                        } catch (Exception exception) {
+-                            Entity.LOGGER.warn("Failed to parse entity custom name {}", s, exception);
+-                        }
++                        this.setCustomName(Component.Serializer.fromJsonSafe(s, this.registryAccess())); // Scissors - Use safer method for getting Components from JSON
+                     }
+ 
+                     this.setCustomNameVisible(nbt.getBoolean("CustomNameVisible"));
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+index c0563260277f9f4bd9ff08993b2efb4bca9a0c60..f3c296f2464620083e44c14cc99eca1add8f8d9b 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+@@ -362,7 +362,7 @@ public abstract class BlockEntity {
+     @Nullable
+     public static Component parseCustomNameSafe(String json, HolderLookup.Provider registryLookup) {
+         try {
+-            return Component.Serializer.fromJson(json, registryLookup);
++            return Component.Serializer.fromJsonSafe(json, registryLookup); // Scissors
+         } catch (Exception exception) {
+             BlockEntity.LOGGER.warn("Failed to parse custom name from string '{}', discarding", json, exception);
+             return null;
+diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
+index b679bbdfa307d3aa9f2f5e4c70c559695b2733de..4c195b56b956b31028c4f51453d6e9bf31cada0c 100644
+--- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
++++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
+@@ -42,7 +42,7 @@ public class ScoreboardSaveData extends SavedData {
+             CompoundTag compoundTag = nbt.getCompound(i);
+             String string = compoundTag.getString("Name");
+             PlayerTeam playerTeam = this.scoreboard.addPlayerTeam(string);
+-            Component component = Component.Serializer.fromJson(compoundTag.getString("DisplayName"), registries);
++            Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("DisplayName"), registries); // Scissors - Use safer method for getting Components from JSON
+             if (component != null) {
+                 playerTeam.setDisplayName(component);
+             }
+@@ -60,14 +60,14 @@ public class ScoreboardSaveData extends SavedData {
+             }
+ 
+             if (compoundTag.contains("MemberNamePrefix", 8)) {
+-                Component component2 = Component.Serializer.fromJson(compoundTag.getString("MemberNamePrefix"), registries);
++                Component component2 = Component.Serializer.fromJsonSafe(compoundTag.getString("MemberNamePrefix"), registries); // Scissors - Use safer method for getting Components from JSON
+                 if (component2 != null) {
+                     playerTeam.setPlayerPrefix(component2);
+                 }
+             }
+ 
+             if (compoundTag.contains("MemberNameSuffix", 8)) {
+-                Component component3 = Component.Serializer.fromJson(compoundTag.getString("MemberNameSuffix"), registries);
++                Component component3 = Component.Serializer.fromJsonSafe(compoundTag.getString("MemberNameSuffix"), registries); // Scissors - Use safer method for getting Components from JSON
+                 if (component3 != null) {
+                     playerTeam.setPlayerSuffix(component3);
+                 }
+@@ -124,7 +124,7 @@ public class ScoreboardSaveData extends SavedData {
+                 return ObjectiveCriteria.DUMMY;
+             });
+             String string2 = compoundTag.getString("Name");
+-            Component component = Component.Serializer.fromJson(compoundTag.getString("DisplayName"), registries);
++            Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("DisplayName"), registries); // Scissors - Use safer method for getting Components from JSON
+             ObjectiveCriteria.RenderType renderType = ObjectiveCriteria.RenderType.byId(compoundTag.getString("RenderType"));
+             boolean bl = compoundTag.getBoolean("display_auto_update");
+             NumberFormat numberFormat = NumberFormatTypes.CODEC

patches/server/0009-ItemEntity-Check-if-items-are-air-before-calling-set.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Sun, 13 Mar 2022 14:38:38 -0300
-Subject: [PATCH] ItemEntity - Check if items are air before calling setItem
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 9ca37cbf829ff4240ae79fc283bcf9e7f2c728d2..bc71ca6e082a137d17ee0bf43de72095bd19ab3d 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -379,11 +379,14 @@ public class ItemEntity extends Entity {
- 
-         CompoundTag nbttagcompound1 = nbt.getCompound("Item");
- 
--        this.setItem(ItemStack.of(nbttagcompound1));
-+        // Scissors start
-         if (this.getItem().isEmpty()) {
-             this.discard();
-+            return;
-         }
- 
-+        this.setItem(ItemStack.of(nbttagcompound1));
-+        // Scissors end
-     }
- 
-     @Override

patches/server/0010-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch

@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 18:42:07 -0600
-Subject: [PATCH] Fixes Knowledge Books causing log spam when invalid data is
- provided
-
-
-diff --git a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
-index b79f4ce38a42e4dba8ebdfc97dadc531b7245c7a..9c49be7c53a1f2a8c203341b8ded9cd222d0c178 100644
---- a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
-+++ b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
-@@ -40,9 +40,9 @@ public class KnowledgeBookItem extends Item {
- 
-                 for(int i = 0; i < listTag.size(); ++i) {
-                     String string = listTag.getString(i);
--                    Optional<? extends Recipe<?>> optional = recipeManager.byKey(new ResourceLocation(string));
-+                    Optional<? extends Recipe<?>> optional = recipeManager.byKey(ResourceLocation.tryParse(string)); // Scissors - Validate resource locations
-                     if (!optional.isPresent()) {
--                        LOGGER.error("Invalid recipe: {}", (Object)string);
-+                        // Scissors - Don't log errors caused by invalid recipes being provided
-                         return InteractionResultHolder.fail(itemStack);
-                     }
- 
-@@ -55,7 +55,7 @@ public class KnowledgeBookItem extends Item {
- 
-             return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
-         } else {
--            LOGGER.error("Tag not valid: {}", (Object)compoundTag);
-+            // Scissors - Don't throw errors into the logs if an NBT compound isn't present or is missing the Recipes tag.
-             return InteractionResultHolder.fail(itemStack);
-         }
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
-index e816e505cd292d6c5138dff0aeae0e9592c09de0..0f6438dfe0a6620eb87233b9eefbe2340dfc347b 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
-@@ -42,7 +42,12 @@ public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBo
-             for (int i = 0; i < pages.size(); i++) {
-                 String recipe = pages.getString(i);
- 
--                this.addRecipe(CraftNamespacedKey.fromString(recipe));
-+                // Scissors start - Don't add recipes with invalid namespaces
-+                try {
-+                    this.addRecipe(CraftNamespacedKey.fromString(recipe));
-+                } catch (Exception ignored) {
-+                }
-+                // Scissors end
-             }
-         }
-     }

patches/server/0010-Prevent-attributes-with-invalid-namespaces-from-bein.patch

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:00:35 -0500
+Subject: [PATCH] Prevent attributes with invalid namespaces from being applied
+ to CraftMetaItems
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+index b6cd6897844aa9c8b9a94e41c56c4cfe4ac78780..34130c2cc3f643fcfe32a02747c45dd1eba05396 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -57,6 +57,7 @@ import net.minecraft.nbt.NbtOps;
+ import net.minecraft.nbt.SnbtPrinterTagVisitor;
+ import net.minecraft.nbt.Tag;
+ import net.minecraft.network.chat.Component;
++import net.minecraft.resources.ResourceLocation;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.util.Unit;
+ import net.minecraft.world.entity.EquipmentSlotGroup;
+@@ -764,7 +765,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                 continue;
+             }
+             String attributeName = (String) obj;
+-            if (Strings.isNullOrEmpty(attributeName)) {
++            if (Strings.isNullOrEmpty(attributeName) || attributeName.length() > 256 || !ResourceLocation.isValidResourceLocation(attributeName)) { // Scissors
+                 continue;
+             }
+             List<?> list = SerializableMeta.getObject(List.class, mods, attributeName, true);

patches/server/0011-Don-t-query-player-data-in-the-nbt-component.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 12:35:56 -0500
+Subject: [PATCH] Don't query player data in the `nbt` component
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
+index 2750702cff35762bc817ffbe5bf81631e86bc49b..f69261dae717cbb3e7bc9f5e0767adc897f0388d 100644
+--- a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
++++ b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
+@@ -8,12 +8,15 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
+ import java.util.List;
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.advancements.critereon.NbtPredicate;
+ import net.minecraft.commands.CommandSourceStack;
+ import net.minecraft.commands.arguments.selector.EntitySelector;
+ import net.minecraft.commands.arguments.selector.EntitySelectorParser;
+ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.world.entity.Entity;
++import org.bukkit.entity.Player;
+ 
+ public record EntityDataSource(String selectorPattern, @Nullable EntitySelector compiledSelector) implements DataSource {
+     public static final MapCodec<EntityDataSource> SUB_CODEC = RecordCodecBuilder.mapCodec(
+@@ -39,7 +42,11 @@ public record EntityDataSource(String selectorPattern, @Nullable EntitySelector
+     public Stream<CompoundTag> getData(CommandSourceStack source) throws CommandSyntaxException {
+         if (this.compiledSelector != null) {
+             List<? extends Entity> list = this.compiledSelector.findEntities(source);
+-            return list.stream().map(NbtPredicate::getEntityTagToCompare);
++            // Scissors start
++            Stream<? extends Entity> stream = list.stream();
++            if (ScissorsConfig.excludePlayersFromNbtComponents) stream = stream.filter((entity) -> !(entity instanceof Player));
++            return stream.map(NbtPredicate::getEntityTagToCompare);
++            // Scissors end
+         } else {
+             return Stream.empty();
+         }

patches/server/0011-Validate-BlockState-and-SoundEvent-values.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 21:56:29 -0600
-Subject: [PATCH] Validate BlockState and SoundEvent values
-
-
-diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 050ee055b9a2a0767f58d6677ad7f2d927fbaa54..9ec5bc2c29fc98ac2fbf9ff6231e8c3215ff11a1 100644
---- a/src/main/java/net/minecraft/nbt/NbtUtils.java
-+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -229,7 +229,7 @@ public final class NbtUtils {
-         if (!compound.contains("Name", 8)) {
-             return Blocks.AIR.defaultBlockState();
-         } else {
--            Block block = Registry.BLOCK.get(new ResourceLocation(compound.getString("Name")));
-+            Block block = Registry.BLOCK.get(ResourceLocation.tryParse(compound.getString("Name"))); // Scissors - Validate BlockState
-             BlockState blockState = block.defaultBlockState();
-             if (compound.contains("Properties", 10)) {
-                 CompoundTag compoundTag = compound.getCompound("Properties");
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 53d0024daf6963ac4dab575666b0d6a74a39a958..ce13ba13c30428558391defbb09a49429dd10422 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -549,7 +549,7 @@ public abstract class AbstractArrow extends Projectile {
-         this.setCritArrow(nbt.getBoolean("crit"));
-         this.setPierceLevel(nbt.getByte("PierceLevel"));
-         if (nbt.contains("SoundEvent", 8)) {
--            this.soundEvent = (SoundEvent) Registry.SOUND_EVENT.getOptional(new ResourceLocation(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent());
-+            this.soundEvent = (SoundEvent) Registry.SOUND_EVENT.getOptional(ResourceLocation.tryParse(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent()); // Scissors - Validate SoundEvents before trying to play them
-         }
- 
-         this.setShotFromCrossbow(nbt.getBoolean("ShotFromCrossbow"));

patches/server/0012-Even-more-ResourceLocation-validation-and-log-spam-f.patch

@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Mon, 9 May 2022 23:40:59 -0500
-Subject: [PATCH] Even more ResourceLocation validation and log spam fixes
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-index 7e1885d9cc568a544e934cede32bff05c20b567a..2481c50d8eb58a003e30e2d957b877bce5123a3a 100644
---- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-+++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-@@ -420,7 +420,7 @@ public class AreaEffectCloud extends Entity {
-             try {
-                 this.setParticle(ParticleArgument.readParticle(new StringReader(nbt.getString("Particle"))));
-             } catch (CommandSyntaxException commandsyntaxexception) {
--                AreaEffectCloud.LOGGER.warn("Couldn't load custom particle {}", nbt.getString("Particle"), commandsyntaxexception);
-+                // Scissors - Don't log custom particle errors
-             }
-         }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index e49eece9bff3a53469673d03a7bbf8f9cf8776b8..a49f32e9649155b6af4b1f236e4e8142d730e7e8 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-@@ -30,8 +30,14 @@ public abstract class CraftLootable<T extends RandomizableContainerBlockEntity>
-             return null;
-         }
- 
--        ResourceLocation key = getSnapshot().lootTable;
--        return Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(key));
-+        // Scissors start - Return a null loot table if the specified loot table is not valid
-+        try {
-+            ResourceLocation key = getSnapshot().lootTable;
-+            return Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(key));
-+        } catch (Exception ex) {
-+            return null;
-+        }
-+        // Scissors end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 0dd0ce9a9b3253e87eda12354249ec2fd2a33cf2..b6920f9432ca1736afbe775186fbbcf11cf046fb 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-@@ -33,8 +33,14 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
-             return null; // return empty loot table?
-         }
- 
--        NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable);
--        return Bukkit.getLootTable(key);
-+        // Scissors start - Return a null loot table if the specified loot table is not valid
-+        try {
-+            NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable);
-+            return Bukkit.getLootTable(key);
-+        } catch (Exception ex) {
-+            return null;
-+        }
-+        // Scissors end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index d775e19402188e35f79affb4ed636b6533f90ab5..29f5ab80ffbc421da911046678427755c6156894 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -63,8 +63,18 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
- 
-     @Override
-     public LootTable getLootTable() {
--        NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable());
--        return Bukkit.getLootTable(key);
-+        if (this.getHandle().lootTable == null) {
-+            this.getHandle().lootTable = this.getHandle().getDefaultLootTable();
-+        }
-+
-+        // Scissors start - Return a null loot table if the specified loot table is not valid
-+        try {
-+            NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable());
-+            return Bukkit.getLootTable(key);
-+        } catch (Exception ex) {
-+            return null;
-+        }
-+        // Scissors end
-     }
- 
-     @Override

patches/server/0012-Limit-string-tag-visitors-to-1024-elements.patch

@@ -0,0 +1,142 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 12:43:35 -0500
+Subject: [PATCH] Limit string tag visitors to 1024 elements
+
+
+diff --git a/src/main/java/net/minecraft/nbt/SnbtPrinterTagVisitor.java b/src/main/java/net/minecraft/nbt/SnbtPrinterTagVisitor.java
+index b45bb4ddf6b586ba1285db230e0bc3d1b5e447e8..4a46935cac263325a87a1b0bf32302839a75516e 100644
+--- a/src/main/java/net/minecraft/nbt/SnbtPrinterTagVisitor.java
++++ b/src/main/java/net/minecraft/nbt/SnbtPrinterTagVisitor.java
+@@ -89,6 +89,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
+     public void visitByteArray(ByteArrayTag element) {
+         StringBuilder stringBuilder = new StringBuilder("[").append("B").append(";");
+         byte[] bs = element.getAsByteArray();
++        if (bs.length > 1024) { this.result = stringBuilder.append("]").toString(); return; } // Scissors
+ 
+         for (int i = 0; i < bs.length; i++) {
+             stringBuilder.append(" ").append(bs[i]).append("B");
+@@ -105,6 +106,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
+     public void visitIntArray(IntArrayTag element) {
+         StringBuilder stringBuilder = new StringBuilder("[").append("I").append(";");
+         int[] is = element.getAsIntArray();
++        if (is.length > 1024) { this.result = stringBuilder.append("]").toString(); return; } // Scissors
+ 
+         for (int i = 0; i < is.length; i++) {
+             stringBuilder.append(" ").append(is[i]);
+@@ -122,6 +124,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
+         String string = "L";
+         StringBuilder stringBuilder = new StringBuilder("[").append("L").append(";");
+         long[] ls = element.getAsLongArray();
++        if (ls.length > 1024) { this.result = stringBuilder.append("]").toString(); return; } // Scissors
+ 
+         for (int i = 0; i < ls.length; i++) {
+             stringBuilder.append(" ").append(ls[i]).append("L");
+@@ -136,7 +139,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
+ 
+     @Override
+     public void visitList(ListTag element) {
+-        if (element.isEmpty()) {
++        if (element.isEmpty() || element.size() > 1024) { // Scissors
+             this.result = "[]";
+         } else {
+             StringBuilder stringBuilder = new StringBuilder("[");
+@@ -166,7 +169,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
+ 
+     @Override
+     public void visitCompound(CompoundTag compound) {
+-        if (compound.isEmpty()) {
++        if (compound.isEmpty() || compound.size() > 1024) { // Scissors
+             this.result = "{}";
+         } else {
+             StringBuilder stringBuilder = new StringBuilder("{");
+diff --git a/src/main/java/net/minecraft/nbt/StringTagVisitor.java b/src/main/java/net/minecraft/nbt/StringTagVisitor.java
+index d8892641d5671fa100aeb43d42ebb6103a2d280c..d10242ecd6f8442e1af3f4cd13f769517b33058a 100644
+--- a/src/main/java/net/minecraft/nbt/StringTagVisitor.java
++++ b/src/main/java/net/minecraft/nbt/StringTagVisitor.java
+@@ -53,6 +53,7 @@ public class StringTagVisitor implements TagVisitor {
+     public void visitByteArray(ByteArrayTag element) {
+         this.builder.append("[B;");
+         byte[] bs = element.getAsByteArray();
++        if (bs.length > 1024) { this.builder.append(']'); return; } // Scissors
+ 
+         for (int i = 0; i < bs.length; i++) {
+             if (i != 0) {
+@@ -69,6 +70,7 @@ public class StringTagVisitor implements TagVisitor {
+     public void visitIntArray(IntArrayTag element) {
+         this.builder.append("[I;");
+         int[] is = element.getAsIntArray();
++        if (is.length > 1024) { this.builder.append(']'); return; } // Scissors
+ 
+         for (int i = 0; i < is.length; i++) {
+             if (i != 0) {
+@@ -85,6 +87,7 @@ public class StringTagVisitor implements TagVisitor {
+     public void visitLongArray(LongArrayTag element) {
+         this.builder.append("[L;");
+         long[] ls = element.getAsLongArray();
++        if (ls.length > 1024) { this.builder.append(']'); return; } // Scissors
+ 
+         for (int i = 0; i < ls.length; i++) {
+             if (i != 0) {
+@@ -100,6 +103,7 @@ public class StringTagVisitor implements TagVisitor {
+     @Override
+     public void visitList(ListTag element) {
+         this.builder.append('[');
++        if (element.size() > 1024) { this.builder.append(']'); return; } // Scissors
+ 
+         for (int i = 0; i < element.size(); i++) {
+             if (i != 0) {
+@@ -116,6 +120,7 @@ public class StringTagVisitor implements TagVisitor {
+     public void visitCompound(CompoundTag compound) {
+         this.builder.append('{');
+         List<String> list = Lists.newArrayList(compound.getAllKeys());
++        if (list.size() > 1024) { this.builder.append('}'); return; } // Scissors
+         Collections.sort(list);
+ 
+         for (String string : list) {
+diff --git a/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java b/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java
+index 6644359d68706b7c3af2f782c33f930387c221d7..b76cd0ff6f60d83da8754ef788bc0e669b8b4f9c 100644
+--- a/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java
++++ b/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java
+@@ -105,6 +105,7 @@ public class TextComponentTagVisitor implements TagVisitor {
+         Component component = Component.literal("B").withStyle(SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+         MutableComponent mutableComponent = Component.literal("[").append(component).append(";");
+         byte[] bs = element.getAsByteArray();
++        if (bs.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
+ 
+         for (int i = 0; i < bs.length; i++) {
+             MutableComponent mutableComponent2 = Component.literal(String.valueOf(bs[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER);
+@@ -123,6 +124,7 @@ public class TextComponentTagVisitor implements TagVisitor {
+         Component component = Component.literal("I").withStyle(SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+         MutableComponent mutableComponent = Component.literal("[").append(component).append(";");
+         int[] is = element.getAsIntArray();
++        if (is.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
+ 
+         for (int i = 0; i < is.length; i++) {
+             mutableComponent.append(" ").append(Component.literal(String.valueOf(is[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER));
+@@ -140,6 +142,7 @@ public class TextComponentTagVisitor implements TagVisitor {
+         Component component = Component.literal("L").withStyle(SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
+         MutableComponent mutableComponent = Component.literal("[").append(component).append(";");
+         long[] ls = element.getAsLongArray();
++        if (ls.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
+ 
+         for (int i = 0; i < ls.length; i++) {
+             Component component2 = Component.literal(String.valueOf(ls[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER);
+@@ -155,7 +158,7 @@ public class TextComponentTagVisitor implements TagVisitor {
+ 
+     @Override
+     public void visitList(ListTag element) {
+-        if (element.isEmpty()) {
++        if (element.isEmpty() || element.size() > 1024) { // Scissors
+             this.result = Component.literal("[]");
+         } else if (this.depth >= 64) {
+             this.result = Component.literal("[").append(TOO_DEEP).append("]");
+@@ -202,7 +205,7 @@ public class TextComponentTagVisitor implements TagVisitor {
+ 
+     @Override
+     public void visitCompound(CompoundTag compound) {
+-        if (compound.isEmpty()) {
++        if (compound.isEmpty() || compound.size() > 1024) { // Scissors
+             this.result = Component.literal("{}");
+         } else if (this.depth >= 64) {
+             this.result = Component.literal("{").append(TOO_DEEP).append("}");

patches/server/0013-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Sun, 20 Mar 2022 09:31:16 -0300
-Subject: [PATCH] Do not log invalid items in HoverEvent and ItemFrame
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-index 67feb4e688d049e9f74f0deabb1ec583336a29be..63dbbc0f027ab66d183f81d6a8e0f9e0b85ea562 100644
---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
-+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -314,7 +314,7 @@ public class HoverEvent {
-                         CompoundTag compoundTag = TagParser.parseTag(string);
-                         return new HoverEvent.ItemStackInfo(item, i, compoundTag);
-                     } catch (CommandSyntaxException var6) {
--                        HoverEvent.LOGGER.warn("Failed to parse tag: {}", string, var6);
-+                        // Scissors - Ignore invalid items
-                     }
-                 }
- 
-@@ -328,7 +328,7 @@ public class HoverEvent {
-                 CompoundTag compoundTag = TagParser.parseTag(text.getString());
-                 return new HoverEvent.ItemStackInfo(ItemStack.of(compoundTag));
-             } catch (CommandSyntaxException var2) {
--                HoverEvent.LOGGER.warn("Failed to parse item tag: {}", text, var2);
-+                // Scissors - Ignore invalid items
-                 return null;
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index f134a2e68d50fba021b19fac4c75fb35d0e252c6..5e79ce09bf8ba48eb7f5dfdcf1511a2964c3281d 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -396,7 +396,7 @@ public class ItemFrame extends HangingEntity {
-             ItemStack itemstack = ItemStack.of(nbttagcompound1);
- 
-             if (itemstack.isEmpty()) {
--                ItemFrame.LOGGER.warn("Unable to load item from: {}", nbttagcompound1);
-+                // Scissors - ignore invalid items
-             }
- 
-             ItemStack itemstack1 = this.getItem();

patches/server/0013-Fixes-creative-killing-potion-effects-and-certain-po.patch

@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 12:46:29 -0500
+Subject: [PATCH] Fixes creative-killing potion effects and certain potion
+ effect overflows
+
+
+diff --git a/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
+index b95afa9f6b7cf6c522ff5ec278adec7a9a851e9a..3f65f24936cdf3379e39bab3cd8bd46aacd95518 100644
+--- a/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
++++ b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
+@@ -15,6 +15,10 @@ class HealOrHarmMobEffect extends InstantenousMobEffect {
+ 
+     @Override
+     public boolean applyEffectTick(LivingEntity entity, int amplifier) {
++        // Scissors start - Don't apply any healing/harming effects for Creative/Invulnerable players and cap the amplifier for those who aren't.
++        if (entity instanceof net.minecraft.world.entity.player.Player player && (player.isCreative() || player.isInvulnerable())) return false;
++        amplifier = Math.min(Math.abs(amplifier), 124);
++        // Scissors end
+         if (this.isHarm == entity.isInvertedHealAndHarm()) {
+             entity.heal((float) Math.max(4 << amplifier, 0), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC); // CraftBukkit
+         } else {
+@@ -28,6 +32,11 @@ class HealOrHarmMobEffect extends InstantenousMobEffect {
+     public void applyInstantenousEffect(@Nullable Entity source, @Nullable Entity attacker, LivingEntity target, int amplifier, double proximity) {
+         int j;
+ 
++        // Scissors start - Don't apply any healing/harming effects for Creative/Invulnerable players and cap the amplifier for those who aren't.
++        if (target instanceof net.minecraft.world.entity.player.Player player && (player.isCreative() || player.isInvulnerable())) return;
++        amplifier = Math.min(Math.abs(amplifier), 124);
++        // Scissors end
++
+         if (this.isHarm == target.isInvertedHealAndHarm()) {
+             j = (int) (proximity * (double) (4 << amplifier) + 0.5D);
+             target.heal((float) j, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC); // CraftBukkit

patches/server/0014-Even-more-resource-location-validation.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 22 Apr 2022 01:19:49 -0500
-Subject: [PATCH] Even more resource location validation
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-index 2481c50d8eb58a003e30e2d957b877bce5123a3a..6b284666eae8b7e0ef8f54dfe9311a0979b420fe 100644
---- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-+++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-@@ -143,7 +143,7 @@ public class AreaEffectCloud extends Entity {
-     }
- 
-     public void setPotionType(String string) {
--        this.setPotion(Registry.POTION.get(new ResourceLocation(string)));
-+        this.setPotion(Registry.POTION.get(ResourceLocation.tryParse(string))); // Scissors - Validate resource locations
-     }
-     // CraftBukkit end
- 
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 79abd84696ef099f6b12ddeaa6e398f18c53316a..7070b64c0c66b5c9d09bf7764ce506f4461dbac5 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -514,7 +514,7 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
-         }), (entity) -> {
-             entity.load(nbt);
-         }, () -> {
--            EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
-+            // Scissors - Don't log invalid entities
-         });
-     }
- 
-@@ -538,7 +538,7 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
-     }
- 
-     public static Optional<EntityType<?>> by(CompoundTag nbt) {
--        return Registry.ENTITY_TYPE.getOptional(new ResourceLocation(nbt.getString("id")));
-+        return Registry.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(nbt.getString("id"))); // Scissors - Validate resource locations
-     }
- 
-     @Nullable
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e3227a806d9e19923783122ea94ae19e7dbe71da..473dba5213f6aed7573e970119f4b6ad0e4f6367 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -572,7 +572,7 @@ public abstract class Mob extends LivingEntity {
- 
-         this.setLeftHanded(nbt.getBoolean("LeftHanded"));
-         if (nbt.contains("DeathLootTable", 8)) {
--            this.lootTable = new ResourceLocation(nbt.getString("DeathLootTable"));
-+            this.lootTable = ResourceLocation.tryParse(nbt.getString("DeathLootTable")); // Scissors - Validate resource locations
-             this.lootTableSeed = nbt.getLong("DeathLootTableSeed");
-         }
- 

patches/server/0014-Fix-negative-death-times.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 12:48:19 -0500
+Subject: [PATCH] Fix negative death times
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 6e043457a29a890bcefd27fc5bb07c1a7e4e30f7..8ff815b1bb77eab735c65fa9c6bf469dca8562c4 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -650,7 +650,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ 
+     protected void tickDeath() {
+         ++this.deathTime;
+-        if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved()) {
++        if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level().isClientSide() && !this.isRemoved()) { // Scissors
+             this.level().broadcastEntityEvent(this, (byte) 60);
+             this.remove(Entity.RemovalReason.KILLED, EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
+         }

patches/server/0015-Change-version-fetcher-to-AMG.patch

@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Sat, 26 Mar 2022 21:51:07 -0500
-Subject: [PATCH] Change version fetcher to AMG
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index ece77f5ea4b14bbed7c070131b3251ea86764538..f92610edcfb724374c69e66443eab60919ee955a 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -4,6 +4,8 @@ import com.destroystokyo.paper.util.VersionFetcher;
- import com.google.common.base.Charsets;
- import com.google.common.io.Resources;
- import com.google.gson.*;
-+import io.papermc.paper.util.JarManifests;
-+import java.util.Map;
- import net.kyori.adventure.text.Component;
- import net.kyori.adventure.text.event.ClickEvent;
- import net.kyori.adventure.text.format.NamedTextColor;
-@@ -19,8 +21,8 @@ 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";
-+    private static final String GITHUB_BRANCH_NAME = getBranch();
-+    private static final String DOWNLOAD_PAGE = "https://ci.plex.us.org/job/Scissors/job/" + GITHUB_BRANCH_NAME;
-     private static @Nullable String mcVer;
- 
-     @Override
-@@ -31,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Nonnull
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
--        String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
--        final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        String[] parts = serverVersion.substring("git-Scissors-".length()).split("[-\\s]");
-+        final Component updateMessage = getUpdateStatusMessage("AtlasMediaGroup/Scissors", GITHUB_BRANCH_NAME, parts[0]);
-         final Component history = getHistory();
- 
-         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -54,15 +56,24 @@ public class PaperVersionFetcher implements VersionFetcher {
-         return mcVer;
-     }
- 
-+    // Scissors start - Allow getting git information
-+    public static String getCommit() {
-+        Map<String, String> attributes = JarManifests.MANIFEST_MAP;
-+        return attributes.get("Git-Commit");
-+    }
-+
-+    public static String getBranch() {
-+        Map<String, String> attributes = JarManifests.MANIFEST_MAP;
-+        return attributes.get("Git-Branch");
-+    }
-+    // Scissors end
-+
-     private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
-         int distance;
--        try {
--            int jenkinsBuild = Integer.parseInt(versionInfo);
--            distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion());
--        } catch (NumberFormatException ignored) {
--            versionInfo = versionInfo.replace("\"", "");
--            distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
--        }
-+        // Scissors start - always use Git for version checking
-+        versionInfo = getCommit();
-+        distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
-+        // Scissors end
- 
-         switch (distance) {
-             case -1:

patches/server/0015-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch

@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 13:00:39 -0500
+Subject: [PATCH] Limit amount of vehicle collision checks to 3 and discard
+ vehicles if they collide with more than 15 other entities
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+index 4d7454e5a64fc18e63793a221daa94617f17c666..0ebc9b469d684251ba73989b3f7483522faf48d7 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
+@@ -8,6 +8,7 @@ import com.mojang.datafixers.util.Pair;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
++import java.util.concurrent.TimeUnit;
+ import javax.annotation.Nullable;
+ import net.minecraft.BlockUtil;
+ import net.minecraft.Util;
+@@ -101,6 +102,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
+     private double flyingX = 0.95;
+     private double flyingY = 0.95;
+     private double flyingZ = 0.95;
++    private long lastLargeCollision = 0L; // Scissors - Add a collision debounce
+     public double maxSpeed = 0.4D;
+     // CraftBukkit end
+ 
+@@ -381,8 +383,8 @@ public abstract class AbstractMinecart extends VehicleEntity {
+             if (this.getMinecartType() == AbstractMinecart.Type.RIDEABLE && this.getDeltaMovement().horizontalDistanceSqr() > 0.01D) {
+                 List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this));
+ 
+-                if (!list.isEmpty()) {
+-                    Iterator iterator = list.iterator();
++                if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Scissors - add collision debounce, using TimeUnit for better code readability
++                    Iterator iterator = list.size() <= 15 ? list.iterator() : list.subList(0, 15).iterator(); // Scissors
+ 
+                     while (iterator.hasNext()) {
+                         Entity entity = (Entity) iterator.next();
+@@ -411,6 +413,13 @@ public abstract class AbstractMinecart extends VehicleEntity {
+                             entity.push(this);
+                         }
+                     }
++                    // Scissors start - Add a collision debounce
++                    if (list.size() > 15) {
++                        this.discard(null);
++                    } else if (list.size() > 3) {
++                        lastLargeCollision = System.currentTimeMillis();
++                    }
++                    // Scissors end
+                 }
+             } else {
+                 Iterator iterator1 = this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator();
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+index b068cff9b5aa457d65b679529956e8210296d799..8274154f2ce4a752ea49790c6526ecb353934a04 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
+ import com.google.common.collect.UnmodifiableIterator;
+ import java.util.Iterator;
+ import java.util.List;
++import java.util.concurrent.TimeUnit;
+ import java.util.function.IntFunction;
+ import javax.annotation.Nullable;
+ import net.minecraft.BlockUtil;
+@@ -107,6 +108,8 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+     public boolean landBoats = false;
+     // CraftBukkit end
+ 
++    private long lastLargeCollision = 0L; // Scissors - Add a collision debounce
++
+     public Boat(EntityType<? extends Boat> type, Level world) {
+         super(type, world);
+         this.paddlePositions = new float[2];
+@@ -401,9 +404,9 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+         this.checkInsideBlocks();
+         List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, -0.009999999776482582D, 0.20000000298023224D), EntitySelector.pushableBy(this));
+ 
+-        if (!list.isEmpty()) {
++        if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Scissors - add collision debounce, using TimeUnit for better code readability
+             boolean flag = !this.level().isClientSide && !(this.getControllingPassenger() instanceof Player);
+-            Iterator iterator = list.iterator();
++            Iterator iterator = list.size() <= 15 ? list.iterator() : list.subList(0, 15).iterator(); // Scissors
+ 
+             while (iterator.hasNext()) {
+                 Entity entity = (Entity) iterator.next();
+@@ -416,6 +419,13 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+                     }
+                 }
+             }
++            // Scissors start - Add collision debounce
++            if (list.size() > 15) {
++                this.discard(null);
++            } else if (list.size() > 3) {
++                lastLargeCollision = System.currentTimeMillis();
++            }
++            // Scissors end
+         }
+ 
+     }

patches/server/0016-Add-custom-classes-used-by-Scissors.patch

@@ -0,0 +1,182 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Wed, 8 May 2024 13:01:45 -0500
+Subject: [PATCH] Add custom classes used by Scissors
+
+
+diff --git a/src/main/java/me/totalfreedom/scissors/MathUtility.java b/src/main/java/me/totalfreedom/scissors/MathUtility.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..754b578b575137a9c48cb20dee965a9388fedb3c
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/MathUtility.java
+@@ -0,0 +1,29 @@
++package me.totalfreedom.scissors;
++
++public class MathUtility
++{
++    public static int clampInt(int number, int minimum, int maximum)
++    {
++        return Math.min(Math.max(number, minimum), maximum);
++    }
++
++    public static long clampLong(long number, long minimum, long maximum)
++    {
++        return Math.min(Math.max(number, minimum), maximum);
++    }
++
++    public static double clampDouble(double number, double minimum, double maximum)
++    {
++        return Math.min(Math.max(number, minimum), maximum);
++    }
++
++    public static int safeDoubleToInt(double number)
++    {
++        return (int) clampDouble(number, Integer.MIN_VALUE, Integer.MAX_VALUE);
++    }
++
++    public static int safeLongToInt(long number)
++    {
++        return (int) clampLong(number, Integer.MIN_VALUE, Integer.MAX_VALUE);
++    }
++}
+diff --git a/src/main/java/me/totalfreedom/scissors/NbtUtility.java b/src/main/java/me/totalfreedom/scissors/NbtUtility.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..9ad690056bffd9e85e469c5a54dffa3e1e13db5a
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/NbtUtility.java
+@@ -0,0 +1,76 @@
++package me.totalfreedom.scissors;
++
++import net.minecraft.nbt.CompoundTag;
++import net.minecraft.nbt.ListTag;
++import net.minecraft.nbt.Tag;
++
++import javax.annotation.Nullable;
++import java.nio.charset.StandardCharsets;
++
++public class NbtUtility
++{
++    public static final long MAXIMUM_SIZE = (256 * 1024);
++
++    public static long getTagSize(@Nullable Tag tag, int depth)
++    {
++        if (depth > 512)
++        {
++            return 0;
++        }
++        if (tag == null)
++        {
++            return 0;
++        }
++
++        long size = 0;
++
++        if (tag.getType() == CompoundTag.TYPE)
++        {
++            CompoundTag compoundTag = (CompoundTag) tag;
++            for (String key : compoundTag.getAllKeys())
++            {
++                size += key.getBytes(StandardCharsets.UTF_8).length;
++                size += getTagSize(compoundTag.get(key), depth + 1);
++            }
++        }
++        else if (tag.getType() == ListTag.TYPE)
++        {
++            ListTag listTag = (ListTag) tag;
++            for (Tag tag1 : listTag)
++            {
++                size += getTagSize(tag1, depth + 1);
++            }
++        }
++        else
++        {
++            size += tag.getAsString().getBytes(StandardCharsets.UTF_8).length;
++        }
++
++        return size;
++    }
++
++    public static long getTagSize(@Nullable CompoundTag tag)
++    {
++        return getTagSize(tag, 0);
++    }
++
++    public static boolean isTooLarge(@Nullable CompoundTag tag)
++    {
++        if (tag == null)
++        {
++            return false;
++        }
++        return getTagSize(tag) > MAXIMUM_SIZE;
++    }
++
++    public static class Item
++    {
++        public static CompoundTag removeItemData(CompoundTag tag)
++        {
++            CompoundTag cleaned = new CompoundTag();
++            cleaned.putString("id", tag.getString("id"));
++            cleaned.putByte("Count", tag.getByte("Count"));
++            return cleaned;
++        }
++    }
++}
+diff --git a/src/main/java/me/totalfreedom/scissors/PositionUtility.java b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c5dcc833d6f2c0daa1d0c2a7ab81430f25e0b2f3
+--- /dev/null
++++ b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
+@@ -0,0 +1,53 @@
++package me.totalfreedom.scissors;
++
++import net.minecraft.core.BlockPos;
++import net.minecraft.world.entity.Entity;
++import net.minecraft.world.level.Level;
++import net.minecraft.world.level.border.WorldBorder;
++import net.minecraft.world.phys.Vec3;
++
++public class PositionUtility
++{
++
++    public static Vec3 getValidVec3FromBlockPos(BlockPos blockPos, Entity entity)
++    {
++        final BlockPos validBlockPos = getValidBlockPos(blockPos, entity);
++
++        return new Vec3(validBlockPos.getX(), validBlockPos.getY(), validBlockPos.getZ());
++    }
++
++    public static BlockPos getValidBlockPos(BlockPos blockPos, Entity entity)
++    {
++        final Level level = entity.level();
++
++        try
++        {
++            if (level.isInWorldBounds(blockPos))
++            {
++                return blockPos;
++            }
++            else
++            {
++                final int x = blockPos.getX();
++                final int y = blockPos.getY();
++                final int z = blockPos.getZ();
++
++                final WorldBorder worldBorder = level.getWorldBorder();
++
++                final int maxX = MathUtility.safeDoubleToInt(worldBorder.getMaxX());
++                final int maxY = level.getMaxBuildHeight();
++                final int maxZ = MathUtility.safeDoubleToInt(worldBorder.getMaxZ());
++
++                final int minX = MathUtility.safeDoubleToInt(worldBorder.getMinX());
++                final int minY = level.getMinBuildHeight();
++                final int minZ = MathUtility.safeDoubleToInt(worldBorder.getMinZ());
++
++                return new BlockPos(MathUtility.clampInt(x, minX, maxX), MathUtility.clampInt(y, minY, maxY), MathUtility.clampInt(z, minZ, maxZ));
++            }
++        }
++        catch (Exception e)
++        { // If we throw some sort of exception due to the position being crazy, catch it
++            return new BlockPos(0, 0, 0);
++        }
++    }
++}

patches/server/0016-Prevent-attributes-with-invalid-namespaces-from-bein.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Wed, 30 Mar 2022 18:20:09 -0600
-Subject: [PATCH] Prevent attributes with invalid namespaces from being applied
- to CraftMetaItems
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 65844bb02bd3d9ef566d4779106a1f9ef2a2b7bc..f856ac2dfe55a1f1f63725ec20e7b8dd3d394acf 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -46,6 +46,7 @@ import net.minecraft.nbt.NbtIo;
- import net.minecraft.nbt.StringTag;
- import net.minecraft.nbt.Tag;
- import net.minecraft.network.chat.TextComponent;
-+import net.minecraft.resources.ResourceLocation; // Scissors
- import net.minecraft.world.item.BlockItem;
- import org.apache.commons.lang.Validate;
- import org.apache.commons.lang3.EnumUtils;
-@@ -481,7 +482,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-             AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
- 
-             String attributeName = CraftAttributeMap.convertIfNeeded(entry.getString(ATTRIBUTES_IDENTIFIER.NBT)); // Paper
--            if (attributeName == null || attributeName.isEmpty()) {
-+            if (attributeName == null || attributeName.isEmpty() || attributeName.length() < 256 || !ResourceLocation.isValidResourceLocation(attributeName)) { // Scissors
-                 continue;
-             }
- 

patches/server/0017-Don-t-log-invalid-teams-to-console.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 12:24:26 -0500
+Subject: [PATCH] Don't log invalid teams to console
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 8ff815b1bb77eab735c65fa9c6bf469dca8562c4..8768ab338836569d53e0a70cc5f097b5a6d721ec 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -901,7 +901,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+             boolean flag = scoreboardteam != null && scoreboard.addPlayerToTeam(this.getStringUUID(), scoreboardteam);
+ 
+             if (!flag) {
+-                LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s);
++                // Scissors - Prevent log spam possible with this error message, easily provokable by players in creative.
+             }
+         }
+ 

patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Wed, 30 Mar 2022 02:01:55 -0600
-Subject: [PATCH] Validate String UUIDs during the CompoundTag -> GameProfile
- conversion process
-
-
-diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 9ec5bc2c29fc98ac2fbf9ff6231e8c3215ff11a1..9ef6b0a861a2b0f6e6d54775c6b0496689d12d66 100644
---- a/src/main/java/net/minecraft/nbt/NbtUtils.java
-+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -76,7 +76,12 @@ public final class NbtUtils {
-         }
-         // Paper start - support string UUID's
-         if (compound.contains("Id", 8)) {
--            uUID = UUID.fromString(compound.getString("Id"));
-+            // Scissors start - Validate String UUIDs in game profiles
-+            try {
-+                uUID = UUID.fromString(compound.getString("Id"));
-+            } catch (Exception ignored) {
-+            }
-+            // Scissors end
-         }
-         // Paper end
- 

patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sat, 9 Apr 2022 13:00:27 -0600
-Subject: [PATCH] Don't query player data in the `nbt` component
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/NbtComponent.java b/src/main/java/net/minecraft/network/chat/NbtComponent.java
-index 8e658eeb4edc83db72c187baa52b7ada7b848af8..e3dc56de3f91e03b1543257f72448a734d914ed7 100644
---- a/src/main/java/net/minecraft/network/chat/NbtComponent.java
-+++ b/src/main/java/net/minecraft/network/chat/NbtComponent.java
-@@ -23,6 +23,7 @@ import net.minecraft.nbt.Tag;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.level.block.entity.BlockEntity;
- import org.slf4j.Logger;
- 
-@@ -217,7 +218,7 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
-         protected Stream<CompoundTag> getData(CommandSourceStack source) throws CommandSyntaxException {
-             if (this.compiledSelector != null) {
-                 List<? extends Entity> list = this.compiledSelector.findEntities(source);
--                return list.stream().map(NbtPredicate::getEntityTagToCompare);
-+                return list.stream().filter((entity) -> !(entity instanceof Player)).map(NbtPredicate::getEntityTagToCompare); // Scissors - Don't query NBT from players
-             } else {
-                 return Stream.empty();
-             }

patches/server/0018-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Fri, 19 Aug 2022 00:49:38 -0600
+Subject: [PATCH] Fixes out of bounds HangingEntity crash exploit
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
+index bf2d91bbb4bf401696f5f5d14a67e3920a179084..e31102bb56fac4ffc1e114cc8ea2075af0f92e7f 100644
+--- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
+@@ -279,6 +279,13 @@ public abstract class HangingEntity extends Entity {
+     public void readAdditionalSaveData(CompoundTag nbt) {
+         BlockPos blockposition = new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ"));
+ 
++        // Scissors start - Fixes exploit where bad TileX, TileY, and TileZ coordinates can crash servers
++        if (level().isLoadedAndInBounds(blockposition))
++        {
++            this.pos = blockposition;
++        }
++        // Scissors end
++
+         if (!blockposition.closerThan(this.blockPosition(), 16.0D)) {
+             HangingEntity.LOGGER.error("Hanging entity at invalid position: {}", blockposition);
+         } else {

patches/server/0019-Add-MasterBlockFireEvent.patch

@@ -0,0 +1,141 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 12:31:03 -0500
+Subject: [PATCH] Add MasterBlockFireEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/CommandBlock.java b/src/main/java/net/minecraft/world/level/block/CommandBlock.java
+index ec1a8c60ccac50e5131f937c4262128fd2768331..385c73cc952caea21f6ebf5512fdf72bf121b953 100644
+--- a/src/main/java/net/minecraft/world/level/block/CommandBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/CommandBlock.java
+@@ -4,6 +4,7 @@ import com.mojang.logging.LogUtils;
+ import com.mojang.serialization.Codec;
+ import com.mojang.serialization.MapCodec;
+ import com.mojang.serialization.codecs.RecordCodecBuilder;
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.component.DataComponents;
+@@ -27,6 +28,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+ import net.minecraft.world.level.block.state.properties.BooleanProperty;
+ import net.minecraft.world.level.block.state.properties.DirectionProperty;
+ import net.minecraft.world.phys.BlockHitResult;
++import org.bukkit.Location;
+ import org.slf4j.Logger;
+ 
+ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
+@@ -128,6 +130,13 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock {
+     }
+ 
+     private void execute(BlockState state, Level world, BlockPos pos, BaseCommandBlock executor, boolean hasCommand) {
++        // Scissors start - Add master block fire event
++        final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
++        if (!event.callEvent()) {
++            return;
++        }
++        // Scissors end
++
+         if (hasCommand) {
+             executor.performCommand(world);
+         } else {
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
+index 922592f2073eaea8ca361a3a1efcda8b18bea21c..7fec97a00f271eca29beca0ec0862de4036dd546 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java
+@@ -2,6 +2,8 @@ package net.minecraft.world.level.block.entity;
+ 
+ import java.util.Arrays;
+ import java.util.Optional;
++
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Holder;
+ import net.minecraft.core.HolderLookup;
+@@ -18,6 +20,7 @@ import net.minecraft.world.level.block.JigsawBlock;
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.level.levelgen.structure.pools.JigsawPlacement;
+ import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
++import org.bukkit.Location;
+ 
+ public class JigsawBlockEntity extends BlockEntity {
+     public static final String TARGET = "target";
+@@ -135,6 +138,14 @@ public class JigsawBlockEntity extends BlockEntity {
+     }
+ 
+     public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
++        // Scissors start - Add master block fire event
++        final BlockPos pos = this.getBlockPos();
++        final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), pos.getX(), pos.getY(), pos.getZ()));
++        if (!event.callEvent()) {
++            return;
++        }
++        // Scissors end
++
+         BlockPos blockPos = this.getBlockPos().relative(this.getBlockState().getValue(JigsawBlock.ORIENTATION).front());
+         Registry<StructureTemplatePool> registry = world.registryAccess().registryOrThrow(Registries.TEMPLATE_POOL);
+         // Paper start - Replace getHolderOrThrow with a null check
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java
+index ab3e35069a069040f72900a9581f41848e4c4653..d390b05486dcaa563269500b350aecd9dfa3bc28 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/StructureBlockEntity.java
+@@ -5,6 +5,8 @@ import java.util.Objects;
+ import java.util.Optional;
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
+ import net.minecraft.ResourceLocationException;
+ import net.minecraft.Util;
+ import net.minecraft.core.BlockPos;
+@@ -30,6 +32,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProce
+ import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
+ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
+ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
++import org.bukkit.Location;
+ 
+ public class StructureBlockEntity extends BlockEntity {
+     private static final int SCAN_CORNER_BLOCKS_RANGE = 5;
+@@ -317,6 +320,14 @@ public class StructureBlockEntity extends BlockEntity {
+         if (this.structureName == null) {
+             return false;
+         } else {
++            // Scissors start - Add master block fire event
++            final BlockPos pos = this.getBlockPos();
++            final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), pos.getX(), pos.getY(), pos.getZ()));
++            if (!event.callEvent()) {
++                return false;
++            }
++            // Scissors end
++
+             BlockPos blockPos = this.getBlockPos().offset(this.structurePos);
+             ServerLevel serverLevel = (ServerLevel)this.level;
+             StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager();
+@@ -368,6 +379,13 @@ public class StructureBlockEntity extends BlockEntity {
+         if (structureTemplate == null) {
+             return false;
+         } else {
++            // Scissors start - Add master block fire event
++            final BlockPos blockPos = this.getBlockPos();
++            final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), blockPos.getX(), blockPos.getY(), blockPos.getZ()));
++            if (!event.callEvent()) {
++                return false;
++            }
++            // Scissors end
+             this.loadStructureInfo(structureTemplate);
+             return true;
+         }
+@@ -408,6 +426,14 @@ public class StructureBlockEntity extends BlockEntity {
+     }
+ 
+     public void unloadStructure() {
++        // Scissors start - Add master block fire event
++        final BlockPos blockPos = this.getBlockPos();
++        final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(this.getLevel().getWorld(), blockPos.getX(), blockPos.getY(), blockPos.getZ()));
++
++        if (!event.callEvent()) {
++            return;
++        }
++        // Scissors end
+         if (this.structureName != null) {
+             ServerLevel serverLevel = (ServerLevel)this.level;
+             StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager();

patches/server/0019-Limit-ListTags-to-1024-elements.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Fri, 8 Apr 2022 23:38:12 -0300
-Subject: [PATCH] Limit ListTags to 1024 elements
-
-
-diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java
-index ea68b26e506e48d8238b7ee4266e61b211d52bd2..10d3a1b31233f884823ee9a4bb27d70eac3914df 100644
---- a/src/main/java/net/minecraft/nbt/ListTag.java
-+++ b/src/main/java/net/minecraft/nbt/ListTag.java
-@@ -33,6 +33,7 @@ public class ListTag extends CollectionTag<Tag> {
-                         list.add(tagType.load(dataInput, i + 1, nbtAccounter));
-                     }
- 
-+                    if(j > 1024) return new ListTag(Lists.newArrayListWithCapacity(0), b);
-                     return new ListTag(list, b);
-                 }
-             }

patches/server/0020-Add-spectator-teleport-event.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 13:02:20 -0500
+Subject: [PATCH] Add spectator teleport event
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 5e9202bc7fc649764568b55d66ba0d684118c00c..31a6be18075723eb53fd1cbb664429e49909cf66 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -29,6 +29,8 @@ import java.util.function.Consumer;
+ import java.util.stream.Collectors;
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.Util;
+ import net.minecraft.advancements.AdvancementHolder;
+@@ -2033,6 +2035,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                 Entity entity = packet.getEntity(worldserver);
+ 
+                 if (entity != null) {
++                    // Scissors start - Add spectator teleport event
++                    final SpectatorTeleportEvent event = new SpectatorTeleportEvent(this.player.getBukkitEntity(), entity.getBukkitEntity());
++                    if (!event.callEvent()) {
++                        return;
++                    }
++                    // Scissors end
+                     this.player.teleportTo(worldserver, entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot(), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.SPECTATE); // CraftBukkit
+                     return;
+                 }

patches/server/0020-Fix-lectern-quick-move.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sat, 2 Apr 2022 02:12:13 -0400
-Subject: [PATCH] Fix lectern quick move
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/LecternMenu.java b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-index ff79925bc6437222f9ceb133e21bbc0600cc74ed..e5498a5703f282160b8171a0b81711cfc24d323a 100644
---- a/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-@@ -120,6 +120,13 @@ public class LecternMenu extends AbstractContainerMenu {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public ItemStack quickMoveStack(net.minecraft.world.entity.player.Player player, int index) {
-+        return ItemStack.EMPTY;
-+    }
-+    // Paper end
-+
-     @Override
-     public void setData(int id, int value) {
-         super.setData(id, value);

patches/server/0021-Prevent-invalid-container-events.patch

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 13:04:21 -0500
+Subject: [PATCH] Prevent invalid container events
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 2b93d90da92559da021bac81bb3bc0a4e556ffb6..f8c6d5e2e384e3cf549c68b71c77b0f376cf32f0 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -31,6 +31,7 @@ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
+ 
+ import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
++import net.kyori.adventure.text.format.NamedTextColor;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.Util;
+ import net.minecraft.advancements.AdvancementHolder;
+@@ -2964,6 +2965,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                         return;
+                     }
+ 
++                    // Scissors start - Do not call events when the slot/button number is invalid
++                    final int sentSlotNum = packet.getSlotNum();
++                    if((Mth.clamp(sentSlotNum, -1, this.player.containerMenu.slots.size() - 1) != sentSlotNum) && sentSlotNum != -999)
++                    {
++                        this.getCraftPlayer().kick(
++                            net.kyori.adventure.text.Component.text("Invalid container click slot (Hacking?)")
++                                .color(NamedTextColor.RED)
++                        );
++                        return;
++                    }
++                    // Scissors end
++
+                     InventoryView inventory = this.player.containerMenu.getBukkitView();
+                     SlotType type = inventory.getSlotType(packet.getSlotNum());
+ 

patches/server/0022-Validate-block-entity-entity-tag-query-positions.patch

@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 13:08:40 -0500
+Subject: [PATCH] Validate block entity/entity tag query positions
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 65284355b6fc97eb1967e5c6fd51bc5b018e3e29..26eb85c9be17fcac00a5f31c2ede3111319c4044 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1266,7 +1266,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         if (this.player.hasPermissions(2)) {
+             Entity entity = this.player.level().getEntity(packet.getEntityId());
+ 
+-            if (entity != null) {
++            if (entity != null && this.player.distanceToSqr(entity.position().x, entity.position().y, entity.position().z) < 32 * 32) { // Scissors - Validate entity tag query positions
+                 CompoundTag nbttagcompound = entity.saveWithoutId(new CompoundTag());
+ 
+                 this.player.connection.send(new ClientboundTagQueryPacket(packet.getTransactionId(), nbttagcompound));
+@@ -1298,7 +1298,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     @Override
+     public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQueryPacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+-        if (this.player.hasPermissions(2)) {
++        // Scissors start - Validate block entity tag query positions
++        if (this.player.hasPermissions(2) && this.player.level().isLoadedAndInBounds(packet.getPos())
++            && this.player.distanceToSqr(packet.getPos().getX(), packet.getPos().getY(), packet.getPos().getZ()) < 32 * 32) {
++            // Scissors end
+             BlockEntity tileentity = this.player.level().getBlockEntity(packet.getPos());
+             CompoundTag nbttagcompound = tileentity != null ? tileentity.saveWithoutMetadata(this.player.registryAccess()) : null;
+ 

patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 22 Apr 2022 01:24:05 -0500
-Subject: [PATCH] Validate coordinates before attempting to get block entities
- when handling Creative Inventory packets
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 901fa17d0f0a3f66923f68f13f183bc4c17f7748..dc9199c0b1fa9b8779afc51d7af4c516d217ddb3 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2991,20 +2991,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
-         if (this.player.gameMode.isCreative()) {
-             boolean flag = packet.getSlotNum() < 0;
-             ItemStack itemstack = packet.getItem();
--            CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack);
- 
-+            CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack);
-             if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot
-                 BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
-                 // Paper start
--                BlockEntity tileentity = null;
-+                // Scissors start - Validate coordinates and whether or not the player can reach them
-+                if (Level.isInSpawnableBounds(blockposition) && !isOutsideOfReach(blockposition.getX(), blockposition.getY(), blockposition.getZ())) {
-+                    BlockEntity tileentity = null;
-                 if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.getLevel().isLoadedAndInBounds(blockposition)) {
-                     tileentity = this.player.level.getBlockEntity(blockposition);
-                 }
-                 // Paper end
- 
--                if (tileentity != null) {
--                    tileentity.saveToItem(itemstack);
-+                    if (tileentity != null) {
-+                        tileentity.saveToItem(
-+                        itemstack);
-+                    }
-                 }
-+                // Scissors end
-             }
- 
-             boolean flag1 = packet.getSlotNum() >= 1 && packet.getSlotNum() <= 45;

patches/server/0023-Better-handling-of-invalid-JSON-components.patch

@@ -1,199 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 22 Apr 2022 01:26:55 -0500
-Subject: [PATCH] Better handling of invalid JSON components
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index 984105c226f16746b43bb2d2932e0b87f3a6a70c..faa41d102c06b52bc758ebe3484820376c482093 100644
---- a/src/main/java/net/minecraft/network/chat/Component.java
-+++ b/src/main/java/net/minecraft/network/chat/Component.java
-@@ -24,6 +24,8 @@ import java.util.List;
- import java.util.Map.Entry;
- import java.util.Optional;
- import javax.annotation.Nullable;
-+
-+import net.minecraft.ChatFormatting;
- import net.minecraft.Util;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.util.FormattedCharSequence;
-@@ -427,6 +429,26 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
-             return Component.Serializer.GSON.toJsonTree(text);
-         }
- 
-+        // Scissors start
-+        @Nullable
-+        public static MutableComponent fromJsonSafe(String json) {
-+            try {
-+                return fromJson(json);
-+            } catch (Exception ex) {
-+                return new TextComponent("** Invalid JSON Component **").withStyle(ChatFormatting.RED);
-+            }
-+        }
-+
-+        @Nullable
-+        public static MutableComponent fromJsonSafe(JsonElement json) {
-+            try {
-+                return fromJson(json);
-+            } catch (Exception ex) {
-+                return new TextComponent("** Invalid JSON Component **").withStyle(ChatFormatting.RED);
-+            }
-+        }
-+        // Scissors end
-+
-         @Nullable
-         public static MutableComponent fromJson(String json) {
-             return (MutableComponent) GsonHelper.fromJson(Component.Serializer.GSON, json, MutableComponent.class, false);
-diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-index 63dbbc0f027ab66d183f81d6a8e0f9e0b85ea562..21ee39172b3efb6414d1cf8fbf36cd463194abab 100644
---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
-+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -79,7 +79,7 @@ public class HoverEvent {
-                 if (jsonElement != null) {
-                     return action.deserialize(jsonElement);
-                 } else {
--                    Component component = Component.Serializer.fromJson(json.get("value"));
-+                    Component component = Component.Serializer.fromJsonSafe(json.get("value")); // Scissors - Use safer method for getting Components from JSON
-                     return component != null ? action.deserializeFromLegacy(component) : null;
-                 }
-             }
-@@ -94,7 +94,7 @@ public class HoverEvent {
-     }
- 
-     public static class Action<T> {
--        public static final HoverEvent.Action<Component> SHOW_TEXT = new HoverEvent.Action<>("show_text", true, Component.Serializer::fromJson, Component.Serializer::toJsonTree, Function.identity());
-+        public static final HoverEvent.Action<Component> SHOW_TEXT = new HoverEvent.Action<>("show_text", true, Component.Serializer::fromJsonSafe, Component.Serializer::toJsonTree, Function.identity()); // Scissors - Use safer method for getting Components from JSON
-         public static final HoverEvent.Action<HoverEvent.ItemStackInfo> SHOW_ITEM = new HoverEvent.Action<>("show_item", true, HoverEvent.ItemStackInfo::create, HoverEvent.ItemStackInfo::serialize, HoverEvent.ItemStackInfo::create);
-         public static final HoverEvent.Action<HoverEvent.EntityTooltipInfo> SHOW_ENTITY = new HoverEvent.Action<>("show_entity", true, HoverEvent.EntityTooltipInfo::create, HoverEvent.EntityTooltipInfo::serialize, HoverEvent.EntityTooltipInfo::create);
-         private static final Map<String, HoverEvent.Action<?>> LOOKUP = Stream.of(SHOW_TEXT, SHOW_ITEM, SHOW_ENTITY).collect(ImmutableMap.toImmutableMap(HoverEvent.Action::getName, (action) -> {
-@@ -182,7 +182,7 @@ public class HoverEvent {
-                     return null;
-                 }
-                 // Scissors end
--                Component component = Component.Serializer.fromJson(jsonObject.get("name"));
-+                Component component = Component.Serializer.fromJsonSafe(jsonObject.get("name")); // Scissors - Use safer method for getting Components from JSON
-                 return new HoverEvent.EntityTooltipInfo(entityType, uUID, component);
-             }
-         }
-@@ -191,7 +191,7 @@ public class HoverEvent {
-         public static HoverEvent.EntityTooltipInfo create(Component text) {
-             try {
-                 CompoundTag compoundTag = TagParser.parseTag(text.getString());
--                Component component = Component.Serializer.fromJson(compoundTag.getString("name"));
-+                Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("name")); // Scissors - Use safer method for getting Components from JSON
-                 EntityType<?> entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type")));
-                 // Scissors start
-                 UUID uUID;
-diff --git a/src/main/java/net/minecraft/network/chat/NbtComponent.java b/src/main/java/net/minecraft/network/chat/NbtComponent.java
-index e3dc56de3f91e03b1543257f72448a734d914ed7..f518e47818a47be0dfd7cccc4845ba9736c6cd8b 100644
---- a/src/main/java/net/minecraft/network/chat/NbtComponent.java
-+++ b/src/main/java/net/minecraft/network/chat/NbtComponent.java
-@@ -78,13 +78,14 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
-             if (this.interpreting) {
-                 Component component = DataFixUtils.orElse(ComponentUtils.updateForEntity(source, this.separator, sender, depth), ComponentUtils.DEFAULT_NO_STYLE_SEPARATOR);
-                 return stream.flatMap((text) -> {
-+                    // Scissors start - Use safer method for getting Components from JSON
-                     try {
--                        MutableComponent mutableComponent = Component.Serializer.fromJson(text);
-+                        MutableComponent mutableComponent = Component.Serializer.fromJsonSafe(text);
-                         return Stream.of(ComponentUtils.updateForEntity(source, mutableComponent, sender, depth));
-                     } catch (Exception var5) {
--                        LOGGER.warn("Failed to parse component: {}", text, var5);
-                         return Stream.of();
-                     }
-+                    // Scissors end
-                 }).reduce((accumulator, current) -> {
-                     return accumulator.append(component).append(current);
-                 }).orElseGet(() -> {
-@@ -95,7 +96,7 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
-                     return stream.map((string) -> {
-                         return new TextComponent(string);
-                     }).reduce((accumulator, current) -> {
--                        return accumulator.append(text).append(current);
-+                        return (TextComponent) accumulator.append(text).append(current);
-                     }).orElseGet(() -> {
-                         return new TextComponent("");
-                     });
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..876e8f83fab4e255959948e59cabf05478446e4d 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2215,12 +2215,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-                     this.setRot(this.getYRot(), this.getXRot());
-                     if (nbt.contains("CustomName", 8)) {
-                         String s = nbt.getString("CustomName");
--
--                        try {
--                            this.setCustomName(Component.Serializer.fromJson(s));
--                        } catch (Exception exception) {
--                            Entity.LOGGER.warn("Failed to parse entity custom name {}", s, exception);
--                        }
-+                        this.setCustomName(Component.Serializer.fromJsonSafe(s)); // Scissors - Use safer method for getting Components from JSON
-                     }
- 
-                     this.setCustomNameVisible(nbt.getBoolean("CustomNameVisible"));
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 8d5c9813010a0256bd2712a1eabbc91f0f473a41..6ec48f834f5fef8678c690fd5d1ea530ebd2720f 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -402,7 +402,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-         this.levels = nbt.getInt("Levels"); // SPIGOT-5053, use where available
-         // CraftBukkit end
-         if (nbt.contains("CustomName", 8)) {
--            this.name = net.minecraft.server.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException
-+            this.name = Component.Serializer.fromJsonSafe(nbt.getString("CustomName")); // Scissors - Use safer method for getting Components from JSON
-         }
- 
-         this.lockKey = LockCode.fromTag(nbt);
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-index 1eccf9424bd8a4bcbeed4ebb1795fd113fe5af18..fcc3d2fbc679fdb70da27d20d19380fa238ba7ea 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
-@@ -43,7 +43,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
-     public void load(CompoundTag nbt) {
-         super.load(nbt);
-         if (nbt.contains("CustomName", 8)) {
--            this.name = net.minecraft.server.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException
-+            this.name = Component.Serializer.fromJsonSafe(nbt.getString("CustomName")); // Scissors - Use safer method for getting Components from JSON
-         }
- 
-     }
-diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index 0efb63d1a4cefede25712daf9cea0f5c3256980f..07fe4043184eda6fa11e0680930100eb914f64c1 100644
---- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-+++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-@@ -35,7 +35,7 @@ public class ScoreboardSaveData extends SavedData {
-             CompoundTag compoundTag = nbt.getCompound(i);
-             String string = compoundTag.getString("Name");
-             PlayerTeam playerTeam = this.scoreboard.addPlayerTeam(string);
--            Component component = Component.Serializer.fromJson(compoundTag.getString("DisplayName"));
-+            Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("DisplayName")); // Scissors - Use safer method for getting Components from JSON
-             if (component != null) {
-                 playerTeam.setDisplayName(component);
-             }
-@@ -53,14 +53,14 @@ public class ScoreboardSaveData extends SavedData {
-             }
- 
-             if (compoundTag.contains("MemberNamePrefix", 8)) {
--                Component component2 = Component.Serializer.fromJson(compoundTag.getString("MemberNamePrefix"));
-+                Component component2 = Component.Serializer.fromJsonSafe(compoundTag.getString("MemberNamePrefix")); // Scissors - Use safer method for getting Components from JSON
-                 if (component2 != null) {
-                     playerTeam.setPlayerPrefix(component2);
-                 }
-             }
- 
-             if (compoundTag.contains("MemberNameSuffix", 8)) {
--                Component component3 = Component.Serializer.fromJson(compoundTag.getString("MemberNameSuffix"));
-+                Component component3 = Component.Serializer.fromJsonSafe(compoundTag.getString("MemberNameSuffix")); // Scissors - Use safer method for getting Components from JSON
-                 if (component3 != null) {
-                     playerTeam.setPlayerSuffix(component3);
-                 }
-@@ -115,7 +115,7 @@ public class ScoreboardSaveData extends SavedData {
-             CompoundTag compoundTag = nbt.getCompound(i);
-             ObjectiveCriteria.byName(compoundTag.getString("CriteriaName")).ifPresent((criterion) -> {
-                 String string = compoundTag.getString("Name");
--                Component component = Component.Serializer.fromJson(compoundTag.getString("DisplayName"));
-+                Component component = Component.Serializer.fromJsonSafe(compoundTag.getString("DisplayName")); // Scissors - Use safer method for getting Components from JSON
-                 ObjectiveCriteria.RenderType renderType = ObjectiveCriteria.RenderType.byId(compoundTag.getString("RenderType"));
-                 this.scoreboard.addObjective(string, criterion, component, renderType);
-             });

patches/server/0023-Refuse-to-convert-legacy-messages-over-1k-characters.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 13:09:44 -0500
+Subject: [PATCH] Refuse to convert legacy messages over 1k characters
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+index 70f207f016959402ff3cba9de924f906fea28110..f4751469d925f350a7eda9ae6a1f340d41636b2c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+@@ -216,6 +216,7 @@ public final class CraftChatMessage {
+     }
+ 
+     public static Component[] fromString(String message, boolean keepNewlines, boolean plain) {
++        if (message.length() > 1_000) return new Component[]{Component.empty()}; // Scissors - Refuse to convert legacy messages over 1k characters
+         return new StringMessage(message, keepNewlines, plain).getOutput();
+     }
+ 

patches/server/0024-Fix-ClickEvents-on-Signs-bypassing-permissions.patch

@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 13:11:20 -0500
+Subject: [PATCH] Fix ClickEvents on Signs bypassing permissions
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+index a28be7a332659be655f419d969e0c64e659b6c21..7867f88fdb7ed0b644ab7c4e3c971d1164feea7a 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+@@ -9,8 +9,11 @@ import java.util.Objects;
+ import java.util.UUID;
+ import java.util.function.UnaryOperator;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.commands.CommandSource;
+ import net.minecraft.commands.CommandSourceStack;
++import net.minecraft.commands.Commands;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.HolderLookup;
+ import net.minecraft.nbt.CompoundTag;
+@@ -21,6 +24,7 @@ import net.minecraft.network.chat.Component;
+ import net.minecraft.network.chat.ComponentUtils;
+ import net.minecraft.network.chat.Style;
+ import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
++import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ServerLevel;
+ import net.minecraft.server.level.ServerPlayer;
+ import net.minecraft.server.network.FilteredText;
+@@ -34,6 +38,8 @@ import net.minecraft.world.level.block.SignBlock;
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
++import org.bukkit.craftbukkit.CraftServer;
++import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+ import org.slf4j.Logger;
+ import org.bukkit.block.sign.Side;
+ import org.bukkit.craftbukkit.block.CraftBlock;
+@@ -290,6 +296,19 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+                 }
+                 player.getServer().getCommands().performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle(), world, pos), event.getMessage());
+                 // Paper end - Fix commands from signs not firing command events
++                // Scissors start - Add optional permissions to command signs
++                final MinecraftServer vanillaServer = player.getServer();
++                final CraftServer craftServer = vanillaServer.server;
++                final CraftHumanEntity craftPlayer = player.getBukkitEntity();
++                final Commands commands = vanillaServer.getCommands();
++
++                if (ScissorsConfig.commandSignsBypassPermissions) {
++                    commands.performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle(), world, pos), event.getMessage());
++                }
++                else {
++                    craftServer.dispatchCommand(craftPlayer, command.substring(1));
++                }
++                // Scissors end
+                 flag1 = true;
+             }
+         }

patches/server/0024-Fixes-creative-killing-potion-effects-and-certain-po.patch

@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Mon, 11 Apr 2022 13:33:52 -0600
-Subject: [PATCH] Fixes creative-killing potion effects and certain potion
- effect overflows
-
-
-diff --git a/src/main/java/net/minecraft/world/effect/MobEffect.java b/src/main/java/net/minecraft/world/effect/MobEffect.java
-index 8bbb9bdcf95989f1737714655f6f6a269d46d7f2..3f5df0a365ddafe4277988767f8366536b928dab 100644
---- a/src/main/java/net/minecraft/world/effect/MobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/MobEffect.java
-@@ -47,6 +47,7 @@ public class MobEffect {
-     }
- 
-     public void applyEffectTick(LivingEntity entity, int amplifier) {
-+        boolean god = entity instanceof Player player && (player.isCreative() || player.isInvulnerable()); // Scissors
-         if (this == MobEffects.REGENERATION) {
-             if (entity.getHealth() < entity.getMaxHealth()) {
-                 entity.heal(1.0F, RegainReason.MAGIC_REGEN); // CraftBukkit
-@@ -75,17 +76,31 @@ public class MobEffect {
-                 // CraftBukkit end
-             }
-         } else if ((this != MobEffects.HEAL || entity.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !entity.isInvertedHealAndHarm())) {
--            if (this == MobEffects.HARM && !entity.isInvertedHealAndHarm() || this == MobEffects.HEAL && entity.isInvertedHealAndHarm()) {
-+            // Scissors start
-+            amplifier = Math.min(Math.abs(amplifier), 124);
-+            if (!god && (this == MobEffects.HARM && !entity.isInvertedHealAndHarm() || this == MobEffects.HEAL && entity.isInvertedHealAndHarm())) {
-                 entity.hurt(DamageSource.MAGIC, (float) (6 << amplifier));
-             }
-+            // Scissors end
-         } else {
--            entity.heal((float) Math.max(4 << amplifier, 0), RegainReason.MAGIC); // CraftBukkit
-+            // Scissors start
-+            if (!god) {
-+                amplifier = Math.min(Math.abs(amplifier), 124);
-+                entity.heal((float) Math.max(4 << amplifier, 0), RegainReason.MAGIC); // CraftBukkit
-+            }
-+            // Scissors end
-         }
- 
-     }
- 
-     public void applyInstantenousEffect(@Nullable Entity source, @Nullable Entity attacker, LivingEntity target, int amplifier, double proximity) {
-         int j;
-+        // Scissors start - Don't apply any healing/harming effects for Creative/Invulnerable players and cap the amplifier for those who aren't.
-+        if (target instanceof Player player && (player.isCreative() || player.isInvulnerable())) {
-+            return;
-+        }
-+        amplifier = Math.min(Math.abs(amplifier), 124);
-+        // Scissors end
- 
-         if ((this != MobEffects.HEAL || target.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !target.isInvertedHealAndHarm())) {
-             if ((this != MobEffects.HARM || target.isInvertedHealAndHarm()) && (this != MobEffects.HEAL || !target.isInvertedHealAndHarm())) {

patches/server/0025-Fix-negative-death-times.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 3 Jun 2022 19:30:14 -0500
-Subject: [PATCH] Fix negative death times
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d6ef140bcc35b10f78f2ec2f10c8a153395fc9df..d8393887cc98930815864eca28b07ef89b26f39e 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -620,7 +620,7 @@ public abstract class LivingEntity extends Entity {
- 
-     protected void tickDeath() {
-         ++this.deathTime;
--        if (this.deathTime == 20 && !this.level.isClientSide()) {
-+        if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level.isClientSide()) {
-             this.level.broadcastEntityEvent(this, (byte) 60);
-             this.remove(Entity.RemovalReason.KILLED);
-         }

patches/server/0025-Patch-large-selector-distance-crash.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 11 May 2024 13:18:03 -0500
+Subject: [PATCH] Patch large selector distance crash
+
+
+diff --git a/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java b/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
+index 060c0ffe57a4648598870c6168be203bf3a8634d..5c697e5d85c5c65af0ec969dbd68c38e876fc02f 100644
+--- a/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
++++ b/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
+@@ -121,11 +121,11 @@ public interface MinMaxBounds<T extends Number> {
+     public static record Doubles(@Override Optional<Double> min, @Override Optional<Double> max, Optional<Double> minSq, Optional<Double> maxSq)
+         implements MinMaxBounds<Double> {
+         public static final MinMaxBounds.Doubles ANY = new MinMaxBounds.Doubles(Optional.empty(), Optional.empty());
+-        public static final Codec<MinMaxBounds.Doubles> CODEC = MinMaxBounds.createCodec(Codec.DOUBLE, MinMaxBounds.Doubles::new);
++        public static final Codec<MinMaxBounds.Doubles> CODEC = MinMaxBounds.<Double, MinMaxBounds.Doubles>createCodec(Codec.DOUBLE, MinMaxBounds.Doubles::new); // Scissors - compile fixes
+ 
+-        private Doubles(Optional<Double> min, Optional<Double> max) {
++        public Doubles(Optional<Double> min, Optional<Double> max) {
+             this(min, max, squareOpt(min), squareOpt(max));
+-        }
++        } // Scissors - private -> public
+ 
+         private static MinMaxBounds.Doubles create(StringReader reader, Optional<Double> min, Optional<Double> max) throws CommandSyntaxException {
+             if (min.isPresent() && max.isPresent() && min.get() > max.get()) {
+@@ -177,7 +177,7 @@ public interface MinMaxBounds<T extends Number> {
+     public static record Ints(@Override Optional<Integer> min, @Override Optional<Integer> max, Optional<Long> minSq, Optional<Long> maxSq)
+         implements MinMaxBounds<Integer> {
+         public static final MinMaxBounds.Ints ANY = new MinMaxBounds.Ints(Optional.empty(), Optional.empty());
+-        public static final Codec<MinMaxBounds.Ints> CODEC = MinMaxBounds.createCodec(Codec.INT, MinMaxBounds.Ints::new);
++        public static final Codec<MinMaxBounds.Ints> CODEC = MinMaxBounds.<Integer, MinMaxBounds.Ints>createCodec(Codec.INT, MinMaxBounds.Ints::new); // Scissors - compile fixes
+ 
+         private Ints(Optional<Integer> min, Optional<Integer> max) {
+             this(min, max, min.map(i -> i.longValue() * i.longValue()), squareOpt(max));
+diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
+index 676a1499747b071515479130875157263d3a8352..6a65850101b8ea348a4bfeaeca805a39987b06fc 100644
+--- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
++++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
+@@ -10,6 +10,8 @@ import java.util.function.BiConsumer;
+ import java.util.function.Function;
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.MathUtility;
+ import net.minecraft.advancements.critereon.MinMaxBounds;
+ import net.minecraft.commands.CommandSourceStack;
+ import net.minecraft.commands.arguments.EntityArgument;
+@@ -60,9 +62,26 @@ public class EntitySelector {
+         this.includesEntities = includesNonPlayers;
+         this.worldLimited = localWorldOnly;
+         this.predicate = basePredicate;
+-        this.range = distance;
++        // Scissors start - Patch large selector distance crash
++        this.range = new MinMaxBounds.Doubles(
++            distance.min().map(min -> Math.min(min, 1024)),
++            distance.max().map(max -> Math.min(max, 1024))
++        );
+         this.position = positionOffset;
+-        this.aabb = box;
++        if (box != null) {
++            this.aabb = new AABB(
++                MathUtility.clampDouble(box.minX, -1024, 1025),
++                MathUtility.clampDouble(box.minY, -1024, 1025),
++                MathUtility.clampDouble(box.minZ, -1024, 1025),
++                MathUtility.clampDouble(box.maxX, -1024, 1025),
++                MathUtility.clampDouble(box.maxY, -1024, 1025),
++                MathUtility.clampDouble(box.maxZ, -1024, 1025),
++                false
++            );
++        } else {
++            this.aabb = null;
++        }
++        // Scissors end
+         this.order = sorter;
+         this.currentEntity = senderOnly;
+         this.playerName = playerName;

patches/server/0026-Patch-invalid-entity-rotation-log-spam.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:07:11 -0500
+Subject: [PATCH] Patch invalid entity rotation log spam
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 6ee2d11e4f3fbc8424a2ffbe6a7ebd1832a25503..6bfe06748df9e36c20dc276471f209c1072ad3e4 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -4812,7 +4812,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ 
+     public void setXRot(float pitch) {
+         if (!Float.isFinite(pitch)) {
+-            Util.logAndPauseIfInIde("Invalid entity rotation: " + pitch + ", discarding.");
++            // Scissors - Patch invalid entity rotation log spam
+         } else {
+             this.xRot = pitch;
+         }

patches/server/0026-Update-for-1.18.2.patch

@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 22 Apr 2022 01:27:54 -0500
-Subject: [PATCH] Update for 1.18.2
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index f92610edcfb724374c69e66443eab60919ee955a..69cc277e4b737ff5a7424cd9afc5573e6eaec3d3 100644
---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -18,6 +18,7 @@ import java.io.*;
- import java.net.HttpURLConnection;
- import java.net.URL;
- import java.util.stream.StreamSupport;
-+import org.bukkit.Bukkit;
- 
- 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
-@@ -56,15 +57,14 @@ public class PaperVersionFetcher implements VersionFetcher {
-         return mcVer;
-     }
- 
--    // Scissors start - Allow getting git information
--    public static String getCommit() {
--        Map<String, String> attributes = JarManifests.MANIFEST_MAP;
--        return attributes.get("Git-Commit");
-+    // Scissors start - Allow getting Git information
-+    private static String getCommit() {
-+        final var manifest = JarManifests.manifest(Bukkit.getServer().getClass());
-+        return manifest == null ? null : manifest.getMainAttributes().getValue("Git-Commit");
-     }
--
--    public static String getBranch() {
--        Map<String, String> attributes = JarManifests.MANIFEST_MAP;
--        return attributes.get("Git-Branch");
-+    private static String getBranch() {
-+        final var manifest = JarManifests.manifest(Bukkit.getServer().getClass());
-+        return manifest == null ? null : manifest.getMainAttributes().getValue("Git-Branch");
-     }
-     // Scissors end
- 
-diff --git a/src/main/java/net/minecraft/network/chat/NbtComponent.java b/src/main/java/net/minecraft/network/chat/NbtComponent.java
-index f518e47818a47be0dfd7cccc4845ba9736c6cd8b..218525ba1742d68cde10f6caf09ee30eb2d01d50 100644
---- a/src/main/java/net/minecraft/network/chat/NbtComponent.java
-+++ b/src/main/java/net/minecraft/network/chat/NbtComponent.java
-@@ -96,6 +96,7 @@ public abstract class NbtComponent extends BaseComponent implements ContextAware
-                     return stream.map((string) -> {
-                         return new TextComponent(string);
-                     }).reduce((accumulator, current) -> {
-+                        // Scissors - untested, likely needs fixing
-                         return (TextComponent) accumulator.append(text).append(current);
-                     }).orElseGet(() -> {
-                         return new TextComponent("");

patches/server/0027-Add-configuration-option-to-disable-chat-signatures.patch

@@ -0,0 +1,116 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:12:12 -0500
+Subject: [PATCH] Add configuration option to disable chat signatures
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
+index c87b708c368713a23a10ad97704575ee4df27891..72b22821165efaecf9e2fa243d0ce3e45931d00c 100644
+--- a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
++++ b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.network.chat;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.server.level.ServerPlayer;
+ 
+ public interface OutgoingChatMessage {
+@@ -46,9 +47,19 @@ public interface OutgoingChatMessage {
+             // Paper end
+             PlayerChatMessage playerChatMessage = this.message.filter(filterMaskEnabled);
+             playerChatMessage = unsigned != null ? playerChatMessage.withUnsignedContent(unsigned) : playerChatMessage; // Paper
+-            if (!playerChatMessage.isFullyFiltered()) {
++            // Scissors start
++            if (!playerChatMessage.isFullyFiltered() && ScissorsConfig.chatSignaturesEnabled) {
+                 sender.connection.sendPlayerChatMessage(playerChatMessage, params);
++                return;
+             }
++            sender.connection.sendPlayerChatMessage(new PlayerChatMessage(
++                SignedMessageLink.unsigned(playerChatMessage.sender()),
++                null,
++                SignedMessageBody.unsigned(playerChatMessage.signedContent()),
++                unsigned,
++                playerChatMessage.filterMask()
++            ), params);
++            // Scissors end
+         }
+     }
+ }
+diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+index 300929a406905f5ff1ede664d5b99fb0938d4d2e..769da86c130354f8c31642f5d87196b68ccd2dd5 100644
+--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
++++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+@@ -5,6 +5,8 @@ import java.time.Instant;
+ import java.util.UUID;
+ import java.util.function.BooleanSupplier;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.util.SignatureValidator;
+ import net.minecraft.util.Signer;
+ import net.minecraft.world.entity.player.ProfilePublicKey;
+@@ -55,7 +57,7 @@ public class SignedMessageChain {
+                             this.setChainBroken();
+                             throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.INVALID_SIGNATURE);
+                         } else {
+-                            if (playerChatMessage.hasExpiredServer(Instant.now())) {
++                            if (playerChatMessage.hasExpiredServer(Instant.now()) && ScissorsConfig.chatSignaturesEnabled) { // Scissors
+                                 SignedMessageChain.LOGGER.warn("Received expired chat: '{}'. Is the client/server system time unsynchronized?", body.content());
+                             }
+ 
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 703a4ea4c303b28d9cebb0bec86777529ef970da..779d44f878e3ae48f1808d1f48bf2b3120cc97ed 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -30,6 +30,7 @@ import java.util.stream.Collectors;
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
+ import net.kyori.adventure.text.format.NamedTextColor;
+ import net.minecraft.ChatFormatting;
+@@ -2268,6 +2269,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     }
+ 
+     private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {
++        if (!ScissorsConfig.chatSignaturesEnabled) return; // Scissors
+         ServerGamePacketListenerImpl.LOGGER.warn("Failed to update secure chat state for {}: '{}'", this.player.getGameProfile().getName(), exception.getComponent().getString());
+         this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED));
+     }
+@@ -2364,6 +2366,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+             Optional<LastSeenMessages> optional = this.lastSeenMessages.applyUpdate(acknowledgment);
+ 
+             if (optional.isEmpty()) {
++                if (!ScissorsConfig.chatSignaturesEnabled) return optional; // Scissors
+                 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
+                 this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
+             }
+@@ -2549,6 +2552,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ 
+         synchronized (this.lastSeenMessages) {
+             if (!this.lastSeenMessages.applyOffset(packet.offset())) {
++                if (!ScissorsConfig.chatSignaturesEnabled) return; // Scissors
+                 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
+                 this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
+             }
+@@ -3532,6 +3536,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     @Override
+     public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
++        if (!ScissorsConfig.chatSignaturesEnabled) return; // Scissors
+         RemoteChatSession.Data remotechatsession_a = packet.chatSession();
+         ProfilePublicKey.Data profilepublickey_a = this.chatSession != null ? this.chatSession.profilePublicKey().data() : null;
+         ProfilePublicKey.Data profilepublickey_a1 = remotechatsession_a.profilePublicKey();
+diff --git a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
+index dbdd9cb76f9e2d0962001d9a1e82896c907d7aea..1a3417361960f470faafe0d28aa08b49b463bba4 100644
+--- a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
++++ b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
+@@ -182,6 +182,7 @@ public class SculkSpreader {
+             while (iterator.hasNext()) {
+                 SculkSpreader.ChargeCursor sculkspreader_a = (SculkSpreader.ChargeCursor) iterator.next();
+ 
++                if (!world.getMinecraftWorld().isLoadedAndInBounds(sculkspreader_a.getPos())) continue; // Scissors
+                 sculkspreader_a.update(world, pos, random, this, shouldConvertToBlock);
+                 if (sculkspreader_a.charge <= 0) {
+                     world.levelEvent(3006, sculkspreader_a.getPos(), 0);

patches/server/0027-Reset-large-tags.patch

@@ -1,158 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 22 Apr 2022 01:56:03 -0500
-Subject: [PATCH] Reset large tags
-
-
-diff --git a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..058203440fd071ce5edbe18391ea60f0a5fbee3a
---- /dev/null
-+++ b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-@@ -0,0 +1,28 @@
-+package com.github.atlasmediagroup.scissors;
-+
-+import net.minecraft.nbt.CompoundTag;
-+
-+import javax.annotation.Nullable;
-+import java.nio.charset.StandardCharsets;
-+
-+public class NbtUtility
-+{
-+
-+    public static boolean isTooLarge(@Nullable CompoundTag tag)
-+    {
-+        if (tag == null) return false;
-+        return tag.toString().getBytes(StandardCharsets.UTF_8).length > (256 * 1024);
-+    }
-+
-+    public static class Item
-+    {
-+
-+        public static CompoundTag removeItemData(CompoundTag tag)
-+        {
-+            CompoundTag cleaned = new CompoundTag();
-+            cleaned.putString("id", tag.getString("id"));
-+            cleaned.putByte("Count", tag.getByte("Count"));
-+            return cleaned;
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 6837c965592d4584cfc958a1008b98791a0fc780..0f7d7248be0aa99dd759d12ed956a98822a2749b 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.item;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import com.google.common.collect.HashMultimap;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Multimap;
-@@ -8,13 +9,13 @@ import com.mojang.brigadier.StringReader;
- import com.mojang.brigadier.exceptions.CommandSyntaxException;
- import com.mojang.logging.LogUtils;
- import com.mojang.serialization.Codec;
-+import com.mojang.serialization.Dynamic;
- import com.mojang.serialization.codecs.RecordCodecBuilder;
- import java.text.DecimalFormat;
- import java.text.DecimalFormatSymbols;
- import java.util.Collection;
- import java.util.Iterator;
- import java.util.List;
--import java.util.Collections;
- import java.util.Comparator;
- import java.util.Locale;
- import java.util.Map.Entry;
-@@ -50,11 +51,7 @@ import net.minecraft.util.datafix.fixes.References;
- import net.minecraft.world.InteractionHand;
- import net.minecraft.world.InteractionResult;
- import net.minecraft.world.InteractionResultHolder;
--import net.minecraft.world.entity.Entity;
--import net.minecraft.world.entity.EquipmentSlot;
--import net.minecraft.world.entity.LivingEntity;
--import net.minecraft.world.entity.MobType;
--import net.minecraft.world.entity.SlotAccess;
-+import net.minecraft.world.entity.*;
- import net.minecraft.world.entity.ai.attributes.Attribute;
- import net.minecraft.world.entity.ai.attributes.AttributeModifier;
- import net.minecraft.world.entity.ai.attributes.Attributes;
-@@ -75,8 +72,6 @@ import net.minecraft.world.level.block.Block;
- import org.slf4j.Logger;
- 
- // CraftBukkit start
--import com.mojang.serialization.Dynamic;
--import java.util.List;
- import java.util.Map;
- import java.util.Objects;
- import net.minecraft.server.MinecraftServer;
-@@ -251,6 +246,13 @@ public final class ItemStack {
- 
-     // CraftBukkit - break into own method
-     private void load(CompoundTag nbttagcompound) {
-+        // Scissors start - Reset large tags
-+        if (NbtUtility.isTooLarge(nbttagcompound)) {
-+            // Reset tag without destroying item
-+            nbttagcompound = NbtUtility.Item.removeItemData(nbttagcompound);
-+        }
-+        // Scissors end
-+
-         this.item = (Item) Registry.ITEM.get(new ResourceLocation(nbttagcompound.getString("id")));
-         this.count = nbttagcompound.getByte("Count");
-         if (nbttagcompound.contains("tag", 10)) {
-@@ -495,7 +497,11 @@ public final class ItemStack {
-         nbt.putString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString());
-         nbt.putByte("Count", (byte) this.count);
-         if (this.tag != null) {
--            nbt.put("tag", this.tag.copy());
-+            // Scissors start - Don't save large tags
-+            if (!NbtUtility.isTooLarge(this.tag)) {
-+                nbt.put("tag", this.tag.copy());
-+            }
-+            // Scissors end
-         }
- 
-         return nbt;
-@@ -827,6 +833,9 @@ public final class ItemStack {
-     // Paper end
- 
-     public void setTag(@Nullable CompoundTag nbt) {
-+        // Scissors start - Ignore large tags
-+        if (NbtUtility.isTooLarge(nbt)) return;
-+        // Scissors end
-         this.tag = nbt;
-         this.processEnchantOrder(this.tag); // Paper
-         if (this.getItem().canBeDepleted()) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 226d9ac01c601fc8954a88bea93a521cdce79eda..9bfa2deca1258dd9c294422a0ea032142cd11789 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -1,16 +1,12 @@
- package org.bukkit.craftbukkit.inventory;
- 
--import static org.bukkit.craftbukkit.inventory.CraftMetaItem.*;
- import com.google.common.collect.ImmutableMap;
--import java.util.Map;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.ListTag;
- import net.minecraft.world.item.Item;
- import org.apache.commons.lang.Validate;
- import org.bukkit.Material;
--import org.bukkit.NamespacedKey;
- import org.bukkit.configuration.serialization.DelegateDeserialization;
--import org.bukkit.craftbukkit.enchantments.CraftEnchantment;
- import org.bukkit.craftbukkit.util.CraftLegacy;
- import org.bukkit.craftbukkit.util.CraftMagicNumbers;
- import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-@@ -19,6 +15,11 @@ import org.bukkit.inventory.ItemStack;
- import org.bukkit.inventory.meta.ItemMeta;
- import org.bukkit.material.MaterialData;
- 
-+import java.util.Map;
-+
-+import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS_ID;
-+import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS_LVL;
-+
- @DelegateDeserialization(ItemStack.class)
- public final class CraftItemStack extends ItemStack {
- 

patches/server/0028-Account-for-items-inside-containers.patch

@@ -1,267 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Business Goose <arclicious@vivaldi.net>
-Date: Sun, 1 May 2022 01:20:13 +0100
-Subject: [PATCH] Account for items inside containers
-
-
-diff --git a/src/main/java/net/minecraft/world/ContainerHelper.java b/src/main/java/net/minecraft/world/ContainerHelper.java
-index 4092c7a8c2b0d9d26e6f4d97386735236300d132..ad3af6d90b68bc55c29243da8814516575299bf0 100644
---- a/src/main/java/net/minecraft/world/ContainerHelper.java
-+++ b/src/main/java/net/minecraft/world/ContainerHelper.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import java.util.List;
- import java.util.function.Predicate;
- import net.minecraft.core.NonNullList;
-@@ -22,10 +23,14 @@ public class ContainerHelper {
- 
-     public static CompoundTag saveAllItems(CompoundTag nbt, NonNullList<ItemStack> stacks, boolean setIfEmpty) {
-         ListTag listTag = new ListTag();
-+        // Scissors - Account for items inside containers
-+        long total = 0;
- 
-         for(int i = 0; i < stacks.size(); ++i) {
-             ItemStack itemStack = stacks.get(i);
-+
-             if (!itemStack.isEmpty()) {
-+                total += NbtUtility.getTagSize(itemStack.getTag());
-                 CompoundTag compoundTag = new CompoundTag();
-                 compoundTag.putByte("Slot", (byte)i);
-                 itemStack.save(compoundTag);
-@@ -33,7 +38,7 @@ public class ContainerHelper {
-             }
-         }
- 
--        if (!listTag.isEmpty() || setIfEmpty) {
-+        if ((!listTag.isEmpty() || setIfEmpty) && !(total > NbtUtility.MAXIMUM_SIZE)) {
-             nbt.put("Items", listTag);
-         }
- 
-@@ -42,11 +47,18 @@ public class ContainerHelper {
- 
-     public static void loadAllItems(CompoundTag nbt, NonNullList<ItemStack> stacks) {
-         ListTag listTag = nbt.getList("Items", 10);
-+        // Scissors - Account for items inside containers
-+        long total = 0;
- 
-         for(int i = 0; i < listTag.size(); ++i) {
-             CompoundTag compoundTag = listTag.getCompound(i);
-             int j = compoundTag.getByte("Slot") & 255;
-             if (j >= 0 && j < stacks.size()) {
-+                total += NbtUtility.getTagSize(compoundTag);
-+                if (total >= NbtUtility.MAXIMUM_SIZE) {
-+                    stacks.clear();
-+                    break;
-+                }
-                 stacks.set(j, ItemStack.of(compoundTag));
-             }
-         }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 888e1f2bc6ea4ddbbcc5466f177233f25b290459..0f19ef250a2f82e49730cb58ea43ee6bf407455a 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry;
-@@ -211,6 +212,17 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
- 
-     public List<ItemStack> getContents() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index 5a47d58071b83ea911e4cb5e1cc5468801ad0d55..c6f25cb62335fda65596ba3f4a55734a88b75bd4 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -35,6 +36,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     @Override
-     public List<ItemStack> getContents() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index 5c0f1488c8a8100cd39a03adeccded9984722249..d1e1b29298e1e074df1966498d7f3c94b20c77f4 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import java.util.Arrays;
- import java.util.Iterator;
- import javax.annotation.Nullable;
-@@ -72,6 +73,17 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
-     }
- 
-     public List<ItemStack> getContents() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+
-         return this.items;
-     }
- 
-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 e56f7d76b501dab7d549efd2fafd514a9625c24e..153c70defdd6c25203764035c97ed3d20bc9c17e 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
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -41,6 +42,17 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
-     private int maxStack = MAX_STACK;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
-index f74c5bb8e1ba42c77c59d481b871fd992483b128..10393d499fa6a5e36750ed9305d22454ef98e6cf 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import java.util.Random;
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.NonNullList;
-@@ -30,6 +31,17 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
-     private int maxStack = MAX_STACK;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+
-         return this.items;
-     }
- 
-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 d241b25acc223982109495542fd17e0fbdf53437..ab952ef090ca5183340b014e0aae3aef553a4803 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
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import java.util.Iterator;
- import java.util.List;
- import java.util.function.BooleanSupplier;
-@@ -53,7 +54,19 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-     private int maxStack = MAX_STACK;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+
-         return this.items;
-+
-     }
- 
-     public void onOpen(CraftHumanEntity who) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
-index b4d38a9aa8792e979c99bedc20906679ba7991c6..5bdff2d3b13b3dbd0f3f83d9ece5a42173fb7e6c 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.level.block.entity;
- 
-+import com.github.atlasmediagroup.scissors.NbtUtility;
- import java.util.List;
- import java.util.stream.IntStream;
- import javax.annotation.Nullable;
-@@ -252,7 +253,19 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
- 
-     @Override
-     protected NonNullList<ItemStack> getItems() {
-+        // Scissors - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.itemStacks) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.itemStacks.clear();
-+        }
-+
-         return this.itemStacks;
-+
-     }
- 
-     @Override

patches/server/0028-Limit-map-decorations.patch

@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:20:01 -0500
+Subject: [PATCH] Limit map decorations
+
+
+diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+index cf8ae635fce7ea66d4e1ab1dc05575f035fa95ef..6983cf8ecf299285db200ce519c781882c0d2a9b 100644
+--- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
++++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+@@ -366,6 +366,11 @@ public class MapItemSavedData extends SavedData {
+     }
+ 
+     private void addDecoration(Holder<MapDecorationType> type, @Nullable LevelAccessor world, String key, double x, double z, double rotation, @Nullable Component text) {
++        // Scissors start - Limit decoration count
++        if (this.decorations.size() > 32) {
++            return;
++        }
++        // Scissors end
+         int i = 1 << this.scale;
+         float f = (float) (x - (double) this.centerX) / (float) i;
+         float f1 = (float) (z - (double) this.centerZ) / (float) i;

patches/server/0029-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch

@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Sun, 1 May 2022 14:23:35 -0500
-Subject: [PATCH] Limit amount of vehicle collision checks to 3 and discard
- vehicles if they collide with more than 15 other entities
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 96a7bfd921e59f298f0ee502d356cc3552c30ce8..6c1a489f03ecd7dfef161822cf6910f6119c082b 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-@@ -8,6 +8,7 @@ import com.mojang.datafixers.util.Pair;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
-+import java.util.concurrent.TimeUnit;
- import javax.annotation.Nullable;
- import net.minecraft.BlockUtil;
- import net.minecraft.Util;
-@@ -106,6 +107,7 @@ public abstract class AbstractMinecart extends Entity {
-     private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
-+    private long lastLargeCollision = 0L; // Scissors - Add a collision debounce
-     public double maxSpeed = 0.4D;
-     // CraftBukkit end
- 
-@@ -422,8 +424,10 @@ public abstract class AbstractMinecart extends Entity {
-             if (this.getMinecartType() == AbstractMinecart.Type.RIDEABLE && this.getDeltaMovement().horizontalDistanceSqr() > 0.01D) {
-                 List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this));
- 
--                if (!list.isEmpty()) {
--                    for (int l = 0; l < list.size(); ++l) {
-+                // Scissors - Add a collision debounce
-+                if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability
-+                    // Scissors - Limit amount of vehicle collision checks to 3 maximum
-+                    for (int l = 0; l < Math.min(3, list.size()); ++l) {
-                         Entity entity = (Entity) list.get(l);
- 
-                         if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) {
-@@ -450,6 +454,16 @@ public abstract class AbstractMinecart extends Entity {
-                             entity.push(this);
-                         }
-                     }
-+
-+                    // Scissors - Add a collision debounce
-+                    if (list.size() > 3) {
-+                        lastLargeCollision = System.currentTimeMillis();
-+                    }
-+
-+                    // Scissors - Delete entity if the collision amount is over 15
-+                    if (list.size() > 15) {
-+                        this.discard();
-+                    }
-                 }
-             } else {
-                 Iterator iterator = this.level.getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator();
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index 0dbc85c450797d7384e641f80e1b1f8c56fd14fc..99e9867dfc0b3ba8b11dd95c264794f2f0079994 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
- import com.google.common.collect.UnmodifiableIterator;
- import java.util.Iterator;
- import java.util.List;
-+import java.util.concurrent.TimeUnit;
- import javax.annotation.Nullable;
- import net.minecraft.BlockUtil;
- import net.minecraft.core.BlockPos;
-@@ -106,6 +107,7 @@ public class Boat extends Entity {
-     public double unoccupiedDeceleration = -1;
-     public boolean landBoats = false;
-     // CraftBukkit end
-+    private long lastLargeCollision = 0L; // Scissors - Add a collision debounce
- 
-     public Boat(EntityType<? extends Boat> type, Level world) {
-         super(type, world);
-@@ -398,10 +400,12 @@ public class Boat extends Entity {
-         this.checkInsideBlocks();
-         List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, -0.009999999776482582D, 0.20000000298023224D), EntitySelector.pushableBy(this));
- 
--        if (!list.isEmpty()) {
-+        // Scissors - Add collision debounce
-+        if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability
-             boolean flag = !this.level.isClientSide && !(this.getControllingPassenger() instanceof Player);
- 
--            for (int j = 0; j < list.size(); ++j) {
-+            // Scissors - Limit amount of vehicle collision checks to 3 maximum
-+            for (int j = 0; j < Math.min(3, list.size()); ++j) {
-                 Entity entity = (Entity) list.get(j);
- 
-                 if (!entity.hasPassenger((Entity) this)) {
-@@ -412,6 +416,16 @@ public class Boat extends Entity {
-                     }
-                 }
-             }
-+
-+            // Scissors - Add collision debounce
-+            if (list.size() > 3) {
-+                lastLargeCollision = System.currentTimeMillis();
-+            }
-+
-+            // Scissors - Delete entity if the collision amount is over 15
-+            if (list.size() > 15) {
-+                this.discard();
-+            }
-         }
- 
-     }

patches/server/0029-Prevent-player-banning-using-duplicate-UUIDs.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:21:25 -0500
+Subject: [PATCH] Prevent player banning using duplicate UUIDs
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index ca56a0b596976448da6bb2a0e82b3d5cd4133e12..f8198f99244b4a635fa6fc68757acb38008c4564 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1673,7 +1673,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (entity != null) {
+             ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
+             entity.unRide();
+-            this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED);
++            // Scissors start - Prevent player banning using duplicate UUIDs
++            if (entity instanceof ServerPlayer serverPlayer) {
++                this.removePlayerImmediately(serverPlayer, Entity.RemovalReason.DISCARDED);
++            } else {
++                entity.discard(null);
++            }
++            // Scissors end
+         }
+ 
+         this.entityLookup.addNewEntity(player); // Paper - rewite chunk system

patches/server/0030-Don-t-warn-on-duplicate-entity-UUIDs.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:22:22 -0500
+Subject: [PATCH] Don't warn on duplicate entity UUIDs
+
+
+diff --git a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
+index 15ee41452992714108efe53b708b5a4e1da7c1ff..5054dce35127cb0132431021578c345fcbb1f92a 100644
+--- a/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
++++ b/src/main/java/io/papermc/paper/chunk/system/entity/EntityLookup.java
+@@ -415,7 +415,7 @@ public final class EntityLookup implements LevelEntityGetter<Entity> {
+                 return false;
+             }
+             if (this.entityByUUID.containsKey(entity.getUUID())) {
+-                LOGGER.warn("Entity uuid already exists: " + entity.getUUID() + ", mapped to " + this.entityByUUID.get(entity.getUUID()) + ", can't add " + entity);
++                // Scissors - Don't warn on duplicate entity UUIDs
+                 return false;
+             }
+             this.entityById.put(entity.getId(), entity);

patches/server/0030-Make-the-maximum-tag-size-a-constant-add-a-method-fo.patch

@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Business Goose <arclicious@vivaldi.net>
-Date: Sun, 1 May 2022 01:19:36 +0100
-Subject: [PATCH] Make the maximum tag size a constant & add a method for
- getting tag size
-
-
-diff --git a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-index 058203440fd071ce5edbe18391ea60f0a5fbee3a..978cb98c81195640fb3704d2077148f2be0dca36 100644
---- a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-+++ b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-@@ -1,17 +1,49 @@
- package com.github.atlasmediagroup.scissors;
- 
--import net.minecraft.nbt.CompoundTag;
-+import com.google.common.base.Strings;
-+import com.google.common.collect.Lists;
-+import net.minecraft.nbt.*;
- 
- import javax.annotation.Nullable;
- import java.nio.charset.StandardCharsets;
-+import java.util.Collections;
-+import java.util.List;
- 
- public class NbtUtility
- {
-+    public static final long MAXIMUM_SIZE = (256 * 1024);
-+
-+    public static long getTagSize(@Nullable Tag tag, int depth) {
-+        if(depth > 512) return 0;
-+        if(tag == null) return 0;
-+
-+        long size = 0;
-+
-+        if(tag.getType() == CompoundTag.TYPE) {
-+            CompoundTag compoundTag = (CompoundTag) tag;
-+            for(String key : compoundTag.getAllKeys()) {
-+                size += getTagSize(compoundTag.get(key), depth + 1);
-+            }
-+        } else if(tag.getType() == ListTag.TYPE) {
-+            ListTag listTag = (ListTag) tag;
-+            for (Tag tag1 : listTag) {
-+                size += getTagSize(tag1, depth + 1);
-+            }
-+        } else {
-+            size += tag.getAsString().getBytes(StandardCharsets.UTF_8).length;
-+        }
-+
-+        return size;
-+    }
-+
-+    public static long getTagSize(@Nullable CompoundTag tag) {
-+        return getTagSize(tag, 0);
-+    }
- 
-     public static boolean isTooLarge(@Nullable CompoundTag tag)
-     {
-         if (tag == null) return false;
--        return tag.toString().getBytes(StandardCharsets.UTF_8).length > (256 * 1024);
-+        return getTagSize(tag) > MAXIMUM_SIZE;
-     }
- 
-     public static class Item

patches/server/0031-Don-t-log-invalid-teams-to-console.patch

@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Tue, 17 May 2022 05:57:52 +0100
-Subject: [PATCH] Don't log invalid teams to console
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d8393887cc98930815864eca28b07ef89b26f39e..3b5c48bfb7e7bcd0be9ad6d0357213c7adde08ad 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -813,7 +813,9 @@ public abstract class LivingEntity extends Entity {
-             boolean flag = scoreboardteam != null && this.level.getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
- 
-             if (!flag) {
--                LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s);
-+                // Scissors start - Prevent log spam possible with this error message, easily provokable by players in creative.
-+                // LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s);
-+                // Scissors end
-             }
-         }
- 

patches/server/0031-Limit-beacon-effectRange.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:23:46 -0500
+Subject: [PATCH] Limit beacon effectRange
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+index a6ffbbc1b5021564864e42c0756342352c2b8290..724edea5d4399fef2ddadbe631adef3d22513894 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+@@ -91,7 +91,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+     private double effectRange = -1;
+ 
+     public double getEffectRange() {
+-        if (this.effectRange < 0) {
++        if (this.effectRange < 0 || this.effectRange > 256) { // Scissors
+             return this.levels * 10 + 10;
+         } else {
+             return effectRange;
+@@ -458,6 +458,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+ 
+         this.lockKey = LockCode.fromTag(nbt);
+         this.effectRange = nbt.contains(PAPER_RANGE_TAG, 6) ? nbt.getDouble(PAPER_RANGE_TAG) : -1; // Paper - Custom beacon ranges
++        if (this.effectRange > 256) this.effectRange = 256; // Scissors
+     }
+ 
+     @Override

patches/server/0032-Improve-validation-of-ResourceLocations.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:24:35 -0500
+Subject: [PATCH] Improve validation of ResourceLocations
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
+index 5014192edb9616ce725fc1592832034789527b6f..64da1b0afd51720803aba0d9e86d0b1743bdb0da 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftNamespacedKey.java
+@@ -21,6 +21,7 @@ public final class CraftNamespacedKey {
+     }
+ 
+     public static NamespacedKey fromMinecraft(ResourceLocation minecraft) {
++        if (minecraft == null) throw new IllegalArgumentException("Null ResourceLocation provided"); // Scissors
+         return new NamespacedKey(minecraft.getNamespace(), minecraft.getPath());
+     }
+ 

patches/server/0032-Prevent-crash-paintings-and-similar-entity-OOB-explo.patch

@@ -1,231 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Sun, 22 May 2022 21:15:51 -0500
-Subject: [PATCH] Prevent crash paintings and similar entity OOB exploits
-
-
-diff --git a/src/main/java/com/github/atlasmediagroup/scissors/MathUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/MathUtility.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..7965cf3abd02d415dd0e71a0de73987e5fdf11ec
---- /dev/null
-+++ b/src/main/java/com/github/atlasmediagroup/scissors/MathUtility.java
-@@ -0,0 +1,29 @@
-+package com.github.atlasmediagroup.scissors;
-+
-+public class MathUtility
-+{
-+    public static int clampInt(int number, int minimum, int maximum)
-+    {
-+        return Math.min(Math.max(number, minimum), maximum);
-+    }
-+
-+    public static long clampLong(long number, long minimum, long maximum)
-+    {
-+        return Math.min(Math.max(number, minimum), maximum);
-+    }
-+
-+    public static double clampDouble(double number, double minimum, double maximum)
-+    {
-+        return Math.min(Math.max(number, minimum), maximum);
-+    }
-+
-+    public static int safeDoubleToInt(double number)
-+    {
-+        return (int) clampDouble(number, Integer.MIN_VALUE, Integer.MAX_VALUE);
-+    }
-+
-+    public static int safeLongToInt(long number)
-+    {
-+        return (int) clampLong(number, Integer.MIN_VALUE, Integer.MAX_VALUE);
-+    }
-+}
-diff --git a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-index 978cb98c81195640fb3704d2077148f2be0dca36..59a4ff3593e74f72c3843554c2e14b82912c0a54 100644
---- a/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-+++ b/src/main/java/com/github/atlasmediagroup/scissors/NbtUtility.java
-@@ -1,13 +1,9 @@
- package com.github.atlasmediagroup.scissors;
- 
--import com.google.common.base.Strings;
--import com.google.common.collect.Lists;
- import net.minecraft.nbt.*;
- 
- import javax.annotation.Nullable;
- import java.nio.charset.StandardCharsets;
--import java.util.Collections;
--import java.util.List;
- 
- public class NbtUtility
- {
-diff --git a/src/main/java/com/github/atlasmediagroup/scissors/PositionUtility.java b/src/main/java/com/github/atlasmediagroup/scissors/PositionUtility.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fd22a200e070ca5a594802d2f201c6b27d6cddcf
---- /dev/null
-+++ b/src/main/java/com/github/atlasmediagroup/scissors/PositionUtility.java
-@@ -0,0 +1,83 @@
-+package com.github.atlasmediagroup.scissors;
-+
-+import net.minecraft.core.BlockPos;
-+import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.border.WorldBorder;
-+import net.minecraft.world.phys.Vec3;
-+
-+public class PositionUtility
-+{
-+    public static Vec3 getValidVec3(double x, double y, double z, Entity entity)
-+    {
-+        final Level level = entity.level;
-+
-+        try
-+        {
-+            if (level.isInWorldBounds(new BlockPos(Math.floor(MathUtility.safeDoubleToInt(x)), Math.floor(MathUtility.safeDoubleToInt(y)), Math.floor(MathUtility.safeDoubleToInt(z)))))
-+            {
-+                return new Vec3(x, y, z);
-+            }
-+            else
-+            {
-+                final WorldBorder worldBorder = level.getWorldBorder();
-+
-+                final double maxX = worldBorder.getMaxX();
-+                final double maxY = level.getMaxBuildHeight();
-+                final double maxZ = worldBorder.getMaxZ();
-+
-+                final double minX = worldBorder.getMinX();
-+                final double minY = level.getMinBuildHeight();
-+                final double minZ = worldBorder.getMinZ();
-+
-+                return new Vec3(MathUtility.clampDouble(x, minX, maxX), MathUtility.clampDouble(y, minY, maxY), MathUtility.clampDouble(z, minZ, maxZ));
-+            }
-+        }
-+        catch (Exception e)
-+        { // If we throw some sort of exception due to the position being crazy, catch it
-+            return new Vec3(0, 0, 0);
-+        }
-+    }
-+
-+    public static Vec3 getValidVec3FromBlockPos(BlockPos blockPos, Entity entity)
-+    {
-+        final BlockPos validBlockPos = getValidBlockPos(blockPos, entity);
-+
-+        return new Vec3(validBlockPos.getX(), validBlockPos.getY(), validBlockPos.getZ());
-+    }
-+
-+    public static BlockPos getValidBlockPos(BlockPos blockPos, Entity entity)
-+    {
-+        final Level level = entity.level;
-+
-+        try
-+        {
-+            if (level.isInWorldBounds(blockPos))
-+            {
-+                return blockPos;
-+            }
-+            else
-+            {
-+                final int x = blockPos.getX();
-+                final int y = blockPos.getY();
-+                final int z = blockPos.getZ();
-+
-+                final WorldBorder worldBorder = level.getWorldBorder();
-+
-+                final int maxX = MathUtility.safeDoubleToInt(worldBorder.getMaxX());
-+                final int maxY = level.getMaxBuildHeight();
-+                final int maxZ = MathUtility.safeDoubleToInt(worldBorder.getMaxZ());
-+
-+                final int minX = MathUtility.safeDoubleToInt(worldBorder.getMinX());
-+                final int minY = level.getMinBuildHeight();
-+                final int minZ = MathUtility.safeDoubleToInt(worldBorder.getMinZ());
-+
-+                return new BlockPos(MathUtility.clampInt(x, minX, maxX), MathUtility.clampInt(y, minY, maxY), MathUtility.clampInt(z, minZ, maxZ));
-+            }
-+        }
-+        catch (Exception e)
-+        { // If we throw some sort of exception due to the position being crazy, catch it
-+            return new BlockPos(0, 0, 0);
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 876e8f83fab4e255959948e59cabf05478446e4d..886451893fbc30576249ca6816c2579127acfe06 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.entity;
- 
-+import com.github.atlasmediagroup.scissors.PositionUtility;
- import com.google.common.collect.ImmutableList;
- import com.google.common.collect.ImmutableList.Builder;
- import com.google.common.collect.Iterables;
-@@ -1775,6 +1776,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     public void moveTo(double x, double y, double z, float yaw, float pitch) {
-+        // Scissors start - Reassign x, y & z to make sure entities can't move out of the world border
-+        Vec3 vec3 = PositionUtility.getValidVec3(x, y, z, this);
-+        x = vec3.x;
-+        y = vec3.y;
-+        z = vec3.z;
-+        // Scissors end
-+
-         // Paper - cancel entity velocity if teleported
-         if (!preserveMotion) {
-             this.deltaMovement = Vec3.ZERO;
-@@ -3209,6 +3217,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     @Nullable
-     public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
-+        // Scissors start - Reassign location to a safe value
-+        location = PositionUtility.getValidBlockPos(location, this);
-+        // Scissors end
-+
-         // CraftBukkit end
-         // Paper start - fix bad state entities causing dupes
-         if (!isAlive() || !valid) {
-@@ -4103,6 +4115,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         this.setPosRaw(x, y, z, false);
-     }
-     public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
-+        // Scissors start - Reassign x, y & z to prevent entities from moving outside the world border
-+        Vec3 vec = PositionUtility.getValidVec3(x, y, z, this);
-+        x = vec.x;
-+        y = vec.y;
-+        z = vec.z;
-+        // Scissors end
-+
-         // Paper start - block invalid positions
-         if (!checkPosition(this, x, y, z)) {
-             return;
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-index 2805ebfe4ffe769bcde778a1225b3101c91538d8..7c988395567c170d825af2bd99121f2d4d05cd8d 100644
---- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world.entity.decoration;
- 
-+import com.github.atlasmediagroup.scissors.PositionUtility;
- import java.util.function.Predicate;
- import javax.annotation.Nullable;
- import net.minecraft.core.BlockPos;
-@@ -265,7 +266,9 @@ public abstract class HangingEntity extends Entity {
- 
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
--        this.pos = new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ"));
-+        // Scissors start - Stop this stupid bullshit
-+        this.pos = PositionUtility.getValidBlockPos(new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ")), this);
-+        // Scissors end
-     }
- 
-     public abstract int getWidth();
-@@ -292,7 +295,9 @@ public abstract class HangingEntity extends Entity {
- 
-     @Override
-     public void setPos(double x, double y, double z) {
--        this.pos = new BlockPos(x, y, z);
-+        // Scissors start - Fix this stupid bullshit
-+        this.pos = PositionUtility.getValidBlockPos(new BlockPos(x, y, z), this);
-+        // Scissors end
-         this.recalculateBoundingBox();
-         this.hasImpulse = true;
-     }

patches/server/0033-Don-t-log-on-too-many-chained-updates.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:25:43 -0500
+Subject: [PATCH] Don't log on too many chained updates
+
+
+diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
+index 106af2b2c7ff72c7549975aef75cdcff8d9a7d97..ecdcf4cf8650270ce7595905ce9d498eee520dcd 100644
+--- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
++++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
+@@ -58,7 +58,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
+                 this.stack.push(entry);
+             }
+         } else if (this.count - 1 == this.maxChainedNeighborUpdates) {
+-            LOGGER.error("Too many chained neighbor updates. Skipping the rest. First skipped position: " + pos.toShortString());
++            // Scissors - don't log
+         }
+ 
+         if (!bl) {

patches/server/0034-Implement-command-block-events.patch

@@ -0,0 +1,85 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:34:17 -0500
+Subject: [PATCH] Implement command block events
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
+index 5cee02970241caafd151cadf08fc8d7092ec13d9..81e16e36b1950d4ae81cb09c39b36d7d4ba91d31 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
+@@ -14,7 +14,7 @@ public class ServerboundSetCommandMinecartPacket implements Packet<ServerGamePac
+     public static final StreamCodec<FriendlyByteBuf, ServerboundSetCommandMinecartPacket> STREAM_CODEC = Packet.codec(
+         ServerboundSetCommandMinecartPacket::write, ServerboundSetCommandMinecartPacket::new
+     );
+-    private final int entity;
++    public final int entity; // Scissors - private -> public
+     private final String command;
+     private final boolean trackOutput;
+ 
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 779d44f878e3ae48f1808d1f48bf2b3120cc97ed..87d0dc96d8592612cefa25c378805aeea131b99e 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -31,6 +31,9 @@ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
+ 
+ import me.totalfreedom.scissors.ScissorsConfig;
++import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent;
++import me.totalfreedom.scissors.event.block.CommandMinecartPlayerEditEvent;
++import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent;
+ import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
+ import net.kyori.adventure.text.format.NamedTextColor;
+ import net.minecraft.ChatFormatting;
+@@ -160,6 +163,7 @@ import net.minecraft.world.entity.player.Inventory;
+ import net.minecraft.world.entity.player.ProfilePublicKey;
+ import net.minecraft.world.entity.projectile.AbstractArrow;
+ import net.minecraft.world.entity.vehicle.Boat;
++import net.minecraft.world.entity.vehicle.MinecartCommandBlock;
+ import net.minecraft.world.inventory.AbstractContainerMenu;
+ import net.minecraft.world.inventory.AnvilMenu;
+ import net.minecraft.world.inventory.BeaconMenu;
+@@ -197,6 +201,8 @@ import net.minecraft.world.phys.Vec3;
+ import net.minecraft.world.phys.shapes.BooleanOp;
+ import net.minecraft.world.phys.shapes.Shapes;
+ import net.minecraft.world.phys.shapes.VoxelShape;
++import org.bukkit.craftbukkit.block.CraftCommandBlock;
++import org.bukkit.craftbukkit.entity.CraftMinecartCommand;
+ import org.slf4j.Logger;
+ 
+ // CraftBukkit start
+@@ -931,6 +937,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                     this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity);
+                 }
+ 
++                // Scissors start
++                CommandBlockPlayerEditEvent event = new CommandBlockPlayerEditEvent(this.getCraftPlayer(), commandblocklistenerabstract.getCommand(), s, new CraftCommandBlock(this.player.level().getWorld(), tileentitycommand));
++                if (!event.callEvent()) {
++                    return;
++                }
++
++                s = event.getNewCommand();
++                // Scissors end
++
+                 commandblocklistenerabstract.setCommand(s);
+                 commandblocklistenerabstract.setTrackOutput(flag);
+                 if (!flag) {
+@@ -962,7 +977,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+             BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level());
+ 
+             if (commandblocklistenerabstract != null) {
+-                commandblocklistenerabstract.setCommand(packet.getCommand());
++                // Scissors start - Implement command block events
++                String command = packet.getCommand();
++                CommandMinecartPlayerEditEvent event = new CommandMinecartPlayerEditEvent(this.getCraftPlayer(), commandblocklistenerabstract.getCommand(), command, new CraftMinecartCommand(this.cserver, (MinecartCommandBlock) this.player.level().getEntity(packet.entity)));
++
++                if (!event.callEvent()) {
++                    return;
++                }
++
++                command = event.getNewCommand();
++                commandblocklistenerabstract.setCommand(command);
++                // Scissors end
+                 commandblocklistenerabstract.setTrackOutput(packet.isTrackOutput());
+                 if (!packet.isTrackOutput()) {
+                     commandblocklistenerabstract.setLastOutput((Component) null);

patches/server/0035-Limit-save-data-for-Bees-and-Vexes.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:39:39 -0500
+Subject: [PATCH] Limit save data for Bees and Vexes
+
+
+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 0dfb8109fd8c022b079da00f6a0e3fc85b57bf7a..fdfe3ca7c2a1d34567651e64933392c4a17bd751 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
++++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
+@@ -231,7 +231,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+ 
+     @Override
+     public void readAdditionalSaveData(CompoundTag nbt) {
+-        this.hivePos = (BlockPos) NbtUtils.readBlockPos(nbt, "hive_pos").orElse(null); // CraftBukkit - decompile error
++        // Scissors start - limit hive_pos
++        if (nbt.contains("hive_pos"))
++        {
++            final BlockPos savedHivePos = NbtUtils.readBlockPos(nbt, "hive_pos").orElse(null); // CraftBukkit - decompile error
++            this.hivePos = this.level().isLoadedAndInBounds(savedHivePos) ? savedHivePos : null;
++        }
++        // Scissors end
+         this.savedFlowerPos = (BlockPos) NbtUtils.readBlockPos(nbt, "flower_pos").orElse(null); // CraftBukkit - decompile error
+         super.readAdditionalSaveData(nbt);
+         this.setHasNectar(nbt.getBoolean("HasNectar"));
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+index fd3b37dde54623ba38186efb2a64d364c86b81d2..ae1051a7ebc2b2bf6d5bf5582443fedeb307ee01 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
+@@ -111,7 +111,10 @@ public class Vex extends Monster implements TraceableEntity {
+     public void readAdditionalSaveData(CompoundTag nbt) {
+         super.readAdditionalSaveData(nbt);
+         if (nbt.contains("BoundX")) {
+-            this.boundOrigin = new BlockPos(nbt.getInt("BoundX"), nbt.getInt("BoundY"), nbt.getInt("BoundZ"));
++            // Scissors start - Limit Vex bound origin
++            final BlockPos savedBoundOrigin = new BlockPos(nbt.getInt("BoundX"), nbt.getInt("BoundY"), nbt.getInt("BoundZ"));
++            this.boundOrigin = this.level().isLoadedAndInBounds(savedBoundOrigin) ? savedBoundOrigin : null;
++            // Scissors end - Limit Vex bound origin
+         }
+ 
+         if (nbt.contains("LifeTicks")) {

patches/server/0036-Mute-invalid-Enderdragon-phases.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:49:11 -0500
+Subject: [PATCH] Mute invalid Enderdragon phases
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java
+index 1b1a210a86121049e507a497649727a99452c0a2..5501d94f3b39665a94062ae97b3739ae197dadb1 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java
++++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.java
+@@ -20,7 +20,7 @@ public class DragonChargePlayerPhase extends AbstractDragonPhaseInstance {
+     @Override
+     public void doServerTick() {
+         if (this.targetLocation == null) {
+-            LOGGER.warn("Aborting charge player as no target was set.");
++            // Scissors - Mute invalid Enderdragon phases
+             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
+         } else if (this.timeSinceCharge > 0 && this.timeSinceCharge++ >= 10) {
+             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
+diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
+index c5269c3117901b8521720d1b32689d7f600f20a3..02dd6f72aa16e6b3edec700b7bc82a84b5ca8dd9 100644
+--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
++++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
+@@ -31,7 +31,7 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
+     @Override
+     public void doServerTick() {
+         if (this.attackTarget == null) {
+-            LOGGER.warn("Skipping player strafe phase because no player was found");
++            // Scissors - Mute invalid Enderdragon phases
+             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
+         } else {
+             if (this.currentPath != null && this.currentPath.isDone()) {

patches/server/0037-Add-length-limit-to-note-block-sound.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:50:32 -0500
+Subject: [PATCH] Add length limit to note block sound
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
+index e79b1ccbdf12006d72401b5be1ac25187033ec59..a7b1a44de0689f7d07bd3e69048b04c28c272159 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
+@@ -147,7 +147,7 @@ public class SkullBlockEntity extends BlockEntity {
+         }
+ 
+         if (nbt.contains("note_block_sound", 8)) {
+-            this.noteBlockSound = ResourceLocation.tryParse(nbt.getString("note_block_sound"));
++            this.noteBlockSound = ResourceLocation.tryParse(StringUtil.truncateStringIfNecessary(nbt.getString("note_block_sound"), 32767, false));
+         }
+ 
+         if (nbt.contains("custom_name", 8)) {

patches/server/0038-Change-version-fetcher-to-AMG.patch

@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 18:56:18 -0500
+Subject: [PATCH] Change version fetcher to AMG
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..1cdba130f6224ba0eb5e958d3328b1c476520efe 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+@@ -18,10 +18,14 @@ import java.net.URI;
+ import java.util.Optional;
+ import java.util.OptionalInt;
+ import java.util.stream.StreamSupport;
++
++import io.papermc.paper.util.JarManifests;
+ import net.kyori.adventure.text.Component;
+ import net.kyori.adventure.text.event.ClickEvent;
+ import net.kyori.adventure.text.format.NamedTextColor;
+ import net.kyori.adventure.text.format.TextDecoration;
++import org.bukkit.Bukkit;
++import org.bukkit.Server;
+ import org.checkerframework.checker.nullness.qual.NonNull;
+ import org.checkerframework.checker.nullness.qual.Nullable;
+ import org.checkerframework.framework.qual.DefaultQualifier;
+@@ -35,7 +39,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static final Logger LOGGER = LogUtils.getClassLogger();
+     private static final int DISTANCE_ERROR = -1;
+     private static final int DISTANCE_UNKNOWN = -2;
+-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
++    private static final String DOWNLOAD_PAGE = "https://ci.plex.us.org/job/Scissors/job/" + ServerBuildInfo.buildInfo().gitBranch(); // Scissors
+ 
+     @Override
+     public long getCacheTime() {
+@@ -49,7 +53,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+         if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
+             updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
+         } else {
+-            updateMessage = getUpdateStatusMessage("PaperMC/Paper", build);
++            updateMessage = getUpdateStatusMessage("AtlasMediaGroup/Scissors", build);
+         }
+         final @Nullable Component history = this.getHistory();
+ 
+@@ -59,15 +63,10 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static Component getUpdateStatusMessage(final String repo, final ServerBuildInfo build) {
+         int distance = DISTANCE_ERROR;
+ 
+-        final OptionalInt buildNumber = build.buildNumber();
+-        if (buildNumber.isPresent()) {
+-            distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
+-        } else {
+-            final Optional<String> gitBranch = build.gitBranch();
+-            final Optional<String> gitCommit = build.gitCommit();
+-            if (gitBranch.isPresent() && gitCommit.isPresent()) {
+-                distance = fetchDistanceFromGitHub(repo, gitBranch.get(), gitCommit.get());
+-            }
++        final Optional<String> gitBranch = build.gitBranch();
++        final Optional<String> gitCommit = build.gitCommit();
++        if (gitBranch.isPresent() && gitCommit.isPresent()) {
++            distance = fetchDistanceFromGitHub(repo, gitBranch.get(), gitCommit.get());
+         }
+ 
+         return switch (distance) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 6101ff98022e7c1ad253edb112a0bf87b139e62b..4338714a0bc8c3618a88b915b575e8b17a77dbd8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -316,7 +316,7 @@ public class Main {
+                     if (buildDate.before(deadline.getTime())) {
+                         // Paper start - This is some stupid bullshit
+                         System.err.println("*** Warning, you've not updated in a while! ***");
+-                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
++                        System.err.println("*** Please download a new build as per instructions from https://ci.plex.us.org/job/Scissors ***"); // Paper
+                         //System.err.println("*** Server will start in 20 seconds ***");
+                         //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
+                         // Paper end

patches/server/0039-Add-depth-limit-to-Component-deserialization.patch

@@ -0,0 +1,117 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 19:01:14 -0500
+Subject: [PATCH] Add depth limit to Component deserialization
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
+index 3b075dcb6bda40b278296fc8750f2af90c13acc4..a0c3c4faa8c80c880340e0150e16223ac0b5e5a0 100644
+--- a/src/main/java/net/minecraft/network/chat/Component.java
++++ b/src/main/java/net/minecraft/network/chat/Component.java
+@@ -1,15 +1,7 @@
+ package net.minecraft.network.chat;
+ 
+ import com.google.common.collect.Lists;
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.JsonDeserializationContext;
+-import com.google.gson.JsonDeserializer;
+-import com.google.gson.JsonElement;
+-import com.google.gson.JsonParseException;
+-import com.google.gson.JsonParser;
+-import com.google.gson.JsonSerializationContext;
+-import com.google.gson.JsonSerializer;
++import com.google.gson.*;
+ import com.google.gson.stream.JsonReader;
+ import com.mojang.brigadier.Message;
+ import com.mojang.serialization.JsonOps;
+@@ -24,6 +16,7 @@ import java.util.Optional;
+ import java.util.UUID;
+ import javax.annotation.Nullable;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.core.HolderLookup;
+ import net.minecraft.network.chat.contents.DataSource;
+@@ -35,8 +28,10 @@ import net.minecraft.network.chat.contents.SelectorContents;
+ import net.minecraft.network.chat.contents.TranslatableContents;
+ import net.minecraft.resources.ResourceLocation;
+ import net.minecraft.util.FormattedCharSequence;
++import net.minecraft.util.GsonHelper;
+ import net.minecraft.world.level.ChunkPos;
+ // CraftBukkit start
++import java.util.regex.Pattern;
+ import java.util.stream.Stream;
+ // CraftBukkit end
+ 
+@@ -286,10 +281,70 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+     public static class Serializer {
+ 
+         private static final Gson GSON = (new GsonBuilder()).disableHtmlEscaping().create();
++        private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("%[0-9]+\\$s"); // Scissors
+ 
+         private Serializer() {}
+ 
++        // Scissors start
++        static int depthChecker(int depth) {
++            depth = depth + 1;
++            if (depth > ScissorsConfig.componentDepthLimit) {
++                throw new JsonParseException("Depth limit exceeded");
++            }
++            return depth;
++        }
++
++        static int getPenalty(String string) {
++            if (PLACEHOLDER_PATTERN.matcher(string).find()) {
++                long translate_placeholders = PLACEHOLDER_PATTERN.matcher(string).results().count();
++                return (int) translate_placeholders * 12;
++            }
++            return 0;
++        }
++
+         static MutableComponent deserialize(JsonElement json, HolderLookup.Provider registries) {
++            int depth = 1;
++            if (!json.isJsonPrimitive()) {
++                if (!json.isJsonObject()) {
++                    if (json.isJsonArray()) {
++                        JsonArray jsonArray = json.getAsJsonArray();
++                        if (jsonArray.size() <= 0) {
++                            throw new JsonParseException("Unexpected empty array of components");
++                        }
++
++                        for (JsonElement ignored : jsonArray) {
++                            depth = depthChecker(depth);
++                        }
++                    }
++                }
++                else
++                {
++                    JsonObject jsonObject = json.getAsJsonObject();
++                    if (jsonObject.has("translate")) {
++                        String s = GsonHelper.getAsString(jsonObject, "translate");
++                        int penalty = getPenalty(s);
++                        depth = depthChecker(depth + penalty);
++
++                        if (jsonObject.has("with")) {
++                            String s1 = GsonHelper.getAsJsonArray(jsonObject, "with").toString();
++                            penalty = getPenalty(s1);
++                            depth = depthChecker(depth + penalty);
++                        }
++                    }
++
++                    if (jsonObject.has("extra")) {
++                        JsonArray jsonArray = GsonHelper.getAsJsonArray(jsonObject, "extra");
++                        if (jsonArray.size() <= 0) {
++                            throw new JsonParseException("Unexpected empty array of components");
++                        }
++
++                        for (JsonElement ignored : jsonArray) {
++                            depth = depthChecker(depth);
++                        }
++                    }
++                }
++            }
++            // Scissors end
+             return (MutableComponent) ComponentSerialization.CODEC.parse(registries.createSerializationContext(JsonOps.INSTANCE), json).getOrThrow(JsonParseException::new);
+         }
+ 

patches/server/0040-Add-depth-limit-to-updateCustomBlockEntityTag.patch

@@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Fri, 14 Jun 2024 19:05:44 -0500
+Subject: [PATCH] Add depth limit to updateCustomBlockEntityTag
+
+
+diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
+index 96fb69ec6db2e7c8c728435f0c537b076259b2fb..b27a5f2251012f256652bcb50caf317c31378b63 100644
+--- a/src/main/java/net/minecraft/world/item/BlockItem.java
++++ b/src/main/java/net/minecraft/world/item/BlockItem.java
+@@ -2,12 +2,18 @@ package net.minecraft.world.item;
+ 
+ import java.util.List;
+ import java.util.Map;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.advancements.CriteriaTriggers;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Holder;
+ import net.minecraft.core.component.DataComponents;
+ import net.minecraft.nbt.CompoundTag;
++import net.minecraft.nbt.ListTag;
++import net.minecraft.nbt.Tag;
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ServerLevel;
+@@ -217,6 +223,35 @@ public class BlockItem extends Item {
+             if (!customdata.isEmpty()) {
+                 BlockEntity tileentity = world.getBlockEntity(pos);
+ 
++                // Scissors start
++                if (customdata.contains("CustomName")) {
++                    String customName = customdata.getUnsafe().getString("CustomName");
++                    Pattern EXTRA_PATTERN = Pattern.compile("\"extra\":(\\[(.*?)\\{|\\[\\{)");
++                    Matcher matcher = EXTRA_PATTERN.matcher(customName);
++                    if (matcher.find()) {
++                        String matcherString = matcher.group();
++                        int penalty = (matcherString.startsWith("\"extra\":[{") ? (int) matcher.results().count() : matcher.group().replace("\"extra\":", "").replace("{", "").length()) * 12;
++                        if (penalty > ScissorsConfig.componentDepthLimit) {
++                            return false;
++                        }
++                    }
++                }
++
++                for (Tag tag : customdata.getUnsafe().tags.values()) {
++                    if (tag instanceof CompoundTag compoundTag && compoundTag.contains("messages")) {
++                        ListTag messagesList = compoundTag.getList("messages", 8);
++                        Pattern TRANSLATE_PLACEHOLDER_PATTERN = Pattern.compile("%[0-9]+\\$s");
++                        Matcher matcher = TRANSLATE_PLACEHOLDER_PATTERN.matcher(messagesList.toString());
++                        if (matcher.find()) {
++                            int penalty = (int) matcher.results().count() * 12;
++                            if (penalty > ScissorsConfig.componentDepthLimit) {
++                                return false;
++                            }
++                        }
++                    }
++                }
++                // Scissors end
++
+                 if (tileentity != null) {
+                     if (!world.isClientSide && tileentity.onlyOpCanSetNbt() && (player == null || !(player.canUseGameMasterBlocks() || (player.getAbilities().instabuild && player.getBukkitEntity().hasPermission("minecraft.nbt.place"))))) { // Spigot - add permission
+                         return false;

patches/server/0041-Add-more-fallback-code-for-chunk-bans.patch

@@ -0,0 +1,157 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sun, 16 Jun 2024 15:38:49 -0500
+Subject: [PATCH] Add more fallback code for chunk bans
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+index 5d3e739d28d394ed59fe0003245cc55ac62e6087..e721aa95e0e11455df2fb337978cefdd1bbcf018 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+@@ -1,6 +1,8 @@
+ package net.minecraft.network.protocol.game;
+ 
+ import java.util.function.BiFunction;
++
++import me.totalfreedom.scissors.NbtUtility;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.RegistryAccess;
+ import net.minecraft.core.registries.Registries;
+@@ -36,6 +38,23 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
+         return create(blockEntity, BlockEntity::getUpdateTag);
+     }
+ 
++    // Scissors start - Handle large packets disconnecting client
++    @Override
++    public boolean hasLargePacketFallback() {
++        return true;
++    }
++
++    @Override
++    public boolean packetTooLarge(net.minecraft.network.Connection manager) {
++        if (NbtUtility.isTooLarge(this.tag))
++        {
++            this.tag.getAllKeys().forEach(tag::remove);
++        }
++        manager.send(new ClientboundBlockEntityDataPacket(pos, this.type, this.tag));
++        return true;
++    }
++    // Scissors end - Handle large packets disconnecting client
++
+     public ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> blockEntityType, CompoundTag nbt) {
+         this.pos = pos;
+         this.type = blockEntityType;
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
+index 63f6a2437da9363786b55af0a7cbc5373232d35b..38e8e3e58821da896851a42d6088bc70857ae7e1 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetSlotPacket.java
+@@ -43,6 +43,19 @@ public class ClientboundContainerSetSlotPacket implements Packet<ClientGamePacke
+         return GamePacketTypes.CLIENTBOUND_CONTAINER_SET_SLOT;
+     }
+ 
++    // Scissors start - Handle large packets disconnecting client
++    @Override
++    public boolean hasLargePacketFallback() {
++        return true;
++    }
++
++    @Override
++    public boolean packetTooLarge(net.minecraft.network.Connection manager) {
++        manager.send(new ClientboundContainerSetSlotPacket(this.containerId, this.stateId, this.slot, ItemStack.EMPTY));
++        return true;
++    }
++    // Scissors end - Handle large packets disconnecting client
++
+     @Override
+     public void handle(ClientGamePacketListener listener) {
+         listener.handleContainerSetSlot(this);
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
+index 466dc69d8c06766733a6164fa5c911e902493a23..84f05afd07c23ffd34492b4c45344ccbfb66c2a9 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
+@@ -36,6 +36,19 @@ public record ClientboundMapItemDataPacket(
+         this(mapId, scale, locked, decorations != null ? Optional.of(List.copyOf(decorations)) : Optional.empty(), Optional.ofNullable(updateData));
+     }
+ 
++    // Scissors start - Handle large packets disconnecting client
++    @Override
++    public boolean hasLargePacketFallback() {
++        return true;
++    }
++
++    @Override
++    public boolean packetTooLarge(net.minecraft.network.Connection manager) {
++        manager.send(new ClientboundMapItemDataPacket(mapId, scale, locked, Optional.empty(), Optional.empty()));
++        return true;
++    }
++    // Scissors end - Handle large packets disconnecting client
++
+     @Override
+     public PacketType<ClientboundMapItemDataPacket> type() {
+         return GamePacketTypes.CLIENTBOUND_MAP_ITEM_DATA;
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java
+index 37ab438ab37b9235666ae69376509bdde7722d87..b6cdadfbfe8756a3fd10b7a2d93da31701bc44e1 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerChatPacket.java
+@@ -2,6 +2,8 @@ package net.minecraft.network.protocol.game;
+ 
+ import java.util.UUID;
+ import javax.annotation.Nullable;
++
++import net.minecraft.ChatFormatting;
+ import net.minecraft.network.FriendlyByteBuf;
+ import net.minecraft.network.RegistryFriendlyByteBuf;
+ import net.minecraft.network.chat.ChatType;
+@@ -39,6 +41,19 @@ public record ClientboundPlayerChatPacket(
+         );
+     }
+ 
++    // Scissors start - Handle large packets disconnecting client
++    @Override
++    public boolean hasLargePacketFallback() {
++        return true;
++    }
++
++    @Override
++    public boolean packetTooLarge(net.minecraft.network.Connection manager) {
++        manager.send(new ClientboundPlayerChatPacket(sender, index, signature, body, Component.empty().append("** Message too large **").withStyle(ChatFormatting.RED), filterMask, chatType));
++        return true;
++    }
++    // Scissors end - Handle large packets disconnecting client
++
+     private void write(RegistryFriendlyByteBuf buf) {
+         buf.writeUUID(this.sender);
+         buf.writeVarInt(this.index);
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
+index 3945ca04ede578121b370592482ac917f2d4cf96..f05678ab6fc598da0416c6e0c68bc30a1beef139 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
+@@ -2,6 +2,8 @@ package net.minecraft.network.protocol.game;
+ 
+ import com.google.common.collect.Lists;
+ import com.mojang.datafixers.util.Pair;
++
++import java.util.Collections;
+ import java.util.List;
+ import net.minecraft.network.RegistryFriendlyByteBuf;
+ import net.minecraft.network.codec.StreamCodec;
+@@ -44,6 +46,19 @@ public class ClientboundSetEquipmentPacket implements Packet<ClientGamePacketLis
+         } while ((i & -128) != 0);
+     }
+ 
++    // Scissors start - Handle large packets disconnecting client
++    @Override
++    public boolean hasLargePacketFallback() {
++        return true;
++    }
++
++    @Override
++    public boolean packetTooLarge(net.minecraft.network.Connection manager) {
++        manager.send(new ClientboundSetEquipmentPacket(entity, Collections.emptyList()));
++        return true;
++    }
++    // Scissors end - Handle large packets disconnecting client
++
+     private void write(RegistryFriendlyByteBuf buf) {
+         buf.writeVarInt(this.entity);
+         int i = this.slots.size();

settings.gradle.kts

@@ -1,7 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
 }