summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-14 15:52:22 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-14 15:52:22 +0000
commitf0def90301aa7baba98a01763ef41e25c1ead021 (patch)
tree39e941a293af6f0afbcc27ce1b6708f060dc9ac6 /EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
parent856cef32862ba9c15d45b85e00c69fba624c9aa5 (diff)
parentd0e5685ac0afb7bb69df9a17aafe0f78f5fc5aef (diff)
downloadEssentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar.gz
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar.lz
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.tar.xz
Essentials-f0def90301aa7baba98a01763ef41e25c1ead021.zip
Merge remote branch 'remotes/origin/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 4ba2624bf..8134a1c23 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -948,7 +948,7 @@ public class GroupManager extends JavaPlugin {
}
} else {
- sender.sendMessage(ChatColor.YELLOW + "The grpup '" + auxGroup.getName() + "' has no specific permissions.");
+ sender.sendMessage(ChatColor.YELLOW + "The group '" + auxGroup.getName() + "' has no specific permissions.");
auxString = "";
for (String grp : auxGroup.getInherits()) {
auxString += grp + ", ";
@@ -1522,7 +1522,8 @@ public class GroupManager extends JavaPlugin {
}
// WORKING
config.load();
-
+ worldsHolder.mirrorSetUp();
+
isLoaded = false;
if (args.length > 0) {
@@ -1539,7 +1540,6 @@ public class GroupManager extends JavaPlugin {
worldsHolder.reloadAll();
sender.sendMessage(ChatColor.YELLOW + " The current world was reloaded.");
}
- worldsHolder.mirrorSetUp();
isLoaded = true;