- Reverted WorldHolder static change to maintain backward plugin

compatability.

3 files changed, 9 insertions, 8 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 50f6d0f4d..f4ba657e7 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -11,4 +11,5 @@ v 1.1:
 	- Fix for an infinite loop bug with the new Bukkit Perms during a new user creation.

     - Fixed BukkitPerms population. Wasn't correctly setting superperms.

     - Push updates to superperms for all valid GM commands.

-    - All GroupManager commands issued by players are now echoed in the console.
\ No newline at end of file
+    - All GroupManager commands issued by players are now echoed in the console.

+    - Reverted WorldHolder static change to maintain backward plugin compatability.
\ 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 b48c3feae..b56d42122 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -47,7 +47,7 @@ public class GroupManager extends JavaPlugin {
     private ScheduledThreadPoolExecutor scheduler;
     private Map<String, ArrayList<User>> overloadedUsers = new HashMap<String, ArrayList<User>>();
     private Map<CommandSender, String> selectedWorlds = new HashMap<CommandSender, String>();
-    private static WorldsHolder worldsHolder;
+    private WorldsHolder worldsHolder;
     private boolean validateOnlinePlayer = true;
     private boolean isReady = false;
     public static boolean isLoaded = false;
@@ -123,7 +123,7 @@ public class GroupManager extends JavaPlugin {
 
                 @Override
                 public void run() {
-                    GroupManager.worldsHolder.saveChanges();
+                    worldsHolder.saveChanges();
                 }
             };
             scheduler = new ScheduledThreadPoolExecutor(1);
@@ -166,7 +166,7 @@ public class GroupManager extends JavaPlugin {
         worldsHolder.reloadAll();
     }
 
-    public static WorldsHolder getWorldsHolder() {
+    public WorldsHolder getWorldsHolder() {
         return worldsHolder;
     }
 
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index ae22076a9..97695ffdb 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -58,12 +58,12 @@ public class BukkitPermissions {
 

     protected Map<Player, PermissionAttachment> attachments = new HashMap<Player, PermissionAttachment>();

     protected Set<Permission> registeredPermissions = new HashSet<Permission>();

-    protected Plugin plugin;

+    protected GroupManager plugin;

     protected boolean dumpAllPermissions = true;

     protected boolean dumpMatchedPermissions = true;

     public boolean player_join = false;

 

-    public BukkitPermissions(Plugin plugin) {

+    public BukkitPermissions(GroupManager plugin) {

         this.plugin = plugin;

 

         this.collectPermissions();

@@ -120,7 +120,7 @@ public class BukkitPermissions {
         // All permissions registered with Bukkit for this player

         PermissionAttachment attachment = this.attachments.get(player);

         

-        OverloadedWorldHolder worldData = GroupManager.getWorldsHolder().getWorldData(world);

+        OverloadedWorldHolder worldData = plugin.getWorldsHolder().getWorldData(world);

 

         User user = worldData.getUser(player.getName());

         

@@ -185,7 +185,7 @@ public class BukkitPermissions {
         	player_join = true;

         	Player player = event.getPlayer();

         	//force GM to create the player if they are not already listed.

-        	if (GroupManager.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {

+        	if (plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {

         		player_join = false;

         		updatePermissions(event.getPlayer());

         	} else