From 0a52c589841253f4a50e43171b664d213ec9d579 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 17 Feb 2023 20:23:49 -0600 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../0034-Add-Scissors-configuration-file-command.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7d448ad..5f3a03d 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=27516ee39ea7be95b5eb4ea700a2df4aeab147d6 +paperRef=f9dc371fd8c56f1ad1359fc3bf1f7a40921ec66f 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 b8fd91b..17aa9fe 100644 --- a/patches/server/0034-Add-Scissors-configuration-file-command.patch +++ b/patches/server/0034-Add-Scissors-configuration-file-command.patch @@ -421,10 +421,10 @@ 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 83fa0d27e72261fe7bcec2ae58a61f431963b36e..2934df817c2a1e10cc30de47e33b9eaf2a82e252 100644 +index f667193cffb9205ed0c6291ff08c68ca0dae3792..ca7cb582db2f66b9e57083d7c55b24be7d48644b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -979,6 +979,8 @@ public final class CraftServer implements Server { +@@ -980,6 +980,8 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -433,7 +433,7 @@ index 83fa0d27e72261fe7bcec2ae58a61f431963b36e..2934df817c2a1e10cc30de47e33b9eaf this.console.paperConfigurations.reloadConfigs(this.console); for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty -@@ -1010,6 +1012,7 @@ public final class CraftServer implements Server { +@@ -1011,6 +1013,7 @@ public final class CraftServer implements Server { this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper @@ -441,7 +441,7 @@ index 83fa0d27e72261fe7bcec2ae58a61f431963b36e..2934df817c2a1e10cc30de47e33b9eaf this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2764,6 +2767,12 @@ public final class CraftServer implements Server { +@@ -2765,6 +2768,12 @@ public final class CraftServer implements Server { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); }