From 35fd7b6fc0b80228bb973cbef931d51ba51c98a9 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 23 Sep 2023 12:36:55 -0500
Subject: [PATCH] Update Paper

---
 gradle.properties                               |  2 +-
 ...dd-Scissors-configuration-file-command.patch |  8 ++++----
 ...-Limit-sculk-catalyst-cursor-positions.patch | 17 +++++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 81d1d77..a5f3c52 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.1-R0.1-SNAPSHOT
 
 mcVersion=1.20.1
-paperRef=1b1c23010ac55e610e3a36f4e5b93a8198cff69c
+paperRef=773dd724469bae89d0c2075edc3d1ddc8d5b0b18
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0016-Add-Scissors-configuration-file-command.patch b/patches/server/0016-Add-Scissors-configuration-file-command.patch
index e0d8af6..3cad371 100644
--- a/patches/server/0016-Add-Scissors-configuration-file-command.patch
+++ b/patches/server/0016-Add-Scissors-configuration-file-command.patch
@@ -447,10 +447,10 @@ index c49802c936ae8e3f4dc1badd98414d96714ecd60..c9725f2df7a66eba3d5994a2b4b16b07
          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 b74d78f5f3f015330005c463cc34bddc079a1e0c..2512258ec280c9921186d00d15d738b67ec02955 100644
+index 26937b8dd0411b0c96e461c57eeee6ae8595211e..bf8ade78a771b0295811f48cba96aeb05a39524e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1034,6 +1034,7 @@ public final class CraftServer implements Server {
+@@ -1036,6 +1036,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -458,7 +458,7 @@ index b74d78f5f3f015330005c463cc34bddc079a1e0c..2512258ec280c9921186d00d15d738b6
          this.console.paperConfigurations.reloadConfigs(this.console);
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-@@ -1065,6 +1066,7 @@ public final class CraftServer implements Server {
+@@ -1067,6 +1068,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -466,7 +466,7 @@ index b74d78f5f3f015330005c463cc34bddc079a1e0c..2512258ec280c9921186d00d15d738b6
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2910,6 +2912,14 @@ public final class CraftServer implements Server {
+@@ -2912,6 +2914,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
diff --git a/patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch b/patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch
index 90e4672..0759bd9 100644
--- a/patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch
+++ b/patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch
@@ -5,14 +5,15 @@ 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..9785f2d8c94552b4a1139fa6d936fdaa61e5827c 100644
+index de90a216321f7d82310a0d1c915fefe64360534c..7e52f6c26234cf6fa092151d51c0c6b70dc22ca8 100644
 --- a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
 +++ b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
-@@ -141,6 +141,7 @@ public class SculkSpreader {
-             Object2IntMap<BlockPos> object2IntMap = new Object2IntOpenHashMap<>();
+@@ -181,7 +181,7 @@ public class SculkSpreader {
  
-             for(SculkSpreader.ChargeCursor chargeCursor : this.cursors) {
-+                if (!world.getMinecraftWorld().isLoadedAndInBounds(chargeCursor.getPos())) continue; // Scissors
-                 chargeCursor.update(world, pos, random, this, shouldConvertToBlock);
-                 if (chargeCursor.charge <= 0) {
-                     world.levelEvent(3006, chargeCursor.getPos(), 0);
+             while (iterator.hasNext()) {
+                 SculkSpreader.ChargeCursor sculkspreader_a = (SculkSpreader.ChargeCursor) iterator.next();
+-
++                if (!world.getMinecraftWorld().isLoadedAndInBounds(sculkspreader_a.getPos())) continue; // Scissors
+                 sculkspreader_a.update(world, pos, random, this, shouldConvertToBlock);
+                 if (sculkspreader_a.charge <= 0) {
+                     world.levelEvent(3006, sculkspreader_a.getPos(), 0);