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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
60135676 [Auto] Updated Upstream (CraftBukkit)
fa90052a Fix MC-125757 (#3859)
071c08d7 Only convert lore lines that actually look legacy
8c4787e3 Misc Improvements to Async Teleporting and Light patch
6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-10 23:08:29 -05:00
parent 2bf9d992b1
commit 714f0a04d0
81 changed files with 205 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0103-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch Normal file
View File

@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 10 Jul 2020 12:38:12 -0500
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
index 2f29d7040..719c9db3c 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -86,6 +86,15 @@ public class Main {
return;
}
+ // Purpur start - fix SPIGOT-5885
+ try {
+ org.bukkit.configuration.file.YamlConfiguration config = new org.bukkit.configuration.file.YamlConfiguration();
+ config.load((File) optionset.valueOf("spigot-settings"));
+ org.spigotmc.SpigotConfig.disabledAdvancements = config.getStringList("advancements.disabled");
+ } catch (Exception ignore) {
+ }
+ // Purpur end - fix SPIGOT-5885
+
File file = (File) optionset.valueOf("universe"); // CraftBukkit
YggdrasilAuthenticationService yggdrasilauthenticationservice = new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString()); // Paper
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();