diff options
author | ElgarL <ElgarL@palmergames.com> | 2012-07-10 14:27:50 +0100 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2012-07-10 14:27:50 +0100 |
commit | dfaa1db76f969efdc8897cb5709982250815bdaa (patch) | |
tree | c89d9112eccc4cc7bade18c2f80c103c5160c728 | |
parent | 2ecddaa46e96a35b5c40db6dcf3a10e88decc43b (diff) | |
parent | 6503e49d4d8e3c20bec200953cd9983fa3e62686 (diff) | |
download | Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar.gz Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar.lz Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar.xz Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.zip |
Merge branch 'groupmanager' of
https://ElgarL@github.com/essentials/Essentials.git into groupmanager
Conflicts:
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index b145e8f90..6b81f17d0 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -425,10 +425,10 @@ public class BukkitPermissions { updatePermissions(event.getPlayer(), event.getPlayer().getWorld().getName());
}
-
+ /*
* Trigger at highest so we tidy up last.
- */
+ */ @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerQuit(PlayerQuitEvent event) {
@@ -464,4 +464,4 @@ public class BukkitPermissions { }
}
-}
\ No newline at end of file +} |