Permissions Murder 4: The quest for revenge

This commit is contained in:
shatteredbeam 2013-02-12 18:33:55 -08:00
parent 0684b1d425
commit 9be6a7cf3b

View File

@ -16,7 +16,6 @@ import com.gmail.nossr50.runnables.McRankAsync;
import com.gmail.nossr50.skills.utilities.SkillTools; import com.gmail.nossr50.skills.utilities.SkillTools;
import com.gmail.nossr50.skills.utilities.SkillType; import com.gmail.nossr50.skills.utilities.SkillType;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class McrankCommand implements CommandExecutor { public class McrankCommand implements CommandExecutor {
@ -24,7 +23,7 @@ public class McrankCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
switch (args.length) { switch (args.length) {
case 0: case 0:
if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank")) { if (!sender.hasPermission("mcmmo.commands.mcrank")) {
sender.sendMessage(command.getPermissionMessage()); sender.sendMessage(command.getPermissionMessage());
return true; return true;
} }
@ -44,7 +43,7 @@ public class McrankCommand implements CommandExecutor {
return true; return true;
case 1: case 1:
if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others")) { if (!sender.hasPermission("mcmmo.commands.mcrank.others")) {
sender.sendMessage(command.getPermissionMessage()); sender.sendMessage(command.getPermissionMessage());
return true; return true;
} }
@ -59,7 +58,7 @@ public class McrankCommand implements CommandExecutor {
return true; return true;
} }
if (sender instanceof Player && !!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.offline")) { if (sender instanceof Player && !!sender.hasPermission("mcmmo.commands.mcrank.others.offline")) {
sender.sendMessage(LocaleLoader.getString("Inspect.Offline")); sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
return true; return true;
} }
@ -67,7 +66,7 @@ public class McrankCommand implements CommandExecutor {
else { else {
Player target = mcMMOPlayer.getPlayer(); Player target = mcMMOPlayer.getPlayer();
if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.far")) { if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !sender.hasPermission("mcmmo.commands.mcrank.others.far")) {
sender.sendMessage(LocaleLoader.getString("Inspect.TooFar")); sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
return true; return true;
} }