AtlasMediaGroup/Scissors
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/Scissors.git synced 2025-08-07 12:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Paper

Browse Source
This commit is contained in:
Telesphoreo
2022-09-26 13:07:45 -05:00
parent 15012da3ac
commit 4a70956116
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0035-Add-Scissors-configuration-file-command.patch
View File

@@ -400,7 +400,7 @@ index 5962f7a2b185d7d54a0f9e341a4fdf6e6f1c1ec5..41cc0fe90e10ee53c4fcd49265be0297
Path path1 = Paths.get("eula.txt");
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index bdd6560fe85950b0a857a949cb38c044da44ca6b..c4894b7022ee5e63135c9463c8faf61ec827d245 100644
index 2932d2bb797a49e904cebec4285d24d69b429cd9..25d3949fc39cb463c8190a2c5db6ccb1ef662642 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -226,7 +226,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -421,10 +421,10 @@ index bdd6560fe85950b0a857a949cb38c044da44ca6b..c4894b7022ee5e63135c9463c8faf61e
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 4017fbe7761ba7eaf4e9b3c047e1ca79042aab8c..bc459fd74701e0aad7a5a1491ca349cba68efd4e 100644
index a09030476eeabe50733d06eb8df20f287a18aecf..6707f27b22fe3cb935cb8f7043914a5ceb0425a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -960,6 +960,8 @@ public final class CraftServer implements Server {
@@ -965,6 +965,8 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -433,7 +433,7 @@ index 4017fbe7761ba7eaf4e9b3c047e1ca79042aab8c..bc459fd74701e0aad7a5a1491ca349cb
this.console.paperConfigurations.reloadConfigs(this.console);
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
@@ -991,6 +993,7 @@ public final class CraftServer implements Server {
@@ -996,6 +998,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 4017fbe7761ba7eaf4e9b3c047e1ca79042aab8c..bc459fd74701e0aad7a5a1491ca349cb
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2731,6 +2734,12 @@ public final class CraftServer implements Server {
@@ -2736,6 +2739,12 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}