Add Metrics and compile fixes

.github/workflows/build.yml

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

Jenkinsfile

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

README.md

@@ -1,14 +1,8 @@
-# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.20/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.20/)
+# Scissors [![Build Status](https://ci.scissors.gg/job/Scissors/job/1.19.3/badge/icon)](https://ci.scissors.gg/job/Scissors/job/1.19.3/)
 
 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)
-### [Scissors Announcements](https://totalfreedom.me/forum/board/139)
-### [Scissors General Discussion](https://totalfreedom.me/forum/board/140)
-
 ## Tasks
 ```
 Paperweight tasks

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    id("com.github.johnrengelman.shadow") version "8.1.0" apply false
     id("io.papermc.paperweight.patcher") version "1.5.5"
 }
 

gradle.properties

@@ -1,9 +1,10 @@
 group=me.totalfreedom.scissors
-version=1.20-R0.1-SNAPSHOT
+version=1.19.3-R0.1-SNAPSHOT
 
-mcVersion=1.20
+mcVersion=1.19.3
-paperRef=de19eb8c4a490ff4f427e9ad8b8bbe181c368cc1
+paperRef=155aa36d89b260ef5841615899299756b5983c0a
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=false
+org.gradle.jvmargs=-Xmx4096m

gradle/wrapper/gradle-wrapper.properties

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

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 1d1a1d087dabc9794e0062a064da2cced4062309..1770de3705aa14232b133bce9fac56dfe89faa37 100644
+index 2204336d8800311b65e894739ab1b27273e7c6f2..766d0143290cfc5062c548c2361316dbddca9afe 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1994,6 +1994,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1971,6 +1971,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  

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

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

patches/server/0001-Build-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a3a76b9b7efa773117d2ee1ce53ef784b09b277d..fad5e021f1282cd478f6ce484edbc135494b81b3 100644
+index 1919a8e9cb7c995b2a9c876ff4980bdc98977133..c2e924b05178e2c6324a0f797897cd69422a89ef 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,10 @@ plugins {
@@ -15,7 +15,7 @@ index a3a76b9b7efa773117d2ee1ce53ef784b09b277d..fad5e021f1282cd478f6ce484edbc135
 -    implementation(project(":paper-api"))
 -    implementation(project(":paper-mojangapi"))
 +    implementation(project(":Scissors-API"))
-+    implementation("io.papermc.paper:paper-mojangapi:1.20-R0.1-SNAPSHOT") {
++    implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
 +        exclude("io.papermc.paper", "paper-api")
 +    }
      // Paper start
@@ -77,24 +77,11 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..5ff11b9bcef76cb767f0b03ffc326d3f
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
-diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..2fbb5fc19e6d7f3767c7c6eedcbc6af2b0877ae5 100644
---- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
-@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
-     @Override
-     protected LineReader buildReader(LineReaderBuilder builder) {
-         builder
--                .appName("Paper")
-+                .appName("Scissors")
-                 .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
-                 .completer(new ConsoleCommandCompleter(this.server))
-                 .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..0f9928bf68f8bc5abfe02f41c98c63888987d9b9 100644
+index 753a917d34a1e1c1521a8916bc8e44a6acd90a46..b289da2fc7c2053415365505f830aaa045f70ff2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -104,10 +91,10 @@ index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..0f9928bf68f8bc5abfe02f41c98c6388
  
      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 aefbb6a3f49a74a4c8fd004aa6a4ab1ab907e878..777b727a360683a72cef8c06ab7ab1439d69ac0a 100644
+index bbb8335dae0a3e2761e6bbb8dc723bcf28cd82ba..3fa8a282e4511e79def2470f1abc34f3bf6527a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
+@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {

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

@@ -32,10 +32,10 @@ index 2ee4ee14ab3345486dad6b24fd9a4fcc6c746b99..c5ac6cda91a81d3075f5c763e30dc009
  
      @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
+index d559f93a9a09bac414dd5d58afccad42c127f09b..8ac4e76bf9acf2f99539c4f874ac5c8605573604 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
+@@ -45,7 +45,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
      protected boolean tryLoadLootTable(CompoundTag nbt) {
          this.lootableData.loadNbt(nbt); // Paper
          if (nbt.contains("LootTable", 8)) {

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

@@ -5,10 +5,10 @@ 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 4caf272f065a681bd7101d52fedf2642cc78d3bc..af5a1111a06789e1401f8c60bb4c8838587f2376 100644
+index 58c1d07f41fc382b23df17739090f5031fd41aad..92be52c3d193878ef9a3ed0e938c10d59247b256 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1798,8 +1798,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1794,8 +1794,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,22 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Video <videogamesm12@gmail.com>
-Date: Thu, 8 Jun 2023 19:19:37 -0500
+Date: Sun, 13 Mar 2022 08:14:44 -0600
 Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities
  with content in them
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 272095d7a09ab41227d741172735f66fd2798ce1..ea966ea94062be3ed9b6b2c460a316378c016fa7 100644
+index b8fb7b5a347298ada16bc8b818edf1863e3f6040..7ec912bfec20d6b5d91f23341c4e9e3188d1236b 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,12 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
      @Override
      public void remove(Entity.RemovalReason reason) {
-         if (!this.level().isClientSide && reason.shouldDestroy()) {
+         if (!this.level.isClientSide && reason.shouldDestroy()) {
--            Containers.dropContents(this.level(), (Entity) this, (Container) this);
+-            Containers.dropContents(this.level, (Entity) this, (Container) this);
 +            // Scissors start - Ignore errors thrown when trying to remove minecart entities with content in them
 +            try {
-+                Containers.dropContents(this.level(), (Entity) this, (Container) this);
++                Containers.dropContents(this.level, (Entity) this, (Container) this);
 +            } 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 3d41dbe0285f8fec8adae1e93010cf464df9b08c..7ee2c5beaaca9deb61589074f55e4004d1dd76b5 100644
+index f0ccdfbd7d7be8c6e302609accf8fe9cac8885c4..2dad46159fb1653aff0ecdd907535ac0c59deeed 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -420,11 +420,15 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -407,11 +407,15 @@ public class ItemEntity extends Entity {
  
          CompoundTag nbttagcompound1 = nbt.getCompound("Item");
  

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

@@ -5,10 +5,10 @@ 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 6dac24354192bea79a4b9eb721543110826790b2..b87999106b5068a243c064fa3c30968411996e2b 100644
+index c33a6d3d5700a7ec1dae2434d00cf0f480a5f0e5..1ccf1d22ac77b669fffd2a1bd7b1331cf0fa281a 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 {
+@@ -234,7 +234,7 @@ public final class NbtUtils {
          if (!nbt.contains("Name", 8)) {
              return Blocks.AIR.defaultBlockState();
          } else {
@@ -18,7 +18,7 @@ index 6dac24354192bea79a4b9eb721543110826790b2..b87999106b5068a243c064fa3c309684
              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 5d6d26cfe8f0ab68a3145214b3fc126ca7a71a66..7e0559cdcabeb33ff383be1a23f4ed04fa091867 100644
+index 9788e477ff1446ad2ea3669922cc7dfc09900ce8..809c9b9dfb29c8ce177ade8be980e1d8e94de31e 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

@@ -5,10 +5,10 @@ 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
+index 11a6f5b9e726453979d4c718c32a44024e1b8a08..c4810371c00eb92dc8574841c74a89203d586c78 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 {
+@@ -422,7 +422,7 @@ public class AreaEffectCloud extends Entity {
              try {
                  this.setParticle(ParticleArgument.readParticle(new StringReader(nbt.getString("Particle")), (HolderLookup) BuiltInRegistries.PARTICLE_TYPE.asLookup()));
              } catch (CommandSyntaxException commandsyntaxexception) {

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 955316687e2e29ad75a0052317a7b0f89034c82a..2537c48d1269d8ea51222412b2eeaac26a7dc4d4 100644
+index 428523feaa4f30260e32ba03937e88200246c693..21e6053a62409784c175ea6cf1ada6b5557097a8 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-@@ -431,7 +431,7 @@ public class ItemFrame extends HangingEntity {
+@@ -428,7 +428,7 @@ public class ItemFrame extends HangingEntity {
              ItemStack itemstack = ItemStack.of(nbttagcompound1);
  
              if (itemstack.isEmpty()) {

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

@@ -5,10 +5,10 @@ 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
+index c4810371c00eb92dc8574841c74a89203d586c78..929f05c8692223959282f68bf68c4467e4167a80 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 {
+@@ -145,7 +145,7 @@ public class AreaEffectCloud extends Entity {
      }
  
      public void setPotionType(String string) {
@@ -18,10 +18,10 @@ index db3cddf8b227453c9b08e481b21101c5d2e0472d..77ae3bc5fd6cf34aae7bd3baa563f3e2
      // 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
+index 4589f7db68f7a72065c85c0a50216c6d02658f1e..5c23608e20e243eb844c73f713c39bf3e5ab05dd 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
+@@ -580,7 +580,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          }), (entity) -> {
              entity.load(nbt);
          }, () -> {
@@ -30,7 +30,7 @@ index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..ffcb77755b28bcdb3eae981fc735e6dd
          });
      }
  
-@@ -607,7 +607,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -599,7 +599,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
      }
  
      public static Optional<EntityType<?>> by(CompoundTag nbt) {
@@ -40,10 +40,10 @@ index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..ffcb77755b28bcdb3eae981fc735e6dd
  
      @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
+index 49b983064ea810382b6112f5dc7f93ba4e5710bd..4dd32f38ebf06d868a37c8e4ae667ac14a774b8d 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 {
+@@ -585,7 +585,7 @@ public abstract class Mob extends LivingEntity {
  
          this.setLeftHanded(nbt.getBoolean("LeftHanded"));
          if (nbt.contains("DeathLootTable", 8)) {

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

@@ -1,39 +1,38 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Telesphoreo <me@telesphoreo.me>
-Date: Fri, 7 Apr 2023 15:35:35 -0500
+Date: Sat, 26 Mar 2022 21:51:07 -0500
 Subject: [PATCH] Change version fetcher to AMG
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..0a8fda6939152d393f07e5d2812409ad38855646 100644
+index bf42969859545a8a520923ef1836ffa4a5cc24a0..31d0624fcaf1998383eebde7fbd3a1033e6c80aa 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;
+@@ -4,6 +4,8 @@ import com.destroystokyo.paper.util.VersionFetcher;
  import com.google.common.base.Charsets;
  import com.google.common.io.Resources;
  import com.google.gson.*;
 +import io.papermc.paper.util.JarManifests;
++import java.util.Map;
  import net.kyori.adventure.text.Component;
  import net.kyori.adventure.text.event.ClickEvent;
  import net.kyori.adventure.text.format.NamedTextColor;
- import net.kyori.adventure.text.format.TextDecoration;
+@@ -16,11 +18,12 @@ import java.io.*;
- import net.kyori.adventure.text.TextComponent;
+ import java.net.HttpURLConnection;
+ import java.net.URL;
+ import java.util.stream.StreamSupport;
 +import org.bukkit.Bukkit;
  
- import javax.annotation.Nonnull;
- import javax.annotation.Nullable;
-@@ -19,8 +21,8 @@ import java.util.stream.StreamSupport;
- 
  public class PaperVersionFetcher implements VersionFetcher {
      private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
 -    private static final String GITHUB_BRANCH_NAME = "master";
--    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
+-    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads";
 +    private static final String GITHUB_BRANCH_NAME = getBranch();
 +    private static final String DOWNLOAD_PAGE = "https://ci.scissors.gg/job/Scissors/job/" + GITHUB_BRANCH_NAME;
      private static @Nullable String mcVer;
  
      @Override
-@@ -31,8 +33,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -31,8 +34,8 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
      public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -44,7 +43,7 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..0a8fda6939152d393f07e5d2812409ad
          final Component history = getHistory();
  
          return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -54,15 +56,24 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -54,15 +57,24 @@ public class PaperVersionFetcher implements VersionFetcher {
          return mcVer;
      }
  
@@ -77,14 +76,14 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..0a8fda6939152d393f07e5d2812409ad
          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 bfa091f72d6f477bcaf63d364639a1b4df9b1987..1fe26cb620e8b550790c3e110e2a1180cf0838fd 100644
+index e072a5475a64d110f25ebcc871aa7703c2fc1e70..21db4153a9eb5e52ff357b4146ae4302029d5cd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -292,7 +292,7 @@ public class Main {
+@@ -278,7 +278,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
--                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
+-                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper
 +                        System.err.println("*** Please download a new build from https://ci.scissors.gg/job/Scissors ***"); // Scissors > // Paper
                          //System.err.println("*** Server will start in 20 seconds ***");
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));

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

@@ -6,7 +6,7 @@ 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 af5a1111a06789e1401f8c60bb4c8838587f2376..bfcdc18f9b06023a5c461e06abbb93eea32bcdba 100644
+index 92be52c3d193878ef9a3ed0e938c10d59247b256..fe50f9a7771dd2085dc6f3f76d15b735961958a1 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;
@@ -15,9 +15,9 @@ index af5a1111a06789e1401f8c60bb4c8838587f2376..bfcdc18f9b06023a5c461e06abbb93ee
  import net.minecraft.network.chat.Component;
 +import net.minecraft.resources.ResourceLocation;
  import net.minecraft.world.item.BlockItem;
- import net.minecraft.world.level.block.state.BlockState;
  import org.apache.commons.lang.Validate;
-@@ -485,7 +486,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+ import org.apache.commons.lang3.EnumUtils;
+@@ -482,7 +483,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              AttributeModifier attribMod = CraftAttributeInstance.convert(nmsModifier);
  
              String attributeName = CraftAttributeMap.convertIfNeeded(entry.getString(ATTRIBUTES_IDENTIFIER.NBT)); // Paper

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Validate String UUIDs during the CompoundTag -> GameProfile
 
 
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index b87999106b5068a243c064fa3c30968411996e2b..596baf1bc372875b8b82904d9d5bd53f4bedc0fb 100644
+index 1ccf1d22ac77b669fffd2a1bd7b1331cf0fa281a..6b31a32f9dac31b587693ed8001bf190786ceae8 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 {
+@@ -81,7 +81,12 @@ public final class NbtUtils {
          }
          // Paper start - support string UUID's
          if (nbt.contains("Id", 8)) {

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Fixes creative-killing potion effects and certain potion
 
 
 diff --git a/src/main/java/net/minecraft/world/effect/MobEffect.java b/src/main/java/net/minecraft/world/effect/MobEffect.java
-index 2cc714585fc3790b70a7ad1ab8034543462e2b3b..2d3706d8d0dbed3b3588066eaa6b9ce1b266294f 100644
+index e708b2c987fac150c22b3367cec2e3e2bcb9914c..06872ee2d0eb9ea847568d328a95f60db7373be8 100644
 --- a/src/main/java/net/minecraft/world/effect/MobEffect.java
 +++ b/src/main/java/net/minecraft/world/effect/MobEffect.java
-@@ -58,6 +58,7 @@ public class MobEffect {
+@@ -59,6 +59,7 @@ public class MobEffect {
      }
  
      public void applyEffectTick(LivingEntity entity, int amplifier) {
@@ -17,7 +17,7 @@ index 2cc714585fc3790b70a7ad1ab8034543462e2b3b..2d3706d8d0dbed3b3588066eaa6b9ce1
          if (this == MobEffects.REGENERATION) {
              if (entity.getHealth() < entity.getMaxHealth()) {
                  entity.heal(1.0F, RegainReason.MAGIC_REGEN); // CraftBukkit
-@@ -86,17 +87,31 @@ public class MobEffect {
+@@ -87,17 +88,31 @@ public class MobEffect {
                  // CraftBukkit end
              }
          } else if ((this != MobEffects.HEAL || entity.isInvertedHealAndHarm()) && (this != MobEffects.HARM || !entity.isInvertedHealAndHarm())) {
@@ -25,7 +25,7 @@ index 2cc714585fc3790b70a7ad1ab8034543462e2b3b..2d3706d8d0dbed3b3588066eaa6b9ce1
 +            // 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));
+                 entity.hurt(DamageSource.MAGIC, (float) (6 << amplifier));
              }
 +            // Scissors end
          } else {

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

@@ -1,19 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Telesphoreo <me@telesphoreo.me>
-Date: Thu, 8 Jun 2023 19:24:05 -0500
+Date: Sat, 10 Dec 2022 23:23:52 -0600
 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 67627bbf84f5aab2872f636b1dcb6728c8494147..468f64afb7e9b3ef579205d3beea025deb31b460 100644
+index 9e075de3542bda8ae086c9ca68bcd00b16d565d0..2012c147f60f39ae7dbae74641fd00b3b282a991 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -630,7 +630,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -622,7 +622,7 @@ public abstract class LivingEntity extends Entity {
  
      protected void tickDeath() {
          ++this.deathTime;
--        if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved()) {
+-        if (this.deathTime >= 20 && !this.level.isClientSide() && !this.isRemoved()) {
-+        if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level().isClientSide() && !this.isRemoved()) {
++        if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level.isClientSide() && !this.isRemoved()) {
-             this.level().broadcastEntityEvent(this, (byte) 60);
+             this.level.broadcastEntityEvent(this, (byte) 60);
              this.remove(Entity.RemovalReason.KILLED);
          }

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

@@ -121,7 +121,7 @@ index 0000000000000000000000000000000000000000..b724baaef8d565e41db1af6393d0890e
 +}
 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..c54535042a7ac12fe46b3b37db8d7b116e9469d5
+index 0000000000000000000000000000000000000000..9e33ad84e50c7e2491aa883f905323f3ad2b070c
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/PositionUtility.java
 @@ -0,0 +1,83 @@
@@ -175,7 +175,7 @@ index 0000000000000000000000000000000000000000..c54535042a7ac12fe46b3b37db8d7b11
 +
 +    public static BlockPos getValidBlockPos(BlockPos blockPos, Entity entity)
 +    {
-+        final Level level = entity.level();
++        final Level level = entity.level;
 +
 +        try
 +        {

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Validate coordinates before attempting to get block entities
 
 
 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
+index 9b0b42add71172bd154226e51d62cebd8de3542e..9e093d3001a57b577a7c93d8b721235617656e15 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
+@@ -1922,6 +1922,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
      // Spigot end
  
@@ -27,27 +27,27 @@ index 1288f651fa83d5ab99a88858f52a6d3212284df0..61f6b51b9d868ae6bd79185cc066976a
 +
      @Override
      public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -3344,17 +3356,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3314,17 +3326,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)) {
+-                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)) {
+-                    if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.getLevel().isLoadedAndInBounds(blockposition)) {
--                        tileentity = this.player.level().getBlockEntity(blockposition);
+-                        tileentity = this.player.level.getBlockEntity(blockposition);
 -                    }
 -                    // Paper end
-+                if (this.player.level().isLoaded(blockposition))
++                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))
++                        if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.getLevel().isLoadedAndInBounds(blockposition))
 +                        {
-+                            tileentity = this.player.level().getBlockEntity(blockposition);
++                            tileentity = this.player.level.getBlockEntity(blockposition);
 +                        }
 +                        // Paper end
  

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Reset large tags
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index b367ec1feaccbd67e9e28c0d0515e163f37135fe..d1547b9ba36baec925751b9bb0498c8a8cac12f8 100644
+index 6860096cb8c0deecc9c1d87543d1128fb95fd2d4..d7b02676c646db61a5351b72c1c929e8dd80795c 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;
+@@ -20,6 +20,7 @@ import java.util.function.Predicate;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
@@ -16,7 +16,7 @@ index b367ec1feaccbd67e9e28c0d0515e163f37135fe..d1547b9ba36baec925751b9bb0498c8a
  import net.minecraft.ChatFormatting;
  import net.minecraft.Util;
  import net.minecraft.advancements.CriteriaTriggers;
-@@ -253,6 +254,12 @@ public final class ItemStack {
+@@ -255,6 +256,12 @@ public final class ItemStack {
  
      // CraftBukkit - break into own method
      private void load(CompoundTag nbttagcompound) {
@@ -29,7 +29,7 @@ index b367ec1feaccbd67e9e28c0d0515e163f37135fe..d1547b9ba36baec925751b9bb0498c8a
          this.item = (Item) BuiltInRegistries.ITEM.get(new ResourceLocation(nbttagcompound.getString("id")));
          this.count = nbttagcompound.getByte("Count");
          if (nbttagcompound.contains("tag", 10)) {
-@@ -550,7 +557,11 @@ public final class ItemStack {
+@@ -516,7 +523,11 @@ public final class ItemStack {
          nbt.putString("id", minecraftkey == null ? "minecraft:air" : minecraftkey.toString());
          nbt.putByte("Count", (byte) this.count);
          if (this.tag != null) {
@@ -42,7 +42,7 @@ index b367ec1feaccbd67e9e28c0d0515e163f37135fe..d1547b9ba36baec925751b9bb0498c8a
          }
  
          return nbt;
-@@ -880,6 +891,9 @@ public final class ItemStack {
+@@ -847,6 +858,9 @@ public final class ItemStack {
      // Paper end
  
      public void setTag(@Nullable CompoundTag nbt) {

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

@@ -59,7 +59,7 @@ index 4092c7a8c2b0d9d26e6f4d97386735236300d132..9e0ab51dd7a4f9fed8f9edde962d42d4
              }
          }
 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
+index cac2768fe520b591990c7bc943ae7e95f49efb31..f734cba350ed85dbbf52ff527c9bb14b9eb04c86 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;
@@ -70,7 +70,7 @@ index 2a786c9fd29dc2139cf487fa645cd43345d60167..dbdc66620ae4284cfe96f633b1f4db46
  import net.minecraft.SharedConstants;
  import net.minecraft.Util;
  import net.minecraft.core.BlockPos;
-@@ -212,6 +213,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -211,6 +212,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
  
      public List<ItemStack> getContents() {
@@ -116,7 +116,7 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..893cf89dd2b022e2b785318e7e86eb5d
      }
  
 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
+index 0bab2693b91d5bab222c7db8bc6965ccde954003..4a02d8f4d99d2d0e6cac4e40cd0e6350d03c0cd0 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;
@@ -127,7 +127,7 @@ index c57efcb9a79337ec791e4e8f6671612f0a82b441..2963b72061a9ede734842d6fb46a67a1
  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
+@@ -72,6 +73,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
      }
  
      public List<ItemStack> getContents() {
@@ -201,7 +201,7 @@ index 881379681c39230a00b3a1f11cd87498984396c7..1be5d600573f7632e6630224530dd765
      }
  
 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
+index d76603c4172aa10889949c6c2acff05fee02a13d..b82fde14db232e63748dddd74d85f5a41359ae41 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;
@@ -212,7 +212,7 @@ index 789e5458f4a137694563a22612455506807de51b..84c721da46b7786857677b56f439c2b9
  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
+@@ -54,6 +55,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
      private int maxStack = MAX_STACK;
  
      public List<ItemStack> getContents() {

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Limit amount of vehicle collision checks to 3 and discard
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 9948a28dae4edba877c13ef0156be5ff58df3fa2..93f359c71659c0b2fdf25b1c76c072bf9209db2a 100644
+index eec7d7a5b558830111831792c42665724613af23..79f296388a7f86944f33b9a783ab81b3a9e4d4dc 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -8,6 +8,7 @@ import com.mojang.datafixers.util.Pair;
@@ -17,7 +17,7 @@ index 9948a28dae4edba877c13ef0156be5ff58df3fa2..93f359c71659c0b2fdf25b1c76c072bf
  import javax.annotation.Nullable;
  import net.minecraft.BlockUtil;
  import net.minecraft.Util;
-@@ -107,6 +108,7 @@ public abstract class AbstractMinecart extends Entity {
+@@ -105,6 +106,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,9 +25,9 @@ index 9948a28dae4edba877c13ef0156be5ff58df3fa2..93f359c71659c0b2fdf25b1c76c072bf
      public double maxSpeed = 0.4D;
      // CraftBukkit end
  
-@@ -434,8 +436,10 @@ public abstract class AbstractMinecart extends Entity {
+@@ -431,8 +433,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));
+                 List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this));
  
 -                if (!list.isEmpty()) {
 -                    for (int l = 0; l < list.size(); ++l) {
@@ -38,7 +38,7 @@ index 9948a28dae4edba877c13ef0156be5ff58df3fa2..93f359c71659c0b2fdf25b1c76c072bf
                          Entity entity = (Entity) list.get(l);
  
                          if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) {
-@@ -462,6 +466,16 @@ public abstract class AbstractMinecart extends Entity {
+@@ -459,6 +463,16 @@ public abstract class AbstractMinecart extends Entity {
                              entity.push(this);
                          }
                      }
@@ -54,9 +54,9 @@ index 9948a28dae4edba877c13ef0156be5ff58df3fa2..93f359c71659c0b2fdf25b1c76c072bf
 +                    }
                  }
              } else {
-                 Iterator iterator = 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 35aeba4e8430e6419caa9db4a0b931a994228618..11b337298ac824adce04cf0608f8f960e59640c9 100644
+index 85e1892866cd2ee0cec1552b8541c1f800bdf68c..2950f60e068cbeb945cfe38972eaf65b79e3a4f1 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;
@@ -67,7 +67,7 @@ index 35aeba4e8430e6419caa9db4a0b931a994228618..11b337298ac824adce04cf0608f8f960
  import javax.annotation.Nullable;
  import net.minecraft.BlockUtil;
  import net.minecraft.core.BlockPos;
-@@ -109,6 +110,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
+@@ -108,6 +109,7 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
      public double unoccupiedDeceleration = -1;
      public boolean landBoats = false;
      // CraftBukkit end
@@ -75,14 +75,14 @@ index 35aeba4e8430e6419caa9db4a0b931a994228618..11b337298ac824adce04cf0608f8f960
  
      public Boat(EntityType<? extends Boat> type, Level world) {
          super(type, world);
-@@ -421,10 +423,12 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
+@@ -417,10 +419,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));
+         List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, -0.009999999776482582D, 0.20000000298023224D), EntitySelector.pushableBy(this));
  
 -        if (!list.isEmpty()) {
 +        // Scissors - Add collision debounce
 +        if (!list.isEmpty() && (System.currentTimeMillis() - lastLargeCollision) >= TimeUnit.SECONDS.toMillis(5)) { // Using TimeUnit for better code readability
-             boolean flag = !this.level().isClientSide && !(this.getControllingPassenger() instanceof Player);
+             boolean flag = !this.level.isClientSide && !(this.getControllingPassenger() instanceof Player);
  
 -            for (int j = 0; j < list.size(); ++j) {
 +            // Scissors - Limit amount of vehicle collision checks to 3 maximum
@@ -90,7 +90,7 @@ index 35aeba4e8430e6419caa9db4a0b931a994228618..11b337298ac824adce04cf0608f8f960
                  Entity entity = (Entity) list.get(j);
  
                  if (!entity.hasPassenger((Entity) this)) {
-@@ -435,6 +439,16 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
+@@ -431,6 +435,16 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
                      }
                  }
              }

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

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
+From: Allink <arclicious@vivaldi.net>
-Date: Thu, 8 Jun 2023 19:32:11 -0500
+Date: Tue, 17 May 2022 05:57:52 +0100
 Subject: [PATCH] Don't log invalid teams to console
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 468f64afb7e9b3ef579205d3beea025deb31b460..71a32f8dfdf043f55f092225a13884ae8935e67c 100644
+index 2012c147f60f39ae7dbae74641fd00b3b282a991..d828b838216083192d9a344ca978f6a7360e0363 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -862,7 +862,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -850,7 +850,9 @@ public abstract class LivingEntity extends Entity {
-             boolean flag = scoreboardteam != null && this.level().getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
+             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);

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Better handling of invalid JSON components
 
 
 diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index 37fc353c3e59dd5af2fd6c58ac084fb0e6e155d7..3c0ee4e1f42f6056ca86a6f9f129d467e29a2fbc 100644
+index 3ca733528acb40354b308019a84436ea67e05751..76932c683153c7dcbf46de78cccc14772babc5fc 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;
@@ -16,7 +16,7 @@ index 37fc353c3e59dd5af2fd6c58ac084fb0e6e155d7..3c0ee4e1f42f6056ca86a6f9f129d467
  import net.minecraft.Util;
  import net.minecraft.network.chat.contents.BlockDataSource;
  import net.minecraft.network.chat.contents.DataSource;
-@@ -522,6 +523,26 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
+@@ -506,6 +507,26 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
              return GsonHelper.toStableString(Serializer.toJsonTree(text));
          }
  
@@ -110,10 +110,10 @@ index 97a2657bc98d41c3c1e376b266d2c85f685acc88..7b6476455e095eed15c92797ce3a3e11
                      }
                  }).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 92202262eff01ae3bbeff0e6ebdcf26ad613c169..38c027c0fbddf58136b7d67eb7156403a79de4d1 100644
+index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..f052ebb7758017dabc7e336898065231a6e4e4fb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2473,12 +2473,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2340,12 +2340,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");
@@ -128,7 +128,7 @@ index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..38c027c0fbddf58136b7d67eb7156403
  
                      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
+index 928625b5ab054ffa412be8a438f58291cc7a3cc0..54e74f39c960daa1f7ebd1d435281b5cc93e59c0 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

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

@@ -5,7 +5,7 @@ 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 584a58659fae6ba3d8b53858890bc6ec509ffb0e..0dcee5b53740126e0886058dacc43e447836b8d8 100644
+index 9d0d5a44c5948bde037165147d18aaabe21ce50a..c42b8b4daa1ffa6f3ae89b35056edbf61ae47283 100644
 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java
 +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java
 @@ -39,8 +39,10 @@ public class ComponentUtils {

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

@@ -0,0 +1,193 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ayunami2000 <spwilliamsiam@gmail.com>
+Date: Fri, 17 Jun 2022 15:28:43 -0500
+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 5fce1177e7198d791d4ab1c64b394c5b1c145782..25d483a4792cf159ff691521cd32382d0f7fe931 100644
+--- a/src/main/java/net/minecraft/network/PacketEncoder.java
++++ b/src/main/java/net/minecraft/network/PacketEncoder.java
+@@ -6,9 +6,18 @@ import io.netty.channel.ChannelHandlerContext;
+ import io.netty.handler.codec.MessageToByteEncoder;
+ import io.papermc.paper.adventure.PaperAdventure; // Paper
+ import java.io.IOException;
++import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.network.protocol.Packet;
+ import net.minecraft.network.protocol.PacketFlow;
++import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
++import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;
++import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
++import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
++import net.minecraft.network.protocol.game.ClientboundMapItemDataPacket;
++import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
++import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+ import net.minecraft.util.profiling.jfr.JvmProfiler;
++import net.minecraft.world.item.ItemStack;
+ import org.slf4j.Logger;
+ 
+ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+@@ -41,30 +50,101 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
+                     packet.write(friendlyByteBuf);
+                     int j = friendlyByteBuf.writerIndex() - i;
+                     if (j > 8388608) {
+-                        throw new IllegalArgumentException("Packet too big (is " + j + ", should be less than 8388608): " + packet);
++                        // Scissors start
++                        noKicking(friendlyByteBuf, packet, integer, channelHandlerContext);
++                        // Scissors end
+                     } else {
+                         int k = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get().getId();
+                         JvmProfiler.INSTANCE.onPacketSent(k, integer, channelHandlerContext.channel().remoteAddress(), j);
+                     }
+                 } catch (Throwable var10) {
+-                    LOGGER.error("Packet encoding of packet ID {} threw (skippable? {})", integer, packet.isSkippable(), var10); // Paper - Give proper error message
+-                    if (packet.isSkippable()) {
+-                        throw new SkipPacketException(var10);
+-                    } else {
+-                        throw var10;
+-                    }
++                    noKicking(friendlyByteBuf, packet, integer, channelHandlerContext);
+                 }
+ 
+                 // Paper start
+                 int packetLength = friendlyByteBuf.readableBytes();
+                 if (packetLength > MAX_PACKET_SIZE) {
+-                    throw new PacketTooLargeException(packet, packetLength);
++                    // Scissors start
++                    friendlyByteBuf.clear();
++                    noKicking(friendlyByteBuf, packet, integer, channelHandlerContext);
++                    packetLength = friendlyByteBuf.readableBytes();
++                    if (packetLength > MAX_PACKET_SIZE) {
++                        friendlyByteBuf.clear();
++                    }
++                    // Scissors end
+                 }
+                 // Paper end
+             }
+         }
+     }
+ 
++    // Scissors start
++    private static void noKicking(FriendlyByteBuf friendlyByteBuf, Packet packet, Integer integer, ChannelHandlerContext channelHandlerContext)
++    {
++        friendlyByteBuf.clear();
++        friendlyByteBuf.writeVarInt(integer);
++        friendlyByteBuf.adventure$locale = channelHandlerContext.channel().attr(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
++        boolean didIt = true;
++        if (packet instanceof ClientboundBlockEntityDataPacket blockEntityDataPacket)
++        {
++            packet = new ClientboundBlockEntityDataPacket(blockEntityDataPacket.getPos(), blockEntityDataPacket.getType(), new CompoundTag());
++        }
++        else if (packet instanceof ClientboundLevelChunkPacketData chunkPacket)
++        {
++            chunkPacket.clearNBT();
++        }
++        else if (packet instanceof ClientboundSetEntityDataPacket entityDataPacket)
++        {
++            friendlyByteBuf.writeVarInt(entityDataPacket.id());
++            friendlyByteBuf.writeByte(255);
++            didIt = false;//prevent default packet writing
++        }
++        else if (packet instanceof ClientboundContainerSetContentPacket containerSetContentPacket)
++        {
++            containerSetContentPacket.clearNBT();
++        }
++        else if (packet instanceof ClientboundSetEquipmentPacket setEquipmentPacket)
++        {
++            friendlyByteBuf.writeVarInt(setEquipmentPacket.getEntity());
++            didIt = false; //prevent default
++        }
++        else if (packet instanceof ClientboundContainerSetSlotPacket containerSetSlotPacket)
++        {
++            friendlyByteBuf.writeByte(containerSetSlotPacket.getContainerId());
++            friendlyByteBuf.writeVarInt(containerSetSlotPacket.getStateId());
++            friendlyByteBuf.writeShort(containerSetSlotPacket.getSlot());
++            friendlyByteBuf.writeItem(ItemStack.EMPTY);
++            didIt = false; //prevent default
++        }
++        else if (packet instanceof ClientboundMapItemDataPacket mapItemDataPacket)
++        {
++            packet = new ClientboundMapItemDataPacket(mapItemDataPacket.getMapId(), mapItemDataPacket.getScale(), mapItemDataPacket.isLocked(), null, null);
++        }
++        else
++        {
++            didIt = false;
++            LOGGER.info(packet.getClass().getName() + " overflowed/errored and was not caught!!");
++        }
++        if (didIt)
++        {
++            try
++            {
++                int i = friendlyByteBuf.writerIndex();
++                packet.write(friendlyByteBuf);
++                int j = friendlyByteBuf.writerIndex() - i;
++                if (j > 8388608)
++                {
++                    friendlyByteBuf.clear();
++                }
++            }
++            catch (Throwable var69)
++            {
++                friendlyByteBuf.clear();
++            }
++        }
++    }
++    // Scissors end
++
+     // Paper start
+     private static int MAX_PACKET_SIZE = 2097152;
+ 
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+index 3944852921335c78a04a9dc301882ab5b152b1ed..0d88828bc0bbd68328da4d0e7d3b880006d2c775 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+@@ -24,7 +24,8 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
+         return create(blockEntity, BlockEntity::getUpdateTag);
+     }
+ 
+-    private ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> blockEntityType, CompoundTag nbt) {
++    // Scissors - make this public
++    public ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> blockEntityType, CompoundTag nbt) {
+         this.pos = pos;
+         this.type = blockEntityType;
+         this.tag = nbt.isEmpty() ? null : nbt;
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
+index dbd8b9b09b82c1b75e8be9dc7416d9f0863c8c87..24e0f4ee1dc9b5a46ed063e087d4b7bcd2a7fe46 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java
+@@ -10,7 +10,15 @@ public class ClientboundContainerSetContentPacket implements Packet<ClientGamePa
+     private final int containerId;
+     private final int stateId;
+     private final List<ItemStack> items;
+-    private final ItemStack carriedItem;
++    private ItemStack carriedItem; // Scissors - removed "final"
++
++    // Scissors start
++    public void clearNBT()
++    {
++        this.items.clear();
++        this.carriedItem = ItemStack.EMPTY;
++    }
++    // Scissors end
+ 
+     public ClientboundContainerSetContentPacket(int syncId, int revision, NonNullList<ItemStack> contents, ItemStack cursorStack) {
+         this.containerId = syncId;
+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 f3fa2678796c33f3a408a02a1995ad117eac9169..c8dd976240aa4f640bb2d223d472f81fdd8dcf7c 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,14 @@ public class ClientboundLevelChunkPacketData {
+     }
+     // Paper end
+ 
++    // Scissors start
++    public void clearNBT()
++    {
++        this.blockEntitiesData.clear();
++        this.extraPackets.clear();
++    }
++    // Scissors end
++
+     // 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) {

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

@@ -1,173 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Telesphoreo <me@telesphoreo.me>
-Date: Thu, 8 Jun 2023 19:41:10 -0500
-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 fbfadeb83719b81f42724e79c59e92ed88fdece7..bcb9d99359fb3e03c86d7429d9bcfe63b6c0f5d5 100644
---- a/src/main/java/net/minecraft/network/PacketEncoder.java
-+++ b/src/main/java/net/minecraft/network/PacketEncoder.java
-@@ -6,9 +6,18 @@ import io.netty.channel.ChannelHandlerContext;
- import io.netty.handler.codec.MessageToByteEncoder;
- import io.papermc.paper.adventure.PaperAdventure; // Paper
- import java.io.IOException;
-+import java.util.Collections;
-+
-+import net.minecraft.ChatFormatting;
-+import net.minecraft.core.NonNullList;
-+import net.minecraft.nbt.CompoundTag;
-+import net.minecraft.network.chat.Component;
-+import net.minecraft.network.chat.SignedMessageBody;
- import net.minecraft.network.protocol.Packet;
- 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;
- import org.slf4j.Logger;
- 
- public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-@@ -19,6 +28,23 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
-         this.flow = side;
-     }
- 
-+    // Scissors start
-+    private static int tryWrite(Packet packet, FriendlyByteBuf friendlyByteBuf, ChannelHandlerContext channelHandlerContext, int i) {
-+        friendlyByteBuf.writeVarInt(i);
-+        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 (k > 8388608 || packetLength > MAX_PACKET_SIZE) {
-+            throw new SkipPacketException(new IllegalArgumentException("Packet too big (is " + k + "): " + packet));
-+        }
-+
-+        return k;
-+    }
-+    // Scissors end
-+
-     protected void encode(ChannelHandlerContext channelHandlerContext, Packet<?> packet, ByteBuf byteBuf) throws Exception {
-         ConnectionProtocol connectionProtocol = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get();
-         if (connectionProtocol == null) {
-@@ -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(PaperAdventure.LOCALE_ATTRIBUTE).get(); // Paper
- 
-+                // Scissors start
-+                int k;
-                 try {
--                    int j = friendlyByteBuf.writerIndex();
--                    packet.write(friendlyByteBuf);
--                    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);
-                 } catch (Throwable var10) {
--                    LOGGER.error("Packet encoding of packet ID {} threw (skippable? {})", i, packet.isSkippable(), var10); // Paper - Give proper error message
--                    if (packet.isSkippable()) {
--                        throw new SkipPacketException(var10);
--                    } else {
--                        throw var10;
-+                    packet = capPacket(packet, i);
-+                    if (packet == null) {
-+                        throw new SkipPacketException(new IllegalArgumentException("Packet too big: " + packet));
-                     }
-+                    friendlyByteBuf.clear();
-+                    k = tryWrite(packet, friendlyByteBuf, channelHandlerContext, i);
-                 }
- 
--                // Paper start
--                int packetLength = friendlyByteBuf.readableBytes();
--                if (packetLength > MAX_PACKET_SIZE) {
--                    throw new PacketTooLargeException(packet, packetLength);
--                }
--                // Paper end
-+                int l = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get().getId();
-+                JvmProfiler.INSTANCE.onPacketSent(l, i, channelHandlerContext.channel().remoteAddress(), k);
-+                // Scissors end
-             }
-         }
-     }
- 
-+    // Scissors start
-+    private static Packet capPacket(Packet packet, int i) {
-+        if (packet instanceof ClientboundBlockEntityDataPacket blockEntityDataPacket) {
-+            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) {
-+            packet = new ClientboundSetEquipmentPacket(setEquipmentPacket.getEntity(), Collections.emptyList());
-+        } else if (packet instanceof ClientboundContainerSetSlotPacket containerSetSlotPacket) {
-+            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.
-+                playerChatPacket.index(),
-+                playerChatPacket.signature(),
-+                playerChatPacket.body(),
-+                Component.empty().append("** Message too large **").withStyle(ChatFormatting.RED),
-+                playerChatPacket.filterMask(),
-+                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;
-+        }
-+
-+        return packet;
-+    }
-+    // Scissors end
-+
-     // Paper start
-     private static int MAX_PACKET_SIZE = 8388608;
- 
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
-index 3944852921335c78a04a9dc301882ab5b152b1ed..96ee53c7cc862e059328c5cdf5e07f309df6a79e 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
-@@ -24,7 +24,7 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
-         return create(blockEntity, BlockEntity::getUpdateTag);
-     }
- 
--    private ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> blockEntityType, CompoundTag nbt) {
-+    public ClientboundBlockEntityDataPacket(BlockPos pos, BlockEntityType<?> blockEntityType, CompoundTag nbt) { // Scissors - private -> public
-         this.pos = pos;
-         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 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 {
-     }
-     // Paper end
- 
-+    // Scissors start
-+    public void clearNBT() {
-+        this.blockEntitiesData.clear();
-+        this.extraPackets.clear();
-+    }
-+    // Scissors end
-+
-     // 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) {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 61f6b51b9d868ae6bd79185cc066976a094da8ce..2807dbb730974ca4d3a7c7fd1358e2438628bc50 100644
+index da47e84dffd3518b84eeeb80ab4f17073fed9a9c..028d41c22ec5d67434dc42926cd875fe576768ea 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 @@
@@ -15,7 +15,7 @@ index 61f6b51b9d868ae6bd79185cc066976a094da8ce..2807dbb730974ca4d3a7c7fd1358e243
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Floats;
  import com.mojang.brigadier.ParseResults;
-@@ -2066,6 +2067,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2068,6 +2069,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  Entity entity = packet.getEntity(worldserver);
  
                  if (entity != null) {

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

@@ -5,10 +5,10 @@ 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 2807dbb730974ca4d3a7c7fd1358e2438628bc50..37fcbdcddaa6cbfd6ae37d70cffab957c90f4e07 100644
+index c8760e58589cd574e9debd29f7e728b482ec1daf..f780dc437741db42da07241c94f1458aa2654cb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -30,6 +30,8 @@ import java.util.function.UnaryOperator;
+@@ -29,6 +29,8 @@ import java.util.function.UnaryOperator;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
@@ -17,15 +17,15 @@ index 2807dbb730974ca4d3a7c7fd1358e2438628bc50..37fcbdcddaa6cbfd6ae37d70cffab957
  import net.minecraft.ChatFormatting;
  import net.minecraft.CrashReport;
  import net.minecraft.CrashReportCategory;
-@@ -2985,6 +2987,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2956,6 +2958,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      public void handleContainerClick(ServerboundContainerClickPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          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
+@@ -2977,6 +2980,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                          return;
                      }
  

patches/server/0033-Do-not-attempt-to-cast-items-to-recipes.patch

@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Allink <arclicious@vivaldi.net>
+Date: Sun, 10 Jul 2022 02:55:33 +0100
+Subject: [PATCH] Do not attempt to cast items to recipes
+
+
+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 f734cba350ed85dbbf52ff527c9bb14b9eb04c86..68912cc2bd670944465e6819d82c4aad6b7b324a 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
+@@ -642,6 +642,13 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+             Entry<ResourceLocation> entry = (Entry) objectiterator.next();
+ 
+             worldserver.getRecipeManager().byKey((ResourceLocation) entry.getKey()).ifPresent((irecipe) -> {
++                // Scissors start - Do not attempt to cast items to recipes
++                if (!(irecipe instanceof AbstractCookingRecipe))
++                {
++                    return;
++                }
++                // Scissors end
++
+                 list.add(irecipe);
+                 AbstractFurnaceBlockEntity.createExperience(worldserver, vec3d, entry.getIntValue(), ((AbstractCookingRecipe) irecipe).getExperience(), blockposition, entityplayer, itemstack, amount); // CraftBukkit
+             });

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

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Allink <arclicious@vivaldi.net>
-Date: Wed, 15 Mar 2023 23:13:56 -0500
+Date: Sun, 10 Jul 2022 10:15:20 +0100
 Subject: [PATCH] Add Scissors configuration file & command
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..f83b2c4298bd1a5f65487f64bd6a11fb190a622d 100644
+index 06bff37e4c1fddd3be6343049a66787c63fb420c..1c1cb20190e8edb7f55a60fc662c28e204690223 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -25,6 +25,7 @@ package co.aikar.timings;
@@ -16,7 +16,7 @@ index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..f83b2c4298bd1a5f65487f64bd6a11fb
  import net.kyori.adventure.text.event.ClickEvent;
  import net.kyori.adventure.text.format.NamedTextColor;
  import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-@@ -242,7 +243,8 @@ public class TimingsExport extends Thread {
+@@ -241,7 +242,8 @@ public class TimingsExport extends Thread {
          parent.put("config", createObject(
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -26,28 +26,6 @@ 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
@@ -206,10 +184,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..8ac0e938ccc83c2e71da419b33556090d5083d9e
+index 0000000000000000000000000000000000000000..b14ecf820880dca72f55cadfba337f725eaeb464
 --- /dev/null
 +++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,199 @@
 +package me.totalfreedom.scissors;
 +
 +
@@ -248,7 +226,7 @@ index 0000000000000000000000000000000000000000..8ac0e938ccc83c2e71da419b33556090
 +
 +            Discord: https://discord.com/invite/mtVQcHn58h
 +            Website: https://scissors.gg/\s
-+            Docs: https://javadoc.scissors.gg/1.20/\s
++            Docs: https://scissors.gg/javadoc/1.19.3/\s
 +            """;
 +    private static final Pattern SPACE = Pattern.compile(" ");
 +    private static final Pattern NOT_NUMERIC = Pattern.compile("[^-\\d.]");
@@ -299,8 +277,8 @@ index 0000000000000000000000000000000000000000..8ac0e938ccc83c2e71da419b33556090
 +        config.options().header(HEADER);
 +        config.options().copyDefaults(true);
 +
-+        version = getInt("config-version", 3);
++        version = getInt("config-version", 1);
-+        set("config-version", 3);
++        set("config-version", 1);
 +        readConfig(ScissorsConfig.class, null);
 +    }
 +
@@ -363,24 +341,10 @@ index 0000000000000000000000000000000000000000..8ac0e938ccc83c2e71da419b33556090
 +
 +    public static boolean runCommandsInBooks = false;
 +
-+    private static void runCommandsInBooks()
++    private static void runCommandsInBooks() {
-+    {
 +        runCommandsInBooks = getBoolean("runCommandsInBooks", false);
 +    }
 +
-+    // people still may want them to bypass permissions for warps
-+    public static boolean commandSignsBypassPermissions = false;
-+    private static void commandSignsBypassPermissions()
-+    {
-+        commandSignsBypassPermissions = getBoolean("commandSignsBypassPermissions", false);
-+    }
-+
-+    public static boolean chatSignaturesEnabled = true;
-+    private static void chatSignaturesEnabled()
-+    {
-+        chatSignaturesEnabled = getBoolean("chatSignaturesEnabled", true);
-+    }
-+
 +    private static void set(String path, Object val)
 +    {
 +        config.set(path, val);
@@ -423,55 +387,27 @@ index 0000000000000000000000000000000000000000..8ac0e938ccc83c2e71da419b33556090
 +    }
 +}
 +
-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 dae36c6452ccd57a436dd918547b64d59957ab0a..d450cf3cf8ab5cbb5d32a28ee2e4a6717941adef 100644
+index 781b72fd88149642c9fceaecfbfe7546273fb749..7eb60d218a55cea6723955c8cad62af7acc10eb1 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -136,6 +136,7 @@ public class Main {
+@@ -122,6 +122,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"));
 +            org.bukkit.configuration.file.YamlConfiguration scissorsConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("scissors-settings")); // Scissors - TODO Change this
              // Paper end
  
-             if (optionset.has("initSettings")) { // CraftBukkit
+             Path path1 = Paths.get("eula.txt");
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..bbfb536ddec7f44d2a75d35ab495be26104678a1 100644
+index a7e133f3495e9132a5fdae2c24f225e7b026295a..d4f0d596d30ef20d70c9f86d33288c78bdb5e6a0 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
+@@ -221,7 +221,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
- 
+-
 +        // Scissors start
 +        try {
 +            me.totalfreedom.scissors.ScissorsConfig.init((java.io.File) options.valueOf("scissors-settings"));
@@ -481,207 +417,23 @@ index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..bbfb536ddec7f44d2a75d35ab495be26
 +        }
 +        me.totalfreedom.scissors.ScissorsConfig.registerCommands();
 +        // Scissors end
-+
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4946d476a26e1441cea5904cde7c433da4e60717..182291e66717b7e42a500856e99b599daeeae926 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1,5 +1,6 @@
- package net.minecraft.server.network;
- 
-+import me.totalfreedom.scissors.ScissorsConfig;
- import me.totalfreedom.scissors.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
-             }
- 
-         }
-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
+index 3fa8a282e4511e79def2470f1abc34f3bf6527a3..1b75855eece59aa6d3a0e3999c66d220daf99ff2 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 {
+@@ -960,6 +960,8 @@ 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
-@@ -1009,6 +1010,7 @@ public final class CraftServer implements Server {
+@@ -991,6 +993,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -689,7 +441,7 @@ index 717bd02837ac33180ceca92e2f45a8c2e6ad4694..1d904254eaa1be68ca51a2f43c5058ad
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2759,6 +2761,12 @@ public final class CraftServer implements Server {
+@@ -2746,6 +2749,12 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -703,10 +455,10 @@ index 717bd02837ac33180ceca92e2f45a8c2e6ad4694..1d904254eaa1be68ca51a2f43c5058ad
          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 0fb3a648ee6bd6cb88515770bcfc70e368313527..5bbfcfe68dace755fe6ec4bc94965d216d998382 100644
+index a4bb8e91302e6dfdfa35a7d6a62c9e36a9043bcb..ebf71612ddc17074e7956cf6becbe81ba8c80e30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -180,9 +180,27 @@ public class Main {
+@@ -173,6 +173,22 @@ public class Main {
                          .defaultsTo("Unknown Server")
                          .describedAs("Name");
                  // Paper end
@@ -720,17 +472,12 @@ index 0fb3a648ee6bd6cb88515770bcfc70e368313527..5bbfcfe68dace755fe6ec4bc94965d21
 +                // Scissors end
 +
 +                // Scissors start
-+                acceptsAll(asList("scissors", "scissors-settings"), "File for Scissors settings")
++                acceptsAll(asList("scissors", "scissors-settings"), "File for scissors settings")
-+                    .withRequiredArg()
++                        .withRequiredArg()
-+                    .ofType(File.class)
++                        .ofType(File.class)
-+                    .defaultsTo(new File("scissors.yml"))
++                        .defaultsTo(new File("scissors.yml"))
-+                    .describedAs("YAML file");
++                        .describedAs("Yml file");
 +                // Scissors end
              }
          };
  
-+
-+
-         OptionSet options = null;
- 
-         // Paper start - preload logger classes to avoid plugins mixing versions

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

@@ -0,0 +1,96 @@
+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/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+index e08f502fc7165f9f466217910210edb5059d39a8..1aa418ef5e400aabdf17dbe81da6cee6a1f63d96 100644
+--- a/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
++++ b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+@@ -151,7 +151,8 @@ public class ScissorsConfig
+ 
+     public static boolean runCommandsInBooks = false;
+ 
+-    private static void runCommandsInBooks() {
++    private static void runCommandsInBooks()
++    {
+         runCommandsInBooks = getBoolean("runCommandsInBooks", false);
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
+index 31911c09fe15753ae32fa39417bdc9e9de552a88..8ef33e2e2374c456cb9d4aab8ed6f1742951f402 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,41 @@ 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) {

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

@@ -5,15 +5,15 @@ 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
+index 5086fc9f81e9ae894b6fa64819e77267812cae17..ca2b1affa23faf7153fad9e97afbb3b55f1e85d4 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
+@@ -1360,7 +1360,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      @Override
      public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
 -        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());
+             BlockEntity tileentity = this.player.getLevel().getBlockEntity(packet.getPos());
              CompoundTag nbttagcompound = tileentity != null ? tileentity.saveWithoutMetadata() : null;
  

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

@@ -0,0 +1,93 @@
+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/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+index 1aa418ef5e400aabdf17dbe81da6cee6a1f63d96..9cd5ffca69df27f794f5a72e687fc6b3ae0f1656 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", 1);
+-        set("config-version", 1);
++        version = getInt("config-version", 2);
++        set("config-version", 2);
+         readConfig(ScissorsConfig.class, null);
+     }
+ 
+@@ -156,6 +156,13 @@ public class ScissorsConfig
+         runCommandsInBooks = getBoolean("runCommandsInBooks", false);
+     }
+ 
++    // people still may want them to bypass permissions for warps
++    public static boolean commandSignsBypassPermissions = false;
++    private static void commandSignsBypassPermissions()
++    {
++        commandSignsBypassPermissions = getBoolean("commandSignsBypassPermissions", false);
++    }
++
+     private static void set(String path, Object val)
+     {
+         config.set(path, val);
+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 4da4edae517a0efec6e03a719ec47b700509dab1..1ec83cbfc2860e1153be301eefb628e209bf9186 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
+@@ -1,11 +1,13 @@
+ package net.minecraft.world.level.block.entity;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
+ import java.util.UUID;
+ import java.util.function.Function;
+ import javax.annotation.Nullable;
+ 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.network.chat.ClickEvent;
+@@ -15,6 +17,7 @@ import net.minecraft.network.chat.ComponentUtils;
+ import net.minecraft.network.chat.MutableComponent;
+ 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.util.FormattedCharSequence;
+@@ -24,6 +27,8 @@ import net.minecraft.world.item.DyeColor;
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
++import org.bukkit.craftbukkit.CraftServer;
++import org.bukkit.craftbukkit.entity.CraftPlayer;
+ 
+ public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements
+     private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper
+@@ -270,7 +275,21 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+                 if (!event.callEvent()) {
+                     return false;
+                 }
+-                player.getServer().getCommands().performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle()), event.getMessage());
++
++                // Scissors start - Add optional permissions to command signs
++                final MinecraftServer vanillaServer = player.getServer();
++                final CraftServer craftServer = vanillaServer.server;
++                final CraftPlayer craftPlayer = player.getBukkitEntity();
++                final Commands commands = vanillaServer.getCommands();
++
++                if (ScissorsConfig.commandSignsBypassPermissions)
++                {
++                    commands.performPrefixedCommand(this.createCommandSourceStack(((org.bukkit.craftbukkit.entity.CraftPlayer) event.getPlayer()).getHandle()), event.getMessage());
++                } else
++                {
++                    craftServer.dispatchCommand(craftPlayer, command.substring(1));
++                }
++                // Scissors end
+                 // Paper end
+             }
+         }

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

@@ -1,32 +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 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-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes out of bounds HangingEntity crash exploit
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
-index 66cf0a6cd1525ecf2615809210a26d55f445d07d..74fb79d4ea11f88f2c0de65b492a5fecc49684f1 100644
+index 334a47b5e0d205c57dfcbb17168cbd3f21d15606..0227f4ed153d229747722ab709932741e0998dc1 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java
 @@ -270,6 +270,13 @@ public abstract class HangingEntity extends Entity {
@@ -13,7 +13,7 @@ index 66cf0a6cd1525ecf2615809210a26d55f445d07d..74fb79d4ea11f88f2c0de65b492a5fec
          BlockPos blockposition = new BlockPos(nbt.getInt("TileX"), nbt.getInt("TileY"), nbt.getInt("TileZ"));
  
 +        // Scissors start - Fixes exploit where bad TileX, TileY, and TileZ coordinates can crash servers
-+        if (level().isLoadedAndInBounds(blockposition))
++        if (level.isLoadedAndInBounds(blockposition))
 +        {
 +            this.pos = blockposition;
 +        }

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

@@ -1,61 +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 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

@@ -1,24 +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 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/0040-Prevent-velocity-freeze.patch

@@ -5,17 +5,10 @@ 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 2096e8a0bdbcfc865f175f3a01ab688542481531..15d375221c253dc4ca1b598eb80b4638eba6f8d0 100644
+index 97231f7328f0eebffcacdae5469027be8aeec3ae..cca792cfabedcc72be99a334f1c2a303217484d7 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 @@
+@@ -41,9 +41,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
- package net.minecraft.world.entity.projectile;
- 
-+import me.totalfreedom.scissors.MathUtility;
- import net.minecraft.core.particles.ParticleOptions;
- import net.minecraft.core.particles.ParticleTypes;
- import net.minecraft.nbt.CompoundTag;
-@@ -41,9 +42,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
          double d6 = Math.sqrt(d3 * d3 + d4 * d4 + d5 * d5);
  
          if (d6 != 0.0D) {
@@ -32,7 +25,7 @@ index 2096e8a0bdbcfc865f175f3a01ab688542481531..15d375221c253dc4ca1b598eb80b4638
          }
  
      }
-@@ -141,6 +146,25 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -141,6 +145,25 @@ public abstract class AbstractHurtingProjectile extends Projectile {
          nbt.put("power", this.newDoubleList(new double[]{this.xPower, this.yPower, this.zPower}));
      }
  
@@ -49,16 +42,16 @@ index 2096e8a0bdbcfc865f175f3a01ab688542481531..15d375221c253dc4ca1b598eb80b4638
 +            return;
 +        }
 +
-+        this.xPower = MathUtility.clampDouble(xPower, -1024, 1024);
++        this.xPower = xPower;
-+        this.yPower = MathUtility.clampDouble(yPower, -1024, 1024);
++        this.yPower = yPower;
-+        this.zPower = MathUtility.clampDouble(zPower, -1024, 1024);
++        this.zPower = zPower;
 +    }
 +    // Scissors end
 +
      @Override
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
-@@ -148,9 +172,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -148,9 +171,13 @@ public abstract class AbstractHurtingProjectile extends Projectile {
              ListTag nbttaglist = nbt.getList("power", 6);
  
              if (nbttaglist.size() == 3) {
@@ -75,7 +68,7 @@ index 2096e8a0bdbcfc865f175f3a01ab688542481531..15d375221c253dc4ca1b598eb80b4638
              }
          }
  
-@@ -184,9 +212,12 @@ public abstract class AbstractHurtingProjectile extends Projectile {
+@@ -184,9 +211,12 @@ public abstract class AbstractHurtingProjectile extends Projectile {
                      Vec3 vec3d = entity.getLookAngle();
  
                      this.setDeltaMovement(vec3d);

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

@@ -0,0 +1,102 @@
+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/me/totalfreedom/scissors/ScissorsConfig.java b/src/main/java/me/totalfreedom/scissors/ScissorsConfig.java
+index 37b8ce4fe8913fd1097c552609c9eddb2751555e..5f46c6e93048a237e25ad84b8839a2945cc88e81 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", 2);
+-        set("config-version", 2);
++        version = getInt("config-version", 3);
++        set("config-version", 3);
+         readConfig(ScissorsConfig.class, null);
+     }
+ 
+@@ -163,6 +163,12 @@ public class ScissorsConfig
+         commandSignsBypassPermissions = getBoolean("commandSignsBypassPermissions", false);
+     }
+ 
++    public static boolean chatSignaturesEnabled = true;
++    private static void chatSignaturesEnabled()
++    {
++        chatSignaturesEnabled = getBoolean("chatSignaturesEnabled", true);
++    }
++
+     private static void set(String path, Object val)
+     {
+         config.set(path, val);
+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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 7d160cdc01d85c4fdc78342051c92be26e394a7f..b55d78ae48ebc18b857f28084fe86ea41e574cd9 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.server.network;
+ 
++import me.totalfreedom.scissors.ScissorsConfig;
+ import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
+ import com.google.common.collect.Lists;
+ import com.google.common.primitives.Floats;
+@@ -2366,6 +2367,13 @@ 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
+             }
+@@ -2601,6 +2609,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ 
+         synchronized (this.lastSeenMessages) {
+             if (!this.lastSeenMessages.applyOffset(packet.offset())) {
++                // 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
+             }

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

@@ -1,31 +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 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

@@ -1,23 +0,0 @@
-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

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Fri, 28 Apr 2023 16:44:50 -0300
-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 2ac23779222369ace69f1e3f7fb12184865b7a43..05c8e4e30b2dce565e84f4c09b3f27244f8c0451 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -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().toString());
-             entity.unRide();
--            this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED);
-+
-+            // Scissors start - Prevent player banning using duplicate UUIDs
-+            if (entity instanceof ServerPlayer serverPlayer) {
-+                this.removePlayerImmediately(serverPlayer, Entity.RemovalReason.DISCARDED);
-+            } else {
-+                entity.discard();
-+            }
-+            // Scissors end
-         }
- 
-         this.entityLookup.addNewEntity(player); // Paper - rewite chunk system

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

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Fri, 28 Apr 2023 16:46:00 -0300
-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 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
-@@ -367,7 +367,7 @@ public final class EntityLookup implements LevelEntityGetter<Entity> {
-                 return false;
-             }
-             if (this.entityByUUID.containsKey(entity.getUUID())) {
--                LOGGER.warn("Entity uuid already exists: " + entity.getUUID() + ", mapped to " + this.entityByUUID.get(entity.getUUID()) + ", can't add " + entity);
-+                // Scissors - Don't warn on duplicate entity UUIDs
-                 return false;
-             }
-             this.entityById.put(entity.getId(), entity);

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

@@ -1,58 +0,0 @@
-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

@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Mon, 29 May 2023 19:34:50 -0300
-Subject: [PATCH] Fix component extra empty array exploit
-
-
-diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
-index 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,11 @@ 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();

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

@@ -1,163 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Wed, 31 May 2023 18:14:00 -0300
-Subject: [PATCH] Add depth limit to Component deserializer
-
-
-diff --git a/src/main/java/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 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;
- import java.util.Map.Entry;
- import java.util.Optional;
- import javax.annotation.Nullable;
-+import me.totalfreedom.scissors.ScissorsConfig; // 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;
- import net.minecraft.util.LowerCaseEnumTypeAdapterFactory;
- // CraftBukkit start
- import com.google.common.collect.Streams;
-+import java.util.regex.Pattern; // Scissors
- import java.util.stream.Stream;
- // CraftBukkit end
- 
-@@ -254,10 +256,16 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
-                 throw new IllegalStateException("Couldn't get field 'lineStart' for JsonReader", nosuchfieldexception);
-             }
-         });
-+        private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("%[0-9]+\\$s"); // Scissors
- 
-         public Serializer() {}
- 
--        public MutableComponent deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
-+        // Scissors start
-+        private MutableComponent deserialize(JsonElement jsonelement, JsonDeserializationContext jsondeserializationcontext, int depth) throws JsonParseException {
-+            if (depth > ScissorsConfig.componentDepthLimit) {
-+                throw new JsonParseException("Depth limit exceeded");
-+            }
-+
-             if (jsonelement.isJsonPrimitive()) {
-                 return Component.literal(jsonelement.getAsString());
-             } else {
-@@ -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);
- 
-                             if (ichatmutablecomponent == null) {
-                                 ichatmutablecomponent = ichatmutablecomponent1;
-@@ -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);
- 
-+                        // 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;
-+
-                         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));
-                             }
- 
-                             ichatmutablecomponent = Component.translatableWithFallback(s, s1, aobject);
-@@ -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);
- 
-                         ichatmutablecomponent = Component.selector(GsonHelper.getAsString(jsonobject, "selector"), optional);
-                     } else if (jsonobject.has("keybind")) {
-@@ -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);
-                         boolean flag = GsonHelper.getAsBoolean(jsonobject, "interpret", false);
-                         Object object;
- 
-@@ -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));
-                         }
-                     }
- 
-@@ -370,6 +381,11 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
-             }
-         }
- 
-+        public MutableComponent deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
-+            return this.deserialize(jsonelement, jsondeserializationcontext, 1);
-+        }
-+        // Scissors end
-+
-         private static Object unwrapTextArgument(Object text) {
-             if (text instanceof Component) {
-                 Component ichatbasecomponent = (Component) text;
-@@ -388,8 +404,10 @@ public interface Component extends Message, FormattedText, Iterable<Component> {
-             return text;
-         }
- 
--        private Optional<Component> parseSeparator(Type type, JsonDeserializationContext context, JsonObject json) {
--            return json.has("separator") ? Optional.of(this.deserialize(json.get("separator"), type, context)) : Optional.empty();
-+        // Scissors start
-+        private Optional<Component> parseSeparator(JsonDeserializationContext context, JsonObject json, int depth) {
-+            return json.has("separator") ? Optional.of(this.deserialize(json.get("separator"), context, depth + 1)) : Optional.empty();
-+            // Scissors end
-         }
- 
-         private void serializeStyle(Style style, JsonObject json, JsonSerializationContext context) {

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

@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Fri, 2 Jun 2023 22:13:54 +0100
-Subject: [PATCH] Add depth limit to SNBT
-
-
-diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java
-index fbfe810e8be6cb159742f7fd85e7491b9cefa4dc..82b1d851e310504e7373a967dfb5b0b096d36693 100644
---- a/src/main/java/net/minecraft/nbt/TagParser.java
-+++ b/src/main/java/net/minecraft/nbt/TagParser.java
-@@ -169,8 +169,58 @@ public class TagParser {
-         }
- 
-         this.expect('}');
--        return compoundTag;
-+
-+        // 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);
-+    }
-+
-+    private boolean exceedsDepthLimit(long depth, Tag tag)
-+    {
-+        if (depth > 256)
-+        {
-+            return true;
-+        }
-+
-+        if (tag instanceof ListTag listTag)
-+        {
-+            for (Tag childTag : listTag)
-+            {
-+                boolean returnValue = this.exceedsDepthLimit(depth + 1, childTag);
-+
-+                if (returnValue)
-+                {
-+                    return true;
-+                }
-+            }
-+        } else if (tag instanceof CompoundTag compoundTag)
-+        {
-+            for (String key: compoundTag.getAllKeys())
-+            {
-+                Tag childTag = compoundTag.get(key);
-+
-+                if (childTag == null)
-+                {
-+                    continue;
-+                }
-+
-+                boolean returnValue = this.exceedsDepthLimit(depth + 1, childTag);
-+
-+                if (returnValue)
-+                {
-+                    return true;
-+                }
-+            }
-+        }
-+
-+        return false;
-     }
-+    // Scissors end
- 
-     private Tag readListTag() throws CommandSyntaxException {
-         this.expect('[');
-@@ -203,7 +253,11 @@ public class TagParser {
-             }
- 
-             this.expect(']');
--            return listTag;
-+
-+            // Scissors start - Add depth limit to SNBT
-+            return exceedsDepthLimit(listTag) ? new ListTag() : listTag;
-+            // return listTag;
-+            // Scissors end
-         }
-     }
- 
-@@ -228,7 +282,7 @@ public class TagParser {
-     }
- 
-     private <T extends Number> List<T> readArray(TagType<?> arrayTypeReader, TagType<?> typeReader) throws CommandSyntaxException {
--        List<T> list = Lists.newArrayList();
-+        List<Number> list = Lists.newArrayList(); // Scissors - List<T> -> List<Number>
- 
-         while(true) {
-             if (this.reader.peek() != ']') {
-@@ -241,11 +295,11 @@ public class TagParser {
-                 }
- 
-                 if (typeReader == ByteTag.TYPE) {
--                    list.add((T)((NumericTag)tag).getAsByte());
-+                    list.add(((NumericTag)tag).getAsByte()); // Scissors - Remove (T) cast
-                 } else if (typeReader == LongTag.TYPE) {
--                    list.add((T)((NumericTag)tag).getAsLong());
-+                    list.add(((NumericTag)tag).getAsLong()); // Scissors - Remove (T) cast
-                 } else {
--                    list.add((T)((NumericTag)tag).getAsInt());
-+                    list.add(((NumericTag)tag).getAsInt()); // Scissors - Remove (T) cast
-                 }
- 
-                 if (this.hasElementSeparator()) {
-@@ -257,7 +311,7 @@ public class TagParser {
-             }
- 
-             this.expect(']');
--            return list;
-+            return (List<T>) list; // Scissors - Cast to List<T>
-         }
-     }
- 

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

@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Allink <arclicious@vivaldi.net>
-Date: Fri, 2 Jun 2023 20:55:18 +0100
-Subject: [PATCH] Implement command block events
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-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;
-+import me.totalfreedom.scissors.event.block.CommandBlockPlayerEditEvent;
-+import me.totalfreedom.scissors.event.block.CommandMinecartPlayerEditEvent;
- import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent;
- import com.google.common.collect.Lists;
- import com.google.common.primitives.Floats;
-@@ -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;
- import net.minecraft.world.item.BlockItem;
- import net.minecraft.world.item.BucketItem;
- import net.minecraft.world.item.Item;
-@@ -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.entity.minecart.CommandMinecart;
- import org.slf4j.Logger;
- 
- // CraftBukkit start
-@@ -1001,6 +1005,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                     this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity);
-                 }
- 
-+                // Scissors start - Implement command block events
-+                if (commandblocklistenerabstract instanceof org.bukkit.block.CommandBlock commandBlock)
-+                {
-+                    CommandBlockPlayerEditEvent event = new CommandBlockPlayerEditEvent(this.getCraftPlayer(), Objects.requireNonNullElse(commandblocklistenerabstract.getCommand(), ""), s, commandBlock);
-+                    event.callEvent();
-+
-+                    if (event.isCancelled()) {
-+                        return;
-+                    }
-+
-+                    s = event.getNewCommand();
-+                }
-+
-+                // Scissors end
-+
-                 commandblocklistenerabstract.setCommand(s);
-                 commandblocklistenerabstract.setTrackOutput(flag);
-                 if (!flag) {
-@@ -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();
-+
-+                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/0050-Limit-beacon-effectRange.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Luna <lunahatesgogle@gmail.com>
-Date: Wed, 7 Jun 2023 16:50:35 -0300
-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 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
-@@ -83,7 +83,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
-     private double effectRange = -1;
- 
-     public double getEffectRange() {
--        if (this.effectRange < 0) {
-+        if (this.effectRange < 0 || this.effectRange > 256) { // Scissors
-             return this.levels * 10 + 10;
-         } else {
-             return effectRange;
-@@ -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
-+        if (this.effectRange > 256) this.effectRange = 256; // Scissors
-     }
- 
-     @Override

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

@@ -1,19 +0,0 @@
-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
-             }
-         }
-     }