mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix early load perms patch (Fixes #5917)

Browse source
This commit is contained in:
Shane Freeder 2021-06-21 09:41:00 +01:00
parent 10e9c5a01c
commit 984591ce66
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/server/0059-Default-loading-permissions.yml-before-plugins.patch
View file

@ -30,17 +30,17 @@ index 429b74474ced04d8dd8f038b8590b8dfe178bf4d..716f285e67019b8a62922d09c15883c9
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2d84d6a18ef93f591d7eb3ef1bf80e88a1a096f5..6bf6183d318e277f0dd2d448edea73d90c42cfd3 100644
index 43b0ecb3b1c06bbb3b7476c67b29e6deab424ac6..9ca44d8e2de750b821b0d760d49193e94001885a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -294,6 +294,7 @@ public final class CraftServer implements Server {
if (!Main.useConsole) {
this.getLogger().info("Console input is disabled due to --noconsole command argument");
@@ -400,6 +400,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
this.helpMap.clear();
this.helpMap.initializeGeneralTopics();
+ if (com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions(); // Paper
}
this.configuration = YamlConfiguration.loadConfiguration(this.getConfigFile());
Plugin[] plugins = this.pluginManager.getPlugins();
@@ -419,7 +420,7 @@ public final class CraftServer implements Server {
this.commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();