From 9b774083a127dd388a5fdb5484a9342ef35e2cab Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 16 Dec 2022 17:24:43 -0600 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../0034-Add-Scissors-configuration-file-command.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8c73a76..f2d5e07 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=c97581978af124a6aca4fc3ffbd035e1e6e875db +paperRef=44dc5a4c2669f3888bd50a7cb693e43fc1f09280 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0034-Add-Scissors-configuration-file-command.patch b/patches/server/0034-Add-Scissors-configuration-file-command.patch index b5d9aef..3750a0a 100644 --- a/patches/server/0034-Add-Scissors-configuration-file-command.patch +++ b/patches/server/0034-Add-Scissors-configuration-file-command.patch @@ -421,7 +421,7 @@ index 51b3db0b6c2cede95b584268e035c0fb36d38094..f8e49559657c1a2788a3aa8a15df6da7 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 653c34ae4a5f55773f0c4af54c8cbb426ddb7d7b..9a2ed55bc6837875adfbf623b1cabf605801d5b4 100644 +index fe38e40c07523da1016f4802eb4763a631fb57ab..a385fc49a36c444b071871be9bca2e9d0f68f258 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -978,6 +978,8 @@ public final class CraftServer implements Server { @@ -441,7 +441,7 @@ index 653c34ae4a5f55773f0c4af54c8cbb426ddb7d7b..9a2ed55bc6837875adfbf623b1cabf60 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2760,6 +2763,12 @@ public final class CraftServer implements Server { +@@ -2763,6 +2766,12 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -455,7 +455,7 @@ index 653c34ae4a5f55773f0c4af54c8cbb426ddb7d7b..9a2ed55bc6837875adfbf623b1cabf60 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 21db4153a9eb5e52ff357b4146ae4302029d5cd5..f5b5eb6686684791c281604bd308107427861af2 100644 +index 1e62d975e5df8da96e4ebbf163cab5032a9521aa..c7f633d61ce65e34baca51593791e3023977084b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -173,6 +173,22 @@ public class Main {