diff --git a/gradle.properties b/gradle.properties index 5f3a03d..05ba8e0 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=f9dc371fd8c56f1ad1359fc3bf1f7a40921ec66f +paperRef=60b83fee1e77d78acde9ce59d234c586961ef074 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 17aa9fe..c4766de 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 31faf2d6492696f7d0c99a48edbc0d6f15db1209..d6d3e802648eaf001f6e8143a361053ab41c5291 100644 +index a821cb33fbc29109aec68f9d6a0eb2efc121ee13..69344f5caf001dcd557d29a3635cdd2dc0617116 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -121,6 +121,7 @@ public class Main { +@@ -132,6 +132,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,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 f667193cffb9205ed0c6291ff08c68ca0dae3792..ca7cb582db2f66b9e57083d7c55b24be7d48644b 100644 +index 473037da34d8f3ca891117fbb5404b350bf01480..f60f509ac659dec6dd1446b6dbbdf0f69d77ed46 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -980,6 +980,8 @@ public final class CraftServer implements Server { +@@ -961,6 +961,8 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot @@ -433,7 +433,7 @@ index f667193cffb9205ed0c6291ff08c68ca0dae3792..ca7cb582db2f66b9e57083d7c55b24be this.console.paperConfigurations.reloadConfigs(this.console); for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty -@@ -1011,6 +1013,7 @@ public final class CraftServer implements Server { +@@ -992,6 +994,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 f667193cffb9205ed0c6291ff08c68ca0dae3792..ca7cb582db2f66b9e57083d7c55b24be this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2765,6 +2768,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); }