mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
19 lines
936 B
Diff
19 lines
936 B
Diff
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 91b6aeae1e573dfbc8ec54f5ce279a5b43b055c7..0368c64403eacf98b85ab15ed71312d932cb59c9 100644
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
|
@@ -177,6 +177,7 @@ public class Main {
|
|
return;
|
|
}
|
|
|
|
+ org.spigotmc.SpigotConfig.disabledAdvancements = spigotConfiguration.getStringList("advancements.disabled"); // Paper - fix SPIGOT-5885, must be set early in init
|
|
// Paper start - fix SPIGOT-5824
|
|
File file;
|
|
File userCacheFile = new File(Services.USERID_CACHE_FILE);
|