Merge remote branch 'remotes/ess/groupmanager' into essmaster

2 files changed, 4 insertions, 3 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 7f143a779..7e2e65c4d 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -17,4 +17,5 @@ v 1.1:
     - Fix for null in PLAYER_TELEPORT for bukkit perms.

     - Fixed wasteful updating of perms on a manload.

     - manulistp now accepts an additional + to list ALL Superperms effective permissions (/manulistp <name> +).

-    - manucheckp also outputs superperms results.
\ No newline at end of file
+    - manucheckp also outputs superperms results.

+    - Removed superperms update on plugins unloading. Unneeded and created undesired lag on shutdown.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 5a39bd9a8..02a1f4d5c 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -256,8 +256,8 @@ public class BukkitPermissions {
 

         @Override

         public void onPluginDisable(PluginDisableEvent event) {

-            collectPermissions();

-            updateAllPlayers();

+            //collectPermissions();

+            //updateAllPlayers();

         }

     }