mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-08 07:36:42 +02:00
Merge remote-tracking branch 'origin/groupmanager'
This commit is contained in:
@@ -146,3 +146,4 @@ v 1.9:
|
|||||||
- Removed BukkitPermsOverride as this is now the default with bukkit handling child nodes.
|
- Removed BukkitPermsOverride as this is now the default with bukkit handling child nodes.
|
||||||
- Prevent adding inheritances and info nodes to globalgroups. These are permissions collections, not player groups.
|
- Prevent adding inheritances and info nodes to globalgroups. These are permissions collections, not player groups.
|
||||||
- Prevent promoting players to, and demoting to GlobalGroups.
|
- Prevent promoting players to, and demoting to GlobalGroups.
|
||||||
|
- Make 'manload' reload the config correctly.
|
@@ -121,7 +121,7 @@ public class GroupManager extends JavaPlugin {
|
|||||||
ch = new GMLoggerHandler();
|
ch = new GMLoggerHandler();
|
||||||
GroupManager.logger.addHandler(ch);
|
GroupManager.logger.addHandler(ch);
|
||||||
logger.setLevel(Level.ALL);
|
logger.setLevel(Level.ALL);
|
||||||
if (worldsHolder == null) {
|
|
||||||
// Create the backup folder, if it doesn't exist.
|
// Create the backup folder, if it doesn't exist.
|
||||||
prepareFileFields();
|
prepareFileFields();
|
||||||
// Load the config.yml
|
// Load the config.yml
|
||||||
@@ -129,7 +129,7 @@ public class GroupManager extends JavaPlugin {
|
|||||||
// Load the global groups
|
// Load the global groups
|
||||||
globalGroups = new GlobalGroups(this);
|
globalGroups = new GlobalGroups(this);
|
||||||
worldsHolder = new WorldsHolder(this);
|
worldsHolder = new WorldsHolder(this);
|
||||||
}
|
|
||||||
|
|
||||||
PluginDescriptionFile pdfFile = this.getDescription();
|
PluginDescriptionFile pdfFile = this.getDescription();
|
||||||
if (worldsHolder == null) {
|
if (worldsHolder == null) {
|
||||||
|
Reference in New Issue
Block a user