mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-23 17:57:38 +00:00
Added support for newer versions of Permissions, in theory.
This commit is contained in:
parent
ac920fd5b6
commit
fd2de1d264
@ -55,31 +55,44 @@ public class NijiPermissionsResolver implements PermissionsResolver {
|
|||||||
try {
|
try {
|
||||||
Player player = server.getPlayer(name);
|
Player player = server.getPlayer(name);
|
||||||
if (player == null) return false;
|
if (player == null) return false;
|
||||||
return api.Security.permission(player, permission);
|
try {
|
||||||
|
return api.getHandler().has(player, permission);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
return api.Security.permission(player, permission);
|
||||||
|
}
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
t.printStackTrace();
|
t.printStackTrace();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("static-access")
|
@SuppressWarnings({ "static-access", "deprecation" })
|
||||||
public boolean inGroup(String name, String group) {
|
public boolean inGroup(String name, String group) {
|
||||||
try {
|
try {
|
||||||
Player player = server.getPlayer(name);
|
Player player = server.getPlayer(name);
|
||||||
if (player == null) return false;
|
if (player == null) return false;
|
||||||
return api.Security.inGroup(name, group);
|
try {
|
||||||
|
return api.getHandler().inGroup(player.getWorld().getName(), name, group);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
return api.Security.inGroup(name, group);
|
||||||
|
}
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
t.printStackTrace();
|
t.printStackTrace();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("static-access")
|
@SuppressWarnings({ "static-access", "deprecation" })
|
||||||
public String[] getGroups(String name) {
|
public String[] getGroups(String name) {
|
||||||
try {
|
try {
|
||||||
Player player = server.getPlayer(name);
|
Player player = server.getPlayer(name);
|
||||||
if (player == null) return new String[0];
|
if (player == null) return new String[0];
|
||||||
String group = api.Security.getGroup(player.getName());
|
String group;
|
||||||
|
try {
|
||||||
|
group = api.getHandler().getGroup(player.getWorld().getName(), player.getName());
|
||||||
|
} catch (Throwable t) {
|
||||||
|
group = api.Security.getGroup(player.getName());
|
||||||
|
}
|
||||||
if (group == null) {
|
if (group == null) {
|
||||||
return new String[0];
|
return new String[0];
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user