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

Call load() directly to avoid Bukkit logger

Browse Source
This commit is contained in:
William Blake Galbreath
2020-07-10 16:08:40 -05:00
parent 3fd350965f
commit cf1410403e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0104-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 2f29d7040..21d4c965d 100644 index 2f29d7040..719c9db3c 100644
--- a/src/main/java/net/minecraft/server/Main.java --- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java
@@ -86,6 +86,15 @@ public class Main { @@ -86,6 +86,15 @@ public class Main {
@@ -14,9 +14,9 @@ index 2f29d7040..21d4c965d 100644
+ // Purpur start - fix SPIGOT-5885 + // Purpur start - fix SPIGOT-5885
+ try { + try {
+ org.spigotmc.SpigotConfig.disabledAdvancements = org.bukkit.configuration.file.YamlConfiguration + org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration();
+ .loadConfiguration((File) optionset.valueOf("spigot-settings")) + config.load((File) optionset.valueOf("spigot-settings"));
+ .getStringList("advancements.disabled"); + org.spigotmc.SpigotConfig.disabledAdvancements = config.getStringList("advancements.disabled");
+ } catch (Exception ignore) { + } catch (Exception ignore) {
+ } + }
+ // Purpur end - fix SPIGOT-5885 + // Purpur end - fix SPIGOT-5885

8
patches/server/0106-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 21d4c965d..220a084be 100644 index 719c9db3c..5071fd1cd 100644
--- a/src/main/java/net/minecraft/server/Main.java --- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java
@@ -95,7 +95,20 @@ public class Main { @@ -95,7 +95,20 @@ public class Main {
@@ -19,9 +19,9 @@ index 21d4c965d..220a084be 100644
+ file = (File) optionset.valueOf("universe"); // CraftBukkit + file = (File) optionset.valueOf("universe"); // CraftBukkit
+ } else { + } else {
+ try { + try {
+ file = new File(org.bukkit.configuration.file.YamlConfiguration + org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration();
+ .loadConfiguration((File) optionset.valueOf("bukkit-settings")) + config.load((File) optionset.valueOf("bukkit-settings"));
+ .getString("settings.world-container", ".")); + file = new File(config.getString("settings.world-container", "."));
+ } catch (Exception ignore) { + } catch (Exception ignore) {
+ file = new File("."); + file = new File(".");
+ } + }