mirror of
https://github.com/Multiverse/Multiverse-Core.git
synced 2025-01-24 09:11:21 +01:00
GroupManager is going to be the death of me... this was a bad idea to
support it.
This commit is contained in:
parent
097985f24a
commit
f73d5dbcf1
@ -72,15 +72,16 @@ public class MVPermissions {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public Boolean canEnterWorld(Player p, World w) {
|
public Boolean canEnterWorld(Player p, World w) {
|
||||||
// First check if we've got the Permissions plugin, we can't perform the group checks without it.
|
String group = "";
|
||||||
if(MultiVerseCore.Permissions==null) {
|
|
||||||
return true; // If we don't have it we must return true otherwise we are forcing people to use the Permissions plugin.
|
if(MultiVerseCore.GroupManager!=null){
|
||||||
|
group = MultiVerseCore.GroupManager.getWorldsHolder().getWorldPermissions(p).getGroup(p.getName());
|
||||||
|
} else if (MultiVerseCore.Permissions!=null){
|
||||||
|
group = MultiVerseCore.Permissions.getGroup(p.getName(), p.getWorld().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
List<String> whiteList = this.plugin.worlds.get(w.getName()).joinWhitelist;
|
List<String> whiteList = this.plugin.worlds.get(w.getName()).joinWhitelist;
|
||||||
List<String> blackList = this.plugin.worlds.get(w.getName()).joinBlacklist;
|
List<String> blackList = this.plugin.worlds.get(w.getName()).joinBlacklist;
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
String group = MultiVerseCore.Permissions.getGroup(p.getName());
|
|
||||||
|
|
||||||
boolean returnValue = true;
|
boolean returnValue = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user