diff options
| author | snowleo <schneeleo@gmail.com> | 2012-03-01 17:33:25 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-03-01 17:33:25 +0100 |
| commit | a8da3eebd72eaf74303502a251a2daa8a371de92 (patch) | |
| tree | fa0ce072240eb37966e7406c6d8c418c6193add7 | |
| parent | 056303b53c953f4a9effa661b1a61d35893a8858 (diff) | |
| parent | 3823e7a108eaff2ecc65cb9221ad344d36f8c9ef (diff) | |
| download | Essentials-a8da3eebd72eaf74303502a251a2daa8a371de92.tar Essentials-a8da3eebd72eaf74303502a251a2daa8a371de92.tar.gz Essentials-a8da3eebd72eaf74303502a251a2daa8a371de92.tar.lz Essentials-a8da3eebd72eaf74303502a251a2daa8a371de92.tar.xz Essentials-a8da3eebd72eaf74303502a251a2daa8a371de92.zip | |
Merge remote-tracking branch 'origin/groupmanager'
| -rw-r--r-- | EssentialsGroupManager/src/Changelog.txt | 3 | ||||
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 1159607ed..9d7187690 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -145,4 +145,5 @@ v 1.9: - Update for Bukkit R5 compatability.
- 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 promoting players to, and demoting to GlobalGroups.
\ No newline at end of file + - Prevent promoting players to, and demoting to GlobalGroups.
+ - Make 'manload' reload the config correctly.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index b0d46ca1a..00c71a41e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -121,15 +121,15 @@ public class GroupManager extends JavaPlugin { ch = new GMLoggerHandler(); GroupManager.logger.addHandler(ch); logger.setLevel(Level.ALL); - if (worldsHolder == null) { - // Create the backup folder, if it doesn't exist. - prepareFileFields(); - // Load the config.yml - prepareConfig(); - // Load the global groups - globalGroups = new GlobalGroups(this); - worldsHolder = new WorldsHolder(this); - } + + // Create the backup folder, if it doesn't exist. + prepareFileFields(); + // Load the config.yml + prepareConfig(); + // Load the global groups + globalGroups = new GlobalGroups(this); + worldsHolder = new WorldsHolder(this); + PluginDescriptionFile pdfFile = this.getDescription(); if (worldsHolder == null) { |