Merge remote-tracking branch 'origin/master'

This commit is contained in:
Sauilitired 2014-10-28 10:21:04 +01:00
commit a582e036e8
5 changed files with 224 additions and 101 deletions

View file

@ -143,11 +143,11 @@ public class PlotMain extends JavaPlugin {
*/
public static int hasPermissionRange(Player player, String stub, int range) {
if (player==null || player.isOp()) {
return range;
}
if (player.hasPermission(stub + ".*")) {
return range;
}
return Integer.MAX_VALUE;
}
if (player.hasPermission(stub + ".*")) {
return Integer.MAX_VALUE;
}
for (int i = range; i > 0; i--) {
if (player.hasPermission(stub + "." + i)) {
return i;