mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-09-06 13:08:04 +02:00
Merge branch 'refs/heads/groupmanager'
This commit is contained in:
commit
c5c29aef4e
@ -71,3 +71,5 @@ v 1.5:
|
||||
You then MUST issue a '/mansave force' to overwrite the disc files, or a '/manload' to overwrite the memory data.
|
||||
- Fix for an error in checkFullUserPermission caused by players disconnecting mid perms update.
|
||||
- Notification of being moved to the default group only happens if it's a demotion/promotion (not on join).
|
||||
- Fixed GM holding files open and causing the time stamp to be incorrect. This caused GM to require a '/mansave force' when it shouldn't be needed.
|
||||
- Fixed a crash on reload due to bukkit not unloading plugins before reloading.
|
@ -130,6 +130,9 @@ public class GroupManager extends JavaPlugin {
|
||||
throw new IllegalStateException("An error ocurred while loading GroupManager");
|
||||
}
|
||||
|
||||
// Set a few defaults (reloads)
|
||||
setLoaded(false);
|
||||
|
||||
// Initialize the world listener and bukkit permissions to handle
|
||||
// events.
|
||||
WorldEvents = new GMWorldListener(this);
|
||||
|
@ -338,7 +338,7 @@ public class WorldDataHolder {
|
||||
}
|
||||
this.setDefaultGroup(this.getGroup(ph.getDefaultGroup().getName()));
|
||||
this.removeGroupsChangedFlag();
|
||||
this.timeStampGroups = ph.getTimeStampGroups();
|
||||
this.timeStampGroups = getGroupsFile().lastModified();
|
||||
|
||||
ph = null;
|
||||
} catch (Exception ex) {
|
||||
@ -368,7 +368,7 @@ public class WorldDataHolder {
|
||||
tempUser.clone(this);
|
||||
}
|
||||
this.removeUsersChangedFlag();
|
||||
this.timeStampUsers = ph.getTimeStampUsers();
|
||||
this.timeStampUsers = getUsersFile().lastModified();
|
||||
|
||||
ph = null;
|
||||
} catch (Exception ex) {
|
||||
@ -925,6 +925,7 @@ public class WorldDataHolder {
|
||||
out.write(newLine);
|
||||
|
||||
yaml.dump(root, out);
|
||||
out.close();
|
||||
} catch (UnsupportedEncodingException ex) {
|
||||
} catch (FileNotFoundException ex) {
|
||||
} catch (IOException e) {
|
||||
@ -995,9 +996,12 @@ public class WorldDataHolder {
|
||||
opt.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
|
||||
final Yaml yaml = new Yaml(opt);
|
||||
try {
|
||||
yaml.dump(root, new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8"));
|
||||
OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(usersFile), "UTF-8");
|
||||
yaml.dump(root, out);
|
||||
out.close();
|
||||
} catch (UnsupportedEncodingException ex) {
|
||||
} catch (FileNotFoundException ex) {
|
||||
} catch (IOException e) {
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user