Update Jenkinsfile (#101)

.gitignore

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

Jenkinsfile

@@ -18,8 +18,7 @@ pipeline {
                 }
                 sh """
                     #!/bin/sh
-                    BRANCH=\$(echo "\${BRANCH_NAME}" | sed 's/\\//_/g')
+                    mv \${WORKSPACE}/build/libs/Scissors-paperclip-*.jar \${WORKSPACE}/build/libs/scissors-\${BRANCH_NAME}-\${BUILD_NUMBER}.jar
-                    mv \${WORKSPACE}/build/libs/Scissors-paperclip-*.jar \${WORKSPACE}/build/libs/scissors-\${BRANCH}-\${BUILD_NUMBER}.jar
                     rm \${WORKSPACE}/build/libs/Scissors-bundler-*.jar
                     """
             }

LICENSE.md

@@ -16,6 +16,5 @@ should submit a pull request to this project to add their name.
 
 ```text
 Allink (allinkdev) <arclicious@vivaldi.net>
-Luna (LunaWasFlaggedAgain) <lunahatesgogle@gmail.com>
 Telesphoreo <me@telesphoreo.me>
 ```

README.md

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

build-data/dev-imports.txt

@@ -8,3 +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
+
+## 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.10"
+    id("io.papermc.paperweight.patcher") version "1.5.5"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -15,9 +15,9 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.11:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.629.1")
+    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
-    paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
+    paperclip("io.papermc:paperclip:3.0.3")
 }
 
 allprojects {
@@ -65,15 +65,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,9 @@
 group=me.totalfreedom.scissors
-version=1.20.2-R0.1-SNAPSHOT
+version=1.20-R0.1-SNAPSHOT
 
-mcVersion=1.20.2
+mcVersion=1.20
-paperRef=931781c220b98dde0159c9a3c8dce06c3b2b1e13
+paperRef=de19eb8c4a490ff4f427e9ad8b8bbe181c368cc1
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
-org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,8 +83,10 @@ 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
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,13 +133,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -198,10 +197,6 @@ if "$cygwin" || "$msys" ; then
     done
 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;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

patches/api/0001-Add-MasterBlockFireEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add MasterBlockFireEvent
 
 diff --git a/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..812e6ae9f1c8eb9558e5109c522d3ce3a7deb35c
+index 0000000000000000000000000000000000000000..a24cb52a5af62012c5d5acc29e4c3558e92ae572
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
 @@ -0,0 +1,51 @@

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Add spectator teleport event
 
 diff --git a/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e4c9256c78f8b395aea86e9ea1a112f8e7426c1f
+index 0000000000000000000000000000000000000000..d7efa63c316ed99c3eccfeadc1b0873b2ccb5d8a
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
 @@ -0,0 +1,60 @@

patches/api/0003-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 d0c634629aa0b6bac0da93655dd86ad3aea0ce30..5729362a327f6cc67e86d4ebf5328fc60ed710f7 100644
+index 1d1a1d087dabc9794e0062a064da2cced4062309..1770de3705aa14232b133bce9fac56dfe89faa37 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2190,6 +2190,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1994,6 +1994,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  

patches/server/0001-Build-changes.patch

@@ -1,34 +1,31 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Sat, 12 Mar 2022 22:22:22 -0300
+Date: Wed, 27 Jul 2022 22:09:00 -0500
 Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 79beac737c17412913983614bd478d33e3c6ed58..6c396296c3ff8b5559b7bf69af76459117de4e85 100644
+index a3a76b9b7efa773117d2ee1ce53ef784b09b277d..fad5e021f1282cd478f6ce484edbc135494b81b3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+@@ -7,8 +7,10 @@ plugins {
- val alsoShade: Configuration by configurations.creating
+ }
  
  dependencies {
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
-+    // Scissors start
 +    implementation(project(":Scissors-API"))
-+    implementation("io.papermc.paper:paper-mojangapi:1.20.2-R0.1-SNAPSHOT") {
++    implementation("io.papermc.paper:paper-mojangapi:1.20-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")
-@@ -66,11 +70,19 @@ tasks.jar {
+@@ -58,11 +60,17 @@ 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
 -        val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
-+        // Scissors start
 +        var gitBranch: String;
 +        if (System.getenv("JENKINS_URL") == null)
 +        {
@@ -36,26 +33,25 @@ index 79beac737c17412913983614bd478d33e3c6ed58..6c396296c3ff8b5559b7bf69af764591
 +        } else {
 +            gitBranch = System.getenv("GITHUB_BRANCH")
 +        }
-+        // Scissors end
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
 -            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Version" to "git-Scissors-$implementationVersion", // Scissors
++            "Implementation-Version" to "git-Scissors-$implementationVersion",
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -154,7 +166,7 @@ fun TaskContainer.registerRunTask(
+@@ -134,7 +142,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
 -    group = "paper"
-+    group = "paperweight" // Scissors
++    group = "paperweight"
      mainClass.set("org.bukkit.craftbukkit.Main")
      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..5ff11b9bcef76cb767f0b03ffc326d3f7a361371 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,7 @@ public class Metrics {
@@ -63,7 +59,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..a46d3f40642bbf249c2d24e689f474d0
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
 -                Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
-+                Metrics metrics = new Metrics("Scissors", serverUUID, logFailedRequests, Bukkit.getLogger()); // Scissors
++                Metrics metrics = new Metrics("Scissors", serverUUID, logFailedRequests, Bukkit.getLogger());
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
@@ -72,17 +68,17 @@ 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-Scissors-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
                  } else {
                      paperVersion = "unknown";
                  }
 -                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
-+                metrics.addCustomChart(new Metrics.SimplePie("scissors_version", () -> paperVersion)); // Scissors
++                metrics.addCustomChart(new Metrics.SimplePie("scissors_version", () -> paperVersion));
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..21ded7c14c56a40feaa7741131be5166947f7169 100644
+index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..2fbb5fc19e6d7f3767c7c6eedcbc6af2b0877ae5 100644
 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -90,15 +86,15 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..21ded7c14c56a40feaa7741131be5166
      protected LineReader buildReader(LineReaderBuilder builder) {
          builder
 -                .appName("Paper")
-+                .appName("Scissors") // Scissors
++                .appName("Scissors")
                  .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..96c2044c66db2b2aef644e19ecd289cf870ab62a 100644
+index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..0f9928bf68f8bc5abfe02f41c98c63888987d9b9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -108,20 +104,20 @@ index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..96c2044c66db2b2aef644e19ecd289cf
  
      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 9c08303de2891de92e06de8a939a618b7a6f7321..43e331f2946faaf3e7e66e4a81a6b34604647c3b 100644
+index aefbb6a3f49a74a4c8fd004aa6a4ab1ab907e878..777b727a360683a72cef8c06ab7ab1439d69ac0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
+@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
 -    private final String serverName = "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");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..741c76c4dfa0bb34cc23bd795c194bdea10418cc 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..5e6cce78e7987b4aa1c0052262ab8c4563905372 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -129,7 +125,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..741c76c4dfa0bb34cc23bd795c194bde
          String result = "Unknown-Version";
  
 -        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/me.totalfreedom.scissors/Scissors-API/pom.properties"); // Scissors
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/me.totalfreedom.scissors/Scissors-API/pom.properties");
          Properties properties = new Properties();
  
          if (stream != null) {

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

@@ -1,26 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Sat, 12 Mar 2022 19:34:59 -0700
+Date: Sat, 10 Dec 2022 22:25:38 -0600
-Subject: [PATCH] UUID validation
+Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid
 
 
-diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index b65dcff9812dbc3256c080ac264c4aafd83ce276..82b53a7bfb37bfa1752a016a8a454c0b994b9108 100644
---- a/src/main/java/net/minecraft/nbt/NbtUtils.java
-+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -74,7 +74,11 @@ public final class NbtUtils {
-         UUID uUID = nbt.hasUUID("Id") ? nbt.getUUID("Id") : Util.NIL_UUID;
-         // Paper start - support string UUID's
-         if (nbt.contains("Id", Tag.TAG_STRING)) {
--            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
-         String string = nbt.getString("Name");
 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

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

@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Fri, 10 Jun 2022 22:55:01 -0500
+Subject: [PATCH] Fixes invalid LootTables causing problems when applied to
+ Minecart entities
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
+index d4a8c1bbb8fef27ac42bdf27dde495b4c649e6cb..865c61accf211d28be3c82dcf158fec9778b50c1 100644
+--- a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
++++ b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
+@@ -17,7 +17,7 @@ public class PaperContainerEntityLootableInventory implements PaperLootableEntit
+ 
+     @Override
+     public org.bukkit.loot.LootTable getLootTable() {
+-        return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
++        return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() && entity.getLootTable().toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null; // Scissors - Validate length of loot tables before even trying
+     }
+ 
+     @Override
+diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
+index 2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99..c5ac6cda91a81d3075f5c763e30dc009b6be7936 100644
+--- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
++++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
+@@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
+ 
+     @Override
+     public org.bukkit.loot.LootTable getLootTable() {
+-        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
++        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() && tileEntityLootable.lootTable.toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null; // Scissors - Validate length of loot tables before even trying
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+index b9f0dae1ec96194fe78c086b63d8a18b1d0cfcf7..bdc49a9965fd3add3dfca31fb0517c14597fb076 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

patches/server/0003-ResourceLocation-validation.patch

@@ -1,187 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 07:39:26 -0600
-Subject: [PATCH] ResourceLocation validation
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-index 15173e715fa36546820d930a46e0f0c493d07cfc..356cc6f468975faa676db87db8fc0fa2df32f020 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperContainerEntityLootableInventory.java
-@@ -17,7 +17,7 @@ public class PaperContainerEntityLootableInventory implements PaperLootableEntit
- 
-     @Override
-     public org.bukkit.loot.LootTable getLootTable() {
--        return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null;
-+        return entity.getLootTable() != null && !entity.getLootTable().getPath().isEmpty() && entity.getLootTable().toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(entity.getLootTable())) : null; // Scissors - Validate length of loot tables before even trying
-     }
- 
-     @Override
-diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-index 2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99..c5ac6cda91a81d3075f5c763e30dc009b6be7936 100644
---- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
-@@ -15,7 +15,7 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
- 
-     @Override
-     public org.bukkit.loot.LootTable getLootTable() {
--        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null;
-+        return tileEntityLootable.lootTable != null && !tileEntityLootable.lootTable.getPath().isEmpty() && tileEntityLootable.lootTable.toString().length() < 256 ? Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(tileEntityLootable.lootTable)) : null; // Scissors - Validate length of loot tables before even trying
-     }
- 
-     @Override
-diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-index 1f55185814125c691288294d18bf1580461c8066..259d65f8e21f9cf99585d416eafdc967dddccf57 100644
---- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-+++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
-@@ -409,7 +409,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) {
--                AreaEffectCloud.LOGGER.warn("Couldn't load custom particle {}", nbt.getString("Particle"), commandsyntaxexception);
-+                // Scissors - Don't log custom particle errors
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 73871f456a85bda1e51f54986d0e61fb629822e8..df16049a70061c7c38d72b188d054339f5434e03 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -589,7 +589,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-         }), (entity) -> {
-             entity.load(nbt);
-         }, () -> {
--            EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
-+            // Scissors - Don't log invalid entities
-         });
-     }
- 
-@@ -608,7 +608,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 d28c477171c1b6888a45175075017d960464b5cd..cc46185c05a735d4443b266423215f1f7a0c7741 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -619,7 +619,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 a18aadbf7ae83713e1f2b21553185d8000bc7699..f5ad7ddf13cbb6452c2927aef9b54eae3335b4c6 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/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
---- 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>
-             return null;
-         }
- 
--        ResourceLocation key = this.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;
-+            return Bukkit.getLootTable(CraftNamespacedKey.fromMinecraft(key));
-+        } catch (Exception ex) {
-+            return null;
-+        }
-+        // Scissors end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 313ee5c8737b2e57f9b5db6512c1871766b2ccd4..aa7fa17b9fb8519d8b57e27a5b422249b9b875d8 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-@@ -33,8 +33,14 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
-             return null; // return empty loot table?
-         }
- 
--        NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable);
--        return Bukkit.getLootTable(key);
-+        // Scissors start - Return a null loot table if the specified loot table is not valid
-+        try {
-+            NamespacedKey key = CraftNamespacedKey.fromMinecraft(nmsTable);
-+            return Bukkit.getLootTable(key);
-+        } catch (Exception ex) {
-+            return null;
-+        }
-+        // Scissors end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index b4e45d8e9851552f30c9c29d3d9671e1e9094c38..4e8e1a6b718d9ec8720efb648ab023e9e39f67e3 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -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 {
-+            NamespacedKey key = CraftNamespacedKey.fromMinecraft(this.getHandle().getLootTable());
-+            return Bukkit.getLootTable(key);
-+        } catch (Exception ex) {
-+            return null;
-+        }
-+        // Scissors end
-     }
- 
-     @Override

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

@@ -5,14 +5,14 @@ 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 41c9f074203915c31c1ae7a160ce509c13383f84..8b4989593da43fc2fd661ac66bfe5ae1eb5e2780 100644
+index 41c9f074203915c31c1ae7a160ce509c13383f84..79a7fff759f062b783a540079cb43f2942799715 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; // Scissors
++import net.minecraft.resources.ResourceLocation;
  import net.minecraft.sounds.SoundEvents;
  import net.minecraft.sounds.SoundSource;
  import net.minecraft.tags.BlockTags;
@@ -25,7 +25,7 @@ index 41c9f074203915c31c1ae7a160ce509c13383f84..8b4989593da43fc2fd661ac66bfe5ae1
 +            if (!nbttagcompound1.contains("id") || !ResourceLocation.isValidResourceLocation(nbttagcompound1.getString("id")) || EntityType.byString(nbttagcompound1.getString("id")).isEmpty()) {
 +                continue;
 +            }
-+            // Scissors end
++            // Scissor end
 +
              BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks"));
  

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

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

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

@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Video <videogamesm12@gmail.com>
-Date: Sun, 13 Mar 2022 07:47:20 -0600
+Date: Fri, 10 Jun 2022 23:26:03 -0500
 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 aeca803cc0434d9de9434987d6e43b70353e305b..5bd581c1a82236359c810037333590d0d9741587 100644
+index 4caf272f065a681bd7101d52fedf2642cc78d3bc..af5a1111a06789e1401f8c60bb4c8838587f2376 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1814,8 +1814,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1798,8 +1798,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                  resource = CraftNamespacedKey.fromMinecraft(key);
              }
          } catch (IllegalArgumentException ex) {

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

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Sun, 13 Mar 2022 08:14:44 -0600
+Date: Thu, 8 Jun 2023 19:19:37 -0500
 Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities
  with content in them
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 272095d7a09ab41227d741172735f66fd2798ce1..757ae1773ba35c2348483dddbb231060afafc602 100644
+index 272095d7a09ab41227d741172735f66fd2798ce1..ea966ea94062be3ed9b6b2c460a316378c016fa7 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -139,7 +139,11 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+@@ -139,7 +139,12 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
      @Override
      public void remove(Entity.RemovalReason reason) {
          if (!this.level().isClientSide && reason.shouldDestroy()) {
@@ -17,7 +17,8 @@ index 272095d7a09ab41227d741172735f66fd2798ce1..757ae1773ba35c2348483dddbb231060
 +            // Scissors start - Ignore errors thrown when trying to remove minecart entities with content in them
 +            try {
 +                Containers.dropContents(this.level(), (Entity) this, (Container) this);
-+            } catch (Exception ignored) {}
++            } catch (Exception ignored) {
++            }
 +            // Scissors end
          }
  

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

@@ -5,10 +5,10 @@ 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 eb0351aa12eebcefab1d1d14641fc3c60cbbcab8..cf944848cdebbb6f04f5211e00c876329e86d9cc 100644
+index 3d41dbe0285f8fec8adae1e93010cf464df9b08c..7ee2c5beaaca9deb61589074f55e4004d1dd76b5 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -425,11 +425,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -420,11 +420,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
          CompoundTag nbttagcompound1 = nbt.getCompound("Item");
  

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

@@ -6,15 +6,15 @@ 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 37f37be56bab171df442b980ff46ff325daae283..deade19d16a7d6870171b9a60806a8cadb437db4 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) {
                      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: {}", (Object)string);
 +                        // Scissors - Don't log errors caused by invalid recipes being provided
@@ -31,10 +31,10 @@ index 37f37be56bab171df442b980ff46ff325daae283..deade19d16a7d6870171b9a60806a8ca
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaKnowledgeBook.java
-index 50fdb086ffec84edc5138737c95f08ed4757a6f3..da312b4670fc0ac07e4ab798d4793025e362783e 100644
+index 50fdb086ffec84edc5138737c95f08ed4757a6f3..bb0f673a619810850df0d78bb4abd9d7c49ecbe4 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
+@@ -41,7 +41,12 @@ public class CraftMetaKnowledgeBook extends CraftMetaItem implements KnowledgeBo
              for (int i = 0; i < pages.size(); i++) {
                  String recipe = pages.getString(i);
  
@@ -42,7 +42,8 @@ index 50fdb086ffec84edc5138737c95f08ed4757a6f3..da312b4670fc0ac07e4ab798d4793025
 +                // Scissors start - Don't add recipes with invalid namespaces
 +                try {
 +                    this.addRecipe(CraftNamespacedKey.fromString(recipe));
-+                } catch (Exception ignored) {}
++                } catch (Exception ignored) {
++                }
 +                // Scissors end
              }
          }

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

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Sun, 13 Mar 2022 21:56:29 -0600
+Date: Sat, 10 Dec 2022 22:46:24 -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 82b53a7bfb37bfa1752a016a8a454c0b994b9108..b8720020f98ea26da7d3225ddfbb1d9e80be4eb1 100644
+index 6dac24354192bea79a4b9eb721543110826790b2..b87999106b5068a243c064fa3c30968411996e2b 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
 @@ -231,7 +231,7 @@ public final class NbtUtils {
@@ -18,7 +18,7 @@ index 82b53a7bfb37bfa1752a016a8a454c0b994b9108..b8720020f98ea26da7d3225ddfbb1d9e
              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 8affdd74769aed9aa92a76ba539cd9d27208827c..23e480535bfb4071cde84fc400c2e6acb129e1ae 100644
+index 5d6d26cfe8f0ab68a3145214b3fc126ca7a71a66..7e0559cdcabeb33ff383be1a23f4ed04fa091867 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 {

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

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

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

@@ -27,10 +27,10 @@ index c0633f9553fb5aa52e8ffc863159521d09cb3bd5..7449a024265c42f28a6c9a1ed8d8f4b9
              }
          }
 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 759ecd79534a7706f7d4a63eb9dacbefcfe54674..9afda54ad70d446672749506822c6abd729b8f1b 100644
+index 955316687e2e29ad75a0052317a7b0f89034c82a..2537c48d1269d8ea51222412b2eeaac26a7dc4d4 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -441,7 +441,7 @@ public class ItemFrame extends HangingEntity {
+@@ -431,7 +431,7 @@ public class ItemFrame extends HangingEntity {
              ItemStack itemstack = ItemStack.of(nbttagcompound1);
  
              if (itemstack.isEmpty()) {

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

@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Telesphoreo <me@telesphoreo.me>
+Date: Sat, 10 Dec 2022 23:02:48 -0600
+Subject: [PATCH] Even more resource location validation
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
+index db3cddf8b227453c9b08e481b21101c5d2e0472d..77ae3bc5fd6cf34aae7bd3baa563f3e23e57de26 100644
+--- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
++++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
+@@ -145,7 +145,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity {
+     }
+ 
+     public void setPotionType(String string) {
+-        this.setPotion(BuiltInRegistries.POTION.get(new ResourceLocation(string)));
++        this.setPotion(BuiltInRegistries.POTION.get(ResourceLocation.tryParse(string))); // Scissors - Validate resource locations
+     }
+     // CraftBukkit end
+ 
+diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
+index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..ffcb77755b28bcdb3eae981fc735e6dde664bb6e 100644
+--- a/src/main/java/net/minecraft/world/entity/EntityType.java
++++ b/src/main/java/net/minecraft/world/entity/EntityType.java
+@@ -588,7 +588,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+         }), (entity) -> {
+             entity.load(nbt);
+         }, () -> {
+-            EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
++            /*EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));*/ // Scissors - Don't log invalid entities
+         });
+     }
+ 
+@@ -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")));
+     }
+ 
+     @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..b0c953ad8275740679c847e348b311de93d64965 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"));
+             this.lootTableSeed = nbt.getLong("DeathLootTableSeed");
+         }
+ 

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

@@ -1,24 +1,24 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Telesphoreo <me@telesphoreo.me>
-Date: Sat, 26 Mar 2022 21:51:07 -0500
+Date: Fri, 7 Apr 2023 15:35:35 -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..bc5ed619e05f24f3ad50a6a81306d120869f57a1 100644
+index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..0a8fda6939152d393f07e5d2812409ad38855646 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 @@ -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.*;
-+import io.papermc.paper.util.JarManifests; // Scissors
++import io.papermc.paper.util.JarManifests;
  import net.kyori.adventure.text.Component;
  import net.kyori.adventure.text.event.ClickEvent;
  import net.kyori.adventure.text.format.NamedTextColor;
  import net.kyori.adventure.text.format.TextDecoration;
  import net.kyori.adventure.text.TextComponent;
-+import org.bukkit.Bukkit; // Scissors
++import org.bukkit.Bukkit;
  
  import javax.annotation.Nonnull;
  import javax.annotation.Nullable;
@@ -28,8 +28,8 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..bc5ed619e05f24f3ad50a6a81306d120
      private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
 -    private static final String GITHUB_BRANCH_NAME = "master";
 -    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+    private static final String GITHUB_BRANCH_NAME = getBranch(); // Scissors
++    private static final String GITHUB_BRANCH_NAME = getBranch();
-+    private static final String DOWNLOAD_PAGE = "https://ci.scissors.gg/job/Scissors/job/" + GITHUB_BRANCH_NAME; // Scissors
++    private static final String DOWNLOAD_PAGE = "https://ci.scissors.gg/job/Scissors/job/" + GITHUB_BRANCH_NAME;
      private static @Nullable String mcVer;
  
      @Override
@@ -39,8 +39,8 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..bc5ed619e05f24f3ad50a6a81306d120
      public Component getVersionMessage(@Nonnull String serverVersion) {
 -        String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
 -        final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        String[] parts = serverVersion.substring("git-Scissors-".length()).split("[-\\s]"); // Scissors
++        String[] parts = serverVersion.substring("git-Scissors-".length()).split("[-\\s]");
-+        final Component updateMessage = getUpdateStatusMessage("AtlasMediaGroup/Scissors", GITHUB_BRANCH_NAME, parts[0]); // Scissors
++        final Component updateMessage = getUpdateStatusMessage("AtlasMediaGroup/Scissors", GITHUB_BRANCH_NAME, parts[0]);
          final Component history = getHistory();
  
          return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
@@ -77,10 +77,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..bc5ed619e05f24f3ad50a6a81306d120
          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 c737c5d62407337d3db2899cfc01713a058a6467..54891c5d7ca19a4fdab74a8729814a6fecee3fda 100644
+index bfa091f72d6f477bcaf63d364639a1b4df9b1987..1fe26cb620e8b550790c3e110e2a1180cf0838fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -301,7 +301,7 @@ public class Main {
+@@ -292,7 +292,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! ***");

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

@@ -6,21 +6,21 @@ 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 ed6e5060901c348c4f56a573c23e2000d8f2fb72..5cdf1e6fcdc9e2bd821f40ec9bf95cf03f03179a 100644
+index af5a1111a06789e1401f8c60bb4c8838587f2376..bfcdc18f9b06023a5c461e06abbb93eea32bcdba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -46,6 +46,7 @@ import net.minecraft.nbt.NbtIo;
  import net.minecraft.nbt.StringTag;
  import net.minecraft.nbt.Tag;
  import net.minecraft.network.chat.Component;
-+import net.minecraft.resources.ResourceLocation; // Scissors
++import net.minecraft.resources.ResourceLocation;
  import net.minecraft.world.item.BlockItem;
  import net.minecraft.world.level.block.state.BlockState;
- import org.apache.commons.lang3.EnumUtils;
+ import org.apache.commons.lang.Validate;
-@@ -487,7 +488,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -485,7 +486,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
  
-             String attributeName = 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/0016-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Wed, 30 Mar 2022 02:01:55 -0600
+Subject: [PATCH] Validate String UUIDs during the CompoundTag -> GameProfile
+ conversion process
+
+
+diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
+index b87999106b5068a243c064fa3c30968411996e2b..596baf1bc372875b8b82904d9d5bd53f4bedc0fb 100644
+--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
++++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
+@@ -78,7 +78,12 @@ 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
+ 

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

@@ -5,34 +5,23 @@ 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 8a6799b50062c1b7b141ee1568dc523f9ee7ecfd..80e7b0889235288b60d813a569daecb7e08e108e 100644
+index 8a6799b50062c1b7b141ee1568dc523f9ee7ecfd..e5a2bb129100f0f935c8f10682204e7cb6277142 100644
 --- a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
 +++ b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
-@@ -1,5 +1,6 @@
+@@ -11,6 +11,7 @@ import net.minecraft.commands.arguments.selector.EntitySelector;
- 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;
-@@ -11,6 +12,7 @@ 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; // Scissors
++import net.minecraft.world.entity.player.Player;
  
  public record EntityDataSource(String selectorPattern, @Nullable EntitySelector compiledSelector) implements DataSource {
      public EntityDataSource(String rawPath) {
-@@ -31,7 +33,11 @@ public record EntityDataSource(String selectorPattern, @Nullable EntitySelector
+@@ -31,7 +32,7 @@ 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
++            return list.stream().filter((entity) -> !(entity instanceof Player)).map(NbtPredicate::getEntityTagToCompare); // Scissors - Don't query NBT from players
-+            Stream<? extends Entity> stream = list.stream();
-+            if (ScissorsConfig.excludePlayersFromNbtComponents) stream = stream.filter((entity) -> !(entity instanceof Player));
-+            return stream.map(NbtPredicate::getEntityTagToCompare);
-+	         // Scissors end
          } else {
              return Stream.empty();
          }

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

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

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

@@ -1,142 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Fri, 8 Apr 2022 23:38:12 -0300
-Subject: [PATCH] Limit 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 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(";");
-         byte[] bs = element.getAsByteArray();
-+        if (bs.length > 1024) { this.result = stringBuilder.append("]").toString(); return; } // Scissors
- 
-         for(int i = 0; i < bs.length; ++i) {
-             stringBuilder.append(" ").append((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(";");
-         int[] is = element.getAsIntArray();
-+        if (is.length > 1024) { this.result = stringBuilder.append("]").toString(); return; } // Scissors
- 
-         for(int i = 0; i < is.length; ++i) {
-             stringBuilder.append(" ").append(is[i]);
-@@ -122,6 +124,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
-         String string = "L";
-         StringBuilder stringBuilder = (new StringBuilder("[")).append("L").append(";");
-         long[] ls = element.getAsLongArray();
-+        if (ls.length > 1024) { this.result = stringBuilder.append("]").toString(); return; } // Scissors
- 
-         for(int i = 0; i < ls.length; ++i) {
-             stringBuilder.append(" ").append(ls[i]).append("L");
-@@ -136,7 +139,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
- 
-     @Override
-     public void visitList(ListTag element) {
--        if (element.isEmpty()) {
-+        if (element.isEmpty() || element.size() > 1024) { // Scissors
-             this.result = "[]";
-         } else {
-             StringBuilder stringBuilder = new StringBuilder("[");
-@@ -166,7 +169,7 @@ public class SnbtPrinterTagVisitor implements TagVisitor {
- 
-     @Override
-     public void visitCompound(CompoundTag compound) {
--        if (compound.isEmpty()) {
-+        if (compound.isEmpty() || compound.size() > 1024) { // Scissors
-             this.result = "{}";
-         } else {
-             StringBuilder stringBuilder = new StringBuilder("{");
-diff --git a/src/main/java/net/minecraft/nbt/StringTagVisitor.java b/src/main/java/net/minecraft/nbt/StringTagVisitor.java
-index 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 {
-     public void visitByteArray(ByteArrayTag element) {
-         this.builder.append("[B;");
-         byte[] bs = element.getAsByteArray();
-+        if (bs.length > 1024) { this.builder.append(']'); return; } // Scissors
- 
-         for(int i = 0; i < bs.length; ++i) {
-             if (i != 0) {
-@@ -69,6 +70,7 @@ public class StringTagVisitor implements TagVisitor {
-     public void visitIntArray(IntArrayTag element) {
-         this.builder.append("[I;");
-         int[] is = element.getAsIntArray();
-+        if (is.length > 1024) { this.builder.append(']'); return; } // Scissors
- 
-         for(int i = 0; i < is.length; ++i) {
-             if (i != 0) {
-@@ -85,6 +87,7 @@ public class StringTagVisitor implements TagVisitor {
-     public void visitLongArray(LongArrayTag element) {
-         this.builder.append("[L;");
-         long[] ls = element.getAsLongArray();
-+        if (ls.length > 1024) { this.builder.append(']'); return; } // Scissors
- 
-         for(int i = 0; i < ls.length; ++i) {
-             if (i != 0) {
-@@ -100,6 +103,7 @@ public class StringTagVisitor implements TagVisitor {
-     @Override
-     public void visitList(ListTag element) {
-         this.builder.append('[');
-+        if (element.size() > 1024) { this.builder.append(']'); return; } // Scissors
- 
-         for(int i = 0; i < element.size(); ++i) {
-             if (i != 0) {
-@@ -116,6 +120,7 @@ public class StringTagVisitor implements TagVisitor {
-     public void visitCompound(CompoundTag compound) {
-         this.builder.append('{');
-         List<String> list = Lists.newArrayList(compound.getAllKeys());
-+        if (list.size() > 1024) { this.builder.append('}'); return; } // Scissors
-         Collections.sort(list);
- 
-         for(String string : list) {
-diff --git a/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java b/src/main/java/net/minecraft/nbt/TextComponentTagVisitor.java
-index 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 {
-         Component component = Component.literal("B").withStyle(SYNTAX_HIGHLIGHTING_NUMBER_TYPE);
-         MutableComponent mutableComponent = Component.literal("[").append(component).append(";");
-         byte[] bs = element.getAsByteArray();
-+        if (bs.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
- 
-         for(int i = 0; i < bs.length; ++i) {
-             MutableComponent mutableComponent2 = Component.literal(String.valueOf((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) {
-             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);
-         MutableComponent mutableComponent = Component.literal("[").append(component).append(";");
-         long[] ls = element.getAsLongArray();
-+        if (ls.length > 1024) { this.result = mutableComponent.append("]"); return; } // Scissors
- 
-         for(int i = 0; i < ls.length; ++i) {
-             Component component2 = Component.literal(String.valueOf(ls[i])).withStyle(SYNTAX_HIGHLIGHTING_NUMBER);
-@@ -147,7 +150,7 @@ public class TextComponentTagVisitor implements TagVisitor {
- 
-     @Override
-     public void visitList(ListTag element) {
--        if (element.isEmpty()) {
-+        if (element.isEmpty() || element.size() > 1024) { // Scissors
-             this.result = Component.literal("[]");
-         } else if (INLINE_ELEMENT_TYPES.contains(element.getElementType()) && element.size() <= 8) {
-             String string = ELEMENT_SEPARATOR + " ";
-@@ -190,7 +193,7 @@ public class TextComponentTagVisitor implements TagVisitor {
- 
-     @Override
-     public void visitCompound(CompoundTag compound) {
--        if (compound.isEmpty()) {
-+        if (compound.isEmpty() || compound.size() > 1024) { // Scissors
-             this.result = Component.literal("{}");
-         } else {
-             MutableComponent mutableComponent = Component.literal("{");

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

@@ -5,30 +5,49 @@ 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
+diff --git a/src/main/java/net/minecraft/world/effect/MobEffect.java b/src/main/java/net/minecraft/world/effect/MobEffect.java
-index 1c7794de5f0a7238b944c9473e2cc9d011ef2306..9c594c504611b9da5fcd119284b2dcb4b59d3bf4 100644
+index 2cc714585fc3790b70a7ad1ab8034543462e2b3b..2d3706d8d0dbed3b3588066eaa6b9ce1b266294f 100644
---- a/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
+--- a/src/main/java/net/minecraft/world/effect/MobEffect.java
-+++ b/src/main/java/net/minecraft/world/effect/HealOrHarmMobEffect.java
++++ b/src/main/java/net/minecraft/world/effect/MobEffect.java
-@@ -16,6 +16,11 @@ class HealOrHarmMobEffect extends InstantenousMobEffect {
+@@ -58,6 +58,7 @@ public class MobEffect {
-     @Override
+     }
+ 
      public void applyEffectTick(LivingEntity entity, int amplifier) {
-         super.applyEffectTick(entity, amplifier);
++        boolean god = entity instanceof Player player && (player.isCreative() || player.isInvulnerable()); // Scissors
-+        // Scissors start - Don't apply any healing/harming effects for Creative/Invulnerable players and cap the amplifier for those who aren't.
+         if (this == MobEffects.REGENERATION) {
-+        if (entity instanceof net.minecraft.world.entity.player.Player player && (player.isCreative() || player.isInvulnerable())) return;
+             if (entity.getHealth() < entity.getMaxHealth()) {
+                 entity.heal(1.0F, RegainReason.MAGIC_REGEN); // CraftBukkit
+@@ -86,17 +87,31 @@ public class MobEffect {
+                 // CraftBukkit end
+             }
+         } else if ((this != MobEffects.HEAL || entity.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !entity.isInvertedHealAndHarm())) {
+-            if (this == MobEffects.HARM && !entity.isInvertedHealAndHarm() || this == MobEffects.HEAL && entity.isInvertedHealAndHarm()) {
++            // Scissors start
 +            amplifier = Math.min(Math.abs(amplifier), 124);
++            if (!god && (this == MobEffects.HARM && !entity.isInvertedHealAndHarm() || this == MobEffects.HEAL && entity.isInvertedHealAndHarm())) {
+                 entity.hurt(entity.damageSources().magic(), (float) (6 << amplifier));
+             }
 +            // 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 {
+-            entity.heal((float) Math.max(4 << amplifier, 0), RegainReason.MAGIC); // CraftBukkit
-     @Override
++            // 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 net.minecraft.world.entity.player.Player player && (player.isCreative() || player.isInvulnerable())) return;
++        if (target instanceof Player player && (player.isCreative() || player.isInvulnerable())) {
++            return;
++        }
 +        amplifier = Math.min(Math.abs(amplifier), 124);
 +        // Scissors end
  
-         if (this.isHarm == target.isInvertedHealAndHarm()) {
+         if ((this != MobEffects.HEAL || target.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !target.isInvertedHealAndHarm())) {
-             j = (int) (proximity * (double) (4 << amplifier) + 0.5D);
+             if ((this != MobEffects.HARM || target.isInvertedHealAndHarm()) && (this != MobEffects.HEAL || !target.isInvertedHealAndHarm())) {

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

@@ -1,19 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Mon, 18 Apr 2022 16:55:19 +0100
+Date: Thu, 8 Jun 2023 19:24:05 -0500
 Subject: [PATCH] Fix negative death times
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b95f88d5e5b4785ee063695fd81935636a0588d1..168b002377e258f84a3bb86dd8e4a5f42060e3e0 100644
+index 67627bbf84f5aab2872f636b1dcb6728c8494147..468f64afb7e9b3ef579205d3beea025deb31b460 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 {
+@@ -630,7 +630,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      protected void tickDeath() {
          ++this.deathTime;
 -        if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved()) {
-+        if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level().isClientSide() && !this.isRemoved()) { // Scissors
++        if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level().isClientSide() && !this.isRemoved()) {
              this.level().broadcastEntityEvent(this, (byte) 60);
              this.remove(Entity.RemovalReason.KILLED);
          }

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

@@ -41,10 +41,10 @@ index 0000000000000000000000000000000000000000..754b578b575137a9c48cb20dee965a93
 +}
 diff --git a/src/main/java/me/totalfreedom/scissors/NbtUtility.java b/src/main/java/me/totalfreedom/scissors/NbtUtility.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b3efac47ee700d5a7ff26452d6bcbf2f687a32cf
+index 0000000000000000000000000000000000000000..b724baaef8d565e41db1af6393d0890e919a5aa8
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/NbtUtility.java
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,74 @@
 +package me.totalfreedom.scissors;
 +
 +import java.nio.charset.StandardCharsets;
@@ -75,7 +75,6 @@ index 0000000000000000000000000000000000000000..b3efac47ee700d5a7ff26452d6bcbf2f
 +            CompoundTag compoundTag = (CompoundTag) tag;
 +            for (String key : compoundTag.getAllKeys())
 +            {
-+                size += key.getBytes(StandardCharsets.UTF_8).length;
 +                size += getTagSize(compoundTag.get(key), depth + 1);
 +            }
 +        }
@@ -122,10 +121,10 @@ index 0000000000000000000000000000000000000000..b3efac47ee700d5a7ff26452d6bcbf2f
 +}
 diff --git a/src/main/java/me/totalfreedom/scissors/PositionUtility.java b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c5dcc833d6f2c0daa1d0c2a7ab81430f25e0b2f3
+index 0000000000000000000000000000000000000000..c54535042a7ac12fe46b3b37db8d7b116e9469d5
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,83 @@
 +package me.totalfreedom.scissors;
 +
 +import net.minecraft.core.BlockPos;
@@ -136,6 +135,36 @@ index 0000000000000000000000000000000000000000..c5dcc833d6f2c0daa1d0c2a7ab81430f
 +
 +public class PositionUtility
 +{
++    public static Vec3 getValidVec3(double x, double y, double z, Entity entity)
++    {
++        final Level level = entity.level;
++
++        try
++        {
++            if (level.isInWorldBounds(new BlockPos(Math.floor(MathUtility.safeDoubleToInt(x)), Math.floor(MathUtility.safeDoubleToInt(y)), Math.floor(MathUtility.safeDoubleToInt(z)))))
++            {
++                return new Vec3(x, y, z);
++            }
++            else
++            {
++                final WorldBorder worldBorder = level.getWorldBorder();
++
++                final double maxX = worldBorder.getMaxX();
++                final double maxY = level.getMaxBuildHeight();
++                final double maxZ = worldBorder.getMaxZ();
++
++                final double minX = worldBorder.getMinX();
++                final double minY = level.getMinBuildHeight();
++                final double minZ = worldBorder.getMinZ();
++
++                return new Vec3(MathUtility.clampDouble(x, minX, maxX), MathUtility.clampDouble(y, minY, maxY), MathUtility.clampDouble(z, minZ, maxZ));
++            }
++        }
++        catch (Exception e)
++        { // If we throw some sort of exception due to the position being crazy, catch it
++            return new Vec3(0, 0, 0);
++        }
++    }
 +
 +    public static Vec3 getValidVec3FromBlockPos(BlockPos blockPos, Entity entity)
 +    {

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

@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Video <videogamesm12@gmail.com>
+Date: Wed, 27 Jul 2022 22:30:39 -0500
+Subject: [PATCH] Validate coordinates before attempting to get block entities
+ when handling Creative Inventory packets
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 1288f651fa83d5ab99a88858f52a6d3212284df0..61f6b51b9d868ae6bd79185cc066976a094da8ce 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1920,6 +1920,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     }
+     // Spigot end
+ 
++    // Scissors start - Readd the following Paper code
++    // Paper start
++    private static final int SURVIVAL_PLACE_DISTANCE_SQUARED = 6 * 6;
++    private static final int CREATIVE_PLACE_DISTANCE_SQUARED = 7 * 7;
++    private boolean isOutsideOfReach(double x, double y, double z) {
++        Location eyeLoc = this.getCraftPlayer().getEyeLocation();
++        double reachDistance = org.bukkit.util.NumberConversions.square(eyeLoc.getX() - x) + org.bukkit.util.NumberConversions.square(eyeLoc.getY() - y) + org.bukkit.util.NumberConversions.square(eyeLoc.getZ() - z);
++        return reachDistance > (this.getCraftPlayer().getGameMode() == org.bukkit.GameMode.CREATIVE ? CREATIVE_PLACE_DISTANCE_SQUARED : SURVIVAL_PLACE_DISTANCE_SQUARED);
++    }
++    // Paper end
++    // Scissors end
++
+     @Override
+     public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+@@ -3344,17 +3356,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+             if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot
+                 BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
+ 
+-                if (this.player.level().isLoaded(blockposition)) {
+-                    // Paper start
+-                    BlockEntity tileentity = null;
+-                    if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.serverLevel().isLoadedAndInBounds(blockposition)) {
+-                        tileentity = this.player.level().getBlockEntity(blockposition);
+-                    }
+-                    // Paper end
++                if (this.player.level().isLoaded(blockposition))
++                {
++                    // Scissors start - Validate coordinates and whether the player can reach them
++                    if (Level.isInSpawnableBounds(blockposition) && !isOutsideOfReach(blockposition.getX(), blockposition.getY(), blockposition.getZ()))
++                    {
++                        BlockEntity tileentity = null;
++                        if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.serverLevel().isLoadedAndInBounds(blockposition))
++                        {
++                            tileentity = this.player.level().getBlockEntity(blockposition);
++                        }
++                        // Paper end
+ 
+-                    if (tileentity != null) {
+-                        tileentity.saveToItem(itemstack);
++                        if (tileentity != null)
++                        {
++                            tileentity.saveToItem(itemstack);
++                        }
+                     }
++                    // Scissors end
+                 }
+             }
+ 

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

@@ -1,76 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Mon, 18 Apr 2022 03:56:09 +0100
+Date: Sat, 10 Dec 2022 23:38:53 -0600
 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 4092c7a8c2b0d9d26e6f4d97386735236300d132..04c47cf1a920ae6c356449df801227ee14f6dfb7 100644
---- a/src/main/java/net/minecraft/world/ContainerHelper.java
-+++ b/src/main/java/net/minecraft/world/ContainerHelper.java
-@@ -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 +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) {
-             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 +36,7 @@ public class ContainerHelper {
-             }
-         }
- 
--        if (!listTag.isEmpty() || setIfEmpty) {
-+        if ((!listTag.isEmpty() || setIfEmpty) && !(total > NbtUtility.MAXIMUM_SIZE)) { // Scissors
-             nbt.put("Items", listTag);
-         }
- 
-@@ -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) {
-             CompoundTag compoundTag = listTag.getCompound(i);
-             int j = compoundTag.getByte("Slot") & 255;
-             if (j >= 0 && j < stacks.size()) {
-+                // Scissors start
-+                total += NbtUtility.getTagSize(compoundTag);
-+                if (total >= NbtUtility.MAXIMUM_SIZE) {
-+                    stacks.clear();
-+                    break;
-+                }
-+                // Scissors end
-                 stacks.set(j, ItemStack.of(compoundTag));
-             }
-         }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..bedd53797391005d70dcdd61c5ed6d56a32fee5c 100644
+index b367ec1feaccbd67e9e28c0d0515e163f37135fe..d1547b9ba36baec925751b9bb0498c8a8cac12f8 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -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;
-@@ -254,6 +255,12 @@ public final class ItemStack {
+@@ -253,6 +254,12 @@ public final class ItemStack {
  
      // CraftBukkit - break into own method
      private void load(CompoundTag nbttagcompound) {
@@ -83,7 +29,7 @@ index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..bedd53797391005d70dcdd61c5ed6d56
          this.item = (Item) BuiltInRegistries.ITEM.get(new ResourceLocation(nbttagcompound.getString("id")));
          this.count = nbttagcompound.getByte("Count");
          if (nbttagcompound.contains("tag", 10)) {
-@@ -563,7 +570,11 @@ public final class ItemStack {
+@@ -550,7 +557,11 @@ public final class ItemStack {
          nbt.putString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString());
          nbt.putByte("Count", (byte) this.count);
          if (this.tag != null) {
@@ -96,218 +42,13 @@ index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..bedd53797391005d70dcdd61c5ed6d56
          }
  
          return nbt;
-@@ -893,6 +904,7 @@ public final class ItemStack {
+@@ -880,6 +891,9 @@ public final class ItemStack {
      // Paper end
  
      public void setTag(@Nullable CompoundTag nbt) {
-+        if (NbtUtility.isTooLarge(nbt)) return; // Scissors - Ignore large tags
++        // Scissors start - Ignore large tags
++        if (NbtUtility.isTooLarge(nbt)) return;
++        // Scissors end
          this.tag = nbt;
          this.processEnchantOrder(this.tag); // Paper
          if (this.getItem().canBeDepleted()) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index f5ad7ddf13cbb6452c2927aef9b54eae3335b4c6..041e3c8fb7c9ca69a7c7c1c952ed9915a75d7752 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,7 @@ import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
- import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.NbtUtility; // Scissors
- import net.minecraft.SharedConstants;
- import net.minecraft.Util;
- import net.minecraft.core.BlockPos;
-@@ -212,6 +213,17 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
- 
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+        // Scissors end
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index 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; // Scissors
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -34,6 +35,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     @Override
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+        // Scissors end
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index 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,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 net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -73,6 +74,17 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
-     }
- 
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+        // Scissors end
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index 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; // Scissors
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -40,6 +41,17 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
-     private int maxStack = MAX_STACK;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+        // Scissors end
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
-index 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; // Scissors
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.NonNullList;
- import net.minecraft.nbt.CompoundTag;
-@@ -28,6 +29,17 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
-     private int maxStack = MAX_STACK;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+        // Scissors end
-         return this.items;
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index d4dcf7fe26474ae07374e7761d823bc5c8b54f97..7352183f7eaa1ddcd028e53f4b66a1c34e32b988 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,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 net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -56,6 +57,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-     private int maxStack = MAX_STACK;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.items) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.items.clear();
-+        }
-+        // Scissors end
-         return this.items;
-     }
- 
-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..9f12fbcd8d0c75de1d8c06bed2c64a0acdc877c9 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,7 @@ import java.util.Iterator;
- import java.util.List;
- import java.util.stream.IntStream;
- import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.NbtUtility; // Scissors
- import net.minecraft.core.BlockPos;
- import net.minecraft.core.Direction;
- import net.minecraft.core.NonNullList;
-@@ -61,6 +62,17 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
-     public boolean opened;
- 
-     public List<ItemStack> getContents() {
-+        // Scissors start - Account for items inside containers
-+        long total = 0;
-+
-+        for (ItemStack item : this.itemStacks) {
-+            total += NbtUtility.getTagSize(item.getOrCreateTag());
-+        }
-+
-+        if (total > NbtUtility.MAXIMUM_SIZE) {
-+            this.itemStacks.clear();
-+        }
-+        // Scissors end
-         return this.itemStacks;
-     }
- 

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

@@ -0,0 +1,260 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Business Goose <arclicious@vivaldi.net>
+Date: Sat, 11 Jun 2022 23:33:13 -0500
+Subject: [PATCH] Account for items inside containers
+
+
+diff --git a/src/main/java/net/minecraft/world/ContainerHelper.java b/src/main/java/net/minecraft/world/ContainerHelper.java
+index 4092c7a8c2b0d9d26e6f4d97386735236300d132..9e0ab51dd7a4f9fed8f9edde962d42d4bbf604c1 100644
+--- a/src/main/java/net/minecraft/world/ContainerHelper.java
++++ b/src/main/java/net/minecraft/world/ContainerHelper.java
+@@ -2,6 +2,7 @@ package net.minecraft.world;
+ 
+ import java.util.List;
+ import java.util.function.Predicate;
++import me.totalfreedom.scissors.NbtUtility;
+ import net.minecraft.core.NonNullList;
+ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.nbt.ListTag;
+@@ -22,10 +23,13 @@ public class ContainerHelper {
+ 
+     public static CompoundTag saveAllItems(CompoundTag nbt, NonNullList<ItemStack> stacks, boolean setIfEmpty) {
+         ListTag listTag = new ListTag();
++        // Scissors - Account for items inside containers
++        long total = 0;
+ 
+         for(int i = 0; i < stacks.size(); ++i) {
+             ItemStack itemStack = stacks.get(i);
+             if (!itemStack.isEmpty()) {
++                total += NbtUtility.getTagSize(itemStack.getTag()); // Scissors
+                 CompoundTag compoundTag = new CompoundTag();
+                 compoundTag.putByte("Slot", (byte)i);
+                 itemStack.save(compoundTag);
+@@ -33,7 +37,7 @@ public class ContainerHelper {
+             }
+         }
+ 
+-        if (!listTag.isEmpty() || setIfEmpty) {
++        if ((!listTag.isEmpty() || setIfEmpty) && !(total > NbtUtility.MAXIMUM_SIZE)) { // Scissors
+             nbt.put("Items", listTag);
+         }
+ 
+@@ -42,11 +46,18 @@ public class ContainerHelper {
+ 
+     public static void loadAllItems(CompoundTag nbt, NonNullList<ItemStack> stacks) {
+         ListTag listTag = nbt.getList("Items", 10);
++        // Scissors - Account for items inside containers
++        long total = 0;
+ 
+         for(int i = 0; i < listTag.size(); ++i) {
+             CompoundTag compoundTag = listTag.getCompound(i);
+             int j = compoundTag.getByte("Slot") & 255;
+             if (j >= 0 && j < stacks.size()) {
++                total += NbtUtility.getTagSize(compoundTag);
++                if (total >= NbtUtility.MAXIMUM_SIZE) {
++                    stacks.clear();
++                    break;
++                }
+                 stacks.set(j, ItemStack.of(compoundTag));
+             }
+         }
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+index 2a786c9fd29dc2139cf487fa645cd43345d60167..dbdc66620ae4284cfe96f633b1f4db46866b597b 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,7 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import javax.annotation.Nullable;
++import me.totalfreedom.scissors.NbtUtility;
+ import net.minecraft.SharedConstants;
+ import net.minecraft.Util;
+ import net.minecraft.core.BlockPos;
+@@ -212,6 +213,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ 
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.items) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.items.clear();
++        }
+         return this.items;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
+index 416aa989ebb18a8741cc9d605a1180ab830f6643..893cf89dd2b022e2b785318e7e86eb5d75be8ed8 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 net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.NonNullList;
+@@ -34,6 +35,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
+ 
+     @Override
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.items) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.items.clear();
++        }
+         return this.items;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+index c57efcb9a79337ec791e4e8f6671612f0a82b441..2963b72061a9ede734842d6fb46a67a1c41d4740 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,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;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.NonNullList;
+@@ -73,6 +74,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+     }
+ 
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.items) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.items.clear();
++        }
+         return this.items;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+index a71414397bd45ee7bcacfeef0041d80dfa25f114..1b6f91055eb01627761e83e5e99e1731029b32ab 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 net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.NonNullList;
+@@ -40,6 +41,16 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
+     private int maxStack = MAX_STACK;
+ 
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.items) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.items.clear();
++        }
+         return this.items;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/DispenserBlockEntity.java
+index 881379681c39230a00b3a1f11cd87498984396c7..1be5d600573f7632e6630224530dd76522e1b191 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 net.minecraft.core.BlockPos;
+ import net.minecraft.core.NonNullList;
+ import net.minecraft.nbt.CompoundTag;
+@@ -28,6 +29,16 @@ public class DispenserBlockEntity extends RandomizableContainerBlockEntity {
+     private int maxStack = MAX_STACK;
+ 
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.items) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.items.clear();
++        }
+         return this.items;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 789e5458f4a137694563a22612455506807de51b..84c721da46b7786857677b56f439c2b9448ba4b8 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,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;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.NonNullList;
+@@ -56,6 +57,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     private int maxStack = MAX_STACK;
+ 
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.items) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.items.clear();
++        }
+         return this.items;
+     }
+ 
+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 b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..c2904048625bb4439c7f0ba8a2605d3194b66070 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
+@@ -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;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.core.Direction;
+ import net.minecraft.core.NonNullList;
+@@ -60,6 +61,16 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+     public boolean opened;
+ 
+     public List<ItemStack> getContents() {
++        // Scissors - Account for items inside containers
++        long total = 0;
++
++        for (ItemStack item : this.itemStacks) {
++            total += NbtUtility.getTagSize(item.getOrCreateTag());
++        }
++
++        if (total > NbtUtility.MAXIMUM_SIZE) {
++            this.itemStacks.clear();
++        }
+         return this.itemStacks;
+     }
+ 

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

@@ -1,23 +1,23 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Thu, 21 Apr 2022 13:52:32 +0100
+Date: Sat, 10 Dec 2022 23:44:05 -0600
 Subject: [PATCH] Limit amount of vehicle collision checks to 3 and discard
  vehicles if they collide with more than 15 other entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 44a6118d3bd67a95180f750c17967561946e2e87..8aece67eba8d6b558bc2441b8b8e599f86e12e4f 100644
+index 9948a28dae4edba877c13ef0156be5ff58df3fa2..93f359c71659c0b2fdf25b1c76c072bf9209db2a 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -8,6 +8,7 @@ import com.mojang.datafixers.util.Pair;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
-+import java.util.concurrent.TimeUnit; // Scissors
++import java.util.concurrent.TimeUnit;
  import javax.annotation.Nullable;
  import net.minecraft.BlockUtil;
  import net.minecraft.Util;
-@@ -111,6 +112,7 @@ public abstract class AbstractMinecart extends Entity {
+@@ -107,6 +108,7 @@ public abstract class AbstractMinecart extends Entity {
      private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision
      private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
      private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
@@ -25,45 +25,49 @@ index 44a6118d3bd67a95180f750c17967561946e2e87..8aece67eba8d6b558bc2441b8b8e599f
      public double maxSpeed = 0.4D;
      // CraftBukkit end
  
-@@ -432,8 +434,8 @@ public abstract class AbstractMinecart extends Entity {
+@@ -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 - Add a collision debounce
-+                    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
++                    // Scissors - Limit amount of vehicle collision checks to 3 maximum
++                    for (int l = 0; l < Math.min(3, list.size()); ++l) {
+                         Entity entity = (Entity) list.get(l);
  
-                     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,16 @@ public abstract class AbstractMinecart extends Entity {
-@@ -462,6 +464,14 @@ public abstract class AbstractMinecart extends Entity {
                              entity.push(this);
                          }
                      }
 +
-+                    // Scissors start - Add a collision debounce
++                    // Scissors - Add a collision debounce
-+                    if (list.size() > 15) {
++                    if (list.size() > 3) {
-+                        this.discard();
-+                    } else if (list.size() > 3) {
 +                        lastLargeCollision = System.currentTimeMillis();
 +                    }
-+                    // Scissors end
++
++                    // Scissors - Delete entity if the collision amount is over 15
++                    if (list.size() > 15) {
++                        this.discard();
++                    }
                  }
              } 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 5c07da62c82bc70138f6cb5007629d6974be69ac..301a72dffd4ac58333d987e85d22136498d2d82a 100644
+index 35aeba4e8430e6419caa9db4a0b931a994228618..11b337298ac824adce04cf0608f8f960e59640c9 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;
  import java.util.Iterator;
  import java.util.List;
  import java.util.function.IntFunction;
-+import java.util.concurrent.TimeUnit; // Scissors
++import java.util.concurrent.TimeUnit;
  import javax.annotation.Nullable;
  import net.minecraft.BlockUtil;
  import net.minecraft.core.BlockPos;
-@@ -112,6 +113,7 @@ public class Boat extends Entity 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,30 +75,35 @@ index 5c07da62c82bc70138f6cb5007629d6974be69ac..301a72dffd4ac58333d987e85d221364
  
      public Boat(EntityType<? extends Boat> type, Level world) {
          super(type, world);
-@@ -465,9 +467,9 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
+@@ -421,10 +423,12 @@ 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
++        // Scissors - Add collision debounce
++        if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability
              boolean flag = !this.level().isClientSide && !(this.getControllingPassenger() instanceof Player);
--            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();
++            // Scissors - Limit amount of vehicle collision checks to 3 maximum
-@@ -480,6 +482,14 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
++            for (int j = 0; j < Math.min(3, list.size()); ++j) {
+                 Entity entity = (Entity) list.get(j);
+ 
+                 if (!entity.hasPassenger((Entity) this)) {
+@@ -435,6 +439,16 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
                      }
                  }
              }
 +
-+            // Scissors start - Add collision debounce
++            // Scissors - Add collision debounce
-+            if (list.size() > 15) {
++            if (list.size() > 3) {
-+                this.discard();
-+            } else if (list.size() > 3) {
 +                lastLargeCollision = System.currentTimeMillis();
 +            }
-+            // Scissors end
++
++            // Scissors - Delete entity if the collision amount is over 15
++            if (list.size() > 15) {
++                this.discard();
++            }
          }
  
      }

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

@@ -1,36 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Mon, 28 Mar 2022 13:19:43 -0600
+Date: Sat, 10 Dec 2022 23:48:28 -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 8240bb085b619f257f8c0a25775e0b15068e440f..c80d58dc9cb9171d51ff0a0596bb27bf161c3c83 100644
---- a/src/main/java/io/papermc/paper/util/MCUtil.java
-+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -659,12 +659,6 @@ public final class MCUtil {
-             return null;
-         }
-         String string = compound.getString(key);
--        try {
--            return net.minecraft.network.chat.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);
-     }
- }
 diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index b540ce21c65ad52ad7e94d2ca2b3926c0875bee1..9cb6fa8e35c89f73e7c95dbe219a4bf6d00b60a9 100644
+index 37fc353c3e59dd5af2fd6c58ac084fb0e6e155d7..3c0ee4e1f42f6056ca86a6f9f129d467e29a2fbc 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 net.minecraft.ChatFormatting; // Scissors
++import net.minecraft.ChatFormatting;
  import net.minecraft.Util;
  import net.minecraft.network.chat.contents.BlockDataSource;
  import net.minecraft.network.chat.contents.DataSource;
@@ -102,18 +84,18 @@ index 7449a024265c42f28a6c9a1ed8d8f4b9e3096aac..487c68abc3eb5c18dc7fee762b216400
                  // 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 97a2657bc98d41c3c1e376b266d2c85f685acc88..9d20f3f1af8e663a8c13714c8928d4a91653daa4 100644
+index 97a2657bc98d41c3c1e376b266d2c85f685acc88..7b6476455e095eed15c92797ce3a3e1146dbdc3f 100644
 --- a/src/main/java/net/minecraft/network/chat/contents/NbtContents.java
 +++ b/src/main/java/net/minecraft/network/chat/contents/NbtContents.java
 @@ -8,6 +8,7 @@ import java.util.Optional;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
-+import net.kyori.adventure.text.TextComponent; // Scissors
++import net.kyori.adventure.text.TextComponent;
  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 {
+@@ -107,10 +108,11 @@ 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 {
@@ -123,14 +105,15 @@ index 97a2657bc98d41c3c1e376b266d2c85f685acc88..9d20f3f1af8e663a8c13714c8928d4a9
                      } catch (Exception var5) {
 -                        LOGGER.warn("Failed to parse component: {}", text, var5);
 +                        // Scissors - don't log
++                        // LOGGER.warn("Failed to parse component: {}", text, var5);
                          return Stream.of();
                      }
                  }).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 1e05fca2a2ba6e2c0b641b6e27585520889cd8a6..3bf0c06f5042e9ff5572714dfc6a641a01a65978 100644
+index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..38c027c0fbddf58136b7d67eb7156403a79de4d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2503,12 +2503,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2473,12 +2473,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");
@@ -144,11 +127,37 @@ index 1e05fca2a2ba6e2c0b641b6e27585520889cd8a6..3bf0c06f5042e9ff5572714dfc6a641a
                      }
  
                      this.setCustomNameVisible(nbt.getBoolean("CustomNameVisible"));
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+index 59246e24558569f7f50b4d4d508616798091c888..5005a0ad5f703727ea9c618ae4b769a77d5655b5 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
+@@ -410,7 +410,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+         this.levels = nbt.getInt("Levels"); // SPIGOT-5053, use where available
+         // CraftBukkit end
+         if (nbt.contains("CustomName", 8)) {
+-            this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException
++            this.name = Component.Serializer.fromJsonSafe(nbt.getString("CustomName")); // Scissors - Use safer method for getting Components from JSON
+         }
+ 
+         this.lockKey = LockCode.fromTag(nbt);
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
+index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..3e23451066894ebd88cad7022970cb2c0e9b75db 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java
+@@ -42,7 +42,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable
+     public void load(CompoundTag nbt) {
+         super.load(nbt);
+         if (nbt.contains("CustomName", 8)) {
+-            this.name = io.papermc.paper.util.MCUtil.getBaseComponentFromNbt("CustomName", nbt); // Paper - Catch ParseException
++            this.name = Component.Serializer.fromJsonSafe(nbt.getString("CustomName")); // Scissors - Use safer method for getting Components from JSON
+         }
+ 
+     }
 diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index 4def212655cea0fd998b52e924f8b671d6aeb559..4359fb5997f8a207c52a09aa61a9431fa3ff550e 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
-@@ -38,7 +38,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);
@@ -157,7 +166,7 @@ index 4def212655cea0fd998b52e924f8b671d6aeb559..4359fb5997f8a207c52a09aa61a9431f
              if (component != null) {
                  playerTeam.setDisplayName(component);
              }
-@@ -56,14 +56,14 @@ public class ScoreboardSaveData extends SavedData {
+@@ -53,14 +53,14 @@ public class ScoreboardSaveData extends SavedData {
              }
  
              if (compoundTag.contains("MemberNamePrefix", 8)) {
@@ -174,12 +183,12 @@ index 4def212655cea0fd998b52e924f8b671d6aeb559..4359fb5997f8a207c52a09aa61a9431f
                  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 string2 = compoundTag.getString("Name");
+                 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(string2, objectiveCriteria, component, renderType);
+                 this.scoreboard.addObjective(string, criterion, component, renderType);
-         }
+             });

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

@@ -1,32 +1,35 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Mon, 28 Mar 2022 16:49:17 -0600
+Date: Fri, 25 Nov 2022 22:25:24 -0600
 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 7daca712816a79cc4a30b084afbd3d07b5d3755f..a7e04eb4284e7d5148e1c7b991620d666785ec70 100644
+index 584a58659fae6ba3d8b53858890bc6ec509ffb0e..0dcee5b53740126e0886058dacc43e447836b8d8 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,10 @@ public class ComponentUtils {
      }
  
      public static MutableComponent updateForEntity(@Nullable CommandSourceStack source, Component text, @Nullable Entity sender, int depth) throws CommandSyntaxException {
-+        MutableComponent result; // Scissors
++        // Scissors start - Reject oversized components
++        MutableComponent result;
          if (depth > 100) {
 -            return text.copy();
-+            result = text.copy(); // Scissors
++            result = text.copy();
          } else {
              // Paper start
              if (text instanceof io.papermc.paper.adventure.AdventureComponent adventureComponent) {
-@@ -52,8 +53,9 @@ public class ComponentUtils {
+@@ -53,8 +55,11 @@ public class ComponentUtils {
                  mutableComponent.append(updateForEntity(source, component, sender, depth + 1));
              }
  
 -            return mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth));
-+            result = mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth)); // Scissors
++            result = mutableComponent.withStyle(resolveStyle(source, text.getStyle(), sender, depth));
          }
-+        return Component.Serializer.toJson(result).length() > 65535 ? Component.empty() : result; // Scissors
++        // Would the resulting component exceed 65535 bytes when encoded as a string?
++        return Component.Serializer.toJson(result).length() > 65535 ? Component.empty() : result;
++        // Scissors end
      }
  
      private static Style resolveStyle(@Nullable CommandSourceStack source, Style style, @Nullable Entity sender, int depth) throws CommandSyntaxException {

patches/server/0028-Add-MasterBlockFireEvent.patch

@@ -5,29 +5,34 @@ 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 2e7c03b00bc941b86df6a7f1b2b188c9f0aede22..0ae03d3934ad7b2b38afa45a65c7753dcbe796d2 100644
+index 2e7c03b00bc941b86df6a7f1b2b188c9f0aede22..333f9bcccbe9ecd88c1fd13e2956f69414d6e295 100644
 --- a/src/main/java/net/minecraft/world/level/block/CommandBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CommandBlock.java
 @@ -1,5 +1,6 @@
  package net.minecraft.world.level.block;
  
-+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;
-@@ -25,6 +26,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+@@ -25,10 +26,10 @@ 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; // Scissors
++import org.bukkit.event.block.BlockRedstoneEvent;
++import org.bukkit.Location;
  import org.slf4j.Logger;
  
- import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
+-import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
-@@ -117,6 +119,15 @@ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock {
+-
+ public class CommandBlock extends BaseEntityBlock implements GameMasterBlock {
+ 
+     private static final Logger LOGGER = LogUtils.getLogger();
+@@ -117,6 +118,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
++        // Scissors - Add master block fire event
 +        final MasterBlockFireEvent event = new MasterBlockFireEvent(new Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
 +
 +        if (!event.callEvent())
@@ -39,31 +44,44 @@ index 2e7c03b00bc941b86df6a7f1b2b188c9f0aede22..0ae03d3934ad7b2b38afa45a65c7753d
          if (hasCommand) {
              executor.performCommand(world);
          } else {
+diff --git a/src/main/java/net/minecraft/world/level/block/StructureBlock.java b/src/main/java/net/minecraft/world/level/block/StructureBlock.java
+index a3dac53b07618819b322b48339d850d80a1c55ba..4dd21b7ea247b3ced3d3ee6c67746cc6811d5bb8 100644
+--- a/src/main/java/net/minecraft/world/level/block/StructureBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/StructureBlock.java
+@@ -1,6 +1,7 @@
+ package net.minecraft.world.level.block;
+ 
+ import javax.annotation.Nullable;
++
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.server.level.ServerLevel;
+ import net.minecraft.world.InteractionHand;
 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 182e16c1d968707a11329150d71b7d01df6c6e52..8582a9369cffe0eebeb82a81fc413d0bf4ad28ed 100644
+index 182e16c1d968707a11329150d71b7d01df6c6e52..fa5cade3f5f2fecc37cc065b96403d0a1c1a2553 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,7 @@ package net.minecraft.world.level.block.entity;
+@@ -2,6 +2,8 @@ package net.minecraft.world.level.block.entity;
  
  import java.util.Arrays;
  import java.util.Optional;
-+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; // 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 +18,7 @@ import net.minecraft.world.level.block.JigsawBlock;
+@@ -17,6 +19,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; // Scissors
++import org.bukkit.Location;
  
  public class JigsawBlockEntity extends BlockEntity {
      public static final String TARGET = "target";
-@@ -107,6 +109,16 @@ public class JigsawBlockEntity extends BlockEntity {
+@@ -107,6 +110,16 @@ public class JigsawBlockEntity extends BlockEntity {
      }
  
      public void generate(ServerLevel world, int maxDepth, boolean keepJigsaws) {
-+        // Scissors start - Add master block fire event
++        // Scissors - 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()));
 +
@@ -77,39 +95,39 @@ index 182e16c1d968707a11329150d71b7d01df6c6e52..8582a9369cffe0eebeb82a81fc413d0b
          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 e8ecced687261861953899a3bea162dbc03977b4..30720203173b23ccdbb0789f7e2adbbe180c7c69 100644
+index 9792bf3ee083f571f1f4089d30beb586839f5f6b..e9d584b0ca984f9b7c70f99e1665cdedecb710e1 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,7 @@ import java.util.Objects;
+@@ -5,6 +5,8 @@ import java.util.Objects;
  import java.util.Optional;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent; // Scissors
++
++import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
  import net.minecraft.ResourceLocationException;
  import net.minecraft.Util;
  import net.minecraft.core.BlockPos;
-@@ -29,6 +30,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.BlockRotProce
+@@ -29,6 +31,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; // Scissors
++import org.bukkit.Location;
  
  public class StructureBlockEntity extends BlockEntity {
      private static final int SCAN_CORNER_BLOCKS_RANGE = 5;
-@@ -264,7 +266,7 @@ public class StructureBlockEntity extends BlockEntity {
+@@ -264,7 +267,6 @@ public class StructureBlockEntity extends BlockEntity {
              return false;
          } else {
              BlockPos blockPos = this.getBlockPos();
 -            int i = 80;
-+            // Scissors - Obfuscation fixes
              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);
 @@ -321,6 +323,16 @@ public class StructureBlockEntity extends BlockEntity {
  
-     public boolean saveStructure(boolean interactive) {
+     public boolean saveStructure(boolean bl) {
          if (this.mode == StructureMode.SAVE && !this.level.isClientSide && this.structureName != null) {
-+            // Scissors start - Add master block fire event
++            // Scissors - 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,9 +142,9 @@ index e8ecced687261861953899a3bea162dbc03977b4..30720203173b23ccdbb0789f7e2adbbe
              StructureTemplateManager structureTemplateManager = serverLevel.getStructureManager();
 @@ -358,6 +370,16 @@ public class StructureBlockEntity extends BlockEntity {
  
-     public boolean loadStructure(ServerLevel world, boolean interactive) {
+     public boolean loadStructure(ServerLevel world, boolean bl) {
          if (this.mode == StructureMode.LOAD && this.structureName != null) {
-+            // Scissors start - Add master block fire event
++            // Scissors - 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()));
 +
@@ -143,7 +161,7 @@ index e8ecced687261861953899a3bea162dbc03977b4..30720203173b23ccdbb0789f7e2adbbe
      }
  
      public void unloadStructure() {
-+        // Scissors start - Add master block fire event
++        // Scissors - 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()));
 +

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

@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Sun, 10 Jul 2022 10:29:03 +0100
-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 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;
- 
- import java.util.List;
- import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.ScissorsConfig; // Scissors
- import net.minecraft.ChatFormatting;
- import net.minecraft.commands.CommandSourceStack;
- import net.minecraft.core.BlockPos;
-@@ -9,8 +10,7 @@ import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.ListTag;
- import net.minecraft.nbt.StringTag;
- import net.minecraft.nbt.Tag;
--import net.minecraft.network.chat.Component;
--import net.minecraft.network.chat.ComponentUtils;
-+import net.minecraft.network.chat.*; // Scissors
- import net.minecraft.stats.Stats;
- import net.minecraft.util.StringUtil;
- import net.minecraft.world.InteractionHand;
-@@ -161,9 +161,43 @@ public class WrittenBookItem extends Item {
-             component2 = Component.literal(text);
-         }
- 
--        return Component.Serializer.toJson(component2);
-+        return Component.Serializer.toJson(!ScissorsConfig.runCommandsInBooks ? sanitize(component2, 0) : component2); // Scissors - Allow server owners to disable run command in books
-     }
- 
-+    // Scissors start - Allow server owners to disable run command in books
-+    public static Component sanitize(Component component, int depth)
-+    {
-+        if (depth > 128)
-+        {
-+            return Component.nullToEmpty("Sanitization function depth limit exceeded");
-+        }
-+
-+        MutableComponent component2 = component.copy();
-+
-+        final Style style = component2.getStyle();
-+        final ClickEvent clickEvent = style.getClickEvent();
-+
-+        if (clickEvent != null && clickEvent.getAction().equals(ClickEvent.Action.RUN_COMMAND))
-+        {
-+            final String clickEventValue = clickEvent.getValue();
-+
-+            component2 = component2.copy().setStyle(style
-+                .withClickEvent(null)
-+                .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.nullToEmpty("Would've " + (clickEventValue.startsWith("/") ? "ran" : "said") + ": " + clickEvent.getValue())))
-+            );
-+        }
-+
-+        final List<Component> processedExtra = component2.getSiblings()
-+            .stream()
-+            .map(comp -> sanitize(comp, depth + 1))
-+            .toList();
-+        component2.getSiblings().clear();
-+        component2.getSiblings().addAll(processedExtra);
-+
-+        return component2;
-+    }
-+    // Scissors end
-+
-     @Override
-     public boolean isFoil(ItemStack stack) {
-         return true;

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

@@ -1,19 +1,21 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Tue, 17 May 2022 05:57:52 +0100
+Date: Thu, 8 Jun 2023 19:32:11 -0500
 Subject: [PATCH] Don't log invalid teams to console
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 168b002377e258f84a3bb86dd8e4a5f42060e3e0..065d2c1543832190bd8bdcd4b553542115c07e64 100644
+index 468f64afb7e9b3ef579205d3beea025deb31b460..71a32f8dfdf043f55f092225a13884ae8935e67c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -861,7 +861,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -862,7 +862,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
              boolean flag = scoreboardteam != null && this.level().getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
  
              if (!flag) {
 -                LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s);
-+                // Scissors - Prevent log spam possible with this error message, easily provokable by players in creative.
++                // Scissors start - Prevent log spam possible with this error message, easily provokable by players in creative.
++                // LivingEntity.LOGGER.warn("Unable to add mob to team \"{}\" (that team probably doesn't exist)", s);
++                // Scissors end
              }
          }
  

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

@@ -1,45 +1,47 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ayunami2000 <spwilliamsiam@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Mon, 28 Mar 2022 17:02:21 -0400
+Date: Thu, 8 Jun 2023 19:41:10 -0500
-Subject: [PATCH] Block server-side chunkbans
+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 d364bd57b1675c8b21d781c2bc16c3e65800455c..f2e7585630ff724f966c7bcedc17e502d786870d 100644
+index fbfadeb83719b81f42724e79c59e92ed88fdece7..bcb9d99359fb3e03c86d7429d9bcfe63b6c0f5d5 100644
 --- a/src/main/java/net/minecraft/network/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/network/PacketEncoder.java
-@@ -7,8 +7,16 @@ import io.netty.handler.codec.MessageToByteEncoder;
+@@ -6,9 +6,18 @@ 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; // Scissors
++import java.util.Collections;
-+import net.minecraft.ChatFormatting; // Scissors
++
-+import net.minecraft.core.NonNullList; // Scissors
++import net.minecraft.ChatFormatting;
-+import net.minecraft.nbt.CompoundTag; // Scissors
++import net.minecraft.core.NonNullList;
-+import net.minecraft.network.chat.Component; // Scissors
++import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.network.chat.SignedMessageBody; // Scissors
++import net.minecraft.network.chat.Component;
++import net.minecraft.network.chat.SignedMessageBody;
  import net.minecraft.network.protocol.Packet;
-+import net.minecraft.network.protocol.game.*; // Scissors
+ import net.minecraft.network.protocol.PacketFlow;
++import net.minecraft.network.protocol.game.*;
  import net.minecraft.util.profiling.jfr.JvmProfiler;
-+import net.minecraft.world.item.ItemStack; // Scissors
++import net.minecraft.world.item.ItemStack;
  import org.slf4j.Logger;
  
  public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-@@ -19,6 +27,23 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+@@ -19,6 +28,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;
@@ -47,14 +49,14 @@ index d364bd57b1675c8b21d781c2bc16c3e65800455c..f2e7585630ff724f966c7bcedc17e502
 +    // 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,46 +59,59 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+@@ -33,38 +59,66 @@ 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
+-                friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
  
 +                // Scissors start
 +                int k;
@@ -64,41 +66,33 @@ index d364bd57b1675c8b21d781c2bc16c3e65800455c..f2e7585630ff724f966c7bcedc17e502
 -                    int k = friendlyByteBuf.writerIndex() - j;
 -                    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) {
--                    // Paper start - Give proper error message
--                    String packetName = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(packet.getClass().getName());
--                    if (packetName.contains(".")) {
--                        packetName = packetName.substring(packetName.lastIndexOf(".") + 1);
--                    }
--
--                    LOGGER.error("Packet encoding of packet {} (ID: {}) threw (skippable? {})", packetName, i, packet.isSkippable(), var13);
--                    // Paper end
 -                    if (packet.isSkippable()) {
--                        throw new SkipPacketException(var13);
+-                        throw new SkipPacketException(var10);
--                    }
+-                    } else {
--
+-                        throw var10;
--                    throw var13;
--                } finally {
--                    // Paper start
--                    int packetLength = friendlyByteBuf.readableBytes();
--                    if (packetLength > MAX_PACKET_SIZE) {
--                        throw new PacketTooLargeException(packet, this.codecKey, packetLength);
 +                    packet = capPacket(packet, i);
 +                    if (packet == null) {
 +                        throw new SkipPacketException(new IllegalArgumentException("Packet too big: " + packet));
                      }
--                    // Paper end
--                    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);
+-                // Paper start
-+                ProtocolSwapHandler.swapProtocolIfNeeded(attribute, packet);
+-                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
              }
          }
@@ -110,6 +104,8 @@ index d364bd57b1675c8b21d781c2bc16c3e65800455c..f2e7585630ff724f966c7bcedc17e502
 +            packet = new ClientboundBlockEntityDataPacket(blockEntityDataPacket.getPos(), blockEntityDataPacket.getType(), new CompoundTag());
 +        } else if (packet instanceof ClientboundLevelChunkPacketData chunkPacket) {
 +            chunkPacket.clearNBT();
++        } else if (packet instanceof ClientboundSetEntityDataPacket) {
++            return null; // Skip
 +        } else if (packet instanceof ClientboundContainerSetContentPacket containerSetContentPacket) {
 +            packet = new ClientboundContainerSetContentPacket(containerSetContentPacket.getContainerId(), containerSetContentPacket.getStateId(), NonNullList.create(), ItemStack.EMPTY);
 +        } else if (packet instanceof ClientboundSetEquipmentPacket setEquipmentPacket) {
@@ -118,6 +114,10 @@ index d364bd57b1675c8b21d781c2bc16c3e65800455c..f2e7585630ff724f966c7bcedc17e502
 +            packet = new ClientboundContainerSetSlotPacket(containerSetSlotPacket.getContainerId(), containerSetSlotPacket.getStateId(), containerSetSlotPacket.getSlot(), ItemStack.EMPTY);
 +        } else if (packet instanceof ClientboundMapItemDataPacket mapItemDataPacket) {
 +            packet = new ClientboundMapItemDataPacket(mapItemDataPacket.getMapId(), mapItemDataPacket.getScale(), mapItemDataPacket.isLocked(), null, null);
++        } else if (packet instanceof ClientboundSystemChatPacket) {
++            return null;
++        } else if (packet instanceof ClientboundDisguisedChatPacket) {
++            return null;
 +        } else if (packet instanceof ClientboundPlayerChatPacket playerChatPacket) {
 +            final SignedMessageBody.Packed body = playerChatPacket.body();
 +            packet = new ClientboundPlayerChatPacket(playerChatPacket.sender(), // Not sending this packet results in a kick when someone says something.
@@ -129,6 +129,7 @@ index d364bd57b1675c8b21d781c2bc16c3e65800455c..f2e7585630ff724f966c7bcedc17e502
 +                playerChatPacket.chatType()
 +            );
 +        } else {
++            LOGGER.error("Packet with ID {} was too large and was not caught. Please report this to the Scissors developers.", i);
 +            return null;
 +        }
 +
@@ -153,7 +154,7 @@ 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 51e24105facfe71ce9f2757c6c881a21b58dacfd..5692fbae221fb01d32d92edc7bea0f6312e24e1c 100644
+index 39b879f21f958dbd91ab0f74e5d4f3c74928fc33..c5d568ce15879be812207f4cd7819f2f6e7d0f7e 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 {
@@ -170,11 +171,3 @@ index 51e24105facfe71ce9f2757c6c881a21b58dacfd..5692fbae221fb01d32d92edc7bea0f63
      // Paper start - Anti-Xray - Add chunk packet info
      @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
- 
-         for(Map.Entry<BlockPos, BlockEntity> entry2 : chunk.getBlockEntities().entrySet()) {
-+            if (this.extraPackets.size() > 50) break; // Scissors - Limit extraPackets size
-             // Paper start
-             if (++totalTileEntities > TE_LIMIT) {
-                 var packet = entry2.getValue().getUpdatePacket();

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

@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Mon, 11 Jul 2022 17:29:12 -0300
-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 83ae366b4f52261e2e2b65a4183d7ca823edd315..67b5447ffcf54c54b2087df456690a9bed98fbd3 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1262,7 +1262,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         if (this.player.hasPermissions(2)) {
-             Entity entity = this.player.level().getEntity(packet.getEntityId());
- 
--            if (entity != null) {
-+            if (entity != null && this.player.distanceToSqr(entity.position().x, entity.position().y, entity.position().z) < 32 * 32) { // Scissors - Validate entity tag query positions
-                 CompoundTag nbttagcompound = entity.saveWithoutId(new CompoundTag());
- 
-                 this.player.connection.send(new ClientboundTagQueryPacket(packet.getTransactionId(), nbttagcompound));
-@@ -1274,7 +1274,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     @Override
-     public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
--        if (this.player.hasPermissions(2)) {
-+        // Scissors start - Validate block entity tag query positions
-+        if (this.player.hasPermissions(2) && this.player.level().isLoadedAndInBounds(packet.getPos())
-+            && this.player.distanceToSqr(packet.getPos().getX(), packet.getPos().getY(), packet.getPos().getZ()) < 32 * 32) { 
-+        // Scissors end
-             BlockEntity tileentity = this.player.level().getBlockEntity(packet.getPos());
-             CompoundTag nbttagcompound = tileentity != null ? tileentity.saveWithoutMetadata() : null;
- 

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

@@ -5,26 +5,28 @@ 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 65bb221993147a558995b36fb835f7b82e0eb4bd..4ea2c551d924f976a8de9e2ae521544f323fbec4 100644
+index 61f6b51b9d868ae6bd79185cc066976a094da8ce..2807dbb730974ca4d3a7c7fd1358e2438628bc50 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.event.player.SpectatorTeleportEvent; // Scissors
++import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
- import com.mojang.authlib.GameProfile;
+ import com.mojang.brigadier.ParseResults;
-@@ -2006,6 +2007,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2066,6 +2067,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/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-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 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; // Scissors
- import net.minecraft.commands.CommandSource;
- import net.minecraft.commands.CommandSourceStack;
-+import net.minecraft.commands.Commands; // Scissors
- import net.minecraft.core.BlockPos;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.NbtOps;
-@@ -19,6 +21,7 @@ import net.minecraft.network.chat.Component;
- import net.minecraft.network.chat.ComponentUtils;
- import net.minecraft.network.chat.Style;
- import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-+import net.minecraft.server.MinecraftServer; // Scissors
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.server.network.FilteredText;
-@@ -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.entity.CraftHumanEntity; // Scissors
- import org.slf4j.Logger;
- import org.bukkit.block.sign.Side;
- import org.bukkit.craftbukkit.block.CraftBlock;
-@@ -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
-+                // Scissors start - Add optional permissions to command signs
-+                final MinecraftServer vanillaServer = player.getServer();
-+                final CraftServer craftServer = vanillaServer.server;
-+                final CraftHumanEntity craftPlayer = player.getBukkitEntity();
-+                final Commands commands = vanillaServer.getCommands();
-+
-+                if (ScissorsConfig.commandSignsBypassPermissions)
-+                {
-+                    commands.performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle(), world, pos), event.getMessage());
-+                }
-+                else
-+                {
-+                    craftServer.dispatchCommand(craftPlayer, command.substring(1));
-+                }
-+                // Scissors end
-                 flag1 = true;
-             }
-         }

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

@@ -5,18 +5,27 @@ 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 4ea2c551d924f976a8de9e2ae521544f323fbec4..83ae366b4f52261e2e2b65a4183d7ca823edd315 100644
+index 2807dbb730974ca4d3a7c7fd1358e2438628bc50..37fcbdcddaa6cbfd6ae37d70cffab957c90f4e07 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -30,6 +30,7 @@ import java.util.function.UnaryOperator;
+@@ -30,6 +30,8 @@ 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.kyori.adventure.text.format.NamedTextColor;
  import net.minecraft.ChatFormatting;
- import net.minecraft.SharedConstants;
+ import net.minecraft.CrashReport;
- import net.minecraft.Util;
+ import net.minecraft.CrashReportCategory;
-@@ -2900,6 +2901,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2985,6 +2987,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     public void handleContainerClick(ServerboundContainerClickPacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+         if (this.player.isImmobile()) return; // CraftBukkit
++
+         this.player.resetLastActionTime();
+         if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit
+             boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
+@@ -3006,6 +3009,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                          return;
                      }
  

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

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Tue, 16 Aug 2022 17:13:02 +0100
-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 0f70be614f8f5350ad558d0ae645cdf0027e1e76..c006ac8531cf2c029fd2fac449f96736a4afed0d 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-@@ -199,6 +199,7 @@ public final class CraftChatMessage {
-     }
- 
-     public static Component[] fromString(String message, boolean keepNewlines, boolean plain) {
-+        if (message.length() > 1_000) return new Component[]{Component.empty()}; // Scissors - Refuse to convert legacy messages over 1k characters
-         return new StringMessage(message, keepNewlines, plain).getOutput();
-     }
- 

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

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Mon, 11 Jul 2022 17:29:12 -0300
+Subject: [PATCH] Validate block 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 37fcbdcddaa6cbfd6ae37d70cffab957c90f4e07..01f88bf2f4872884a9c4c2d1d5f1369c61fb0ebf 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1375,7 +1375,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     @Override
+     public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+-        if (this.player.hasPermissions(2)) {
++        if (this.player.hasPermissions(2) && Level.isInSpawnableBounds(packet.getPos())) { // Scissors - Validate block entity tag query positions
+             BlockEntity tileentity = this.player.level().getBlockEntity(packet.getPos());
+             CompoundTag nbttagcompound = tileentity != null ? tileentity.saveWithoutMetadata() : null;
+ 

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

@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-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 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; // Scissors
- import net.minecraft.server.level.ServerPlayer;
- 
- 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()) {
-+            // 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.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 c0a80824a0307ea673805015119cc834b268f0dc..9f28f86b1b56ea55ab39f6ac988c1f47c5312c6c 100644
---- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-@@ -4,6 +4,7 @@ import com.mojang.logging.LogUtils;
- import java.time.Instant;
- import java.util.UUID;
- import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.ScissorsConfig; // Scissors
- import net.minecraft.util.SignatureUpdater;
- import net.minecraft.util.SignatureValidator;
- import net.minecraft.util.Signer;
-@@ -41,7 +42,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?", (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 67b5447ffcf54c54b2087df456690a9bed98fbd3..94cc122aad0e48687ea9f25cd810f07dc893acc6 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; // Scissors
- import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
- import com.google.common.collect.Lists;
- import com.google.common.primitives.Floats;
-@@ -2220,7 +2221,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     }
- 
-     private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {
--        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));
-@@ -2276,6 +2277,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             Optional<LastSeenMessages> optional = this.lastSeenMessages.applyUpdate(acknowledgment);
- 
-             if (optional.isEmpty()) {
-+                if (!ScissorsConfig.chatSignaturesEnabled) return optional; // Scissors
-                 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
-                 this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
-             }
-@@ -2484,6 +2486,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
- 
-         synchronized (this.lastSeenMessages) {
-             if (!this.lastSeenMessages.applyOffset(packet.offset())) {
-+                if (!ScissorsConfig.chatSignaturesEnabled) return; // Scissors
-                 ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
-                 this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
-             }
-@@ -3462,6 +3465,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     @Override
-     public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-+        if (!ScissorsConfig.chatSignaturesEnabled) return; // Scissors
-         RemoteChatSession.Data remotechatsession_a = packet.chatSession();
-         ProfilePublicKey.Data profilepublickey_a = this.chatSession != null ? this.chatSession.profilePublicKey().data() : null;
-         ProfilePublicKey.Data profilepublickey_a1 = remotechatsession_a.profilePublicKey();

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

@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Tue, 16 Aug 2022 17:13:02 +0100
+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 0f70be614f8f5350ad558d0ae645cdf0027e1e76..6f036df37609daf33db3884174406e1ccd339735 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+@@ -3,12 +3,14 @@ package org.bukkit.craftbukkit.util;
+ import com.google.common.collect.ImmutableMap;
+ import com.google.common.collect.ImmutableMap.Builder;
+ import com.google.gson.JsonParseException;
++
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Optional;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
++
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.network.chat.ClickEvent;
+ import net.minecraft.network.chat.ClickEvent.Action;
+@@ -199,6 +201,11 @@ public final class CraftChatMessage {
+     }
+ 
+     public static Component[] fromString(String message, boolean keepNewlines, boolean plain) {
++        // Scissors start - Refuse to convert legacy messages over 1k characters
++        if (message.length() > 1_000) {
++            return new Component[]{Component.empty()};
++        }
++        // Scissors end
+         return new StringMessage(message, keepNewlines, plain).getOutput();
+     }
+ 

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Video <videogamesm12@gmail.com>
+From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 19 Aug 2022 00:49:38 -0600
+Date: Mon, 22 Aug 2022 21:33:37 -0500
 Subject: [PATCH] Fixes out of bounds HangingEntity crash exploit
 
 

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

@@ -1,78 +0,0 @@
-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 8897496323378080135127f53db004d576476c21..5f957d3241c1931f8166bc9e4960cef15679e932 100644
---- a/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
-+++ b/src/main/java/net/minecraft/advancements/critereon/MinMaxBounds.java
-@@ -129,9 +129,9 @@ public interface MinMaxBounds<T extends Number> {
- 
-     public static record Doubles(Optional<Double> min, 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> optional, Optional<Double> optional2) {
-+        public Doubles(Optional<Double> optional, Optional<Double> optional2) { // Scissors - private -> public
-             this(optional, optional2, squareOpt(optional), squareOpt(optional2));
-         }
- 
-@@ -202,7 +202,7 @@ public interface MinMaxBounds<T extends Number> {
- 
-     public static record Ints(Optional<Integer> min, 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> optional, Optional<Integer> optional2) {
-             this(optional, optional2, optional.map((integer) -> {
-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 73c15a0c56a103ba4e62f0a51af8d42566b07245..6cb3e86f2d661a55536b782729f768ef72163223 100644
---- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
-+++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
-@@ -5,11 +5,13 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
- import java.util.Collections;
- import java.util.Iterator;
- import java.util.List;
-+import java.util.Optional; // Scissors
- import java.util.UUID;
- 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 +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/0036-Patch-invalid-entity-rotation-log-spam.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Mon, 20 Mar 2023 07:04:50 +0000
-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 e8845d6ec1bcba6df2eb8e1af0d658b10299831a..015d5e9b6de5f1fb466e1801bdf5fb430ba91f35 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4696,7 +4696,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- 
-     public void setXRot(float pitch) {
-         if (!Float.isFinite(pitch)) {
--            Util.logAndPauseIfInIde("Invalid entity rotation: " + pitch + ", discarding.");
-+            // Scissors - Patch invalid entity rotation log spam
-         } else {
-             this.xRot = pitch;
-         }

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

@@ -5,13 +5,13 @@ 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 6c9a8f062f989db022154155e8a05b334a0510da..978fad27ad17de03d108ade2c2bfa464b7d83491 100644
+index 2096e8a0bdbcfc865f175f3a01ab688542481531..15d375221c253dc4ca1b598eb80b4638eba6f8d0 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 @@ -1,5 +1,6 @@
  package net.minecraft.world.entity.projectile;
  
-+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;
@@ -26,9 +26,9 @@ index 6c9a8f062f989db022154155e8a05b334a0510da..978fad27ad17de03d108ade2c2bfa464
 +            //this.xPower = d3 / d6 * 0.1D;
 +            //this.yPower = d4 / d6 * 0.1D;
 +            //this.zPower = d5 / d6 * 0.1D;
++            // Scissors end
 +
 +            setPower(d3 / d6 * .1d, d4 / d6 * .1d, d5 / d6 * .1d);
-+            // Scissors end
          }
  
      }
@@ -69,13 +69,13 @@ index 6c9a8f062f989db022154155e8a05b334a0510da..978fad27ad17de03d108ade2c2bfa464
 +                //this.xPower = nbttaglist.getDouble(0);
 +                //this.yPower = nbttaglist.getDouble(1);
 +                //this.zPower = nbttaglist.getDouble(2);
++                // Scissors end
 +
 +                setPower(nbttaglist.getDouble(0), nbttaglist.getDouble(1), nbttaglist.getDouble(2));
-+                // Scissors end
              }
          }
  
-@@ -184,9 +212,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -184,9 +212,12 @@ public abstract class AbstractHurtingProjectile extends Projectile {
                      Vec3 vec3d = entity.getLookAngle();
  
                      this.setDeltaMovement(vec3d);
@@ -86,7 +86,6 @@ index 6c9a8f062f989db022154155e8a05b334a0510da..978fad27ad17de03d108ade2c2bfa464
 +                    //this.xPower = vec3d.x * 0.1D;
 +                    //this.yPower = vec3d.y * 0.1D;
 +                    //this.zPower = vec3d.z * 0.1D;
-+
 +                    setPower(vec3d.x * 0.1D, vec3d.y * 0.1D, vec3d.z * 0.1D);
 +                    // Scissors end
                      this.setOwner(entity);

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Allink <arclicious@vivaldi.net>
-Date: Sun, 10 Jul 2022 10:12:04 +0100
+Date: Wed, 15 Mar 2023 23:13:56 -0500
 Subject: [PATCH] Add Scissors configuration file & command
 
 
@@ -26,6 +26,28 @@ index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..f83b2c4298bd1a5f65487f64bd6a11fb
          ));
  
          new TimingsExport(listeners, parent, history).start();
+diff --git a/src/main/java/me/totalfreedom/scissors/PositionUtility.java b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
+index c54535042a7ac12fe46b3b37db8d7b116e9469d5..62bb706e6a11749f588b3f0c3ffb1fbd70f15d64 100644
+--- a/src/main/java/me/totalfreedom/scissors/PositionUtility.java
++++ b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
+@@ -8,7 +8,7 @@ import net.minecraft.world.phys.Vec3;
+ 
+ public class PositionUtility
+ {
+-    public static Vec3 getValidVec3(double x, double y, double z, Entity entity)
++    /*public static Vec3 getValidVec3(double x, double y, double z, Entity entity)
+     {
+         final Level level = entity.level;
+ 
+@@ -37,7 +37,7 @@ public class PositionUtility
+         { // If we throw some sort of exception due to the position being crazy, catch it
+             return new Vec3(0, 0, 0);
+         }
+-    }
++    }*/
+ 
+     public static Vec3 getValidVec3FromBlockPos(BlockPos blockPos, Entity entity)
+     {
 diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java b/src/main/java/me/totalfreedom/scissors/ScissorsCommand.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..797677d892d83cf54d9a60af1e277b67ed3d6e95
@@ -184,10 +206,10 @@ index 0000000000000000000000000000000000000000..797677d892d83cf54d9a60af1e277b67
 +}
 diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8cd2848aa6b06c5efbe797ed2d75ff4b025b3c52
+index 0000000000000000000000000000000000000000..8ac0e938ccc83c2e71da419b33556090d5083d9e
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,213 @@
 +package me.totalfreedom.scissors;
 +
 +
@@ -226,7 +248,7 @@ index 0000000000000000000000000000000000000000..8cd2848aa6b06c5efbe797ed2d75ff4b
 +
 +            Discord: https://discord.com/invite/mtVQcHn58h
 +            Website: https://scissors.gg/\s
-+            Docs: https://javadoc.scissors.gg/1.20.1/\s
++            Docs: https://javadoc.scissors.gg/1.20/\s
 +            """;
 +    private static final Pattern SPACE = Pattern.compile(" ");
 +    private static final Pattern NOT_NUMERIC = Pattern.compile("[^-\\d.]");
@@ -277,8 +299,8 @@ index 0000000000000000000000000000000000000000..8cd2848aa6b06c5efbe797ed2d75ff4b
 +        config.options().header(HEADER);
 +        config.options().copyDefaults(true);
 +
-+        version = getInt("config-version", 5);
++        version = getInt("config-version", 3);
-+        set("config-version", 5);
++        set("config-version", 3);
 +        readConfig(ScissorsConfig.class, null);
 +    }
 +
@@ -359,18 +381,6 @@ index 0000000000000000000000000000000000000000..8cd2848aa6b06c5efbe797ed2d75ff4b
 +        chatSignaturesEnabled = getBoolean("chatSignaturesEnabled", true);
 +    }
 +
-+    public static boolean excludePlayersFromNbtComponents = false;
-+    private static void excludePlayersFromNbtComponents()
-+    {
-+        excludePlayersFromNbtComponents = getBoolean("excludePlayersFromNbtComponents", false);
-+    }
-+    public static int componentDepthLimit = 128;
-+    private static void componentDepthLimit()
-+    {
-+        componentDepthLimit = getInt("componentDepthLimit", 128);
-+    }
-+
-+
 +    private static void set(String path, Object val)
 +    {
 +        config.set(path, val);
@@ -413,11 +423,40 @@ index 0000000000000000000000000000000000000000..8cd2848aa6b06c5efbe797ed2d75ff4b
 +    }
 +}
 +
+diff --git a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
+index 74cf1c043beef03cfd5adf481414a5ee78bef2a6..182f68359a7a8c0b331acd103ed3952ea3c33b93 100644
+--- a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
++++ b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.network.chat;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.server.level.ServerPlayer;
+ 
+ public interface OutgoingChatMessage {
+@@ -42,12 +43,16 @@ public interface OutgoingChatMessage {
+         }
+         public void sendToPlayer(ServerPlayer sender, boolean filterMaskEnabled, ChatType.Bound params, @javax.annotation.Nullable Component unsigned) {
+             // Paper end
++            // Scissors start - Add configuration option to disable chat signatures
+             PlayerChatMessage playerChatMessage = this.message.filter(filterMaskEnabled);
+             playerChatMessage = unsigned != null ? playerChatMessage.withUnsignedContent(unsigned) : playerChatMessage; // Paper
+-            if (!playerChatMessage.isFullyFiltered()) {
++            if (!playerChatMessage.isFullyFiltered() && /* Scissors */ ScissorsConfig.chatSignaturesEnabled) {
+                 sender.connection.sendPlayerChatMessage(playerChatMessage, params);
++                return;
+             }
+ 
++            sender.connection.sendDisguisedChatMessage(playerChatMessage.decoratedContent(), params);
++            // Scissors end
+         }
+     }
+ }
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index ec268189b19b6fa5c4521f96ce211a531db35ec5..343cb72710ef100cf7e4de1e081cfdc2744aab46 100644
+index dae36c6452ccd57a436dd918547b64d59957ab0a..d450cf3cf8ab5cbb5d32a28ee2e4a6717941adef 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -144,6 +144,7 @@ public class Main {
+@@ -136,6 +136,7 @@ public class Main {
              // 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"));
@@ -426,7 +465,7 @@ index ec268189b19b6fa5c4521f96ce211a531db35ec5..343cb72710ef100cf7e4de1e081cfdc2
  
              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 1c9742ad81f04052d2c3bc18c7636f45b2fc5160..e2cb86f0323d91fa10ecf6cdf1db2e28405798a8 100644
+index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..bbfb536ddec7f44d2a75d35ab495be26104678a1 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
@@ -446,19 +485,203 @@ index 1c9742ad81f04052d2c3bc18c7636f45b2fc5160..e2cb86f0323d91fa10ecf6cdf1db2e28
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 903df63725faeaa160609edddf9f5c54144945e6..058780b420c9207119f4bb889f602bd94199d7fb 100644
+index 4946d476a26e1441cea5904cde7c433da4e60717..182291e66717b7e42a500856e99b599daeeae926 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1040,6 +1040,7 @@ public final class CraftServer implements Server {
+@@ -1,5 +1,6 @@
+ package net.minecraft.server.network;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
+ import com.google.common.collect.Lists;
+ import com.google.common.primitives.Floats;
+@@ -2375,6 +2376,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+             Optional<LastSeenMessages> optional = this.lastSeenMessages.applyUpdate(acknowledgment);
+ 
+             if (optional.isEmpty()) {
++                // Scissors start - Add configuration option to disable chat signatures
++                if (!ScissorsConfig.chatSignaturesEnabled)
++                {
++                    return optional;
++                }
++                // Scissors end
+                 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
+             }
+@@ -2607,11 +2614,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     @Override
+     public void handleChatAck(ServerboundChatAckPacket packet) {
+         LastSeenMessagesValidator lastseenmessagesvalidator = this.lastSeenMessages;
+-
+-        synchronized (this.lastSeenMessages) {
+             if (!this.lastSeenMessages.applyOffset(packet.offset())) {
+-                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
++                synchronized (this.lastSeenMessages) {
++                    // Scissors start - Add configuration option to disable chat signatures
++                    if (!ScissorsConfig.chatSignaturesEnabled)
++                    {
++                        return;
++                    }
++                    // Scissors end
++                    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
              }
  
-         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
+         }
+diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
+index 31911c09fe15753ae32fa39417bdc9e9de552a88..97ce45c6e44b1400b8d60b52397617038f8fe911 100644
+--- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java
++++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
+@@ -2,6 +2,8 @@ package net.minecraft.world.item;
+ 
+ import java.util.List;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.commands.CommandSourceStack;
+ import net.minecraft.core.BlockPos;
+@@ -9,8 +11,7 @@ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.nbt.ListTag;
+ import net.minecraft.nbt.StringTag;
+ import net.minecraft.nbt.Tag;
+-import net.minecraft.network.chat.Component;
+-import net.minecraft.network.chat.ComponentUtils;
++import net.minecraft.network.chat.*;
+ import net.minecraft.stats.Stats;
+ import net.minecraft.util.StringUtil;
+ import net.minecraft.world.InteractionHand;
+@@ -111,8 +112,7 @@ public class WrittenBookItem extends Item {
+ 
+     public static boolean resolveBookComponents(ItemStack book, @Nullable CommandSourceStack commandSource, @Nullable Player player) {
+         CompoundTag compoundTag = book.getTag();
+-        if (io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.resolveSelectorsInBooks && compoundTag != null && !compoundTag.getBoolean("resolved")) { // Paper
+-            compoundTag.putBoolean("resolved", true);
++        if (compoundTag != null) { // Paper
+             if (!makeSureTagIsValid(compoundTag)) {
+                 return false;
+             } else {
+@@ -161,8 +161,42 @@ public class WrittenBookItem extends Item {
+             component2 = Component.literal(text);
+         }
+ 
+-        return Component.Serializer.toJson(component2);
++        return Component.Serializer.toJson(!ScissorsConfig.runCommandsInBooks ? sanitize(component2, 0) : component2); // Scissors - Allow server owners to disable run command in books
++    }
++
++    // Scissors start - Allow server owners to disable run command in books
++    public static Component sanitize(Component component, int depth)
++    {
++        if (depth > 128)
++        {
++            return Component.nullToEmpty("Sanitization function depth limit exceeded");
++        }
++
++        MutableComponent component2 = component.copy();
++
++        final Style style = component2.getStyle();
++        final ClickEvent clickEvent = style.getClickEvent();
++
++        if (clickEvent != null && clickEvent.getAction().equals(ClickEvent.Action.RUN_COMMAND))
++        {
++            final String clickEventValue = clickEvent.getValue();
++
++            component2 = component2.copy().setStyle(style
++                .withClickEvent(null)
++                .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.nullToEmpty("Would've " + (clickEventValue.startsWith("/") ? "ran" : "said") + ": " + clickEvent.getValue())))
++            );
++        }
++
++        final List<Component> processedExtra = component2.getSiblings()
++            .stream()
++            .map(comp -> sanitize(comp, depth + 1))
++            .toList();
++        component2.getSiblings().clear();
++        component2.getSiblings().addAll(processedExtra);
++
++        return component2;
+     }
++    // Scissors end
+ 
+     @Override
+     public boolean isFoil(ItemStack stack) {
+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 ba6f0ba00cd2635bcd19889dca0349b363b079fe..59fe6f9aba094f8e5393de44d8977e5e48ed76d8 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,11 @@ import java.util.Objects;
+ import java.util.UUID;
+ import java.util.function.UnaryOperator;
+ import javax.annotation.Nullable;
++
++import me.totalfreedom.scissors.ScissorsConfig;
+ import net.minecraft.commands.CommandSource;
+ import net.minecraft.commands.CommandSourceStack;
++import net.minecraft.commands.Commands;
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.nbt.NbtOps;
+@@ -19,6 +22,7 @@ import net.minecraft.network.chat.Component;
+ import net.minecraft.network.chat.ComponentUtils;
+ import net.minecraft.network.chat.Style;
+ import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
++import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ServerLevel;
+ import net.minecraft.server.level.ServerPlayer;
+ import net.minecraft.server.network.FilteredText;
+@@ -30,13 +34,14 @@ 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.entity.CraftHumanEntity;
+ import org.slf4j.Logger;
+ import org.bukkit.block.sign.Side;
+ import org.bukkit.craftbukkit.block.CraftBlock;
+-import org.bukkit.craftbukkit.util.CraftChatMessage;
+ import org.bukkit.entity.Player;
+ import org.bukkit.event.block.SignChangeEvent;
+ // CraftBukkit end
++import org.bukkit.craftbukkit.CraftServer;
+ 
+ public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements
+ 
+@@ -285,6 +290,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
++                // Scissors start - Add optional permissions to command signs
++                final MinecraftServer vanillaServer = player.getServer();
++                final CraftServer craftServer = vanillaServer.server;
++                final CraftHumanEntity craftPlayer = player.getBukkitEntity();
++                final Commands commands = vanillaServer.getCommands();
++
++                if (ScissorsConfig.commandSignsBypassPermissions)
++                {
++                    commands.performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle(), world, pos), event.getMessage());
++                }
++                else
++                {
++                    craftServer.dispatchCommand(craftPlayer, command.substring(1));
++                }
++                // Scissors end
+                 flag1 = true;
+             }
+         }
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 717bd02837ac33180ceca92e2f45a8c2e6ad4694..1d904254eaa1be68ca51a2f43c5058ad48a6c05c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -978,6 +978,7 @@ public final class CraftServer implements Server {
+         }
+ 
+         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
-@@ -1071,6 +1072,7 @@ public final class CraftServer implements Server {
+@@ -1009,6 +1010,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -466,26 +689,24 @@ index 903df63725faeaa160609edddf9f5c54144945e6..058780b420c9207119f4bb889f602bd9
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2978,6 +2980,14 @@ public final class CraftServer implements Server {
+@@ -2759,6 +2761,12 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
-+        // Scissors start
 +        @Override
 +        public YamlConfiguration getScissorsConfig()
 +        {
 +            return me.totalfreedom.scissors.ScissorsConfig.config;
 +        }
-+        // Scissors end
 +
          @Override
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 54891c5d7ca19a4fdab74a8729814a6fecee3fda..05db4799fddfbd8045c967520db99a75ba807697 100644
+index 0fb3a648ee6bd6cb88515770bcfc70e368313527..5bbfcfe68dace755fe6ec4bc94965d216d998382 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,9 +180,27 @@ public class Main {
                          .defaultsTo("Unknown Server")
                          .describedAs("Name");
                  // Paper end
@@ -496,7 +717,9 @@ index 54891c5d7ca19a4fdab74a8729814a6fecee3fda..05db4799fddfbd8045c967520db99a75
 +                    .ofType(File.class)
 +                    .defaultsTo(new File(io.papermc.paper.configuration.PaperConfigurations.CONFIG_DIR))
 +                    .describedAs("Config directory");
++                // Scissors end
 +
++                // Scissors start
 +                acceptsAll(asList("scissors", "scissors-settings"), "File for Scissors settings")
 +                    .withRequiredArg()
 +                    .ofType(File.class)
@@ -506,3 +729,8 @@ index 54891c5d7ca19a4fdab74a8729814a6fecee3fda..05db4799fddfbd8045c967520db99a75
              }
          };
  
++
++
+         OptionSet options = null;
+ 
+         // Paper start - preload logger classes to avoid plugins mixing versions

patches/server/0037-Limit-sculk-catalyst-cursor-positions.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Mon, 10 Apr 2023 13:56:18 -0300
-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 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 {
- 
-             while (iterator.hasNext()) {
-                 SculkSpreader.ChargeCursor sculkspreader_a = (SculkSpreader.ChargeCursor) iterator.next();
--
-+                if (!world.getMinecraftWorld().isLoadedAndInBounds(sculkspreader_a.getPos())) continue; // Scissors
-                 sculkspreader_a.update(world, pos, random, this, shouldConvertToBlock);
-                 if (sculkspreader_a.charge <= 0) {
-                     world.levelEvent(3006, sculkspreader_a.getPos(), 0);

patches/server/0038-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 81f3e64d94fa17e45411e5c1641d9c5a2fe3d2e2..bcf6e2ce9f00d1688a5fa00ec055a57389346922 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundMapItemDataPacket.java
-@@ -65,7 +65,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) {
-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 e4c4948e076cd64686dfd16ae0568fafc1437140..eff53c21b18574750b691b784fb1688885d4ace7 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/0038-Patch-invalid-entity-rotation-log-spam.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Mon, 20 Mar 2023 07:04:50 +0000
+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 38c027c0fbddf58136b7d67eb7156403a79de4d1..ff3940a0d552140cae820fbed16bfb5e69507822 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -4615,7 +4615,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ 
+     public void setYRot(float yaw) {
+         if (!Float.isFinite(yaw)) {
+-            Util.logAndPauseIfInIde("Invalid entity rotation: " + yaw + ", discarding.");
++            // Scissors start - Patch invalid entity rotation log spam
++            //Util.logAndPauseIfInIde("Invalid entity rotation: " + yaw + ", discarding.");
++            // Scissors end
+         } else {
+             this.yRot = yaw;
+         }
+@@ -4627,7 +4629,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ 
+     public void setXRot(float pitch) {
+         if (!Float.isFinite(pitch)) {
+-            Util.logAndPauseIfInIde("Invalid entity rotation: " + pitch + ", discarding.");
++            // Scissors start - Patch invalid entity rotation log spam
++            //Util.logAndPauseIfInIde("Invalid entity rotation: " + pitch + ", discarding.");
++            // Scissors end
+         } else {
+             this.xRot = pitch;
+         }

patches/server/0039-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..ba549e6e5da75413ae3b4083f8b7a5527672de4e 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;
+ 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/0040-Limit-sculk-catalyst-cursor-positions.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Mon, 10 Apr 2023 13:56:18 -0300
+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 ab732f0e52ef3c3d3be6ddc827d693fe294e4167..761c8cfb98e05a3c500599520e26e4323725fc85 100644
+--- a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
++++ b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
+@@ -141,6 +141,13 @@ public class SculkSpreader {
+             Object2IntMap<BlockPos> object2IntMap = new Object2IntOpenHashMap<>();
+ 
+             for(SculkSpreader.ChargeCursor chargeCursor : this.cursors) {
++                // Scissors start
++                if (!world.getMinecraftWorld().isLoadedAndInBounds(chargeCursor.getPos()))
++                {
++                    continue;
++                }
++                // Scissors end
++
+                 chargeCursor.update(world, pos, random, this, shouldConvertToBlock);
+                 if (chargeCursor.charge <= 0) {
+                     world.levelEvent(3006, chargeCursor.getPos(), 0);

patches/server/0041-Limit-map-decoration-text-length.patch

@@ -0,0 +1,31 @@
+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 decoration text length
+
+
+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..b225f770869832775c9a8a79ffaf89e98245cc2e 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;
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.util.Mth;
+ 
+@@ -14,6 +15,12 @@ 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;

patches/server/0042-Limit-map-decoration-count.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Fri, 28 Apr 2023 16:34:15 -0300
+Subject: [PATCH] Limit map decoration count
+
+
+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 3b12030b49b1c539684d75ca3896eb498400ef99..a1f042e5329343489cf30e436a8f553d39e5a6e4 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,12 @@ 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/0043-Prevent-player-banning-using-duplicate-UUIDs.patch

@@ -5,14 +5,15 @@ 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 17610196db7a1c6feb2cf74a02479a8691aa323f..70c52e2293d64d32fdcebbcd0678e0c80d35fbb8 100644
+index 2ac23779222369ace69f1e3f7fb12184865b7a43..05c8e4e30b2dce565e84f4c09b3f27244f8c0451 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1644,7 +1644,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1610,7 +1610,14 @@ 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);

patches/server/0044-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 82ccaf612548a7dbab7e5aeffb6eb8db84367477..5147c5860f0b485ecb82fa06336939d5bb54057d 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> {
+@@ -367,7 +367,7 @@ public final class EntityLookup implements LevelEntityGetter<Entity> {
                  return false;
              }
              if (this.entityByUUID.containsKey(entity.getUUID())) {

patches/server/0045-Make-excluding-players-from-nbt-components-configura.patch

@@ -0,0 +1,58 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chipmunk <65827213+ChipmunkMC@users.noreply.github.com>
+Date: Mon, 1 May 2023 09:13:50 -0400
+Subject: [PATCH] Make excluding players from nbt components configurable
+
+
+diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+index 9f2a51fddb692f5152c32dcbe1f5a6ba150634e4..39b56ca496ed7369ead21805d476c2b813fcdd1d 100644
+--- a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
++++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+@@ -87,8 +87,8 @@ public class ScissorsConfig
+         config.options().header(HEADER);
+         config.options().copyDefaults(true);
+ 
+-        version = getInt("config-version", 3);
+-        set("config-version", 3);
++        version = getInt("config-version", 4);
++        set("config-version", 4);
+         readConfig(ScissorsConfig.class, null);
+     }
+ 
+@@ -169,6 +169,12 @@ public class ScissorsConfig
+         chatSignaturesEnabled = getBoolean("chatSignaturesEnabled", true);
+     }
+ 
++    public static boolean excludePlayersFromNbtComponents = false;
++    private static void excludePlayersFromNbtComponents()
++    {
++        excludePlayersFromNbtComponents = getBoolean("excludePlayersFromNbtComponents", false);
++    }
++
+     private static void set(String path, Object val)
+     {
+         config.set(path, val);
+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 e5a2bb129100f0f935c8f10682204e7cb6277142..1ebc6107bbbf18dd9ede1196769e43ee7cb9d448 100644
+--- a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
++++ b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.network.chat.contents;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import com.mojang.brigadier.StringReader;
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
+ import java.util.List;
+@@ -32,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().filter((entity) -> !(entity instanceof Player)).map(NbtPredicate::getEntityTagToCompare); // Scissors - Don't query NBT from players
++	    // Scissors start
++            Stream<? extends Entity> stream = list.stream();
++            if (ScissorsConfig.excludePlayersFromNbtComponents) stream = stream.filter((entity) -> !(entity instanceof Player));
++            return stream.map(NbtPredicate::getEntityTagToCompare);
++	    // Scissors end
+         } else {
+             return Stream.empty();
+         }

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

@@ -5,14 +5,18 @@ 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 9cb6fa8e35c89f73e7c95dbe219a4bf6d00b60a9..fa6151a2361684426bdd3bf3b433fe4dbd0cf47b 100644
+index 3c0ee4e1f42f6056ca86a6f9f129d467e29a2fbc..9c2c22ee548ad77f0912698f33de5f467f32fb7f 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> {
+@@ -266,6 +266,11 @@ 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
++                        // Scissors start
++                        if (jsonarray.size() <= 0) {
++                            throw new JsonParseException("Unexpected empty array of components");
++                        }
++                        // Scissors end
  
                          ichatmutablecomponent = null;
                          Iterator iterator = jsonarray.iterator();

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

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

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

@@ -4,8 +4,36 @@ Date: Wed, 31 May 2023 18:14:00 -0300
 Subject: [PATCH] Add depth limit to Component deserializer
 
 
+diff --git a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+index 39b56ca496ed7369ead21805d476c2b813fcdd1d..9659cff6412584190ff0c32e01f602de4ff7d3b3 100644
+--- a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
++++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+@@ -87,8 +87,8 @@ public class ScissorsConfig
+         config.options().header(HEADER);
+         config.options().copyDefaults(true);
+ 
+-        version = getInt("config-version", 4);
+-        set("config-version", 4);
++        version = getInt("config-version", 5);
++        set("config-version", 5);
+         readConfig(ScissorsConfig.class, null);
+     }
+ 
+@@ -175,6 +175,12 @@ public class ScissorsConfig
+         excludePlayersFromNbtComponents = getBoolean("excludePlayersFromNbtComponents", false);
+     }
+ 
++    public static int componentDepthLimit = 128;
++    private static void componentDepthLimit()
++    {
++        componentDepthLimit = getInt("componentDepthLimit", 128);
++    }
++
+     private static void set(String path, Object val)
+     {
+         config.set(path, val);
 diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index fa6151a2361684426bdd3bf3b433fe4dbd0cf47b..4dd93e02f2b18e5c75be14ff8f052220ca69f427 100644
+index 9c2c22ee548ad77f0912698f33de5f467f32fb7f..ba2879b25e59290ab81501458414a417c121ed03 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;
@@ -13,7 +41,7 @@ index fa6151a2361684426bdd3bf3b433fe4dbd0cf47b..4dd93e02f2b18e5c75be14ff8f052220
  import java.util.Optional;
  import javax.annotation.Nullable;
 +import me.totalfreedom.scissors.ScissorsConfig; // Scissors
- import net.minecraft.ChatFormatting; // Scissors
+ import net.minecraft.ChatFormatting;
  import net.minecraft.Util;
  import net.minecraft.network.chat.contents.BlockDataSource;
 @@ -44,6 +45,7 @@ import net.minecraft.util.GsonHelper;
@@ -38,70 +66,80 @@ index fa6151a2361684426bdd3bf3b433fe4dbd0cf47b..4dd93e02f2b18e5c75be14ff8f052220
 +            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> {
+@@ -266,18 +274,16 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+                 if (!jsonelement.isJsonObject()) {
+                     if (jsonelement.isJsonArray()) {
+                         JsonArray jsonarray = jsonelement.getAsJsonArray();
+-                        // Scissors start
+                         if (jsonarray.size() <= 0) {
+                             throw new JsonParseException("Unexpected empty array of components");
+                         }
+-                        // Scissors end
+ 
+                         ichatmutablecomponent = null;
+                         Iterator iterator = jsonarray.iterator();
  
                          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
++                            MutableComponent ichatmutablecomponent1 = this.deserialize(jsonelement1, jsondeserializationcontext, depth + 1);
  
                              if (ichatmutablecomponent == null) {
                                  ichatmutablecomponent = ichatmutablecomponent1;
-@@ -297,12 +305,17 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -301,12 +307,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
++                        // 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
++                                aobject[i] = Serializer.unwrapTextArgument(this.deserialize(jsonarray1.get(i), jsondeserializationcontext, depth + 1 + penalty));
                              }
  
                              ichatmutablecomponent = Component.translatableWithFallback(s, s1, aobject);
-@@ -318,7 +331,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -322,7 +333,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
++                        Optional<Component> optional = this.parseSeparator(jsondeserializationcontext, jsonobject, depth + 1);
  
                          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> {
+@@ -333,7 +344,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
++                        Optional<Component> optional1 = this.parseSeparator(jsondeserializationcontext, jsonobject, depth + 1);
                          boolean flag = GsonHelper.getAsBoolean(jsonobject, "interpret", false);
                          Object object;
  
-@@ -356,7 +369,7 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -360,7 +371,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
++                            ichatmutablecomponent.append((Component) this.deserialize(jsonarray2.get(j), jsondeserializationcontext, depth + 1));
                          }
                      }
  
-@@ -366,6 +379,12 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -370,6 +381,11 @@ 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);
 +        }
@@ -110,7 +148,7 @@ index fa6151a2361684426bdd3bf3b433fe4dbd0cf47b..4dd93e02f2b18e5c75be14ff8f052220
          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> {
+@@ -388,8 +404,10 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
              return text;
          }
  

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

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Sat, 1 Jul 2023 21:22:29 -0300
-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 598dc0d3a2b9387e76d7e4e19e54c4573a24bc54..9eed28bf8bc7e2fa528729cde01a535bc7040815 100644
---- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-@@ -56,7 +56,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
-                 this.stack.push(entry);
-             }
-         } else if (this.count - 1 == this.maxChainedNeighborUpdates) {
--            LOGGER.error("Too many chained neighbor updates. Skipping the rest. First skipped position: " + pos.toShortString());
-+            // Scissors - don't log
-         }
- 
-         if (!bl) {

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

@@ -5,17 +5,20 @@ 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 ee012f1ef1ff7f2adf76d1690dbd5611af7deb4d..d79723047317c24c53fb85c423de8dd9f84891ac 100644
+index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..82b1d851e310504e7373a967dfb5b0b096d36693 100644
 --- a/src/main/java/net/minecraft/nbt/TagParser.java
 +++ b/src/main/java/net/minecraft/nbt/TagParser.java
-@@ -179,9 +179,56 @@ public class TagParser {
+@@ -169,8 +169,58 @@ public class TagParser {
          }
  
          this.expect('}');
 -        return compoundTag;
-+        return exceedsDepthLimit(compoundTag) ? new CompoundTag() : compoundTag; // Scissors - Add depth limit to SNBT
++
-     }
++        // Scissors start - Add depth limit to SNBT
- 
++        return exceedsDepthLimit(compoundTag) ? new CompoundTag() : compoundTag;
++        // Scissors end
++    }
++
 +    // Scissors start - Add depth limit to SNBT
 +    private boolean exceedsDepthLimit(Tag tag) {
 +        return this.exceedsDepthLimit(0, tag);
@@ -60,22 +63,25 @@ index ee012f1ef1ff7f2adf76d1690dbd5611af7deb4d..d79723047317c24c53fb85c423de8dd9
 +        }
 +
 +        return false;
-+    }
+     }
 +    // Scissors end
-+
+ 
      private Tag readListTag() throws CommandSyntaxException {
          this.expect('[');
-         this.reader.skipWhitespace();
+@@ -203,7 +253,11 @@ public class TagParser {
-@@ -213,7 +260,7 @@ public class TagParser {
              }
  
              this.expect(']');
 -            return listTag;
-+            return exceedsDepthLimit(listTag) ? new ListTag() : listTag; // Scissors - Add depth limit to SNBT
++
++            // Scissors start - Add depth limit to SNBT
++            return exceedsDepthLimit(listTag) ? new ListTag() : listTag;
++            // return listTag;
++            // Scissors end
          }
      }
  
-@@ -238,7 +285,7 @@ public class TagParser {
+@@ -228,7 +282,7 @@ public class TagParser {
      }
  
      private <T extends Number> List<T> readArray(TagType<?> arrayTypeReader, TagType<?> typeReader) throws CommandSyntaxException {
@@ -84,7 +90,7 @@ index ee012f1ef1ff7f2adf76d1690dbd5611af7deb4d..d79723047317c24c53fb85c423de8dd9
  
          while(true) {
              if (this.reader.peek() != ']') {
-@@ -251,11 +298,11 @@ public class TagParser {
+@@ -241,11 +295,11 @@ public class TagParser {
                  }
  
                  if (typeReader == ByteTag.TYPE) {
@@ -99,7 +105,7 @@ index ee012f1ef1ff7f2adf76d1690dbd5611af7deb4d..d79723047317c24c53fb85c423de8dd9
                  }
  
                  if (this.hasElementSeparator()) {
-@@ -267,7 +314,7 @@ public class TagParser {
+@@ -257,7 +311,7 @@ public class TagParser {
              }
  
              this.expect(']');

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

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Tue, 4 Jul 2023 18:49:34 -0300
-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 bcb195b1e40f562d0cd5ecca236ebba87150d236..fee0a88c6ccecd71ebf63651655dec2d5097f894 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -858,7 +858,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             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"));
--        } else {
-+        } else if (this.player.level().isLoadedAndInBounds(packet.getPos())) { // Scissors
-             BaseCommandBlock commandblocklistenerabstract = null;
-             CommandBlockEntity tileentitycommand = null;
-             BlockPos blockposition = packet.getPos();
-@@ -1025,7 +1025,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     @Override
-     public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
--        if (this.player.canUseGameMasterBlocks()) {
-+        if (this.player.canUseGameMasterBlocks() && this.player.level().isLoadedAndInBounds(packet.getPos())) { // Scissors
-             BlockPos blockposition = packet.getPos();
-             BlockState iblockdata = this.player.level().getBlockState(blockposition);
-             BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
-@@ -1083,7 +1083,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     @Override
-     public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
--        if (this.player.canUseGameMasterBlocks()) {
-+        if (this.player.canUseGameMasterBlocks() && this.player.level().isLoadedAndInBounds(packet.getPos())) { // Scissors
-             BlockPos blockposition = packet.getPos();
-             BlockState iblockdata = this.player.level().getBlockState(blockposition);
-             BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
-@@ -1106,7 +1106,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-     @Override
-     public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
--        if (this.player.canUseGameMasterBlocks()) {
-+        if (this.player.canUseGameMasterBlocks() && this.player.level().isLoadedAndInBounds(packet.getPos())) { // Scissors
-             BlockPos blockposition = packet.getPos();
-             BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
- 

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

@@ -4,83 +4,83 @@ Date: Fri, 2 Jun 2023 20:55:18 +0100
 Subject: [PATCH] Implement command block events
 
 
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
-index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400deb533d2 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundSetCommandMinecartPacket.java
-@@ -9,7 +9,7 @@ import net.minecraft.world.level.BaseCommandBlock;
- import net.minecraft.world.level.Level;
- 
- public class ServerboundSetCommandMinecartPacket implements Packet<ServerGamePacketListener> {
--    private final int entity;
-+    public final int entity; // Scissors - private -> public
-     private final String command;
-     private final boolean trackOutput;
- 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 94cc122aad0e48687ea9f25cd810f07dc893acc6..bcb195b1e40f562d0cd5ecca236ebba87150d236 100644
+index a2b96f7b1e98586017dbbf28a73446196738ee99..0227e2c7197c3684677f76ff7f0fe0acc21b6c14 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; // Scissors
+ import me.totalfreedom.scissors.ScissorsConfig;
-+import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent; // Scissors
++import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent;
-+import me.totalfreedom.scissors.event.block.CommandMinecartPlayerEditEvent; // Scissors
++import me.totalfreedom.scissors.event.block.CommandMinecartPlayerEditEvent;
- import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors
+ import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
-@@ -154,6 +156,7 @@ import net.minecraft.world.entity.player.Inventory;
+@@ -160,6 +162,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; // Scissors
++import net.minecraft.world.entity.vehicle.MinecartCommandBlock;
  import net.minecraft.world.item.BlockItem;
  import net.minecraft.world.item.BucketItem;
  import net.minecraft.world.item.Item;
-@@ -181,6 +184,8 @@ import net.minecraft.world.phys.Vec3;
+@@ -188,6 +191,7 @@ 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; // Scissors
++import org.bukkit.entity.minecart.CommandMinecart;
-+import org.bukkit.craftbukkit.entity.CraftMinecartCommand; // Scissors
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -893,6 +898,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1001,6 +1005,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                      this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity);
                  }
  
-+                // Scissors start
++                // Scissors start - Implement command block events
-+                CommandBlockPlayerEditEvent event = new CommandBlockPlayerEditEvent(this.getCraftPlayer(), commandblocklistenerabstract.getCommand(), s, new CraftCommandBlock(this.player.level().getWorld(), tileentitycommand));
++                if (commandblocklistenerabstract instanceof org.bukkit.block.CommandBlock commandBlock)
++                {
++                    CommandBlockPlayerEditEvent event = new CommandBlockPlayerEditEvent(this.getCraftPlayer(), Objects.requireNonNullElse(commandblocklistenerabstract.getCommand(), ""), s, commandBlock);
++                    event.callEvent();
 +
-+                if (!event.callEvent()) {
++                    if (event.isCancelled()) {
 +                        return;
 +                    }
 +
 +                    s = event.getNewCommand();
++                }
++
 +                // Scissors end
 +
                  commandblocklistenerabstract.setCommand(s);
                  commandblocklistenerabstract.setTrackOutput(flag);
                  if (!flag) {
-@@ -924,7 +939,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1032,7 +1051,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
              BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level());
  
              if (commandblocklistenerabstract != null) {
 -                commandblocklistenerabstract.setCommand(packet.getCommand());
 +                // Scissors start - Implement command block events
 +                String command = packet.getCommand();
-+                CommandMinecartPlayerEditEvent event = new CommandMinecartPlayerEditEvent(this.getCraftPlayer(), commandblocklistenerabstract.getCommand(), command, new CraftMinecartCommand(this.cserver, (MinecartCommandBlock) this.player.level().getEntity(packet.entity)));
 +
-+                if (!event.callEvent()) {
++                if (commandblocklistenerabstract instanceof CommandMinecart commandMinecart)
++                {
++                    CommandMinecartPlayerEditEvent event = new CommandMinecartPlayerEditEvent(this.getCraftPlayer(), Objects.requireNonNullElse(commandblocklistenerabstract.getCommand(), ""), command, commandMinecart);
++                    event.callEvent();
++
++                    if (event.isCancelled()) {
 +                        return;
 +                    }
 +
 +                    command = event.getNewCommand();
++                }
++
 +                commandblocklistenerabstract.setCommand(command);
 +
++                // commandblocklistenerabstract.setCommand(packet.getCommand());
++
 +                // Scissors end
++
                  commandblocklistenerabstract.setTrackOutput(packet.isTrackOutput());
                  if (!packet.isTrackOutput()) {
                      commandblocklistenerabstract.setLastOutput((Component) null);

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

@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Wed, 5 Jul 2023 22:58:24 +0100
-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 9a7956befc346e1b58f064213800fd099a052fc6..2ebedd806bafc6ff7c4bf5a962ead50ce2ad1a8a 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -227,8 +227,12 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         this.hivePos = null;
--        if (nbt.contains("HivePos")) {
--            this.hivePos = NbtUtils.readBlockPos(nbt.getCompound("HivePos"));
-+        if (nbt.contains("HivePos"))
-+        {
-+            // Scissors start - Limit HivePos
-+            final BlockPos savedHivePos = NbtUtils.readBlockPos(nbt.getCompound("HivePos"));
-+            this.hivePos = this.level().isLoadedAndInBounds(savedHivePos) ? savedHivePos : null;
-+            // Scissors end - Limit HivePos
-         }
- 
-         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 90e577b1a89b02c38daff2845a63dafe5ed929e1..1a2b6ee032ab6952634c9f596820db3e7374fb50 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 {
-     @Override
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
--        if (nbt.contains("BoundX")) {
--            this.boundOrigin = new BlockPos(nbt.getInt("BoundX"), nbt.getInt("BoundY"), nbt.getInt("BoundZ"));
-+        if (nbt.contains("BoundX"))
-+        {
-+            // Scissors start - Limit Vex bound origin
-+            final BlockPos savedBoundOrigin = new BlockPos(nbt.getInt("BoundX"), nbt.getInt("BoundY"), nbt.getInt("BoundZ"));
-+            this.boundOrigin = this.level().isLoadedAndInBounds(savedBoundOrigin) ? savedBoundOrigin : null;
-+            // Scissors end - Limit Vex bound origin
-         }
- 
-         if (nbt.contains("LifeTicks")) {

patches/server/0050-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 f13943db6f2fb923c52dcf9e8bf7000041d0a362..2fdcc47dd6a813d5f7a32dc58ca67b6b965c8749 100644
+index f2325c0c475bb465f5275f78c71949648a860d0c..4ec228ce026ee39eebd17d180fb5caea1b74e6e2 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,7 +17,7 @@ index f13943db6f2fb923c52dcf9e8bf7000041d0a362..2fdcc47dd6a813d5f7a32dc58ca67b6b
              return this.levels * 10 + 10;
          } else {
              return effectRange;
-@@ -456,6 +456,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
+@@ -415,6 +415,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

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

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Thu, 6 Jul 2023 23:01:12 +0100
-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 7204b973c3ad9239e82355513f6d538107102e48..2463444778f19f937b18173798c04d9d9788a824 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
-@@ -147,7 +147,7 @@ public class AttributeMap {
-                 }
- 
-             }, () -> {
--                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 a7380ce6dcbf64ad8a51dd047d178ae887518041..cb015941e5ea4618bd0964f4aa66a9f0fceb27a1 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
-@@ -92,7 +92,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: {}", (Object)var3.getMessage());
-+            // LOGGER.warn("Unable to create attribute: {}", (Object)var3.getMessage()); // Scissors - Mute invalid attributes
-             return null;
-         }
-     }

patches/server/0051-Fix-invalid-armor-trim-exploit.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Luna <lunahatesgogle@gmail.com>
+Date: Mon, 12 Jun 2023 17:32:04 -0300
+Subject: [PATCH] Fix invalid armor trim exploit
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
+index c92981aedebe934cefa1c96a0328fb91fe17acbc..a1e1a94f0eb46b7eb3fe19e416e21e29b33f3e9f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java
+@@ -71,7 +71,7 @@ public class CraftMetaArmor extends CraftMetaItem implements ArmorMeta {
+                 TrimMaterial trimMaterial = Registry.TRIM_MATERIAL.get(NamespacedKey.fromString(trimCompound.getString(TRIM_MATERIAL.NBT)));
+                 TrimPattern trimPattern = Registry.TRIM_PATTERN.get(NamespacedKey.fromString(trimCompound.getString(TRIM_PATTERN.NBT)));
+ 
+-                this.trim = new ArmorTrim(trimMaterial, trimPattern);
++                if (trimMaterial != null && trimPattern != null) this.trim = new ArmorTrim(trimMaterial, trimPattern); // Scissors
+             }
+         }
+     }

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

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Thu, 6 Jul 2023 23:34:46 +0100
-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 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 {
-     @Override
-     public void doServerTick() {
-         if (this.targetLocation == null) {
--            LOGGER.warn("Aborting charge player as no target was set.");
-+            // LOGGER.warn("Aborting charge player as no target was set."); // Scissors - Mute invalid Enderdragon phases
-             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
-         } else if (this.timeSinceCharge > 0 && this.timeSinceCharge++ >= 10) {
-             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-index 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
-@@ -32,7 +32,7 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
-     @Override
-     public void doServerTick() {
-         if (this.attackTarget == null) {
--            LOGGER.warn("Skipping player strafe phase because no player was found");
-+            // LOGGER.warn("Skipping player strafe phase because no player was found"); // Scissors - Mute invalid Enderdragon phases
-             this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
-         } else {
-             if (this.currentPath != null && this.currentPath.isDone()) {

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

@@ -1,53 +0,0 @@
-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 607f32b856c6c1fb81d3f1604f3bf3fb240d713f..5afdc9d93e696568cc8a263ab0142fbac258e874 100644
---- a/src/main/java/net/minecraft/util/ExtraCodecs.java
-+++ b/src/main/java/net/minecraft/util/ExtraCodecs.java
-@@ -70,7 +70,10 @@ public class ExtraCodecs {
-     public static final Codec<Component> COMPONENT = adaptJsonSerializer(Component.Serializer::fromJson, Component.Serializer::toJsonTree);
-     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);
-         }
-@@ -233,7 +236,10 @@ public class ExtraCodecs {
-     public static <T> Codec<T> adaptJsonSerializer(Function<JsonElement, T> deserializer, Function<T, JsonElement> serializer) {
-         return JSON.flatXmap((json) -> {
-             try {
--                return DataResult.success(deserializer.apply(json));
-+                // Scissors start
-+                final T value = deserializer.apply(json);
-+                return DataResult.success(value != null ? value : (T)Component.empty());
-+                // Scissors end
-             } catch (JsonParseException var3) {
-                 return DataResult.error(var3::getMessage);
-             }
-@@ -260,7 +266,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());
-@@ -286,7 +292,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) {

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

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Fri, 25 Aug 2023 11:51:47 +0100
-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 238b6cd88cb24ca63770db607f2241fcd7210574..ec02597810a4022112ddf31928eb6976e6ac5371 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
-@@ -92,7 +92,7 @@ public class SkullBlockEntity extends BlockEntity {
-         }
- 
-         if (nbt.contains("note_block_sound", 8)) {
--            this.noteBlockSound = ResourceLocation.tryParse(nbt.getString("note_block_sound"));
-+            this.noteBlockSound = ResourceLocation.tryParse(StringUtil.truncateStringIfNecessary(nbt.getString("note_block_sound"), 32767, false)); // Scissors - Add length limit to note block sound
-         }
- 
-     }