Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 20:03:02 -04:00
parent 102b3130fe
commit 4f291c3b98
30 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0002-Purpur-config-files.patch
View File

@@ -64,13 +64,13 @@ index 0148cadbeb41a882a05d982f0b34770b2829a04a..5213f132f826b47e2825644242aaece2
if (this.source.acceptsSuccess() && !this.silent) {
this.source.sendSystemMessage(message);
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 4fbeee4bede41d96b92c6cdd6503362a2c4dd5fb..6d0a0186778a115f556bbb376a9c1684f9c5740c 100644
index ddfee22ad840970e495c1a6d537fee810b137cbb..a4f19720738b167fd5932defabff9aa144f59c37 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -222,6 +222,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
@@ -223,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
io.papermc.paper.command.PaperCommands.registerCommands(this);
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
+ // Purpur start
+ try {
+ org.purpurmc.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
@@ -84,7 +84,7 @@ index 4fbeee4bede41d96b92c6cdd6503362a2c4dd5fb..6d0a0186778a115f556bbb376a9c1684
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 76aa5d1bcb2ccb554966dcb5916ae527d73f042e..cf719642e6fe7f041489c86560a431eebe839acf 100644
index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..9c7943b8712133aa71de113a5581f591cfd68657 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -175,6 +175,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -105,7 +105,7 @@ index 76aa5d1bcb2ccb554966dcb5916ae527d73f042e..cf719642e6fe7f041489c86560a431ee
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 24917a7d1a6792d5a4ae281200011ddb1bc5b931..aaa9060a4b61034ade81639fb3e8b7ef214eb05b 100644
index db154e64869ff7792d8d3c2c317cb9e00a25f048..00fdfad4164f010ddfbdbf8c4567a94641cc3789 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -950,6 +950,7 @@ public final class CraftServer implements Server {
@@ -127,7 +127,7 @@ index 24917a7d1a6792d5a4ae281200011ddb1bc5b931..aaa9060a4b61034ade81639fb3e8b7ef
@@ -980,6 +982,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.configuration.PaperConfigurations.registerCommands(this.console);
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
+ org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");