2020-03-10 12:01:15 +01:00
|
|
|
From 1053c2b77c943e8f935e414456ecfa157c5e9e7b Mon Sep 17 00:00:00 2001
|
2016-03-19 21:19:00 +01:00
|
|
|
From: William <admin@domnian.com>
|
|
|
|
Date: Fri, 18 Mar 2016 03:30:17 -0400
|
|
|
|
Subject: [PATCH] Allow Reloading of Custom Permissions
|
|
|
|
|
|
|
|
https://github.com/PaperMC/Paper/issues/49
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2020-03-10 12:01:15 +01:00
|
|
|
index 30286a50d..c65e6256b 100644
|
2016-03-19 21:19:00 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2020-03-10 12:01:15 +01:00
|
|
|
@@ -2089,5 +2089,23 @@ public final class CraftServer implements Server {
|
2019-06-22 21:04:26 +02:00
|
|
|
return null;
|
2017-07-16 01:59:18 +02:00
|
|
|
}
|
2016-03-19 21:19:00 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void reloadPermissions() {
|
2018-08-11 14:45:38 +02:00
|
|
|
+ pluginManager.clearPermissions();
|
|
|
|
+ if (com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions();
|
2016-04-19 23:29:33 +02:00
|
|
|
+ for (Plugin plugin : pluginManager.getPlugins()) {
|
2018-08-11 14:45:38 +02:00
|
|
|
+ for (Permission perm : plugin.getDescription().getPermissions()) {
|
2016-04-19 23:29:33 +02:00
|
|
|
+ try {
|
|
|
|
+ pluginManager.addPermission(perm);
|
|
|
|
+ } catch (IllegalArgumentException ex) {
|
|
|
|
+ getLogger().log(Level.WARNING, "Plugin " + plugin.getDescription().getFullName() + " tried to register permission '" + perm.getName() + "' but it's already registered", ex);
|
|
|
|
+ }
|
2018-08-11 14:45:38 +02:00
|
|
|
+ }
|
2016-04-19 23:29:33 +02:00
|
|
|
+ }
|
2018-08-11 14:45:38 +02:00
|
|
|
+ if (!com.destroystokyo.paper.PaperConfig.loadPermsBeforePlugins) loadCustomPermissions();
|
|
|
|
+ DefaultPermissions.registerCorePermissions();
|
|
|
|
+ CraftDefaultPermissions.registerCorePermissions();
|
2016-03-19 21:19:00 +01:00
|
|
|
+ }
|
2017-07-16 01:59:18 +02:00
|
|
|
// Paper end
|
2016-03-19 21:19:00 +01:00
|
|
|
}
|
|
|
|
--
|
2020-02-02 12:53:48 +01:00
|
|
|
2.25.0
|
2016-03-19 21:19:00 +01:00
|
|
|
|