summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-02-28 10:46:10 +0000
committersnowleo <schneeleo@gmail.com>2012-03-01 19:05:47 +0100
commitb48ad9c01810303dd0a5fec569f795a2cf4c6a16 (patch)
treeed69c6ebcc9cbc9848fae6c369b6fad3865c96ab
parent9d2f892f6e07c614a1aa0eba1d86e600f7c40836 (diff)
downloadEssentials-b48ad9c01810303dd0a5fec569f795a2cf4c6a16.tar
Essentials-b48ad9c01810303dd0a5fec569f795a2cf4c6a16.tar.gz
Essentials-b48ad9c01810303dd0a5fec569f795a2cf4c6a16.tar.lz
Essentials-b48ad9c01810303dd0a5fec569f795a2cf4c6a16.tar.xz
Essentials-b48ad9c01810303dd0a5fec569f795a2cf4c6a16.zip
Make 'manload' reload the config correctly.
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java18
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) {