AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-06-28 08:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper

Browse Source
This commit is contained in:
Telesphoreo
2023-03-01 19:48:25 -06:00
parent 888600908c
commit ec540fe8cf
8 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0034-Add-Scissors-configuration-file-command.patch
View File

@ -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 cb8c3bc667f9d8e33656a2151a26d55e0be9d05c..5348eef7306f579ae5119775c3cd6c1a4dba33da 100644
index 3fa8a282e4511e79def2470f1abc34f3bf6527a3..1b75855eece59aa6d3a0e3999c66d220daf99ff2 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 {
@@ -960,6 +960,8 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -433,7 +433,7 @@ index cb8c3bc667f9d8e33656a2151a26d55e0be9d05c..5348eef7306f579ae5119775c3cd6c1a
this.console.paperConfigurations.reloadConfigs(this.console);
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
@@ -992,6 +994,7 @@ public final class CraftServer implements Server {
@@ -991,6 +993,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 cb8c3bc667f9d8e33656a2151a26d55e0be9d05c..5348eef7306f579ae5119775c3cd6c1a
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2747,6 +2750,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);
}