Add compiling instructions for Windows and update Metrics

* Update Jenkinsfile

* Update Jenkinsfile

.github/workflows/build.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout Git Repository
         uses: actions/checkout@v3
+        with:
+          submodules: 'true'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Gradle

.gitignore

@@ -51,4 +51,5 @@ Scissors-API
 
 !gradle/wrapper/gradle-wrapper.jar
 
-paper-api-generator
+aswm-api/src
+aswm-core/src

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "submodules/AdvancedSlimePaper"]
+	path = submodules/AdvancedSlimePaper
+	url = https://github.com/InfernalSuite/AdvancedSlimePaper.git
+	branch = paper_upstream

Jenkinsfile

@@ -1,9 +1,15 @@
 pipeline {
+    options { skipDefaultCheckout() }
     agent any
     environment {
         GITHUB_BRANCH = "${BRANCH_NAME}"
     }
     stages {
+        stage('checkout') {
+            steps {
+                checkout scmGit(branches: [[name: '*/slime/1.20.1']], extensions: [submodule(parentCredentials: true, recursiveSubmodules: true, reference: 'https://github.com/InfernalSuite/AdvancedSlimePaper')], userRemoteConfigs: [[url: 'https://github.com/AtlasMediaGroup/Scissors']])
+            }
+        }
         stage('applyPatches') {
             steps {
                 withGradle {
@@ -40,4 +46,4 @@ pipeline {
             cleanWs()
         }
     }
-}
+}

README.md

@@ -1,11 +1,21 @@
-# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.20.4/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.20.4/)
+# Scissors [![Build Status](https://ci.plex.us.org/job/Scissors/job/slime%252F1.20.1/badge/icon)](https://ci.plex.us.org/job/Scissors/job/slime%252F1.20.1/)
 
 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.
 
+All SWM patches/SWM API belongs to [AdvancedSlimePaper and InfernalSuite](https://github.com/InfernalSuite/AdvancedSlimePaper)
+
+Note: This will not compile on Windows by default. To make it compile, you need to delete the `aswm-core/src`
+and `aswm-api/src` files. Then open up Command Prompt as an administrator and run the following for the api project:
+```mklink /D C:\full\path\to\project\aswm-api\src C:\full\path\to\project\submodules\AdvancedSlimePaper\api\src```. Now,
+run the same thing again for the core
+project: ```mklink /D C:\full\path\to\project\aswm-core\src C:\full\path\to\project\submodules\AdvancedSlimePaper\core\src```
+Make sure you replace the placeholder `C:\full\path\to\project` with the actual full path to the root project on your
+local machine. You do not need to do this if you are compiling on macOS or Linux.
+
 ## Links
 ### [Scissors Download](https://ci.plex.us.org/job/Scissors)
-### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.4)
+### [Scissors Javadoc](https://javadoc.scissors.gg/1.20.1)
 ### [Scissors Announcements](https://totalfreedom.tf/forums/scissors-announcements.55)
 ### [Scissors General Discussion](https://totalfreedom.tf/forums/scissors-discussion.56/)
 

aswm-api/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    `java-library`
+     `maven-publish`
+    signing
+}
+
+dependencies {
+    api("com.flowpowered:flow-nbt:2.0.2")
+    api("org.jetbrains:annotations:23.0.0")
+
+    compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}

aswm-api/src

@@ -0,0 +1 @@
+../submodules/AdvancedSlimePaper/api/src

aswm-core/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+}
+
+dependencies {
+    compileOnly(project(":aswm-api"))
+    implementation("com.github.luben:zstd-jni:1.5.2-2")
+}

aswm-core/src

@@ -0,0 +1 @@
+../submodules/AdvancedSlimePaper/core/src

build-data/dev-imports.txt

@@ -8,5 +8,9 @@
 # To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
 #     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
 #     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
-minecraft net.minecraft.network.chat.FormattedText
+
-minecraft net.minecraft.network.chat.contents.TranslatableContents.java
+## Used in Scissors 1.19
+#minecraft net/minecraft/world/ContainerHelper
+#minecraft net/minecraft/network/chat/contents/NbtContents
+#minecraft net/minecraft/network/chat/ComponentUtils
+#minecraft net/minecraft/network/chat/contents/EntityDataSource

build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.15"
+    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.11:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.9:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.629.1")
     paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
 }
@@ -49,6 +49,7 @@ subprojects {
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
+        maven("https://repo.rapture.pw/repository/maven-releases/")
     }
 }
 
@@ -65,15 +66,6 @@ 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"))
-                }
-            }
         }
     }
 }

gradle.properties

@@ -1,10 +1,10 @@
 group=me.totalfreedom.scissors
-version=1.20.4-R0.1-SNAPSHOT
+version=1.20.1-R0.1-SNAPSHOT
 
-mcVersion=1.20.4
+mcVersion=1.20.1
-paperRef=a6b6ecdd221b6ae7687561c84c1850aaa62473b4
+paperRef=773dd724469bae89d0c2075edc3d1ddc8d5b0b18
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-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
@@ -145,7 +144,7 @@ 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
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +201,11 @@ fi
 # 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:
+# Collect all arguments for the java command;
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     and any embedded shellness will be escaped.
+#     shell script including quotes and variable substitutions, so put them in
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     double quotes to make sure that they get re-expanded; and
-#     treated as '${Hostname}' itself on the command line.
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

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

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
+Date: Mon, 26 Dec 2022 12:08:15 -0500
+Subject: [PATCH] AdvancedSlimePaper API Changes
+
+AdvancedSlimePaper
+Copyright (C) 2023 InfernalSuite
+
+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 <http://www.gnu.org/licenses/>.
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 8045f92ffdfb4164bcbef99c41359590c45f9006..51e49260927f6840c3640275ff26e7398ec72b89 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -27,6 +27,7 @@ configurations.api {
+ 
+ dependencies {
+     // api dependencies are listed transitively to API consumers
++    api(project(":aswm-api")) // ASWM
+     api("com.google.guava:guava:31.1-jre")
+     api("com.google.code.gson:gson:2.10")
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper

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

@@ -5,10 +5,10 @@ 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 4ff1b38eb65f97344257204cf018f176f247ed36..be766fc9c24bedcc58dac2cb1991345bf5ed17e0 100644
+index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..9fd0d55bac867322e8c72dcf4a17bd18f7aa423c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2235,6 +2235,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  

patches/server/0002-Build-changes.patch

@@ -1,29 +1,29 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Luna <lunahatesgogle@gmail.com>
-Date: Sun, 10 Dec 2023 12:34:45 -0600
+Date: Sat, 12 Mar 2022 22:22:22 -0300
 Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..855784d7f9c2993c5d91f67c9b8cc46fe6e4147e 100644
+index ad034c140f18518abc18244ca1f2fb853ca5897e..9a40d3d6bc3862814926e52cf61f46ee440d63fa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+@@ -14,8 +14,12 @@ val alsoShade: Configuration by configurations.creating
- val alsoShade: Configuration by configurations.creating
  
  dependencies {
+     implementation(project(":aswm-core"))
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
 +    // Scissors start
 +    implementation(project(":Scissors-API"))
-+    implementation("io.papermc.paper:paper-mojangapi:1.20.4-R0.1-SNAPSHOT") {
++    implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") {
 +        exclude("io.papermc.paper", "paper-api")
 +    }
 +    // Scissors end
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -67,11 +71,19 @@ tasks.jar {
+@@ -69,11 +73,19 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
          val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@@ -55,7 +55,7 @@ index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..855784d7f9c2993c5d91f67c9b8cc46f
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 4b002e8b75d117b726b0de274a76d3596fce015b..a46d3f40642bbf249c2d24e689f474d07175ca09 100644
+index 4b002e8b75d117b726b0de274a76d3596fce015b..87fd35ad9c7364124286fa5e9ef1d4b7efa73990 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 {
@@ -72,7 +72,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..a46d3f40642bbf249c2d24e689f474d0
                  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); // Scissors
++                    paperVersion = "git-ScissorsASWM-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Scissors
                  } else {
                      paperVersion = "unknown";
                  }
@@ -95,28 +95,28 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..21ded7c14c56a40feaa7741131be5166
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8772c773f9933ed1d1debfe707af4373c458152..05b0d82114aadbb713b7e5dad94ee0fe6221856a 100644
+index e62ebbb2e69df4a79b87cac542482ca913681b02..f0eb2e518cf618dfec7af602d8a77ce4bbf4389e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1865,7 +1865,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1695,7 +1695,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
--        return "Paper"; // Paper
+-        return "Paper"; // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Scissors"; // Scissors
++        return "Scissors"; // Scissors - Scissors > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c490a29bcf7410bc54959ee71375605964379ed5..f192db9868129bd1ee45e2b29c0c7479af33ebe1 100644
+index 74d06790de674cbd230a0b14ac9a6b614c9f84ef..26937b8dd0411b0c96e461c57eeee6ae8595211e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
+@@ -265,7 +265,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 serverName = "Scissors"; // Scissors // Paper
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");

patches/server/0002-UUID-validation.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 10 Dec 2023 13:11:22 -0600
-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 9067bab8ec695417d479393f07d9bc6432427d73..433e586bed53a8c17adec74b3088899c748d4be3 100644
---- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
-+++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -20,6 +20,7 @@ import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.TagParser;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.util.ExtraCodecs;
-+import net.minecraft.util.GsonHelper;
- import net.minecraft.util.StringRepresentable;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.item.Item;
-@@ -148,7 +149,14 @@ public class HoverEvent {
-                 CompoundTag compoundTag = TagParser.parseTag(text.getString());
-                 Component component = Component.Serializer.fromJson(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.success(new HoverEvent.EntityTooltipInfo(entityType, uUID, component));
-             } catch (Exception var5) {
-                 return DataResult.error(() -> "Failed to parse tooltip: " + var5.getMessage());

patches/server/0003-UUID-validation.patch

@@ -0,0 +1,59 @@
+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] UUID validation
+
+
+diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
+index 6dac24354192bea79a4b9eb721543110826790b2..a9c3c55eb622b18c74d8a9bd472e4e871d11b2aa 100644
+--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
++++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
+@@ -78,7 +78,11 @@ public final class NbtUtils {
+         }
+         // Paper start - support string UUID's
+         if (nbt.contains("Id", 8)) {
+-            uUID = UUID.fromString(nbt.getString("Id"));
++            // Scissors start - Validate String UUIDs in game profiles
++            try {
++                uUID = UUID.fromString(nbt.getString("Id"));
++            } catch (Exception ignored) {}
++            // Scissors end
+         }
+         // Paper end
+ 
+diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
+index 3ad05bbab726c59e7b67d9614af4b208d4520cb3..c0633f9553fb5aa52e8ffc863159521d09cb3bd5 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 = BuiltInRegistries.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 = 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 new HoverEvent.EntityTooltipInfo(entityType, uUID, component);
+             } catch (Exception var5) {
+                 return null;

patches/server/0004-ResourceLocation-validation.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Video <videogamesm12@gmail.com>
-Date: Wed, 24 Jan 2024 16:28:16 -0600
+Date: Sun, 13 Mar 2022 07:39:26 -0600
 Subject: [PATCH] ResourceLocation validation
 
 
@@ -31,10 +31,10 @@ index 2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99..c5ac6cda91a81d3075f5c763e30dc009
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-index 094ab43e5a209ea848bf0994db9018281c64e08d..c6faba7da6809e24d734b7d6b0b787d20163b051 100644
+index a178f00744ad2e27c0f35d69803574e5a16ec294..a971a7efc8e2a318d596f668e35a933de90b0525 100644
 --- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-@@ -410,7 +410,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity {
+@@ -408,7 +408,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity {
              try {
                  this.setParticle(ParticleArgument.readParticle(new StringReader(nbt.getString("Particle")), (HolderLookup) BuiltInRegistries.PARTICLE_TYPE.asLookup()));
              } catch (CommandSyntaxException commandsyntaxexception) {
@@ -44,11 +44,11 @@ index 094ab43e5a209ea848bf0994db9018281c64e08d..c6faba7da6809e24d734b7d6b0b787d2
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..cfb2ce684da0ae97a844554b5ad3d41290058f32 100644
+index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..7b0aed8ed3a150b7c10fa246bb0b519232424737 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -595,7 +595,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -588,7 +588,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-             if (generation) entity.generation = true; // Paper - Don't fire sync event during generation
+         }), (entity) -> {
              entity.load(nbt);
          }, () -> {
 -            EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
@@ -56,19 +56,98 @@ index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..cfb2ce684da0ae97a844554b5ad3d412
          });
      }
  
+@@ -607,7 +607,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+     }
+ 
+     public static Optional<EntityType<?>> by(CompoundTag nbt) {
+-        return BuiltInRegistries.ENTITY_TYPE.getOptional(new ResourceLocation(nbt.getString("id")));
++        return BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(nbt.getString("id"))); // Scissors
+     }
+ 
+     @Nullable
+diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
+index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..0bb87ca2556ca41e0b14503d3ae62e0fc133a209 100644
+--- a/src/main/java/net/minecraft/world/entity/Mob.java
++++ b/src/main/java/net/minecraft/world/entity/Mob.java
+@@ -618,7 +618,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+ 
+         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
+             this.lootTableSeed = nbt.getLong("DeathLootTableSeed");
+         }
+ 
+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 448fa4f4f200430d6ce3051763c7ceb697696146..40e59b8db83aec1143e3c394427e916beea7c01f 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
+@@ -289,7 +289,12 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+         while (iterator.hasNext()) {
+             String s = (String) iterator.next();
+ 
+-            this.recipesUsed.put(new ResourceLocation(s), nbttagcompound1.getInt(s));
++            // Scissors start
++            final ResourceLocation rl = ResourceLocation.tryParse(s);
++            if (rl != null) {
++                this.recipesUsed.put(rl, nbttagcompound1.getInt(s));
++            }
++            // Scissors end
+         }
+ 
+         // Paper start - cook speed API
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java
+index 0425151e688966442340ea1cf892aff34ffe0791..244b04e0020b1bd1e7be34a1b6266a8ac75d29fc 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java
+@@ -199,7 +199,7 @@ public class BrushableBlockEntity extends BlockEntity {
+ 
+     private boolean tryLoadLootTable(CompoundTag nbt) {
+         if (nbt.contains("LootTable", 8)) {
+-            this.lootTable = new ResourceLocation(nbt.getString("LootTable"));
++            this.lootTable = ResourceLocation.tryParse(nbt.getString("LootTable")); // Scissors
+             this.lootTableSeed = nbt.getLong("LootTableSeed");
+             return true;
+         } else {
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/DecoratedPotBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/DecoratedPotBlockEntity.java
+index 6f9286db4e5786464fb0b49dc125e1228ab7ae93..8d91accb0d5e8afa3957d816bd71681b4198ee6e 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/DecoratedPotBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/DecoratedPotBlockEntity.java
+@@ -90,7 +90,7 @@ public class DecoratedPotBlockEntity extends BlockEntity {
+                 return Items.BRICK;
+             } else {
+                 Tag tag = list.get(index);
+-                return BuiltInRegistries.ITEM.get(new ResourceLocation(tag.getAsString()));
++                return BuiltInRegistries.ITEM.get(ResourceLocation.tryParse(tag.getAsString())); // Scissors
+             }
+         }
+     }
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+index 081691f9710ff1115e4308f79ed49fbc38941193..c29dfd15e147d5c4d9c9584ff7803c2a52009f0d 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+@@ -46,7 +46,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+     protected boolean tryLoadLootTable(CompoundTag nbt) {
+         this.lootableData.loadNbt(nbt); // Paper
+         if (nbt.contains("LootTable", 8)) {
+-            this.lootTable = new ResourceLocation(nbt.getString("LootTable"));
++            this.lootTable = ResourceLocation.tryParse(nbt.getString("LootTable")); // Scissors - Validate loot tables
+             try { org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.lootTable); } catch (IllegalArgumentException ex) { this.lootTable = null; } // Paper - validate
+             this.lootTableSeed = nbt.getLong("LootTableSeed");
+             return false; // Paper - always load the items, table may still remain
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index f6942cb3ef1f9ef03708d4bc932ea9aeb1c13894..8b32864bafb3c1948993688be8f639dd6492057e 100644
+index e49eece9bff3a53469673d03a7bbf8f9cf8776b8..a49f32e9649155b6af4b1f236e4e8142d730e7e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-@@ -34,8 +34,14 @@ public abstract class CraftLootable<T extends RandomizableContainerBlockEntity>
+@@ -30,8 +30,14 @@ public abstract class CraftLootable<T extends RandomizableContainerBlockEntity>
              return null;
          }
  
--        ResourceLocation key = this.getSnapshot().lootTable;
+-        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 = this.getSnapshot().lootTable;
++            ResourceLocation key = getSnapshot().lootTable;
 +            return Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(key));
 +        } catch (Exception ex) {
 +            return null;
@@ -78,21 +157,20 @@ index f6942cb3ef1f9ef03708d4bc932ea9aeb1c13894..8b32864bafb3c1948993688be8f639dd
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 313ee5c8737b2e57f9b5db6512c1871766b2ccd4..a115a13ec911884a804800fc13f0347be1a30932 100644
+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,15 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
+@@ -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
++        try {
-+        {
 +            NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable);
 +            return Bukkit.getLootTable(key);
-+        } catch (Exception exception) {
++        } catch (Exception ex) {
 +            return null;
 +        }
 +        // Scissors end
@@ -100,18 +178,17 @@ index 313ee5c8737b2e57f9b5db6512c1871766b2ccd4..a115a13ec911884a804800fc13f0347b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 31f62fbb54ec7b270fbd8afba7bd7c4bfafa09e3..684e69753be0398ebe57172454aba8cc45cf6502 100644
+index 18b9b0dc70f6872a9d71c120bcd2edca531b0ac4..4732fff6d1198e5fc4875b4d4523aa2d152817ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -80,8 +80,15 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+@@ -80,8 +80,14 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
  
      @Override
      public LootTable getLootTable() {
 -        NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable());
 -        return Bukkit.getLootTable(key);
 +        // Scissors start - Return a null loot table if the specified loot table is not valid
-+        try
++        try {
-+        {
 +            NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable());
 +            return Bukkit.getLootTable(key);
 +        } catch (Exception ex) {

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

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Sun, 13 Mar 2022 03:01:29 -0600
+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 47c8148e6413c51ffdd30082bfb37a7fb8a73a71..48fce864be2a92c9665b9eeb85e3193eaed4133d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+@@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.nbt.NbtUtils;
+ import net.minecraft.resources.ResourceLocation;
+ import net.minecraft.world.level.block.entity.SkullBlockEntity;
++import org.apache.commons.lang3.StringUtils; // Scissors
+ import org.bukkit.Bukkit;
+ import org.bukkit.Material;
+ import org.bukkit.NamespacedKey;
+@@ -74,7 +75,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+         try { // Paper - Ignore invalid game profiles
+         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()) {
++        } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !StringUtils.isBlank(tag.getString(SKULL_OWNER.NBT))) { // Scissors
+             this.setProfile(new GameProfile(null, tag.getString(SKULL_OWNER.NBT)));
+         }
+         } catch (Exception ignored) {} // Paper

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

@@ -1,22 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Video <videogamesm12@gmail.com>
-Date: Sun, 10 Dec 2023 16:57:48 -0600
+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 d445ed0895293dd45c36226051f5809be8587ebe..b9c8b70fb0bf47ffe62cf0d082156479d07da331 100644
+index 41c9f074203915c31c1ae7a160ce509c13383f84..8b4989593da43fc2fd661ac66bfe5ae1eb5e2780 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.resources.ResourceLocation; // Scissors
  import net.minecraft.sounds.SoundEvents;
  import net.minecraft.sounds.SoundSource;
  import net.minecraft.tags.BlockTags;
-@@ -380,6 +381,13 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -370,6 +371,13 @@ public class BeehiveBlockEntity extends BlockEntity {
  
          for (int i = 0; i < nbttaglist.size(); ++i) {
              CompoundTag nbttagcompound1 = nbttaglist.getCompound(i);
@@ -27,6 +27,6 @@ index d445ed0895293dd45c36226051f5809be8587ebe..b9c8b70fb0bf47ffe62cf0d082156479
 +            }
 +            // Scissors end
 +
-             BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData").copy(), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks"));
+             BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks"));
  
              this.stored.add(tileentitybeehive_hivebee);

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

@@ -0,0 +1,20 @@
+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 3df1822b55358a9bdf41bcacd5b7fecfd8f05dfa..f9741039dada19391e80d9623f2d8cabc1089506 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -1813,8 +1813,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

@@ -6,13 +6,13 @@ Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities
 
 
 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 756d0434472921992c9d84597d7c9c824e93614c..77e9e106c522712a484d01bf7e7434c380de3621 100644
+index 272095d7a09ab41227d741172735f66fd2798ce1..757ae1773ba35c2348483dddbb231060afafc602 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -147,7 +147,11 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+@@ -139,7 +139,11 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-     public void remove(Entity.RemovalReason entity_removalreason, EntityRemoveEvent.Cause cause) {
+     @Override
-         // CraftBukkit end
+     public void remove(Entity.RemovalReason reason) {
-         if (!this.level().isClientSide && entity_removalreason.shouldDestroy()) {
+         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 {
@@ -21,4 +21,4 @@ index 756d0434472921992c9d84597d7c9c824e93614c..77e9e106c522712a484d01bf7e7434c3
 +            // Scissors end
          }
  
-         super.remove(entity_removalreason, cause); // CraftBukkit - add Bukkit remove cause
+         super.remove(reason);

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

@@ -1,19 +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 fe4bea6af0d8734f3a5b972dce5f1e3914d6690e..0ee64be4288f59240beec26c470b78cc1aeac424 100644
---- a/src/main/java/net/minecraft/nbt/NbtUtils.java
-+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -223,7 +223,7 @@ public final class NbtUtils {
-             return Blocks.AIR.defaultBlockState();
-         } else {
-             // Paper start - Validate resource location
--            ResourceLocation resourceLocation = ResourceLocation.tryParse(nbt.getString("Name"));
-+            ResourceLocation resourceLocation = ResourceLocation.tryParse(nbt.getString("Name")); // Scissors - Validate BlockState
-             Optional<? extends Holder<Block>> optional = resourceLocation != null ? blockLookup.get(ResourceKey.create(Registries.BLOCK, resourceLocation)) : Optional.empty();
-             // Paper end - Validate resource location
-             if (optional.isEmpty()) {

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

@@ -5,20 +5,19 @@ 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 c7f06c3cfb737bd17a706798bf9cf0e1af5f0cc0..4fd00227d035284688e641cb2c55a3214dcbaa38 100644
+index 52196431a6538872755344859a0454a0e50c3b6e..2312881cdd925ec538fff3df7cdc7e04770453eb 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -445,11 +445,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -425,11 +425,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
          CompoundTag nbttagcompound1 = nbt.getCompound("Item");
  
 -        this.setItem(ItemStack.of(nbttagcompound1));
 -        if (this.getItem().isEmpty()) {
--            this.discard(null); // CraftBukkit - add Bukkit remove cause
 +        // Scissors start
 +        ItemStack item = ItemStack.of(nbttagcompound1);
 +        if (item.isEmpty()) {
-+            this.discard(null);
+             this.discard();
 +            return;
          }
  

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

@@ -6,17 +6,17 @@ Subject: [PATCH] Fixes Knowledge Books causing log spam when invalid data is
 
 
 diff --git a/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java b/src/main/java/net/minecraft/world/item/KnowledgeBookItem.java
-index 5ebc309aed545a4c22970e617519fe916a29fa3c..14a35465e41c9ecb51bea5b084e2637ebd21d295 100644
+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++) {
+                 for(int i = 0; i < listTag.size(); ++i) {
                      String string = listTag.getString(i);
--                    Optional<RecipeHolder<?>> optional = recipeManager.byKey(new ResourceLocation(string));
+-                    Optional<? extends Recipe<?>> optional = recipeManager.byKey(new ResourceLocation(string));
-+                    Optional<RecipeHolder<?>> optional = recipeManager.byKey(ResourceLocation.tryParse(string)); // Scissors - Validate resource locations
++                    Optional<? extends Recipe<?>> optional = recipeManager.byKey(ResourceLocation.tryParse(string)); // Scissors - Validate resource locations
                      if (!optional.isPresent()) {
--                        LOGGER.error("Invalid recipe: {}", string);
+-                        LOGGER.error("Invalid recipe: {}", (Object)string);
 +                        // Scissors - Don't log errors caused by invalid recipes being provided
                          return InteractionResultHolder.fail(itemStack);
                      }
@@ -25,13 +25,13 @@ index 5ebc309aed545a4c22970e617519fe916a29fa3c..14a35465e41c9ecb51bea5b084e2637e
  
              return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
          } else {
--            LOGGER.error("Tag not valid: {}", compoundTag);
+-            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 e904bf8b6a7d18a0e846c3b59e2d7f3d6e530e39..65b076b376bf6ab363a3eb62dfa2c96c45624957 100644
+index 50fdb086ffec84edc5138737c95f08ed4757a6f3..da312b4670fc0ac07e4ab798d4793025e362783e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
 @@ -41,7 +41,11 @@ public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBo

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

@@ -0,0 +1,32 @@
+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 efa800402413202d190926610d8264dfbf5019e7..1b3229128771adb85a7d007989891ef073a80278 100644
+--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
++++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
+@@ -234,7 +234,7 @@ public final class NbtUtils {
+         if (!nbt.contains("Name", 8)) {
+             return Blocks.AIR.defaultBlockState();
+         } else {
+-            ResourceLocation resourceLocation = new ResourceLocation(nbt.getString("Name"));
++            ResourceLocation resourceLocation = ResourceLocation.tryParse(nbt.getString("Name")); // Scissors - Validate BlockState
+             Optional<? extends Holder<Block>> optional = blockLookup.get(ResourceKey.create(Registries.BLOCK, resourceLocation));
+             if (optional.isEmpty()) {
+                 return Blocks.AIR.defaultBlockState();
+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 fa885337085348308604e50049ecc5bb52023884..366f70bfe6559e4d43844473a2c080c3ec52a4fc 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+@@ -541,7 +541,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) BuiltInRegistries.SOUND_EVENT.getOptional(new ResourceLocation(nbt.getString("SoundEvent"))).orElse(this.getDefaultHitGroundSoundEvent());
++            this.soundEvent = (SoundEvent) BuiltInRegistries.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-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch

@@ -1,27 +1,36 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Luna <lunahatesgogle@gmail.com>
-Date: Mon, 15 Apr 2024 22:26:14 -0500
+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 433e586bed53a8c17adec74b3088899c748d4be3..a82b4e39c3160114aded3f33c85fad2e95065b72 100644
+index c0633f9553fb5aa52e8ffc863159521d09cb3bd5..7449a024265c42f28a6c9a1ed8d8f4b9e3096aac 100644
 --- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
 +++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -261,7 +261,7 @@ public class HoverEvent {
+@@ -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 DataResult.success(new HoverEvent.ItemStackInfo(ItemStack.of(compoundTag)));
+                 return new HoverEvent.ItemStackInfo(ItemStack.of(compoundTag));
              } catch (CommandSyntaxException var2) {
--                return DataResult.error(() -> "Failed to parse item tag: " + var2.getMessage());
+-                HoverEvent.LOGGER.warn("Failed to parse item tag: {}", text, var2);
-+                return null;
++                // 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 c34701f95580e4cf45fe086115563127432a28c5..fc7547381a5dd7c0aae352c0cae72a980953b98f 100644
+index 759ecd79534a7706f7d4a63eb9dacbefcfe54674..9afda54ad70d446672749506822c6abd729b8f1b 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -436,7 +436,7 @@ public class ItemFrame extends HangingEntity {
+@@ -441,7 +441,7 @@ public class ItemFrame extends HangingEntity {
              ItemStack itemstack = ItemStack.of(nbttagcompound1);
  
              if (itemstack.isEmpty()) {

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

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Telesphoreo <me@telesphoreo.me>
-Date: Tue, 23 Jan 2024 19:01:02 -0600
+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 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..48dd50d0e443a59835e92616874c9856c7cbc401 100644
+index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..bc5ed619e05f24f3ad50a6a81306d120869f57a1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -4,6 +4,7 @@ import com.destroystokyo.paper.util.VersionFetcher;
+@@ -4,11 +4,13 @@ import com.destroystokyo.paper.util.VersionFetcher;
  import com.google.common.base.Charsets;
  import com.google.common.io.Resources;
  import com.google.gson.*;
@@ -16,12 +16,14 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..48dd50d0e443a59835e92616874c9856
  import net.kyori.adventure.text.Component;
  import net.kyori.adventure.text.event.ClickEvent;
  import net.kyori.adventure.text.format.NamedTextColor;
-@@ -16,11 +17,12 @@ import java.io.*;
+ import net.kyori.adventure.text.format.TextDecoration;
- import java.net.HttpURLConnection;
+ import net.kyori.adventure.text.TextComponent;
- import java.net.URL;
- import java.util.stream.StreamSupport;
 +import org.bukkit.Bukkit; // Scissors
  
+ import javax.annotation.Nonnull;
+ import javax.annotation.Nullable;
+@@ -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";
@@ -75,15 +77,15 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..48dd50d0e443a59835e92616874c9856
          switch (distance) {
              case -1:
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c0538206a53f0e6d9b54bddde0259b89ac73d675..5ebb80ed81d9bbd4c69a14ccd0be6c67de2fcf0d 100644
+index 7c29d92362a82330440dff151bcf421f15c68f71..d1c8671ba5ca95c425e4c679445d55c4bbba217e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -315,7 +315,7 @@ public class Main {
+@@ -300,7 +300,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.scissors.gg/job/Scissors ***"); // Paper
++                        System.err.println("*** Please download a new build from https://ci.scissors.gg/job/Scissors ***"); // Scissors > // Paper
                          //System.err.println("*** Server will start in 20 seconds ***");
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
-                         // Paper end
+                         // Paper End

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

@@ -1,33 +1,42 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Video <videogamesm12@gmail.com>
-Date: Mon, 15 Apr 2024 22:36:13 -0500
+Date: Mon, 28 Mar 2022 13:19:43 -0600
 Subject: [PATCH] Better handling of invalid JSON components
 
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index e028353e0261310afc42ca0454b723d9f1ffc131..ed8810319db2ce754245193a62ea7a9a32ac13ec 100644
+index c69088a2ec374b2d236fec61e267f42afa2967b1..7ca1ece926b0ef4598d4fa913b96d1e7a0e5bba4 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -675,12 +675,6 @@ public final class MCUtil {
+@@ -559,13 +559,7 @@ public final class MCUtil {
              return null;
          }
          String string = compound.getString(key);
 -        try {
--            return net.minecraft.network.chat.Component.Serializer.fromJson(string);
+-            return Component.Serializer.fromJson(string);
 -        } catch (com.google.gson.JsonParseException e) {
 -            org.bukkit.Bukkit.getLogger().warning("Unable to parse " + key + " from " + compound +": " + e.getMessage());
 -        }
 -
 -        return null;
-+        return net.minecraft.network.chat.Component.Serializer.fromJsonSafe(string); // Scissors
++        return Component.Serializer.fromJsonSafe(string);
      }
- }
+ 
+     public static ChunkStatus getChunkStatus(ChunkHolder chunk) {
 diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index d3a80d0a23be762c05931ae8001d98e43cab2b4a..ae84d06564b2560e13404f6d89f88ad71dbc2cc6 100644
+index 37fc353c3e59dd5af2fd6c58ac084fb0e6e155d7..2873ed7c443ed8c8c57a8b1d3e444d229f10f07b 100644
 --- a/src/main/java/net/minecraft/network/chat/Component.java
 +++ b/src/main/java/net/minecraft/network/chat/Component.java
-@@ -315,6 +315,26 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -26,6 +26,7 @@ import java.util.List;
-             return json == null ? null : Serializer.deserialize(json);
+ import java.util.Map.Entry;
+ import java.util.Optional;
+ import javax.annotation.Nullable;
++import net.minecraft.ChatFormatting; // Scissors
+ import net.minecraft.Util;
+ import net.minecraft.network.chat.contents.BlockDataSource;
+ import net.minecraft.network.chat.contents.DataSource;
+@@ -522,6 +523,26 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+             return GsonHelper.toStableString(Serializer.toJsonTree(text));
          }
  
 +        // Scissors start
@@ -50,15 +59,42 @@ index d3a80d0a23be762c05931ae8001d98e43cab2b4a..ae84d06564b2560e13404f6d89f88ad7
 +        }
 +        // Scissors end
 +
-         @Nullable
+         public static JsonElement toJsonTree(Component text) {
-         public static MutableComponent fromJsonLenient(String json) {
+             return Component.Serializer.GSON.toJsonTree(text);
-             JsonReader jsonreader = new JsonReader(new StringReader(json));
+         }
 diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-index a82b4e39c3160114aded3f33c85fad2e95065b72..e1f15ac481ab598e420ad79bcf289251d9f1c99a 100644
+index 7449a024265c42f28a6c9a1ed8d8f4b9e3096aac..487c68abc3eb5c18dc7fee762b2164001283cab7 100644
 --- a/src/main/java/net/minecraft/network/chat/HoverEvent.java
 +++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java
-@@ -147,7 +147,7 @@ public class HoverEvent {
+@@ -79,7 +79,7 @@ public class HoverEvent {
-         public static DataResult<HoverEvent.EntityTooltipInfo> legacyCreate(Component text) {
+                 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"));
@@ -67,30 +103,39 @@ index a82b4e39c3160114aded3f33c85fad2e95065b72..e1f15ac481ab598e420ad79bcf289251
                  // Scissors start
                  UUID uUID;
 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 c5673657ca6332147a5cbd2f4107fee13b9b7f47..3fec6f3e0adef6e2094157ef9040c7c6dc41a6c2 100644
+index 97a2657bc98d41c3c1e376b266d2c85f685acc88..9d20f3f1af8e663a8c13714c8928d4a91653daa4 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 {
+@@ -8,6 +8,7 @@ import java.util.Optional;
-                 );
+ import java.util.stream.Collectors;
-                 return stream.flatMap(text -> {
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
++import net.kyori.adventure.text.TextComponent; // Scissors
+ import net.minecraft.commands.CommandSourceStack;
+ import net.minecraft.commands.arguments.NbtPathArgument;
+ import net.minecraft.nbt.Tag;
+@@ -107,10 +108,10 @@ public class NbtContents implements ComponentContents {
+                 Component component = DataFixUtils.orElse(ComponentUtils.updateForEntity(source, this.separator, sender, depth), ComponentUtils.DEFAULT_NO_STYLE_SEPARATOR);
+                 return stream.flatMap((text) -> {
                      try {
 -                        MutableComponent mutableComponent = Component.Serializer.fromJson(text);
 +                        MutableComponent mutableComponent = Component.Serializer.fromJsonSafe(text); // Scissors
                          return Stream.of(ComponentUtils.updateForEntity(source, mutableComponent, sender, depth));
-                     } catch (Exception var5x) {
+                     } catch (Exception var5) {
--                        LOGGER.warn("Failed to parse component: {}", text, var5x);
+-                        LOGGER.warn("Failed to parse component: {}", text, var5);
 +                        // Scissors - don't log
                          return Stream.of();
                      }
-                 }).reduce((accumulator, current) -> accumulator.append(component).append(current)).orElseGet(Component::empty);
+                 }).reduce((accumulator, current) -> {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 637478fd8a284e6833cf8f5fa17ccf9d73d1dd3f..2ecf2d8ff546ed097cb3b547db22d28a31d29ec4 100644
+index e8485fb900b25e911a858678a833852731cb2ace..842f8af14b2bd694a48ee6573d98e6cfcf910e16 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2545,11 +2545,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2487,12 +2487,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) {
@@ -101,10 +146,10 @@ index 637478fd8a284e6833cf8f5fa17ccf9d73d1dd3f..2ecf2d8ff546ed097cb3b547db22d28a
  
                      this.setCustomNameVisible(nbt.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index 7eb1c28886741bdfe7985d16b6824f3e85ffae50..a6b7ff2e50c9700589428cc7d61b5ef9f9082ea8 100644
+index 2be7a697f08045b974579e6942b38571e744efac..84ec21c38bb44db1e9ff26c01d5c8af1a2417616 100644
 --- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 +++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-@@ -41,7 +41,7 @@ public class ScoreboardSaveData extends SavedData {
+@@ -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);
@@ -113,7 +158,7 @@ index 7eb1c28886741bdfe7985d16b6824f3e85ffae50..a6b7ff2e50c9700589428cc7d61b5ef9
              if (component != null) {
                  playerTeam.setDisplayName(component);
              }
-@@ -59,14 +59,14 @@ public class ScoreboardSaveData extends SavedData {
+@@ -53,14 +53,14 @@ public class ScoreboardSaveData extends SavedData {
              }
  
              if (compoundTag.contains("MemberNamePrefix", 8)) {
@@ -130,12 +175,12 @@ index 7eb1c28886741bdfe7985d16b6824f3e85ffae50..a6b7ff2e50c9700589428cc7d61b5ef9
                  if (component3 != null) {
                      playerTeam.setPlayerSuffix(component3);
                  }
-@@ -123,7 +123,7 @@ public class ScoreboardSaveData extends SavedData {
+@@ -115,7 +115,7 @@ public class ScoreboardSaveData extends SavedData {
-                 return ObjectiveCriteria.DUMMY;
+             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);
              });
-             String string2 = 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"));
-             boolean bl = compoundTag.getBoolean("display_auto_update");
-             NumberFormat numberFormat = NumberFormatTypes.CODEC.parse(NbtOps.INSTANCE, compoundTag.get("format")).result().orElse(null);

patches/server/0015-Block-server-side-chunkbans.patch

@@ -1,46 +1,46 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: ayunami2000 <spwilliamsiam@gmail.com>
-Date: Thu, 25 Jan 2024 23:48:51 -0600
+Date: Mon, 28 Mar 2022 17:02:21 -0400
 Subject: [PATCH] Block server-side chunkbans
 
 
 diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java
-index 96d5448019d53ac3575e209c1c5c223a62a2638d..d0cfc4fc00d45c91380d2d794ca816db74d40266 100644
+index fbfadeb83719b81f42724e79c59e92ed88fdece7..7de21c9bcc1f3c556790da62f96cc44995e877b2 100644
 --- a/src/main/java/net/minecraft/network/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/network/PacketEncoder.java
-@@ -7,8 +7,17 @@ import io.netty.handler.codec.MessageToByteEncoder;
+@@ -6,9 +6,17 @@ import io.netty.channel.ChannelHandlerContext;
- import io.netty.util.Attribute;
+ import io.netty.handler.codec.MessageToByteEncoder;
- import io.netty.util.AttributeKey;
+ import io.papermc.paper.adventure.PaperAdventure; // Paper
  import java.io.IOException;
-+import java.util.Collections;
++import java.util.Collections; // Scissors
-+
++import net.minecraft.ChatFormatting; // Scissors
-+import net.minecraft.ChatFormatting;
++import net.minecraft.core.NonNullList; // Scissors
-+import net.minecraft.core.NonNullList;
++import net.minecraft.nbt.CompoundTag; // Scissors
-+import net.minecraft.nbt.CompoundTag;
++import net.minecraft.network.chat.Component; // Scissors
-+import net.minecraft.network.chat.Component;
++import net.minecraft.network.chat.SignedMessageBody; // Scissors
-+import net.minecraft.network.chat.SignedMessageBody;
  import net.minecraft.network.protocol.Packet;
-+import net.minecraft.network.protocol.game.*;
+ import net.minecraft.network.protocol.PacketFlow;
++import net.minecraft.network.protocol.game.*; // Scissors
  import net.minecraft.util.profiling.jfr.JvmProfiler;
-+import net.minecraft.world.item.ItemStack;
++import net.minecraft.world.item.ItemStack; // Scissors
  import org.slf4j.Logger;
  
  public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-@@ -19,6 +28,23 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+@@ -19,6 +27,23 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-         this.codecKey = protocolKey;
+         this.flow = side;
      }
  
 +    // Scissors start
-+    private int tryWrite(Packet packet, FriendlyByteBuf friendlyByteBuf, ChannelHandlerContext channelHandlerContext, int i) {
++    private static int tryWrite(Packet packet, FriendlyByteBuf friendlyByteBuf, ChannelHandlerContext channelHandlerContext, int i) {
 +        friendlyByteBuf.writeVarInt(i);
-+        friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
++        friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get();
 +
 +        int j = friendlyByteBuf.writerIndex();
 +        packet.write(friendlyByteBuf);
 +        int k = friendlyByteBuf.writerIndex() - j;
 +        int packetLength = friendlyByteBuf.readableBytes();
-+        if (packetLength > MAX_PACKET_SIZE) {
++        if (k > 8388608 || packetLength > MAX_PACKET_SIZE) {
-+            throw new PacketTooLargeException(packet, this.codecKey, packetLength);
++            throw new SkipPacketException(new IllegalArgumentException("Packet too big (is " + k + "): " + packet));
 +        }
 +
 +        return k;
@@ -48,14 +48,14 @@ index 96d5448019d53ac3575e209c1c5c223a62a2638d..d0cfc4fc00d45c91380d2d794ca816db
 +    // Scissors end
 +
      protected void encode(ChannelHandlerContext channelHandlerContext, Packet<?> packet, ByteBuf byteBuf) throws Exception {
-         Attribute<ConnectionProtocol.CodecData<?>> attribute = channelHandlerContext.channel().attr(this.codecKey);
+         ConnectionProtocol connectionProtocol = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get();
-         ConnectionProtocol.CodecData<?> codecData = attribute.get();
+         if (connectionProtocol == null) {
-@@ -34,45 +60,58 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+@@ -33,38 +58,59 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
                  throw new IOException("Can't serialize unregistered packet");
              } else {
                  FriendlyByteBuf friendlyByteBuf = new FriendlyByteBuf(byteBuf);
 -                friendlyByteBuf.writeVarInt(i);
--                friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper - adventure; set player's locale
+-                friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
  
 +                // Scissors start
 +                int k;
@@ -63,42 +63,35 @@ index 96d5448019d53ac3575e209c1c5c223a62a2638d..d0cfc4fc00d45c91380d2d794ca816db
 -                    int j = friendlyByteBuf.writerIndex();
 -                    packet.write(friendlyByteBuf);
 -                    int k = friendlyByteBuf.writerIndex() - j;
--                    if (false && k > 8388608) { // Paper - Handle large packets disconnecting client; disable
+-                    if (false && k > 8388608) { // Paper - disable
 -                        throw new IllegalArgumentException("Packet too big (is " + k + ", should be less than 8388608): " + packet);
+-                    } else {
+-                        int l = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get().getId();
+-                        JvmProfiler.INSTANCE.onPacketSent(l, i, channelHandlerContext.channel().remoteAddress(), k);
 -                    }
--
++                    k = tryWrite(packet, friendlyByteBuf, channelHandlerContext, i);
--                    JvmProfiler.INSTANCE.onPacketSent(codecData.protocol(), i, channelHandlerContext.channel().remoteAddress(), k);
+                 } catch (Throwable var10) {
-+                    k = this.tryWrite(packet, friendlyByteBuf, channelHandlerContext, i);
+-                    LOGGER.error("Packet encoding of packet ID {} threw (skippable? {})", i, packet.isSkippable(), var10); // Paper - Give proper error message
-                 } catch (Throwable var13) {
+-                    if (packet.isSkippable()) {
--                    // Paper start - Give proper error message
+-                        throw new SkipPacketException(var10);
--                    String packetName = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(packet.getClass().getName());
+-                    } else {
--                    if (packetName.contains(".")) {
+-                        throw var10;
--                        packetName = packetName.substring(packetName.lastIndexOf(".") + 1);
 +                    packet = capPacket(packet, i);
 +                    if (packet == null) {
 +                        throw new SkipPacketException(new IllegalArgumentException("Packet too big: " + packet));
                      }
--
--                    LOGGER.error("Packet encoding of packet {} (ID: {}) threw (skippable? {})", packetName, i, packet.isSkippable(), var13);
--                    // Paper end
--                    if (packet.isSkippable()) {
--                        throw new SkipPacketException(var13);
--                    }
--
--                    throw var13;
--                } finally {
--                    // Paper start - Handle large packets disconnecting client
--                    int packetLength = friendlyByteBuf.readableBytes();
--                    if (packetLength > MAX_PACKET_SIZE) {
--                        throw new PacketTooLargeException(packet, this.codecKey, packetLength);
--                    }
--                    // Paper end - Handle large packets disconnecting client
--                    ProtocolSwapHandler.swapProtocolIfNeeded(attribute, packet);
 +                    friendlyByteBuf.clear();
-+                    k = this.tryWrite(packet, friendlyByteBuf, channelHandlerContext, i);
++                    k = tryWrite(packet, friendlyByteBuf, channelHandlerContext, i);
                  }
-+                JvmProfiler.INSTANCE.onPacketSent(codecData.protocol(), i, channelHandlerContext.channel().remoteAddress(), k);
+ 
-+                ProtocolSwapHandler.swapProtocolIfNeeded(attribute, packet);
+-                // Paper start
+-                int packetLength = friendlyByteBuf.readableBytes();
+-                if (packetLength > MAX_PACKET_SIZE) {
+-                    throw new PacketTooLargeException(packet, packetLength);
+-                }
+-                // Paper end
++                int l = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get().getId();
++                JvmProfiler.INSTANCE.onPacketSent(l, i, channelHandlerContext.channel().remoteAddress(), k);
 +                // Scissors end
              }
          }
@@ -153,12 +146,12 @@ index 3944852921335c78a04a9dc301882ab5b152b1ed..96ee53c7cc862e059328c5cdf5e07f30
          this.type = blockEntityType;
          this.tag = nbt.isEmpty() ? null : nbt;
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 76bde683d193b37e563a67c1c7b9bdcf17d64524..185aa88ff28e6f3e3314abe19dff88609a47334e 100644
+index 39b879f21f958dbd91ab0f74e5d4f3c74928fc33..688287c637a0d4b28d630b7304a3c2cf339bdf54 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -33,6 +33,13 @@ public class ClientboundLevelChunkPacketData {
      }
-     // Paper end - Handle oversized block entities in chunks
+     // Paper end
  
 +    // Scissors start
 +    public void clearNBT() {
@@ -171,10 +164,10 @@ index 76bde683d193b37e563a67c1c7b9bdcf17d64524..185aa88ff28e6f3e3314abe19dff8860
      @Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkPacketData(LevelChunk chunk) { this(chunk, null); }
      public ClientboundLevelChunkPacketData(LevelChunk chunk, com.destroystokyo.paper.antixray.ChunkPacketInfo<net.minecraft.world.level.block.state.BlockState> chunkPacketInfo) {
 @@ -58,6 +65,7 @@ public class ClientboundLevelChunkPacketData {
-         int totalTileEntities = 0; // Paper - Handle oversized block entities in chunks
+         int totalTileEntities = 0; // Paper
  
-         for (Entry<BlockPos, BlockEntity> entry2 : chunk.getBlockEntities().entrySet()) {
+         for(Map.Entry<BlockPos, BlockEntity> entry2 : chunk.getBlockEntities().entrySet()) {
 +            if (this.extraPackets.size() > 50) break; // Scissors - Limit extraPackets size
-             // Paper start - Handle oversized block entities in chunks
+             // Paper start
              if (++totalTileEntities > TE_LIMIT) {
                  var packet = entry2.getValue().getUpdatePacket();

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

@@ -5,10 +5,10 @@ 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 3365aed2b67ae0e4dd0410f5190ba474f146139b..43b62a07b040b1d7d76dc8f940f35b51d1d5f868 100644
+index 584a58659fae6ba3d8b53858890bc6ec509ffb0e..54a7dae26854d320d9e53f63eb411a85a2d78159 100644
 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java
 +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
-@@ -38,8 +38,9 @@ public class ComponentUtils {
+@@ -39,8 +39,9 @@ public class ComponentUtils {
      }
  
      public static MutableComponent updateForEntity(@Nullable CommandSourceStack source, Component text, @Nullable Entity sender, int depth) throws CommandSyntaxException {
@@ -17,9 +17,9 @@ index 3365aed2b67ae0e4dd0410f5190ba474f146139b..43b62a07b040b1d7d76dc8f940f35b51
 -            return text.copy();
 +            result = text.copy(); // Scissors
          } else {
-             // Paper start - adventure; pass actual vanilla component
+             // Paper start
              if (text instanceof io.papermc.paper.adventure.AdventureComponent adventureComponent) {
-@@ -52,8 +53,9 @@ public class ComponentUtils {
+@@ -53,8 +54,9 @@ public class ComponentUtils {
                  mutableComponent.append(updateForEntity(source, component, sender, depth + 1));
              }
  

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

@@ -5,7 +5,7 @@ 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
+index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..f83b2c4298bd1a5f65487f64bd6a11fb190a622d 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;
@@ -16,7 +16,7 @@ index 7620c72a4c243cbeea245203ce03a97cbfa7d922..a05a348c299a68a61fabcbdcc689a89a
  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 {
+@@ -242,7 +243,8 @@ public class TimingsExport extends Thread {
          parent.put("config", createObject(
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -414,24 +414,24 @@ index 0000000000000000000000000000000000000000..8cd2848aa6b06c5efbe797ed2d75ff4b
 +}
 +
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index bc391d27399d8c22e78735ca39aa8ab45efb6413..ce5d500ff4642e646a84c09dcff07375b9d80176 100644
+index a7ebf851a65231074c89a24f30de4ac2fb5b63e4..641fe69cb2131413654c39a32a73c62e2bc092f6 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -130,6 +130,7 @@ public class Main {
+@@ -147,6 +147,7 @@ public class Main {
-             // Paper start - load config files early for access below if needed
+             // Paper start - load config files 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
+             // Paper end
  
              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 68d268b6fff126e8645b6deec3fb549ea2286b77..5cb58e351d38b7214e2002bf608512024744f0ee 100644
+index c49802c936ae8e3f4dc1badd98414d96714ecd60..c9725f2df7a66eba3d5994a2b4b16b07ff0f696d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -222,6 +222,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
+         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+         // Paper end
  
 +        // Scissors start
 +        try {
@@ -447,18 +447,18 @@ index 68d268b6fff126e8645b6deec3fb549ea2286b77..5cb58e351d38b7214e2002bf60851202
          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 f192db9868129bd1ee45e2b29c0c7479af33ebe1..1233d9b15d86079b2710e167ada03a4d0898642f 100644
+index 26937b8dd0411b0c96e461c57eeee6ae8595211e..bf8ade78a771b0295811f48cba96aeb05a39524e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1053,6 +1053,7 @@ public final class CraftServer implements Server {
+@@ -1036,6 +1036,7 @@ public final class CraftServer implements Server {
          }
  
-         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
+         org.spigotmc.SpigotConfig.init((File) 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
-@@ -1084,6 +1085,7 @@ public final class CraftServer implements Server {
+@@ -1067,6 +1068,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -466,7 +466,7 @@ index f192db9868129bd1ee45e2b29c0c7479af33ebe1..1233d9b15d86079b2710e167ada03a4d
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -3028,6 +3030,14 @@ public final class CraftServer implements Server {
+@@ -2912,6 +2914,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -482,10 +482,10 @@ index f192db9868129bd1ee45e2b29c0c7479af33ebe1..1233d9b15d86079b2710e167ada03a4d
          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 8d626fadcd4743b6472a2954d2b1b2ec89669814..c0538206a53f0e6d9b54bddde0259b89ac73d675 100644
+index d1c8671ba5ca95c425e4c679445d55c4bbba217e..3be40632c70f5a7994ada3e61616dca632cef2da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -181,6 +181,20 @@ public class Main {
+@@ -180,6 +180,20 @@ public class Main {
                          .defaultsTo("Unknown Server")
                          .describedAs("Name");
                  // Paper end

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

@@ -1,34 +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/HealOrHarmMobEffect.java b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
-index 1c7794de5f0a7238b944c9473e2cc9d011ef2306..9c594c504611b9da5fcd119284b2dcb4b59d3bf4 100644
---- a/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
-@@ -16,6 +16,11 @@ class HealOrHarmMobEffect extends InstantenousMobEffect {
-     @Override
-     public void applyEffectTick(LivingEntity entity, int amplifier) {
-         super.applyEffectTick(entity, 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;
-+        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 {
-@@ -27,6 +32,10 @@ class HealOrHarmMobEffect extends InstantenousMobEffect {
-     @Override
-     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);

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent attributes with invalid namespaces from being applied
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 5cd0fbac267f9c69c5de4c200a95860f5c56d42e..f2ccf2af05524be91eb0f4855cb8006dea2aede4 100644
+index f9741039dada19391e80d9623f2d8cabc1089506..38238d9e6d464990caf10557997c6ca88ee100c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -47,6 +47,7 @@ import net.minecraft.nbt.NbtIo;
+@@ -46,6 +46,7 @@ import net.minecraft.nbt.NbtIo;
  import net.minecraft.nbt.StringTag;
  import net.minecraft.nbt.Tag;
  import net.minecraft.network.chat.Component;
@@ -17,10 +17,10 @@ index 5cd0fbac267f9c69c5de4c200a95860f5c56d42e..f2ccf2af05524be91eb0f4855cb8006d
  import net.minecraft.world.item.BlockItem;
  import net.minecraft.world.level.block.state.BlockState;
  import org.apache.commons.lang3.EnumUtils;
-@@ -488,7 +489,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -486,7 +487,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
  
-             String attributeName = org.bukkit.craftbukkit.attribute.CraftAttributeMap.convertIfNeeded(entry.getString(CraftMetaItem.ATTRIBUTES_IDENTIFIER.NBT)); // Paper
+             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/0019-Don-t-query-player-data-in-the-nbt-component.patch

@@ -1,39 +1,38 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Video <videogamesm12@gmail.com>
-Date: Sun, 10 Dec 2023 17:39:52 -0600
+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/contents/EntityDataSource.java b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
-index 2750702cff35762bc817ffbe5bf81631e86bc49b..8714c3be77490a87aa6df0ff36a87557c6b99e25 100644
+index 8a6799b50062c1b7b141ee1568dc523f9ee7ecfd..80e7b0889235288b60d813a569daecb7e08e108e 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;
+@@ -1,5 +1,6 @@
+ package net.minecraft.network.chat.contents;
+ 
++import me.totalfreedom.scissors.ScissorsConfig; // Scissors
+ import com.mojang.brigadier.StringReader;
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
  import java.util.List;
- import java.util.stream.Stream;
+@@ -11,6 +12,7 @@ import net.minecraft.commands.arguments.selector.EntitySelector;
- 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 net.minecraft.world.entity.player.Player;
++import net.minecraft.world.entity.player.Player; // Scissors
  
  public record EntityDataSource(String selectorPattern, @Nullable EntitySelector compiledSelector) implements DataSource {
-     public static final MapCodec<EntityDataSource> SUB_CODEC = RecordCodecBuilder.mapCodec(
+     public EntityDataSource(String rawPath) {
-@@ -39,7 +42,11 @@ public record EntityDataSource(String selectorPattern, @Nullable EntitySelector
+@@ -31,7 +33,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
++	         // 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
++	         // Scissors end
          } else {
              return Stream.empty();
          }

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

@@ -5,32 +5,32 @@ 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
+index e07cc7970955ce240754cfe424d768c2bba0241a..a4f41bb4ec6cb20f782668c714229b61415cfdfb 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(";");
+         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++) {
+         for(int i = 0; i < bs.length; ++i) {
-             stringBuilder.append(" ").append(bs[i]).append("B");
+             stringBuilder.append(" ").append((int)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(";");
+         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++) {
+         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(";");
+         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++) {
+         for(int i = 0; i < ls.length; ++i) {
              stringBuilder.append(" ").append(ls[i]).append("L");
 @@ -136,7 +139,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
  
@@ -51,7 +51,7 @@ index b45bb4ddf6b586ba1285db230e0bc3d1b5e447e8..4a46935cac263325a87a1b0bf3230283
          } 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
+index a687a0f17df30126d53a1e3a669dc6d157c23ed5..2c50f41dd8034af16fcceca75eeb6c7a9940e327 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 {
@@ -60,7 +60,7 @@ index d8892641d5671fa100aeb43d42ebb6103a2d280c..d10242ecd6f8442e1af3f4cd13f76951
          byte[] bs = element.getAsByteArray();
 +        if (bs.length > 1024) { this.builder.append(']'); return; } // Scissors
  
-         for (int i = 0; i < bs.length; i++) {
+         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) {
@@ -68,7 +68,7 @@ index d8892641d5671fa100aeb43d42ebb6103a2d280c..d10242ecd6f8442e1af3f4cd13f76951
          int[] is = element.getAsIntArray();
 +        if (is.length > 1024) { this.builder.append(']'); return; } // Scissors
  
-         for (int i = 0; i < is.length; i++) {
+         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) {
@@ -76,7 +76,7 @@ index d8892641d5671fa100aeb43d42ebb6103a2d280c..d10242ecd6f8442e1af3f4cd13f76951
          long[] ls = element.getAsLongArray();
 +        if (ls.length > 1024) { this.builder.append(']'); return; } // Scissors
  
-         for (int i = 0; i < ls.length; i++) {
+         for(int i = 0; i < ls.length; ++i) {
              if (i != 0) {
 @@ -100,6 +103,7 @@ public class StringTagVisitor implements TagVisitor {
      @Override
@@ -84,7 +84,7 @@ index d8892641d5671fa100aeb43d42ebb6103a2d280c..d10242ecd6f8442e1af3f4cd13f76951
          this.builder.append('[');
 +        if (element.size() > 1024) { this.builder.append(']'); return; } // Scissors
  
-         for (int i = 0; i < element.size(); i++) {
+         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) {
@@ -93,9 +93,9 @@ index d8892641d5671fa100aeb43d42ebb6103a2d280c..d10242ecd6f8442e1af3f4cd13f76951
 +        if (list.size() > 1024) { this.builder.append('}'); return; } // Scissors
          Collections.sort(list);
  
-         for (String string : 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 4e238ae29347c5e976ff0d506e94972df0aa7362..9776b9741a7ec46c603b2c2bccd5f006c15cee41 100644
+index 149def3da0b92f64e4fc04630965dce44884f938..c9d753f37bd65e35f8a4e2eb5c6fe8f74d5d1606 100644
 --- a/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java
 +++ b/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java
 @@ -97,6 +97,7 @@ public class TextComponentTagVisitor implements TagVisitor {
@@ -104,15 +104,15 @@ index 4e238ae29347c5e976ff0d506e94972df0aa7362..9776b9741a7ec46c603b2c2bccd5f006
          byte[] bs = element.getAsByteArray();
 +        if (bs.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
  
-         for (int i = 0; i < bs.length; i++) {
+         for(int i = 0; i < bs.length; ++i) {
-             MutableComponent mutableComponent2 = Component.literal(String.valueOf(bs[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER);
+             MutableComponent mutableComponent2 = Component.literal(String.valueOf((int)bs[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER);
 @@ -115,6 +116,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++) {
+         for(int i = 0; i < is.length; ++i) {
              mutableComponent.append(" ").append(Component.literal(String.valueOf(is[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER));
 @@ -132,6 +134,7 @@ public class TextComponentTagVisitor implements TagVisitor {
          Component component = Component.literal("L").withStyle(SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
@@ -120,7 +120,7 @@ index 4e238ae29347c5e976ff0d506e94972df0aa7362..9776b9741a7ec46c603b2c2bccd5f006
          long[] ls = element.getAsLongArray();
 +        if (ls.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
  
-         for (int i = 0; i < ls.length; i++) {
+         for(int i = 0; i < ls.length; ++i) {
              Component component2 = Component.literal(String.valueOf(ls[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER);
 @@ -147,7 +150,7 @@ public class TextComponentTagVisitor implements TagVisitor {
  

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

@@ -0,0 +1,53 @@
+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 53cc6befb752affcfec65e18365f6d369448d407..181f5aa262689617ff3ad766dae485c36b88c9aa 100644
+--- a/src/main/java/net/minecraft/world/effect/MobEffect.java
++++ b/src/main/java/net/minecraft/world/effect/MobEffect.java
+@@ -57,6 +57,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
+@@ -83,17 +84,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())) {
++            // Scissors end
+                 entity.hurt(entity.damageSources().magic(), (float) (6 << amplifier));
+             }
+         } 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/0022-Fix-negative-death-times.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Allink <arclicious@vivaldi.net>
-Date: Sat, 24 Feb 2024 15:32:48 -0600
+Date: Mon, 18 Apr 2022 16:55:19 +0100
 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 e9bb7feb591032904516d1b9374f486d8a7d066c..60961c54e870148b5c649045e7347ca1064b6bde 100644
+index e11d7283662834047b2ff81a2fd25a4263792deb..4bd7eea49a0720063db2a8ed10f53bd19e9499ad 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -629,7 +629,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -15,5 +15,5 @@ index e9bb7feb591032904516d1b9374f486d8a7d066c..60961c54e870148b5c649045e7347ca1
 -        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
+             this.remove(Entity.RemovalReason.KILLED);
          }

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Limit amount of vehicle collision checks to 3 and discard
 
 
 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 d514ec1e4cbdc579c3a61533998437903afdc8b6..7ee1f3552b81bff834c6f414e611e8b05463fc6f 100644
+index 9948a28dae4edba877c13ef0156be5ff58df3fa2..9e25d4a3384d0157b99f7bd4d5f7edce032ece6b 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;
@@ -17,42 +17,44 @@ index d514ec1e4cbdc579c3a61533998437903afdc8b6..7ee1f3552b81bff834c6f414e611e8b0
  import javax.annotation.Nullable;
  import net.minecraft.BlockUtil;
  import net.minecraft.Util;
-@@ -104,6 +105,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
+@@ -107,6 +108,7 @@ public abstract class AbstractMinecart extends Entity {
-     private double flyingX = 0.95;
+     private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingY = 0.95;
+     private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
-     private double flyingZ = 0.95;
+     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
  
-@@ -384,8 +386,8 @@ public abstract class AbstractMinecart extends VehicleEntity {
+@@ -434,8 +436,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()) {
--                    Iterator iterator = list.iterator();
+-                    for (int l = 0; l < list.size(); ++l) {
-+                if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Scissors - add collision debounce, using TimeUnit for better code readability
++                // Scissors start
-+                    Iterator iterator = list.size() <= 15 ? list.iterator() : list.subList(0, 15).iterator(); // Scissors
++                if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability
++                    for (int l = 0; l < Math.min(3, list.size()); ++l) {
++                // Scissors end
+                         Entity entity = (Entity) list.get(l);
  
-                     while (iterator.hasNext()) {
+                         if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) {
-                         Entity entity = (Entity) iterator.next();
+@@ -462,6 +466,14 @@ public abstract class AbstractMinecart extends Entity {
-@@ -414,6 +416,14 @@ public abstract class AbstractMinecart extends VehicleEntity {
                              entity.push(this);
                          }
                      }
 +
 +                    // Scissors start - Add a collision debounce
 +                    if (list.size() > 15) {
-+                        this.discard(null);
++                        this.discard();
 +                    } 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();
+                 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 db6aa75d642f4a7258f197933671907faf79c8f2..e4490494a865e129c69d7df3742f61860763a8d8 100644
+index 35aeba4e8430e6419caa9db4a0b931a994228618..289eb39b15a283b0d9dbc33823f3a73f87202907 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -5,6 +5,7 @@ import com.google.common.collect.UnmodifiableIterator;
@@ -63,7 +65,7 @@ index db6aa75d642f4a7258f197933671907faf79c8f2..e4490494a865e129c69d7df3742f6186
  import javax.annotation.Nullable;
  import net.minecraft.BlockUtil;
  import net.minecraft.core.BlockPos;
-@@ -108,6 +109,7 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+@@ -109,6 +110,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
      public double unoccupiedDeceleration = -1;
      public boolean landBoats = false;
      // CraftBukkit end
@@ -71,26 +73,27 @@ index db6aa75d642f4a7258f197933671907faf79c8f2..e4490494a865e129c69d7df3742f6186
  
      public Boat(EntityType<? extends Boat> type, Level world) {
          super(type, world);
-@@ -408,9 +410,9 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+@@ -421,10 +423,10 @@ public class Boat extends Entity 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()) {
+-            for (int j = 0; j < list.size(); ++j) {
-                 Entity entity = (Entity) iterator.next();
++            for (int j = 0; j < Math.min(3, list.size()); ++j) { // Scissors - Limit amount of vehicle collision checks to 3 maximum
-@@ -423,6 +425,14 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+                 Entity entity = (Entity) list.get(j);
+ 
+                 if (!entity.hasPassenger((Entity) this)) {
+@@ -435,6 +437,14 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
                      }
                  }
              }
 +
 +            // Scissors start - Add collision debounce
 +            if (list.size() > 15) {
-+                this.discard(null);
++                this.discard();
 +            } else if (list.size() > 3) {
 +                lastLargeCollision = System.currentTimeMillis();
 +            }

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

@@ -1,36 +1,35 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Allink <arclicious@vivaldi.net>
-Date: Mon, 15 Apr 2024 22:49:31 -0500
+Date: Mon, 18 Apr 2022 03:56:09 +0100
 Subject: [PATCH] Reset large tags
 
 
 diff --git a/src/main/java/net/minecraft/world/ContainerHelper.java b/src/main/java/net/minecraft/world/ContainerHelper.java
-index 4105bb71b1f1614b3e91478b40b85add94a9257b..52d2a8fd6e16c8d85f2544ffdb9ed4d18b298e1c 100644
+index 4092c7a8c2b0d9d26e6f4d97386735236300d132..04c47cf1a920ae6c356449df801227ee14f6dfb7 100644
 --- a/src/main/java/net/minecraft/world/ContainerHelper.java
 +++ b/src/main/java/net/minecraft/world/ContainerHelper.java
-@@ -2,6 +2,8 @@ package net.minecraft.world;
+@@ -2,6 +2,7 @@ package net.minecraft.world;
  
  import java.util.List;
  import java.util.function.Predicate;
-+
 +import me.totalfreedom.scissors.NbtUtility; // Scissors
  import net.minecraft.core.NonNullList;
  import net.minecraft.nbt.CompoundTag;
  import net.minecraft.nbt.ListTag;
-@@ -22,10 +24,12 @@ public class ContainerHelper {
+@@ -22,10 +23,12 @@ public class ContainerHelper {
  
      public static CompoundTag saveAllItems(CompoundTag nbt, NonNullList<ItemStack> stacks, boolean setIfEmpty) {
          ListTag listTag = new ListTag();
 +        long total = 0; // Scissors
  
-         for (int i = 0; i < stacks.size(); i++) {
+         for(int i = 0; i < stacks.size(); ++i) {
              ItemStack itemStack = stacks.get(i);
              if (!itemStack.isEmpty()) {
 +                total += NbtUtility.getTagSize(itemStack.getTag()); // Scissors
                  CompoundTag compoundTag = new CompoundTag();
                  compoundTag.putByte("Slot", (byte)i);
                  itemStack.save(compoundTag);
-@@ -33,7 +37,7 @@ public class ContainerHelper {
+@@ -33,7 +36,7 @@ public class ContainerHelper {
              }
          }
  
@@ -39,13 +38,13 @@ index 4105bb71b1f1614b3e91478b40b85add94a9257b..52d2a8fd6e16c8d85f2544ffdb9ed4d1
              nbt.put("Items", listTag);
          }
  
-@@ -42,11 +46,19 @@ public class ContainerHelper {
+@@ -42,11 +45,19 @@ public class ContainerHelper {
  
      public static void loadAllItems(CompoundTag nbt, NonNullList<ItemStack> stacks) {
          ListTag listTag = nbt.getList("Items", 10);
 +        long total = 0; // Scissors - Account for items inside containers
  
-         for (int i = 0; i < listTag.size(); i++) {
+         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()) {
@@ -60,19 +59,18 @@ index 4105bb71b1f1614b3e91478b40b85add94a9257b..52d2a8fd6e16c8d85f2544ffdb9ed4d1
              }
          }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1ad126d992d95062a3db08374db7a927f23a0cac..6af963d383293a4a6f8d517e2dc179ab70744b31 100644
+index d138660e459b2d09ba9dd7ae2bf3da499d9ae25c..8c5fe0166a5442a2fa4f212d7c53343c937f53f1 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -23,6 +23,8 @@ import java.util.function.Predicate;
+@@ -21,6 +21,7 @@ import java.util.function.Predicate;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.NbtUtility; // Scissors
-+import me.totalfreedom.scissors.NbtUtility;
  import net.minecraft.ChatFormatting;
  import net.minecraft.Util;
  import net.minecraft.advancements.CriteriaTriggers;
-@@ -278,6 +280,12 @@ public final class ItemStack {
+@@ -253,6 +254,12 @@ public final class ItemStack {
  
      // CraftBukkit - break into own method
      private void load(CompoundTag nbttagcompound) {
@@ -85,7 +83,7 @@ index 1ad126d992d95062a3db08374db7a927f23a0cac..6af963d383293a4a6f8d517e2dc179ab
          this.item = (Item) BuiltInRegistries.ITEM.get(new ResourceLocation(nbttagcompound.getString("id")));
          this.count = nbttagcompound.getByte("Count");
          if (nbttagcompound.contains("tag", 10)) {
-@@ -585,7 +593,11 @@ public final class ItemStack {
+@@ -556,7 +563,11 @@ public final class ItemStack {
          nbt.putString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString());
          nbt.putByte("Count", (byte) this.count);
          if (this.tag != null) {
@@ -98,7 +96,7 @@ index 1ad126d992d95062a3db08374db7a927f23a0cac..6af963d383293a4a6f8d517e2dc179ab
          }
  
          return nbt;
-@@ -919,6 +931,7 @@ public final class ItemStack {
+@@ -886,6 +897,7 @@ public final class ItemStack {
      // Paper end
  
      public void setTag(@Nullable CompoundTag nbt) {
@@ -107,19 +105,18 @@ index 1ad126d992d95062a3db08374db7a927f23a0cac..6af963d383293a4a6f8d517e2dc179ab
          this.processEnchantOrder(this.tag); // Paper
          if (this.getItem().canBeDepleted()) {
 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 89d06253b00604114e543ebbe12a9993ae95dc41..d0af3a9b956b37126811080d65474eacd76bc083 100644
+index 40e59b8db83aec1143e3c394427e916beea7c01f..f292aa0016e6f741b36ddc1417f6f63d248f987f 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
-@@ -9,6 +9,8 @@ import java.util.Iterator;
+@@ -9,6 +9,7 @@ import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.NbtUtility; // Scissors
-+import me.totalfreedom.scissors.NbtUtility;
  import net.minecraft.SharedConstants;
  import net.minecraft.Util;
  import net.minecraft.core.BlockPos;
-@@ -213,6 +215,17 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -212,6 +213,17 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
  
      public List<ItemStack> getContents() {
@@ -138,13 +135,13 @@ index 89d06253b00604114e543ebbe12a9993ae95dc41..d0af3a9b956b37126811080d65474eac
      }
  
 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 416aa989ebb18a8741cc9d605a1180ab830f6643..af7ed06c083161212784f746290129a17523575a 100644
+index 416aa989ebb18a8741cc9d605a1180ab830f6643..a9a8c9e68e5b767dec2c26495685da88e0caa627 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 me.totalfreedom.scissors.NbtUtility;
++import me.totalfreedom.scissors.NbtUtility; // Scissors
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.core.NonNullList;
@@ -167,19 +164,18 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..af7ed06c083161212784f746290129a1
      }
  
 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 9bb542ce3a8c52e1688bb1f66fc916dd23a5fd10..d8386aa10dc1616c4da87bc8078548d13bff5bdf 100644
+index c57efcb9a79337ec791e4e8f6671612f0a82b441..2cbb8170953cb555411db8c171a3d1d91eb799bb 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
-@@ -3,6 +3,8 @@ package net.minecraft.world.level.block.entity;
+@@ -3,6 +3,7 @@ package net.minecraft.world.level.block.entity;
  import java.util.Arrays;
  import java.util.Iterator;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.NbtUtility; // Scissors
-+import me.totalfreedom.scissors.NbtUtility;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.core.NonNullList;
-@@ -73,6 +75,17 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -73,6 +74,17 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
      }
  
      public List<ItemStack> getContents() {
@@ -198,13 +194,13 @@ index 9bb542ce3a8c52e1688bb1f66fc916dd23a5fd10..d8386aa10dc1616c4da87bc8078548d1
      }
  
 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 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..2cf4a854a40aabbfff2f6ee4fb9e36e8d466afd5 100644
+index a71414397bd45ee7bcacfeef0041d80dfa25f114..f51abf1722e98d7ce9e616d84472d847e597eafb 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 me.totalfreedom.scissors.NbtUtility;
++import me.totalfreedom.scissors.NbtUtility; // Scissors
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.core.NonNullList;
@@ -227,13 +223,13 @@ index 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..2cf4a854a40aabbfff2f6ee4fb9e36e8
      }
  
 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 881379681c39230a00b3a1f11cd87498984396c7..8e1ef455c1b563844c416021c478b2a34b90c418 100644
+index 881379681c39230a00b3a1f11cd87498984396c7..d0513b72cdaec3b67b9341d251367b193bafa40c 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 me.totalfreedom.scissors.NbtUtility;
++import me.totalfreedom.scissors.NbtUtility; // Scissors
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.NonNullList;
  import net.minecraft.nbt.CompoundTag;
@@ -256,19 +252,18 @@ index 881379681c39230a00b3a1f11cd87498984396c7..8e1ef455c1b563844c416021c478b2a3
      }
  
 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 cdb739df2a285032d25d84f4464f202a7a3fa578..69845474c207220c0146891be90e3232ac8a3547 100644
+index b11f51762ca289d99eaa49e66e31e58595bcea4e..06adfdc61f1064c1ec0db34632a8740fc09a1782 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
-@@ -6,6 +6,8 @@ import java.util.function.BooleanSupplier;
+@@ -6,6 +6,7 @@ import java.util.function.BooleanSupplier;
  import java.util.stream.Collectors;
  import java.util.stream.IntStream;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.NbtUtility; // Scissors
-+import me.totalfreedom.scissors.NbtUtility;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.core.NonNullList;
-@@ -57,6 +59,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -56,6 +57,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
      private int maxStack = MAX_STACK;
  
      public List<ItemStack> getContents() {
@@ -287,19 +282,18 @@ index cdb739df2a285032d25d84f4464f202a7a3fa578..69845474c207220c0146891be90e3232
      }
  
 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 1fa22445a4ecc8c08dbcf0cc6bd39dc5003604c4..c37f0f12283f528d16fd0450075eab1974ba5057 100644
+index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..db3a4a8cd19da9775bb0884c33494f1e8591b1fa 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
-@@ -4,6 +4,8 @@ import java.util.Iterator;
+@@ -3,6 +3,7 @@ package net.minecraft.world.level.block.entity;
  import java.util.List;
  import java.util.stream.IntStream;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.NbtUtility; // Scissors
-+import me.totalfreedom.scissors.NbtUtility;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.core.NonNullList;
-@@ -61,6 +63,17 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+@@ -60,6 +61,17 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
      public boolean opened;
  
      public List<ItemStack> getContents() {

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

@@ -5,10 +5,10 @@ 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 60961c54e870148b5c649045e7347ca1064b6bde..0ce25857188029335d0afd0a9f0c22b79d4b0b69 100644
+index 4bd7eea49a0720063db2a8ed10f53bd19e9499ad..953c2702880b358c0da4b8117c77b76bae849271 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -869,7 +869,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -861,7 +861,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              boolean flag = scoreboardteam != null && this.level().getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
  
              if (!flag) {

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

@@ -5,10 +5,10 @@ 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 eaad15a4d201356c34c1a09c7fbe5c35f76a2176..e166411e05287d97ea7c9d35b19d4ae3106401c3 100644
+index 66cf0a6cd1525ecf2615809210a26d55f445d07d..74fb79d4ea11f88f2c0de65b492a5fecc49684f1 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-@@ -280,6 +280,13 @@ public abstract class HangingEntity extends Entity {
+@@ -270,6 +270,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"));
  

patches/server/0028-Add-MasterBlockFireEvent.patch

@@ -1,35 +1,35 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Allink <arclicious@vivaldi.net>
-Date: Sun, 10 Dec 2023 18:11:55 -0600
+Date: Mon, 4 Jul 2022 22:12:19 +0100
 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 7ef14e4441a329c680a5dfe4bfb5033ffcb8f9d5..eff5bdf00b0aa7a9925ff59a62ead72509dc67b8 100644
+index 2e7c03b00bc941b86df6a7f1b2b188c9f0aede22..0ae03d3934ad7b2b38afa45a65c7753dcbe796d2 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;
+@@ -1,5 +1,6 @@
- import com.mojang.serialization.Codec;
+ package net.minecraft.world.level.block;
- import com.mojang.serialization.MapCodec;
+ 
- import com.mojang.serialization.codecs.RecordCodecBuilder;
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; // Scissors
-+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
+ import com.mojang.logging.LogUtils;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
- import net.minecraft.server.level.ServerLevel;
+@@ -25,6 +26,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-@@ -28,6 +29,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.bukkit.Location; // Scissors
  import org.slf4j.Logger;
  
  import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
-@@ -130,6 +132,14 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock {
+@@ -117,6 +119,15 @@ 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;
@@ -40,27 +40,26 @@ index 7ef14e4441a329c680a5dfe4bfb5033ffcb8f9d5..eff5bdf00b0aa7a9925ff59a62ead725
              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 447b0359922011fe12b1bb9628d23a47c9d7dc89..0d6be671e1512074ae1265fe93a5d5437f3929dd 100644
+index 182e16c1d968707a11329150d71b7d01df6c6e52..8582a9369cffe0eebeb82a81fc413d0bf4ad28ed 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;
+@@ -2,6 +2,7 @@ package net.minecraft.world.level.block.entity;
  
  import java.util.Arrays;
  import java.util.Optional;
-+
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; // Scissors
-+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Holder;
  import net.minecraft.core.Registry;
-@@ -17,6 +19,7 @@ import net.minecraft.world.level.block.JigsawBlock;
+@@ -17,6 +18,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;
++import org.bukkit.Location; // Scissors
  
  public class JigsawBlockEntity extends BlockEntity {
      public static final String TARGET = "target";
-@@ -134,6 +137,16 @@ public class JigsawBlockEntity extends BlockEntity {
+@@ -107,6 +109,16 @@ public class JigsawBlockEntity extends BlockEntity {
      }
  
      public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
@@ -78,27 +77,26 @@ index 447b0359922011fe12b1bb9628d23a47c9d7dc89..0d6be671e1512074ae1265fe93a5d543
          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 29c59e4a1283ac211b18b953ed6c03834a2587bd..fb385cd66226200ed0b8439cb6659dbac6c2b229 100644
+index 9792bf3ee083f571f1f4089d30beb586839f5f6b..fa6592cdc916d3578fccc6c0075eb616fd3f73eb 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;
+@@ -5,6 +5,7 @@ import java.util.Objects;
  import java.util.Optional;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; // Scissors
-+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
  import net.minecraft.ResourceLocationException;
  import net.minecraft.Util;
  import net.minecraft.core.BlockPos;
-@@ -29,6 +31,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProce
+@@ -29,6 +30,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;
++import org.bukkit.Location; // Scissors
  
  public class StructureBlockEntity extends BlockEntity {
      private static final int SCAN_CORNER_BLOCKS_RANGE = 5;
-@@ -259,7 +262,7 @@ public class StructureBlockEntity extends BlockEntity {
+@@ -264,7 +266,7 @@ public class StructureBlockEntity extends BlockEntity {
              return false;
          } else {
              BlockPos blockPos = this.getBlockPos();
@@ -107,10 +105,10 @@ index 29c59e4a1283ac211b18b953ed6c03834a2587bd..fb385cd66226200ed0b8439cb6659dba
              BlockPos blockPos2 = new BlockPos(blockPos.getX() - 80, this.level.getMinBuildHeight(), blockPos.getZ() - 80);
              BlockPos blockPos3 = new BlockPos(blockPos.getX() + 80, this.level.getMaxBuildHeight() - 1, blockPos.getZ() + 80);
              Stream<BlockPos> stream = this.getRelatedCorners(blockPos2, blockPos3);
-@@ -316,6 +319,16 @@ public class StructureBlockEntity extends BlockEntity {
+@@ -321,6 +323,16 @@ public class StructureBlockEntity extends BlockEntity {
-         if (this.structureName == null) {
+ 
-             return false;
+     public boolean saveStructure(boolean bl) {
-         } else {
+         if (this.mode == StructureMode.SAVE && !this.level.isClientSide && this.structureName != null) {
 +            // 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()));
@@ -124,10 +122,10 @@ index 29c59e4a1283ac211b18b953ed6c03834a2587bd..fb385cd66226200ed0b8439cb6659dba
              BlockPos blockPos = this.getBlockPos().offset(this.structurePos);
              ServerLevel serverLevel = (ServerLevel)this.level;
              StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager();
-@@ -367,6 +380,16 @@ public class StructureBlockEntity extends BlockEntity {
+@@ -358,6 +370,16 @@ public class StructureBlockEntity extends BlockEntity {
-         if (structureTemplate == null) {
+ 
-             return false;
+     public boolean loadStructure(ServerLevel world, boolean bl) {
-         } else {
+         if (this.mode == StructureMode.LOAD && this.structureName != null) {
 +            // 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()));
@@ -138,10 +136,10 @@ index 29c59e4a1283ac211b18b953ed6c03834a2587bd..fb385cd66226200ed0b8439cb6659dba
 +            }
 +            // Scissors end
 +
-             this.loadStructureInfo(structureTemplate);
+             StructureTemplateManager structureTemplateManager = world.getStructureManager();
-             return true;
+ 
-         }
+             Optional<StructureTemplate> optional;
-@@ -407,6 +430,15 @@ public class StructureBlockEntity extends BlockEntity {
+@@ -403,6 +425,16 @@ public class StructureBlockEntity extends BlockEntity {
      }
  
      public void unloadStructure() {
@@ -154,6 +152,7 @@ index 29c59e4a1283ac211b18b953ed6c03834a2587bd..fb385cd66226200ed0b8439cb6659dba
 +            return;
 +        }
 +        // Scissors end
++
          if (this.structureName != null) {
              ServerLevel serverLevel = (ServerLevel)this.level;
              StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager();

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

@@ -5,7 +5,7 @@ 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 860d33ac56680babd87358b1d7d2216dac3f7865..a60f594b3d7c8c30344f5e888e4309b8f75fdeaf 100644
+index 3c0651fa5a5db880202c9a3805a6455269c5f16d..d7ddd44fb9b571850515edc6ee2e6801092f6446 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,5 +1,6 @@
@@ -14,17 +14,19 @@ index 860d33ac56680babd87358b1d7d2216dac3f7865..a60f594b3d7c8c30344f5e888e4309b8
 +import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
- import com.mojang.authlib.GameProfile;
+ import com.mojang.brigadier.ParseResults;
-@@ -2033,6 +2034,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2113,6 +2114,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  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()) {
++
++                    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/0030-Prevent-invalid-container-events.patch

@@ -5,18 +5,18 @@ 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 a60f594b3d7c8c30344f5e888e4309b8f75fdeaf..cfe4f98458c1b1fd311535552b99937d1f319c0e 100644
+index bf7cf2108c0273552a41a9734dfd66b6a68a24d4..1c102fa91711ed595626633e127c89a83ed6b6c5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -29,6 +29,7 @@ import java.util.function.UnaryOperator;
+@@ -30,6 +30,7 @@ import java.util.function.UnaryOperator;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
 +import net.kyori.adventure.text.format.NamedTextColor; // Scissors
  import net.minecraft.ChatFormatting;
- import net.minecraft.SharedConstants;
+ import net.minecraft.CrashReport;
- import net.minecraft.Util;
+ import net.minecraft.CrashReportCategory;
-@@ -2898,6 +2899,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3037,6 +3038,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                          return;
                      }
  

patches/server/0031-Disable-running-commands-in-books-by-default.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable running commands in books by default
 
 
 diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
-index 793ab8acd7445984cff2628e3f001661dc20c8e5..0e6e0d6a9c645db0121637262a6cf90172d3c385 100644
+index 31911c09fe15753ae32fa39417bdc9e9de552a88..b810a5afcb2343174e37efb7dd8a36b968b07c3a 100644
 --- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java
 +++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
 @@ -2,6 +2,7 @@ package net.minecraft.world.item;
@@ -26,7 +26,7 @@ index 793ab8acd7445984cff2628e3f001661dc20c8e5..0e6e0d6a9c645db0121637262a6cf901
  import net.minecraft.stats.Stats;
  import net.minecraft.util.StringUtil;
  import net.minecraft.world.InteractionHand;
-@@ -162,9 +162,43 @@ public class WrittenBookItem extends Item {
+@@ -161,9 +161,43 @@ public class WrittenBookItem extends Item {
              component2 = Component.literal(text);
          }
  

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

@@ -1,76 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Sun, 10 Dec 2023 18:57:50 -0600
-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 f62640152027b874d4266d868574af062bd684d7..f94385837d5ed1ef52458b73410df5fd186d66e2 100644
---- a/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
-+++ b/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
-@@ -123,11 +123,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()) {
-@@ -179,7 +179,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/0032-Validate-block-entity-entity-tag-query-positions.patch

@@ -5,10 +5,10 @@ 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 cfe4f98458c1b1fd311535552b99937d1f319c0e..adbb1036913ba6299f2093c84480e4147a36b344 100644
+index 3c4825e295eefc7fcd628ba804fcc7dd5f160f28..280ebeee9bfae3059b6681873fa5633a9e929161 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1278,7 +1278,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1376,7 +1376,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (this.player.hasPermissions(2)) {
              Entity entity = this.player.level().getEntity(packet.getEntityId());
  
@@ -17,7 +17,7 @@ index cfe4f98458c1b1fd311535552b99937d1f319c0e..adbb1036913ba6299f2093c84480e414
                  CompoundTag nbttagcompound = entity.saveWithoutId(new CompoundTag());
  
                  this.player.connection.send(new ClientboundTagQueryPacket(packet.getTransactionId(), nbttagcompound));
-@@ -1310,7 +1310,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1388,7 +1388,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());

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

@@ -1,21 +1,21 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Allink <arclicious@vivaldi.net>
-Date: Tue, 23 Jan 2024 19:04:22 -0600
+Date: Wed, 13 Jul 2022 12:13:22 +0100
 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 927c7ea03560be0c86884cec70ee8e408e66cb07..c4bb1739ddcfd473ef788f97afa1019e24da8561 100644
+index 38cde466714e5663cd416b6afd5d2558e139ec09..ed48eaae75e709361a260421934b6b925ae9b427 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
 @@ -8,8 +8,10 @@ import java.util.Objects;
  import java.util.UUID;
  import java.util.function.UnaryOperator;
  import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.ScissorsConfig;
++import me.totalfreedom.scissors.ScissorsConfig; // Scissors
  import net.minecraft.commands.CommandSource;
  import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands;
++import net.minecraft.commands.Commands; // Scissors
  import net.minecraft.core.BlockPos;
  import net.minecraft.nbt.CompoundTag;
  import net.minecraft.nbt.NbtOps;
@@ -23,23 +23,30 @@ index 927c7ea03560be0c86884cec70ee8e408e66cb07..c4bb1739ddcfd473ef788f97afa1019e
  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.MinecraftServer; // Scissors
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.server.network.FilteredText;
-@@ -32,6 +35,8 @@ import net.minecraft.world.level.block.SignBlock;
+@@ -30,6 +33,7 @@ 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; // Scissors
-+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
  import org.slf4j.Logger;
  import org.bukkit.block.sign.Side;
  import org.bukkit.craftbukkit.block.CraftBlock;
-@@ -289,6 +294,21 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+@@ -37,6 +41,7 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
+ import org.bukkit.entity.Player;
+ import org.bukkit.event.block.SignChangeEvent;
+ // CraftBukkit end
++import org.bukkit.craftbukkit.CraftServer; // Scissors
+ 
+ public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements
+ 
+@@ -291,6 +296,21 @@ 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
+                 // Paper end
 +                // Scissors start - Add optional permissions to command signs
 +                final MinecraftServer vanillaServer = player.getServer();
 +                final CraftServer craftServer = vanillaServer.server;

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

@@ -5,10 +5,10 @@ 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 753200057e74b8e2d5274894b982e6ee946a559e..25df28c8a2061a754cb576634b63d5ca6e5011d1 100644
+index 0f70be614f8f5350ad558d0ae645cdf0027e1e76..c006ac8531cf2c029fd2fac449f96736a4afed0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-@@ -198,6 +198,7 @@ public final class CraftChatMessage {
+@@ -199,6 +199,7 @@ public final class CraftChatMessage {
      }
  
      public static Component[] fromString(String message, boolean keepNewlines, boolean plain) {

patches/server/0035-Prevent-velocity-freeze.patch

@@ -1,44 +1,38 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Allink <arclicious@vivaldi.net>
-Date: Sun, 10 Dec 2023 18:41:18 -0600
+Date: Sun, 27 Nov 2022 05:14:18 +0000
 Subject: [PATCH] Prevent velocity freeze
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-index 20ce474b72894a8bb3fc21018b9d79bbdc8bb14b..b5c87bb5f5d3526600520913f04cfc6614a62b81 100644
+index 6c9a8f062f989db022154155e8a05b334a0510da..978fad27ad17de03d108ade2c2bfa464b7d83491 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-@@ -1,6 +1,8 @@
+@@ -1,5 +1,6 @@
  package net.minecraft.world.entity.projectile;
  
- import javax.annotation.Nullable;
++import me.totalfreedom.scissors.MathUtility; // Scissors
-+
-+import me.totalfreedom.scissors.MathUtility;
  import net.minecraft.core.particles.ParticleOptions;
  import net.minecraft.core.particles.ParticleTypes;
  import net.minecraft.nbt.CompoundTag;
-@@ -50,12 +52,15 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -41,9 +42,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
-         // CraftBukkit end
          double d6 = Math.sqrt(d3 * d3 + d4 * d4 + d5 * d5);
  
--        if (d6 != 0.0D) {
+         if (d6 != 0.0D) {
 -            this.xPower = d3 / d6 * 0.1D;
 -            this.yPower = d4 / d6 * 0.1D;
 -            this.zPower = d5 / d6 * 0.1D;
-+        if (d6 != 0.0D)
-+        {
 +            // Scissors start - Prevent projectile velocity freeze
 +            //this.xPower = d3 / d6 * 0.1D;
 +            //this.yPower = d4 / d6 * 0.1D;
 +            //this.zPower = d5 / d6 * 0.1D;
++
 +            setPower(d3 / d6 * .1d, d4 / d6 * .1d, d5 / d6 * .1d);
++            // Scissors end
          }
--
-+        // Scissors end
-     }
  
-     public AbstractHurtingProjectile(EntityType<? extends AbstractHurtingProjectile> type, LivingEntity owner, double directionX, double directionY, double directionZ, Level world) {
+     }
-@@ -167,6 +172,25 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -141,6 +146,25 @@ public abstract class AbstractHurtingProjectile extends Projectile {
          nbt.put("power", this.newDoubleList(new double[]{this.xPower, this.yPower, this.zPower}));
      }
  
@@ -64,7 +58,7 @@ index 20ce474b72894a8bb3fc21018b9d79bbdc8bb14b..b5c87bb5f5d3526600520913f04cfc66
      @Override
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
-@@ -174,9 +198,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -148,9 +172,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
              ListTag nbttaglist = nbt.getList("power", 6);
  
              if (nbttaglist.size() == 3) {
@@ -81,7 +75,7 @@ index 20ce474b72894a8bb3fc21018b9d79bbdc8bb14b..b5c87bb5f5d3526600520913f04cfc66
              }
          }
  
-@@ -210,9 +238,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -184,9 +212,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
                      Vec3 vec3d = entity.getLookAngle();
  
                      this.setDeltaMovement(vec3d);

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

@@ -1,84 +1,85 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Allink <arclicious@vivaldi.net>
-Date: Mon, 15 Apr 2024 23:01:26 -0500
+Date: Tue, 31 Jan 2023 23:16:52 +0000
 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..4a8ab800d4a974aaf14872d50dcf01c806a0fe3b 100644
+index 74cf1c043beef03cfd5adf481414a5ee78bef2a6..516c61cbb8299828b2f28d4564d08ae1829649b5 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 me.totalfreedom.scissors.ScissorsConfig; // Scissors
  import net.minecraft.server.level.ServerPlayer;
  
  public interface OutgoingChatMessage {
-@@ -46,9 +47,19 @@ public interface OutgoingChatMessage {
+@@ -44,10 +45,21 @@ public interface OutgoingChatMessage {
              // Paper end
              PlayerChatMessage playerChatMessage = this.message.filter(filterMaskEnabled);
              playerChatMessage = unsigned != null ? playerChatMessage.withUnsignedContent(unsigned) : playerChatMessage; // Paper
 -            if (!playerChatMessage.isFullyFiltered()) {
-+            // Sccissors start
++            // 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()
++                playerChatMessage.filterMask(),
++                playerChatMessage.result()
 +            ), 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 0af9ed92824ccf30814eceb6a2c2e5c12661c991..c92374104b4aed2f952b250c5559ab9cc83532da 100644
+index c0a80824a0307ea673805015119cc834b268f0dc..9f28f86b1b56ea55ab39f6ac988c1f47c5312c6c 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;
+@@ -4,6 +4,7 @@ import com.mojang.logging.LogUtils;
+ import java.time.Instant;
  import java.util.UUID;
- import java.util.function.BooleanSupplier;
  import javax.annotation.Nullable;
-+
++import me.totalfreedom.scissors.ScissorsConfig; // Scissors
-+import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.util.SignatureUpdater;
  import net.minecraft.util.SignatureValidator;
  import net.minecraft.util.Signer;
- import net.minecraft.world.entity.player.ProfilePublicKey;
+@@ -41,7 +42,7 @@ public class SignedMessageChain {
-@@ -45,7 +47,7 @@ public class SignedMessageChain {
                  if (!playerChatMessage.verify(signatureValidator)) {
                      throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.unsigned_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event causes
                  } else {
 -                    if (playerChatMessage.hasExpiredServer(Instant.now())) {
 +                    if (playerChatMessage.hasExpiredServer(Instant.now()) && ScissorsConfig.chatSignaturesEnabled) { // Scissors
-                         LOGGER.warn("Received expired chat: '{}'. Is the client/server system time unsynchronized?", body.content());
+                         LOGGER.warn("Received expired chat: '{}'. Is the client/server system time unsynchronized?", (Object)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 80f0f88258770862f419e4faba4cfca4c0457b2c..c0aa9520d547d6d77169fd1dbb02844b90ef4a1d 100644
+index 562289bbe08b8d8e75436ad94cfc02e7c0e95d2e..a98134b3b59e194c03bb8110652a9208263c420d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,5 +1,6 @@
  package net.minecraft.server.network;
  
-+import me.totalfreedom.scissors.ScissorsConfig;
++import me.totalfreedom.scissors.ScissorsConfig; // Scissors
  import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
-@@ -2243,7 +2244,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2368,7 +2369,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     }
  
      private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {
-         ServerGamePacketListenerImpl.LOGGER.warn("Failed to update secure chat state for {}: '{}'", this.player.getGameProfile().getName(), exception.getComponent().getString());
 -        if (exception.shouldDisconnect()) {
 +        if (exception.shouldDisconnect() && ScissorsConfig.chatSignaturesEnabled) { // Scissors - Do not kick when chat signatures are disabled
              this.disconnect(exception.getComponent(), exception.kickCause); // Paper - kick event causes
          } else {
              this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED));
-@@ -2291,6 +2292,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2424,6 +2425,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              Optional<LastSeenMessages> optional = this.lastSeenMessages.applyUpdate(acknowledgment);
  
              if (optional.isEmpty()) {
@@ -86,7 +87,7 @@ index 80f0f88258770862f419e4faba4cfca4c0457b2c..c0aa9520d547d6d77169fd1dbb02844b
                  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
              }
-@@ -2489,6 +2491,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2632,6 +2634,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
          synchronized (this.lastSeenMessages) {
              if (!this.lastSeenMessages.applyOffset(packet.offset())) {
@@ -94,7 +95,7 @@ index 80f0f88258770862f419e4faba4cfca4c0457b2c..c0aa9520d547d6d77169fd1dbb02844b
                  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
              }
-@@ -3473,6 +3476,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3673,6 +3676,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());

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

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Fri, 28 Apr 2023 16:29:23 -0300
-Subject: [PATCH] Limit map decorations
-
-
-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 02e3d1c9c18952ba53507f7b6887fd3c81af33a9..61573844b236838fd219526ea35df8c7b0c94026 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
-@@ -63,7 +63,8 @@ public class ClientboundMapItemDataPacket implements Packet<ClientGamePacketList
-                 b.writeByte(icon.x());
-                 b.writeByte(icon.y());
-                 b.writeByte(icon.rot() & 15);
--                b.writeNullable(icon.name(), FriendlyByteBuf::writeComponent);
-+                final boolean passedNameCap = icon.name() == null || icon.name().getString().length() <= 32; // Scissors
-+                b.writeNullable(passedNameCap ? icon.name() : null, FriendlyByteBuf::writeComponent); // Scissors
-             }));
-         if (this.colorPatch != null) {
-             buf.writeByte(this.colorPatch.width);
-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 45269115e63cfc3bd7dc740a5694e2cc7c35bcb1..85ea95f55fd6177748edf921e2380142d93b8b06 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
-@@ -361,6 +361,11 @@ public class MapItemSavedData extends SavedData {
-     }
- 
-     private void addDecoration(MapDecoration.Type 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/0037-Patch-invalid-entity-rotation-log-spam.patch

@@ -5,10 +5,10 @@ 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 2ecf2d8ff546ed097cb3b547db22d28a31d29ec4..36b1a1cc66b9852d3b10c09cbf39262f51996663 100644
+index 842f8af14b2bd694a48ee6573d98e6cfcf910e16..e9e98f09e13d7f21333450d892cdc80b0667c915 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4751,7 +4751,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4617,7 +4617,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public void setXRot(float pitch) {
          if (!Float.isFinite(pitch)) {

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

@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Sun, 2 Apr 2023 16:29:51 -0300
+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 60d32afe2eecdfebdc91531ca3672f8f130ac30e..73b0f516f80ef810379860ea74697a3429c646e5 100644
+--- a/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
++++ b/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
+@@ -177,7 +177,7 @@ public abstract class MinMaxBounds<T extends Number> {
+             return value == null ? null : value * value;
+         }
+ 
+-        private Doubles(@Nullable Double min, @Nullable Double max) {
++        public Doubles(@Nullable Double min, @Nullable Double max) { // Scissors - private -> public
+             super(min, max);
+             this.minSq = squareOpt(min);
+             this.maxSq = 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 f25b9330e068c7d9e12cb57a7761cfef9ebaf7bc..e8cf963f0190438bbf65f827d144775ab0b02b63 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,7 @@ import java.util.function.BiConsumer;
+ import java.util.function.Function;
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
++import me.totalfreedom.scissors.MathUtility; // Scissors
+ import net.minecraft.advancements.critereon.MinMaxBounds;
+ import net.minecraft.commands.CommandSourceStack;
+ import net.minecraft.commands.arguments.EntityArgument;
+@@ -60,9 +61,27 @@ 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.getMin() != null ? Math.min(distance.getMin(), 1024) : null,
++            distance.getMax() != null ? Math.min(distance.getMax(), 1024) : null
++        );
+         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/0039-Limit-sculk-catalyst-cursor-positions.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Limit sculk catalyst cursor positions
 
 
 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 01e13e6d3ebd84cff0019f56efff16747420dc95..d4058bc31ca291cbc95eeef594fc35e1ff6a3dde 100644
+index de90a216321f7d82310a0d1c915fefe64360534c..7e52f6c26234cf6fa092151d51c0c6b70dc22ca8 100644
 --- a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
 +++ b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
 @@ -181,7 +181,7 @@ public class SculkSpreader {

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

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Fri, 28 Apr 2023 16:29:23 -0300
+Subject: [PATCH] Limit map decorations
+
+
+diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapDecoration.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapDecoration.java
+index 347d2914f9560a3ee8cea59444bc0dfbb7cf3456..b6a38b1458957bd444fea439fa81d2976ffb86e0 100644
+--- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapDecoration.java
++++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapDecoration.java
+@@ -2,6 +2,7 @@ package net.minecraft.world.level.saveddata.maps;
+ 
+ import java.util.Objects;
+ import javax.annotation.Nullable;
++import net.minecraft.ChatFormatting; // Scissors
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.util.Mth;
+ 
+@@ -14,6 +15,11 @@ public class MapDecoration {
+     private final Component name;
+ 
+     public MapDecoration(MapDecoration.Type type, byte x, byte z, byte rotation, @Nullable Component text) {
++        // Scissors start - Limit decoration text length
++        if (text != null && text.getString().length() > 32) {
++            text = null;
++        }
++        // Scissors end
+         this.type = type;
+         this.x = x;
+         this.y = z;
+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 50713f03c783c63f93710d986d94af544be0615a..feaf252eda57739fe012b865db8c03476a5b4d1a 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
+@@ -354,6 +354,11 @@ public class MapItemSavedData extends SavedData {
+     }
+ 
+     private void addDecoration(MapDecoration.Type 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/0041-Prevent-player-banning-using-duplicate-UUIDs.patch

@@ -5,19 +5,19 @@ 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 502bdc726b7890b00ee36871d905dea44e8719e3..1fbc8b372271bb4cd4375ca6b6b1d7e7961094fb 100644
+index 20099425babf5325005d11bf25faa783e3bc2715..cf02fc7199c893db66bebba6051bc10dbff859ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1667,7 +1667,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1628,7 +1628,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity != null) {
-             ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
+             ServerLevel.LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID().toString());
              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);
++                entity.discard();
 +            }
 +            // Scissors end
          }

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

@@ -5,10 +5,10 @@ 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
+index ff7198a03ab0da79c98513f4a1507e854484f4c2..e7060fce4ba3583cf5be5f6503fd861a24704d6d 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> {
+@@ -372,7 +372,7 @@ public final class EntityLookup implements LevelEntityGetter<Entity> {
                  return false;
              }
              if (this.entityByUUID.containsKey(entity.getUUID())) {

patches/server/0043-Fix-component-extra-empty-array-exploit.patch

@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Mon, 29 May 2023 19:34:50 -0300
+Subject: [PATCH] Fix component extra empty array exploit
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
+index 2873ed7c443ed8c8c57a8b1d3e444d229f10f07b..a2149452ee461002ea74189c5aa49cddd943d0cf 100644
+--- a/src/main/java/net/minecraft/network/chat/Component.java
++++ b/src/main/java/net/minecraft/network/chat/Component.java
+@@ -266,6 +266,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+                 if (!jsonelement.isJsonObject()) {
+                     if (jsonelement.isJsonArray()) {
+                         JsonArray jsonarray = jsonelement.getAsJsonArray();
++                        if (jsonarray.size() <= 0) throw new JsonParseException("Unexpected empty array of components"); // Scissors
+ 
+                         ichatmutablecomponent = null;
+                         Iterator iterator = jsonarray.iterator();

patches/server/0044-Add-depth-limit-to-Component-deserializer.patch

@@ -0,0 +1,125 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Wed, 31 May 2023 18:14:00 -0300
+Subject: [PATCH] Add depth limit to Component deserializer
+
+
+diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
+index a2149452ee461002ea74189c5aa49cddd943d0cf..f1d1501211a923c0ccab6b5982887c3a9262889b 100644
+--- a/src/main/java/net/minecraft/network/chat/Component.java
++++ b/src/main/java/net/minecraft/network/chat/Component.java
+@@ -26,6 +26,7 @@ import java.util.List;
+ import java.util.Map.Entry;
+ import java.util.Optional;
+ import javax.annotation.Nullable;
++import me.totalfreedom.scissors.ScissorsConfig; // Scissors
+ import net.minecraft.ChatFormatting; // Scissors
+ import net.minecraft.Util;
+ import net.minecraft.network.chat.contents.BlockDataSource;
+@@ -44,6 +45,7 @@ import net.minecraft.util.GsonHelper;
+ import net.minecraft.util.LowerCaseEnumTypeAdapterFactory;
+ // CraftBukkit start
+ import com.google.common.collect.Streams;
++import java.util.regex.Pattern; // Scissors
+ import java.util.stream.Stream;
+ // CraftBukkit end
+ 
+@@ -254,10 +256,16 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+                 throw new IllegalStateException("Couldn't get field 'lineStart' for JsonReader", nosuchfieldexception);
+             }
+         });
++        private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("%[0-9]+\\$s"); // Scissors
+ 
+         public Serializer() {}
+ 
+-        public MutableComponent deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++        // Scissors start
++        private MutableComponent deserialize(JsonElement jsonelement, JsonDeserializationContext jsondeserializationcontext, int depth) throws JsonParseException {
++            if (depth > ScissorsConfig.componentDepthLimit) {
++                throw new JsonParseException("Depth limit exceeded");
++            }
++        // Scissors end
+             if (jsonelement.isJsonPrimitive()) {
+                 return Component.literal(jsonelement.getAsString());
+             } else {
+@@ -273,7 +281,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+ 
+                         while (iterator.hasNext()) {
+                             JsonElement jsonelement1 = (JsonElement) iterator.next();
+-                            MutableComponent ichatmutablecomponent1 = this.deserialize(jsonelement1, jsonelement1.getClass(), jsondeserializationcontext);
++                            MutableComponent ichatmutablecomponent1 = this.deserialize(jsonelement1, jsondeserializationcontext, depth + 1); // Scissors
+ 
+                             if (ichatmutablecomponent == null) {
+                                 ichatmutablecomponent = ichatmutablecomponent1;
+@@ -297,12 +305,17 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+                         s = GsonHelper.getAsString(jsonobject, "translate");
+                         String s1 = GsonHelper.getAsString(jsonobject, "fallback", (String) null);
+ 
++                        // Scissors start - Penalize depth for placeholders in translate & fallback
++                        long translate_placeholders = PLACEHOLDER_PATTERN.matcher(s).results().count();
++                        long fallback_placeholders = s1 != null ? PLACEHOLDER_PATTERN.matcher(s1).results().count() : 0;
++                        int penalty = (int)Math.max(translate_placeholders, fallback_placeholders) * 12;
++                        // Scissors end
+                         if (jsonobject.has("with")) {
+                             JsonArray jsonarray1 = GsonHelper.getAsJsonArray(jsonobject, "with");
+                             Object[] aobject = new Object[jsonarray1.size()];
+ 
+                             for (int i = 0; i < aobject.length; ++i) {
+-                                aobject[i] = Serializer.unwrapTextArgument(this.deserialize(jsonarray1.get(i), type, jsondeserializationcontext));
++                                aobject[i] = Serializer.unwrapTextArgument(this.deserialize(jsonarray1.get(i), jsondeserializationcontext, depth + 1 + penalty)); // Scissors
+                             }
+ 
+                             ichatmutablecomponent = Component.translatableWithFallback(s, s1, aobject);
+@@ -318,7 +331,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+ 
+                         ichatmutablecomponent = Component.score(GsonHelper.getAsString(jsonobject1, "name"), GsonHelper.getAsString(jsonobject1, "objective"));
+                     } else if (jsonobject.has("selector")) {
+-                        Optional<Component> optional = this.parseSeparator(type, jsondeserializationcontext, jsonobject);
++                        Optional<Component> optional = this.parseSeparator(jsondeserializationcontext, jsonobject, depth + 1); // Scissors
+ 
+                         ichatmutablecomponent = Component.selector(GsonHelper.getAsString(jsonobject, "selector"), optional);
+                     } else if (jsonobject.has("keybind")) {
+@@ -329,7 +342,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+                         }
+ 
+                         s = GsonHelper.getAsString(jsonobject, "nbt");
+-                        Optional<Component> optional1 = this.parseSeparator(type, jsondeserializationcontext, jsonobject);
++                        Optional<Component> optional1 = this.parseSeparator(jsondeserializationcontext, jsonobject, depth + 1); // Scissors
+                         boolean flag = GsonHelper.getAsBoolean(jsonobject, "interpret", false);
+                         Object object;
+ 
+@@ -356,7 +369,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+                         }
+ 
+                         for (int j = 0; j < jsonarray2.size(); ++j) {
+-                            ichatmutablecomponent.append((Component) this.deserialize(jsonarray2.get(j), type, jsondeserializationcontext));
++                            ichatmutablecomponent.append((Component) this.deserialize(jsonarray2.get(j), jsondeserializationcontext, depth + 1)); // Scissors
+                         }
+                     }
+ 
+@@ -366,6 +379,12 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+             }
+         }
+ 
++        // Scissors start
++        public MutableComponent deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++            return this.deserialize(jsonelement, jsondeserializationcontext, 1);
++        }
++        // Scissors end
++
+         private static Object unwrapTextArgument(Object text) {
+             if (text instanceof Component) {
+                 Component ichatbasecomponent = (Component) text;
+@@ -384,8 +403,10 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+             return text;
+         }
+ 
+-        private Optional<Component> parseSeparator(Type type, JsonDeserializationContext context, JsonObject json) {
+-            return json.has("separator") ? Optional.of(this.deserialize(json.get("separator"), type, context)) : Optional.empty();
++        // Scissors start
++        private Optional<Component> parseSeparator(JsonDeserializationContext context, JsonObject json, int depth) {
++            return json.has("separator") ? Optional.of(this.deserialize(json.get("separator"), context, depth + 1)) : Optional.empty();
++            // Scissors end
+         }
+ 
+         private void serializeStyle(Style style, JsonObject json, JsonSerializationContext context) {

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Allink <arclicious@vivaldi.net>
-Date: Mon, 15 Apr 2024 23:27:16 -0500
+Date: Fri, 2 Jun 2023 20:55:18 +0100
 Subject: [PATCH] Implement command block events
 
 
@@ -18,36 +18,36 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400
      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 88c98ba7673808819b8f85876f22743bc3a4f471..f96c0c5007d9e1d86bfe27518815dc798e431c6a 100644
+index 08390409bbaf9f3ae8260ab36ea5e0580e93b3e3..e2f7cef0edf2775083eb87b1cb5984ec8b25c76f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,6 +1,8 @@
  package net.minecraft.server.network;
  
- import me.totalfreedom.scissors.ScissorsConfig;
+ import me.totalfreedom.scissors.ScissorsConfig; // Scissors
-+import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent;
++import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent; // Scissors
-+import me.totalfreedom.scissors.event.block.CommandMinecartPlayerEditEvent;
++import me.totalfreedom.scissors.event.block.CommandMinecartPlayerEditEvent; // Scissors
  import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
-@@ -155,6 +157,7 @@ import net.minecraft.world.entity.player.Inventory;
+@@ -159,6 +161,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.entity.vehicle.MinecartCommandBlock; // Scissors
- import net.minecraft.world.inventory.AbstractContainerMenu;
+ import net.minecraft.world.item.BlockItem;
- import net.minecraft.world.inventory.AnvilMenu;
+ import net.minecraft.world.item.BucketItem;
- import net.minecraft.world.inventory.BeaconMenu;
+ import net.minecraft.world.item.Item;
-@@ -189,6 +192,8 @@ import net.minecraft.world.phys.Vec3;
+@@ -187,6 +190,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.block.CraftCommandBlock; // Scissors
-+import org.bukkit.craftbukkit.entity.CraftMinecartCommand;
++import org.bukkit.craftbukkit.entity.CraftMinecartCommand; // Scissors
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -905,6 +910,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1007,6 +1012,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity);
                  }
  
@@ -64,7 +64,7 @@ index 88c98ba7673808819b8f85876f22743bc3a4f471..f96c0c5007d9e1d86bfe27518815dc79
                  commandblocklistenerabstract.setCommand(s);
                  commandblocklistenerabstract.setTrackOutput(flag);
                  if (!flag) {
-@@ -936,7 +951,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1038,7 +1053,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level());
  
              if (commandblocklistenerabstract != null) {
@@ -79,6 +79,7 @@ index 88c98ba7673808819b8f85876f22743bc3a4f471..f96c0c5007d9e1d86bfe27518815dc79
 +
 +                command = event.getNewCommand();
 +                commandblocklistenerabstract.setCommand(command);
++
 +                // Scissors end
                  commandblocklistenerabstract.setTrackOutput(packet.isTrackOutput());
                  if (!packet.isTrackOutput()) {

patches/server/0046-Add-depth-limit-to-SNBT.patch

@@ -1,17 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Allink <arclicious@vivaldi.net>
-Date: Mon, 15 Apr 2024 23:40:27 -0500
+Date: Fri, 2 Jun 2023 22:13:54 +0100
 Subject: [PATCH] Add depth limit to SNBT
 
 
 diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java
-index c77860a141064aea6a0b510bb44d35fea90aee42..3be3dd61b8a27b3a8ca3c72ae5ffa2ea8fa00231 100644
+index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..b70bafe2766efcbcce00287e6511a588560564a6 100644
 --- a/src/main/java/net/minecraft/nbt/TagParser.java
 +++ b/src/main/java/net/minecraft/nbt/TagParser.java
-@@ -184,9 +184,47 @@ public class TagParser {
+@@ -169,9 +169,56 @@ public class TagParser {
+         }
  
          this.expect('}');
-         this.depth--; // Paper
 -        return compoundTag;
 +        return exceedsDepthLimit(compoundTag) ? new CompoundTag() : compoundTag; // Scissors - Add depth limit to SNBT
      }
@@ -21,30 +21,39 @@ index c77860a141064aea6a0b510bb44d35fea90aee42..3be3dd61b8a27b3a8ca3c72ae5ffa2ea
 +        return this.exceedsDepthLimit(0, tag);
 +    }
 +
-+    private boolean exceedsDepthLimit(long depth, Tag tag) {
++    private boolean exceedsDepthLimit(long depth, Tag tag)
-+        if (depth > 256) {
++    {
++        if (depth > 256)
++        {
 +            return true;
 +        }
 +
-+        if (tag instanceof ListTag listTag) {
++        if (tag instanceof ListTag listTag)
-+            for (Tag childTag : listTag) {
++        {
++            for (Tag childTag : listTag)
++            {
 +                boolean returnValue = this.exceedsDepthLimit(depth + 1, childTag);
 +
-+                if (returnValue) {
++                if (returnValue)
++                {
 +                    return true;
 +                }
 +            }
-+        } else if (tag instanceof CompoundTag compoundTag) {
++        } else if (tag instanceof CompoundTag compoundTag)
-+            for (String key : compoundTag.getAllKeys()) {
++        {
++            for (String key: compoundTag.getAllKeys())
++            {
 +                Tag childTag = compoundTag.get(key);
 +
-+                if (childTag == null) {
++                if (childTag == null)
++                {
 +                    continue;
 +                }
 +
 +                boolean returnValue = this.exceedsDepthLimit(depth + 1, childTag);
 +
-+                if (returnValue) {
++                if (returnValue)
++                {
 +                    return true;
 +                }
 +            }
@@ -57,45 +66,45 @@ index c77860a141064aea6a0b510bb44d35fea90aee42..3be3dd61b8a27b3a8ca3c72ae5ffa2ea
      private Tag readListTag() throws CommandSyntaxException {
          this.expect('[');
          this.reader.skipWhitespace();
-@@ -220,7 +258,7 @@ public class TagParser {
+@@ -203,7 +250,7 @@ public class TagParser {
+             }
  
              this.expect(']');
-             this.depth--; // Paper
 -            return listTag;
 +            return exceedsDepthLimit(listTag) ? new ListTag() : listTag; // Scissors - Add depth limit to SNBT
          }
      }
  
-@@ -245,7 +283,7 @@ public class TagParser {
+@@ -228,7 +275,7 @@ public class TagParser {
      }
  
      private <T extends Number> List<T> readArray(TagType<?> arrayTypeReader, TagType<?> typeReader) throws CommandSyntaxException {
 -        List<T> list = Lists.newArrayList();
 +        List<Number> list = Lists.newArrayList(); // Scissors - List<T> -> List<Number>
  
-         while (this.reader.peek() != ']') {
+         while(true) {
-             int i = this.reader.getCursor();
+             if (this.reader.peek() != ']') {
-@@ -257,11 +295,11 @@ public class TagParser {
+@@ -241,11 +288,11 @@ public class TagParser {
+                 }
+ 
+                 if (typeReader == ByteTag.TYPE) {
+-                    list.add((T)((NumericTag)tag).getAsByte());
++                    list.add(((NumericTag)tag).getAsByte()); // Scissors - Remove (T) cast
+                 } else if (typeReader == LongTag.TYPE) {
+-                    list.add((T)((NumericTag)tag).getAsLong());
++                    list.add(((NumericTag)tag).getAsLong()); // Scissors - Remove (T) cast
+                 } else {
+-                    list.add((T)((NumericTag)tag).getAsInt());
++                    list.add(((NumericTag)tag).getAsInt()); // Scissors - Remove (T) cast
+                 }
+ 
+                 if (this.hasElementSeparator()) {
+@@ -257,7 +304,7 @@ public class TagParser {
              }
  
-             if (typeReader == ByteTag.TYPE) {
+             this.expect(']');
--                list.add((T)(Byte)((NumericTag)tag).getAsByte()); // Paper - decompile fix
+-            return list;
-+                list.add(((NumericTag)tag).getAsByte()); // Scissors - Remove (T) cast
++            return (List<T>) list; // Scissors - Cast to List<T>
-             } else if (typeReader == LongTag.TYPE) {
--                list.add((T)(Long)((NumericTag)tag).getAsLong()); // Paper - decompile fix
-+                list.add(((NumericTag)tag).getAsLong()); // Scissors - Remove (T) cast
-             } else {
--                list.add((T)(Integer)((NumericTag)tag).getAsInt()); // Paper - decompile fix
-+                list.add(((NumericTag)tag).getAsInt()); // Scissors - Remove (T) cast
-             }
- 
-             if (!this.hasElementSeparator()) {
-@@ -274,7 +312,7 @@ public class TagParser {
          }
- 
-         this.expect(']');
--        return list;
-+        return (List<T>) list; // Scissors - Cast to List<T>
      }
  
-     private boolean hasElementSeparator() {

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

@@ -5,10 +5,10 @@ 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 4b81b0180dfc96fc6a88646838a886ca5b5d301b..63ea77b3e965ff18571492d511ef7c1082441f9d 100644
+index 5c951ef93fe4cf4f085df86b0cefc02bc2610ab9..1d08e3a9493154e075a289d2eb9a8772289534af 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
-@@ -87,7 +87,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -83,7 +83,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
      private double effectRange = -1;
  
      public double getEffectRange() {
@@ -17,10 +17,10 @@ index 4b81b0180dfc96fc6a88646838a886ca5b5d301b..63ea77b3e965ff18571492d511ef7c10
              return this.levels * 10 + 10;
          } else {
              return effectRange;
-@@ -456,6 +456,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -428,6 +428,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
+         this.effectRange = nbt.contains(PAPER_RANGE_TAG, 6) ? nbt.getDouble(PAPER_RANGE_TAG) : -1; // Paper
 +        if (this.effectRange > 256) this.effectRange = 256; // Scissors
      }
  

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

@@ -5,10 +5,10 @@ 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
+index ec81be70cd6f92bbf9011395cb361f0ce54c5ad0..97da1db83dca24759b52fc2d0a360187dbef86f1 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 {
+@@ -56,7 +56,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
                  this.stack.push(entry);
              }
          } else if (this.count - 1 == this.maxChainedNeighborUpdates) {

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

@@ -1,117 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Focusvity <nathan.curran10012@gmail.com>
-Date: Mon, 5 Feb 2024 19:39:23 +1100
-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 ae84d06564b2560e13404f6d89f88ad71dbc2cc6..df3c03aeaee5c12c5d57584535c9c7aa01be7dd3 100644
---- a/src/main/java/net/minecraft/network/chat/Component.java
-+++ b/src/main/java/net/minecraft/network/chat/Component.java
-@@ -3,9 +3,11 @@ 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.JsonArray;
- import com.google.gson.JsonDeserializationContext;
- import com.google.gson.JsonDeserializer;
- import com.google.gson.JsonElement;
-+import com.google.gson.JsonObject;
- import com.google.gson.JsonParseException;
- import com.google.gson.JsonParser;
- import com.google.gson.JsonSerializationContext;
-@@ -13,6 +15,7 @@ import com.google.gson.JsonSerializer;
- import com.google.gson.stream.JsonReader;
- import com.mojang.brigadier.Message;
- import com.mojang.serialization.JsonOps;
-+
- import java.io.StringReader;
- import java.lang.reflect.Type;
- import java.util.ArrayList;
-@@ -23,6 +26,9 @@ import java.util.List;
- import java.util.Optional;
- import java.util.UUID;
- import javax.annotation.Nullable;
-+
-+import me.totalfreedom.scissors.ScissorsConfig; // Scissors
-+import net.minecraft.ChatFormatting;
- import net.minecraft.Util;
- import net.minecraft.network.chat.contents.DataSource;
- import net.minecraft.network.chat.contents.KeybindContents;
-@@ -33,8 +39,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; // Scissors
- import java.util.stream.Stream;
- // CraftBukkit end
- 
-@@ -284,10 +292,65 @@ 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) {
-+            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) Util.getOrThrow(ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, json), JsonParseException::new);
-         }
- 

patches/server/0050-Fix-packet-related-lag-exploits.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix packet-related lag exploits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a..88c98ba7673808819b8f85876f22743bc3a4f471 100644
+index e2f7cef0edf2775083eb87b1cb5984ec8b25c76f..c645e05ec6c309448460c7e983931b9dc79a7f7e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -865,7 +865,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -972,7 +972,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              this.player.sendSystemMessage(Component.translatable("advMode.notEnabled"));
          } else if (!this.player.canUseGameMasterBlocks() && (!this.player.isCreative() || !this.player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission
              this.player.sendSystemMessage(Component.translatable("advMode.notAllowed"));
@@ -17,7 +17,7 @@ index 8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a..88c98ba7673808819b8f85876f22743b
              BaseCommandBlock commandblocklistenerabstract = null;
              CommandBlockEntity tileentitycommand = null;
              BlockPos blockposition = packet.getPos();
-@@ -1013,7 +1013,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1139,7 +1139,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
@@ -26,7 +26,7 @@ index 8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a..88c98ba7673808819b8f85876f22743b
              BlockPos blockposition = packet.getPos();
              BlockState iblockdata = this.player.level().getBlockState(blockposition);
              BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
-@@ -1071,7 +1071,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1197,7 +1197,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
@@ -35,7 +35,7 @@ index 8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a..88c98ba7673808819b8f85876f22743b
              BlockPos blockposition = packet.getPos();
              BlockState iblockdata = this.player.level().getBlockState(blockposition);
              BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
-@@ -1096,7 +1096,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1220,7 +1220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());

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

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Focusvity <nathan.curran10012@gmail.com>
-Date: Sun, 11 Feb 2024 19:44:20 +1100
-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 8d2c0accadaf0c5d28e7db6e62a05f6c619cf02f..75d31897711cf5917bc6f8082edddbb502c46a95 100644
---- a/src/main/java/net/minecraft/world/item/BlockItem.java
-+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -4,12 +4,19 @@ import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
- import java.util.Objects;
-+// Scissors start
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+// Scissors end
- import java.util.stream.Stream;
- import javax.annotation.Nullable;
-+
-+import me.totalfreedom.scissors.ScissorsConfig; // Scissors
- import net.minecraft.advancements.CriteriaTriggers;
- import net.minecraft.core.BlockPos;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.ListTag;
-+import net.minecraft.nbt.Tag; // Scissors
- import net.minecraft.network.chat.Component;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerLevel;
-@@ -240,6 +247,35 @@ public class BlockItem extends Item {
-             if (nbttagcompound != null) {
-                 BlockEntity tileentity = world.getBlockEntity(pos);
- 
-+                // Scissors start
-+                if (nbttagcompound.contains("CustomName")) {
-+                    String customName = nbttagcompound.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 : nbttagcompound.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/0051-Limit-save-data-for-Bees-and-Vexes.patch

@@ -5,10 +5,10 @@ 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 f9521a6e115f0c975a7885b024c99eae300b63bf..c1598d0caee40a7d73af549b31b61ee7aae77315 100644
+index 55026e1731e41b4e3e4c6a8fef5d96a32051a556..4a8383d48da4fcf39ec528a00cd09417f8d08c57 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -234,8 +234,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -227,8 +227,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
      @Override
      public void readAdditionalSaveData(CompoundTag nbt) {
          this.hivePos = null;
@@ -24,7 +24,7 @@ index f9521a6e115f0c975a7885b024c99eae300b63bf..c1598d0caee40a7d73af549b31b61ee7
  
          this.savedFlowerPos = null;
 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 f443006c1e32feee97b32312814e2447a50c45e2..ad418449f5ffd4bcceb5834b1385dc69259f3a21 100644
+index 65cb385ab294e362d666a6d03c4496cdc3b64890..42c3e946e51f6dcb100078969a4fb46c77f42b2d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -118,8 +118,12 @@ public class Vex extends Monster implements TraceableEntity {

patches/server/0052-Mute-invalid-attributes.patch

@@ -5,31 +5,28 @@ Subject: [PATCH] Mute invalid attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index b99a080ab27e24d8131fda931ca70d6d271bb01c..f88b31d9bfc8b332230fa318ba2c1de14d5cc9be 100644
+index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..d304612325d6c70a4100582d6c0fbfeecd8716d1 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-@@ -135,7 +135,10 @@ public class AttributeMap {
+@@ -145,7 +145,7 @@ public class AttributeMap {
-                 if (attributeInstance != null) {
-                     attributeInstance.load(compoundTag);
                  }
--            }, () -> LOGGER.warn("Ignoring unknown attribute '{}'", string));
+ 
-+
+             }, () -> {
-+            }, () -> {
+-                LOGGER.warn("Ignoring unknown attribute '{}'", (Object)string);
 +                // LOGGER.warn("Ignoring unknown attribute '{}'", (Object)string); // Scissors - Mute invalid attributes
-+            });
+             });
          }
-     }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java
-index a38e91552ead256bd8dd3b74794d742555681c2d..116af10e6e2467a3e3b0095c4968a79ebb4a19d6 100644
+index 8de09eea46c27db9d8c472e84f768976769d1b0b..c8d05d35368e0cf593bcc3589b6c108a901bdc22 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeModifier.java
 @@ -90,7 +90,7 @@ public class AttributeModifier {
              AttributeModifier.Operation operation = AttributeModifier.Operation.fromValue(nbt.getInt("Operation"));
              return new AttributeModifier(uUID, nbt.getString("Name"), nbt.getDouble("Amount"), operation);
          } catch (Exception var3) {
--            LOGGER.warn("Unable to create attribute: {}", var3.getMessage());
+-            LOGGER.warn("Unable to create attribute: {}", (Object)var3.getMessage());
-+            // LOGGER.warn("Unable to create attribute: {}", var3.getMessage()); // Scissors - Mute invalid attributes
++            // LOGGER.warn("Unable to create attribute: {}", (Object)var3.getMessage()); // Scissors - Mute invalid attributes
              return null;
          }
      }

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

@@ -5,7 +5,7 @@ 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..a8bcadbf64d5034b172427e16b1468b4c91c4518 100644
+index bca131e9c428e2cb073ae2ef517dda12f73a5dcd..b9d603c82b12299e94c31928b36c9517834cff62 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 {
@@ -18,10 +18,10 @@ index 1b1a210a86121049e507a497649727a99452c0a2..a8bcadbf64d5034b172427e16b1468b4
          } 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 13f60a16f07c50a278b158d64180009020a4dca6..289361cbaad2ca6392ee66627becb8f973bb1e54 100644
+index a3456b35db4e938f91d6bc32d4d202a011bf13c4..aad0b066e4fd63195aa117c5a03f64846bf46fbd 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 {
+@@ -32,7 +32,7 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
      @Override
      public void doServerTick() {
          if (this.attackTarget == null) {

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

@@ -5,10 +5,10 @@ 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 6f52256bfb668aee7fd1628c1c0c7b3434b847a6..74f1227ecf664cf0d4f62d6f9c3e65ffc07b146e 100644
+index a2fc2c0437999dd09f080eafe8ea466b16cdf57b..0dcf1d7e041477fe31dce4b4ee707399520d30f2 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
-@@ -113,7 +113,7 @@ public class SkullBlockEntity extends BlockEntity {
+@@ -80,7 +80,7 @@ public class SkullBlockEntity extends BlockEntity {
          }
  
          if (nbt.contains("note_block_sound", 8)) {

patches/server/0055-Don-t-return-null-Components-in-the-Component-codec.patch

@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Fri, 28 Jul 2023 19:33:23 -0300
+Subject: [PATCH] Don't return null Components in the Component codec
+
+Found by Sk8kman
+
+diff --git a/src/main/java/net/minecraft/util/ExtraCodecs.java b/src/main/java/net/minecraft/util/ExtraCodecs.java
+index 066d423dc908080157586555ba01053a2477d570..aa6e5de37ce69c9bc6b8e1e0b5ab0ee918fc27e2 100644
+--- a/src/main/java/net/minecraft/util/ExtraCodecs.java
++++ b/src/main/java/net/minecraft/util/ExtraCodecs.java
+@@ -62,7 +62,10 @@ public class ExtraCodecs {
+     });
+     public static final Codec<Component> COMPONENT = JSON.flatXmap((element) -> {
+         try {
+-            return DataResult.success(Component.Serializer.fromJson(element));
++            // Scissors start
++            final Component component = Component.Serializer.fromJson(element);
++            return DataResult.success(component != null ? component : Component.empty());
++            // Scissors end
+         } catch (JsonParseException var2) {
+             return DataResult.error(var2::getMessage);
+         }
+@@ -75,7 +78,10 @@ public class ExtraCodecs {
+     });
+     public static final Codec<Component> FLAT_COMPONENT = Codec.STRING.flatXmap((json) -> {
+         try {
+-            return DataResult.success(Component.Serializer.fromJson(json));
++            // Scissors start
++            final Component component = Component.Serializer.fromJson(json);
++            return DataResult.success(component != null ? component : Component.empty());
++            // Scissors end
+         } catch (JsonParseException var2) {
+             return DataResult.error(var2::getMessage);
+         }
+@@ -246,7 +252,7 @@ public class ExtraCodecs {
+         }, (pair) -> {
+             return ImmutableList.of(leftFunction.apply(pair), rightFunction.apply(pair));
+         });
+-        Codec<I> codec3 = RecordCodecBuilder.<Pair>create((instance) -> {
++        Codec<I> codec3 = RecordCodecBuilder.<Pair<P,P>>create((instance) -> { // Scissors - Decompile error
+             return instance.group(codec.fieldOf(leftFieldName).forGetter(Pair::getFirst), codec.fieldOf(rightFieldName).forGetter(Pair::getSecond)).apply(instance, Pair::of);
+         }).comapFlatMap((pair) -> {
+             return combineFunction.apply((P)pair.getFirst(), (P)pair.getSecond());
+@@ -278,7 +284,7 @@ public class ExtraCodecs {
+                 Optional<Pair<A, T>> optional = dataResult.resultOrPartial(mutableObject::setValue);
+                 return optional.isPresent() ? dataResult : DataResult.error(() -> {
+                     return "(" + (String)mutableObject.getValue() + " -> using default)";
+-                }, Pair.of(object, object));
++                }, (Pair<A, T>) Pair.of(object, object)); // Scissors - Decompile error
+             }
+ 
+             public <T> DataResult<T> coApply(DynamicOps<T> dynamicOps, A objectx, DataResult<T> dataResult) {
+@@ -565,7 +571,7 @@ public class ExtraCodecs {
+ 
+     static record LazyInitializedCodec<A>(Supplier<Codec<A>> delegate) implements Codec<A> {
+         LazyInitializedCodec {
+-            supplier = Suppliers.memoize(supplier::get);
++            delegate = Suppliers.memoize(delegate::get); // Scissors - Decompile error
+         }
+ 
+         public <T> DataResult<Pair<A, T>> decode(DynamicOps<T> dynamicOps, T object) {

settings.gradle.kts

@@ -7,4 +7,4 @@ pluginManagement {
 
 rootProject.name = "Scissors"
 
-include("Scissors-API", "Scissors-Server")
+include("aswm-api", "aswm-core", "Scissors-API", "Scissors-Server")