minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-16 03:24:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'refs/heads/groupmanager'

Browse Source
This commit is contained in:
snowleo
2011-12-14 10:03:32 +01:00
parent f251cd14ba c277858790
commit 258a5b9868
2 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EssentialsGroupManager/src/Changelog.txt
View File

@@ -85,3 +85,4 @@ v 1.7:
- Offline player checks now support partial name matches. - Offline player checks now support partial name matches.
- Added custom events so plugins can now be notified of changes within GroupManager. - Added custom events so plugins can now be notified of changes within GroupManager.
- GM now registers with Bukkits ServicesManager. - GM now registers with Bukkits ServicesManager.
- deleting the contents of GlobalGroups.yml will no longer thrown a NullPointerException.

8
EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
View File

@@ -107,13 +107,15 @@ public class GlobalGroups {
throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + GlobalGroupsFile.getPath(), ex); throw new IllegalArgumentException("The following file couldn't pass on Parser.\n" + GlobalGroupsFile.getPath(), ex);
} }
// Clear out old groups
resetGlobalGroups();
if (!GGroups.getKeys(false).isEmpty()) {
// Read all global groups // Read all global groups
Map<String, Object> allGroups = (Map<String, Object>) GGroups.getConfigurationSection("groups").getValues(false); Map<String, Object> allGroups = (Map<String, Object>) GGroups.getConfigurationSection("groups").getValues(false);
// Load each groups permissions list. // Load each groups permissions list.
if (allGroups != null) { if (allGroups != null) {
// Clear out old groups
resetGlobalGroups();
for (String groupName : allGroups.keySet()) { for (String groupName : allGroups.keySet()) {
Group newGroup = new Group(groupName.toLowerCase()); Group newGroup = new Group(groupName.toLowerCase());
Object element; Object element;
@@ -150,6 +152,8 @@ public class GlobalGroups {
} }
removeGroupsChangedFlag(); removeGroupsChangedFlag();
}
setTimeStampGroups(GlobalGroupsFile.lastModified()); setTimeStampGroups(GlobalGroupsFile.lastModified());
GroupManager.setLoaded(true); GroupManager.setLoaded(true);
//GlobalGroupsFile = null; //GlobalGroupsFile = null;