53 Zeilen
2.7 KiB
Diff
53 Zeilen
2.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Fri, 18 Mar 2016 13:17:38 -0400
|
||
|
|
Subject: [PATCH] Default loading permissions.yml before plugins
|
||
|
|
|
||
|
|
Under previous behavior, plugins were not able to check if a player had a permission
|
||
|
|
if it was defined in permissions.yml. there is no clean way for a plugin to fix that either.
|
||
|
|
|
||
|
|
This will change the order so that by default, permissions.yml loads BEFORE plugins instead of after.
|
||
|
|
|
||
|
|
This gives plugins expected permission checks.
|
||
|
|
|
||
|
|
It also helps improve the expected logic, as servers should set the initial defaults, and then let plugins
|
||
|
|
modify that. Under the previous logic, plugins were unable (cleanly) override permissions.yml.
|
||
|
|
|
||
|
|
A config option has been added for those who depend on the previous behavior, but I don't expect that.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
index 429b74474ced04d8dd8f038b8590b8dfe178bf4d..716f285e67019b8a62922d09c15883c99f9421aa 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
@@ -222,4 +222,9 @@ public class PaperConfig {
|
||
|
|
private static void useDisplayNameInQuit() {
|
||
|
|
useDisplayNameInQuit = getBoolean("use-display-name-in-quit-message", useDisplayNameInQuit);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public static boolean loadPermsBeforePlugins = true;
|
||
|
|
+ private static void loadPermsBeforePlugins() {
|
||
|
|
+ loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
index 35d3df7ded4904414a9a61895950b56be530d244..662fc88e2e118a57a6c35a8981d4622188adec3b 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -397,6 +397,7 @@ public final class CraftServer implements Server {
|
||
|
|
if (type == PluginLoadOrder.STARTUP) {
|
||
|
|
helpMap.clear();
|
||
|
|
helpMap.initializeGeneralTopics();
|
||
|
|
+ if (com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions(); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
Plugin[] plugins = pluginManager.getPlugins();
|
||
|
|
@@ -416,7 +417,7 @@ public final class CraftServer implements Server {
|
||
|
|
commandMap.registerServerAliases();
|
||
|
|
DefaultPermissions.registerCorePermissions();
|
||
|
|
CraftDefaultPermissions.registerCorePermissions();
|
||
|
|
- loadCustomPermissions();
|
||
|
|
+ if (!com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions(); // Paper
|
||
|
|
helpMap.initializeCommands();
|
||
|
|
syncCommands();
|
||
|
|
}
|