From ae0e9f505838f9321187b68284357c4987d59e3c Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sun, 25 Sep 2011 03:14:38 +0100 Subject: Fixed silly error with isLoaded() --- .../org/anjocaido/groupmanager/GroupManager.java | 6 +++--- .../src/org/anjocaido/groupmanager/data/Group.java | 4 ++-- .../src/org/anjocaido/groupmanager/data/User.java | 23 +++++++++++++--------- .../permissions/BukkitPermissions.java | 4 +++- 4 files changed, 22 insertions(+), 15 deletions(-) (limited to 'EssentialsGroupManager/src/org') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 13d99ddc1..dcec36639 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -51,7 +51,7 @@ public class GroupManager extends JavaPlugin { private WorldsHolder worldsHolder; private boolean validateOnlinePlayer = true; private boolean isReady = false; - public static boolean isLoaded = false; + private static boolean isLoaded = false; private GMConfiguration config; private GMLoggerHandler ch; public static BukkitPermissions BukkitPermissions; @@ -103,10 +103,10 @@ public class GroupManager extends JavaPlugin { * All plugins will be loaded by then */ - if (getServer().getScheduler().scheduleSyncDelayedTask(this, new BukkitPermsUpdateTask(),1) == -1) + if (getServer().getScheduler().scheduleSyncDelayedTask(this, new BukkitPermsUpdateTask(),1) == -1) { GroupManager.logger.severe("Could not schedule superperms Update."); - else setLoaded(true); + } //setLoaded(true); System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!"); diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java index 7523831e7..c881fc95d 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java @@ -90,7 +90,7 @@ public class Group extends DataUnit implements Cloneable { inherits.add(inherit.getName().toLowerCase()); } flagAsChanged(); - if (GroupManager.isLoaded) + if (GroupManager.isLoaded()) GroupManager.BukkitPermissions.updateAllPlayers(); } @@ -121,7 +121,7 @@ public class Group extends DataUnit implements Cloneable { variables.addVar(key, temp.getVarObject(key)); } flagAsChanged(); - if (GroupManager.isLoaded) + if (GroupManager.isLoaded()) GroupManager.BukkitPermissions.updateAllPlayers(); } } diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index e9bf79aa9..46dbb3ddc 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -104,8 +104,9 @@ public class User extends DataUnit implements Cloneable { public void setGroup(String group) { this.group = group; flagAsChanged(); - if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false)) - GroupManager.BukkitPermissions.updateAllPlayers(); + if (GroupManager.isLoaded()) + if(GroupManager.BukkitPermissions.player_join = false) + GroupManager.BukkitPermissions.updateAllPlayers(); } /** @@ -118,8 +119,9 @@ public class User extends DataUnit implements Cloneable { group = getDataSource().getGroup(group.getName()); this.group = group.getName(); flagAsChanged(); - if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false)) - GroupManager.BukkitPermissions.updateAllPlayers(); + if (GroupManager.isLoaded()) + if (GroupManager.BukkitPermissions.player_join = false) + GroupManager.BukkitPermissions.updateAllPlayers(); } public void addSubGroup(Group subGroup) { @@ -133,7 +135,8 @@ public class User extends DataUnit implements Cloneable { removeSubGroup(subGroup); subGroups.add(subGroup.getName()); flagAsChanged(); - if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false)) + if (GroupManager.isLoaded()) + if (GroupManager.BukkitPermissions.player_join = false) GroupManager.BukkitPermissions.updateAllPlayers(); } @@ -153,8 +156,9 @@ public class User extends DataUnit implements Cloneable { try { if (subGroups.remove(subGroup.getName())) { flagAsChanged(); - if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false)) - GroupManager.BukkitPermissions.updateAllPlayers(); + if (GroupManager.isLoaded()) + if (GroupManager.BukkitPermissions.player_join = false) + GroupManager.BukkitPermissions.updateAllPlayers(); return true; } } catch (Exception e) { @@ -197,7 +201,8 @@ public class User extends DataUnit implements Cloneable { variables.addVar(key, temp.getVarObject(key)); } flagAsChanged(); - if ((GroupManager.isLoaded) && (GroupManager.BukkitPermissions.player_join = false)) - GroupManager.BukkitPermissions.updateAllPlayers(); + if (GroupManager.isLoaded()) + if (GroupManager.BukkitPermissions.player_join = false) + GroupManager.BukkitPermissions.updateAllPlayers(); } } diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index d3fbdbe55..1c2aa8fb7 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -16,6 +16,8 @@ package org.anjocaido.groupmanager.permissions; +import java.io.PrintWriter; +import java.io.StringWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -255,7 +257,7 @@ public class BukkitPermissions { public void onPluginEnable(PluginEnableEvent event) { if (!GroupManager.isLoaded()) return; - + collectPermissions(); updateAllPlayers(); } -- cgit v1.2.3