Merge pull request #72 from daboross/patch-2

Allow Modifyworld to run without PEX being present
This commit is contained in:
zml2008 2013-07-13 14:20:58 -07:00
commit 9697e148d3
1 changed files with 24 additions and 17 deletions

View File

@ -79,31 +79,38 @@ public class PlayerInformer {
} }
public String getMessage(Player player, String permission) { public String getMessage(Player player, String permission) {
if (PermissionsEx.isAvailable()) { boolean permissionsExExists = true;
PermissionUser user = PermissionsEx.getUser(player); try {
Class permissionsExClass = Class.forName("ru.tehkode.permissions.bukkit.PermissionsEx");
} catch (ClassNotFoundException e) {
permissionsExExists = false;
}
if (permissionsExExists) {
if (PermissionsEx.isAvailable()) {
PermissionUser user = PermissionsEx.getUser(player);
String message; String message;
String perm = permission; String perm = permission;
int index; int index;
while ((index = perm.lastIndexOf(".")) != -1) { while ((index = perm.lastIndexOf(".")) != -1) {
perm = perm.substring(0, index); perm = perm.substring(0, index);
message = user.getOption("permission-denied-" + perm, player.getWorld().getName(), null); message = user.getOption("permission-denied-" + perm, player.getWorld().getName(), null);
if (message == null) { if (message == null) {
continue; continue;
}
return message;
} }
return message; message = user.getOption("permission-denied", player.getWorld().getName(), null);
}
message = user.getOption("permission-denied", player.getWorld().getName(), null); if (message != null) {
return message;
if (message != null) { }
return message;
} }
} }
return getMessage(permission); return getMessage(permission);
} }