From 95982e53d41d9e441d8145a03bee213b81264d9c Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Fri, 24 Feb 2023 01:22:27 -0600
Subject: [PATCH] Update Paper

---
 gradle.properties                                         | 2 +-
 .../server/0024-Account-for-items-inside-containers.patch | 8 ++++----
 .../0034-Add-Scissors-configuration-file-command.patch    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 05ba8e0..adafaee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.19.3-R0.1-SNAPSHOT
 
 mcVersion=1.19.3
-paperRef=60b83fee1e77d78acde9ce59d234c586961ef074
+paperRef=81d7ff6e317cee83c971baf7b10046be90a6891b
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0024-Account-for-items-inside-containers.patch b/patches/server/0024-Account-for-items-inside-containers.patch
index c3fbc29..4804109 100644
--- a/patches/server/0024-Account-for-items-inside-containers.patch
+++ b/patches/server/0024-Account-for-items-inside-containers.patch
@@ -201,18 +201,18 @@ 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 ccad692aba2ed77259f6814d88f01b91ed9d229b..da4fc1027e106fd4e4baedd7b9490c41b0e38bd5 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
-@@ -5,6 +5,7 @@ import java.util.List;
- import java.util.function.BooleanSupplier;
+@@ -6,6 +6,7 @@ import java.util.function.BooleanSupplier;
+ import java.util.stream.Collectors;
  import java.util.stream.IntStream;
  import javax.annotation.Nullable;
 +import me.totalfreedom.scissors.NbtUtility;
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.core.NonNullList;
-@@ -52,6 +53,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() {
diff --git a/patches/server/0034-Add-Scissors-configuration-file-command.patch b/patches/server/0034-Add-Scissors-configuration-file-command.patch
index c4766de..fcd4530 100644
--- a/patches/server/0034-Add-Scissors-configuration-file-command.patch
+++ b/patches/server/0034-Add-Scissors-configuration-file-command.patch
@@ -388,10 +388,10 @@ index 0000000000000000000000000000000000000000..b14ecf820880dca72f55cadfba337f72
 +}
 +
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index a821cb33fbc29109aec68f9d6a0eb2efc121ee13..69344f5caf001dcd557d29a3635cdd2dc0617116 100644
+index 781b72fd88149642c9fceaecfbfe7546273fb749..7eb60d218a55cea6723955c8cad62af7acc10eb1 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -132,6 +132,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"));
@@ -421,7 +421,7 @@ index a7e133f3495e9132a5fdae2c24f225e7b026295a..d4f0d596d30ef20d70c9f86d33288c78
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 473037da34d8f3ca891117fbb5404b350bf01480..f60f509ac659dec6dd1446b6dbbdf0f69d77ed46 100644
+index cb8c3bc667f9d8e33656a2151a26d55e0be9d05c..5348eef7306f579ae5119775c3cd6c1a4dba33da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -961,6 +961,8 @@ public final class CraftServer implements Server {
@@ -441,7 +441,7 @@ index 473037da34d8f3ca891117fbb5404b350bf01480..f60f509ac659dec6dd1446b6dbbdf0f6
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2746,6 +2749,12 @@ public final class CraftServer implements Server {
+@@ -2747,6 +2750,12 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }