Merge branch 'groupmanager' of

https://ElgarL@github.com/essentials/Essentials.git into groupmanager

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
This commit is contained in:
ElgarL 2012-07-10 14:27:50 +01:00
commit 8fac5f6beb

View file

@ -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 {
}
}
}
}