Fix #516 and a related problem

This commit is contained in:
boy0001 2015-08-08 02:30:21 +10:00
parent b88c6d8d26
commit 94df643e6e
4 changed files with 4 additions and 8 deletions

View File

@ -72,14 +72,11 @@ public class Add extends SubCommand {
if (args[0].equalsIgnoreCase("*")) { if (args[0].equalsIgnoreCase("*")) {
uuid = DBFunc.everyone; uuid = DBFunc.everyone;
} else { } else {
// TODO have a runnable for fetch
uuid = UUIDHandler.getUUID(args[0], null); uuid = UUIDHandler.getUUID(args[0], null);
} }
if (uuid == null) { if (uuid == null) {
if (UUIDHandler.implementation instanceof SQLUUIDHandler) { MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
MainUtil.sendMessage(plr, C.INVALID_PLAYER_WAIT, args[0]);
} else {
MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
}
return false; return false;
} }
if (plot.isOwner(uuid)) { if (plot.isOwner(uuid)) {

View File

@ -40,7 +40,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
description = "Comment on a plot", description = "Comment on a plot",
category = CommandCategory.ACTIONS, category = CommandCategory.ACTIONS,
requiredType = RequiredType.NONE, requiredType = RequiredType.NONE,
permission = "plot.comment" permission = "plots.comment"
) )
public class Comment extends SubCommand { public class Comment extends SubCommand {

View File

@ -42,7 +42,6 @@ public class Unclaim extends SubCommand {
@Override @Override
public boolean onCommand(final PlotPlayer plr, final String[] args) { public boolean onCommand(final PlotPlayer plr, final String[] args) {
final Location loc = plr.getLocation(); final Location loc = plr.getLocation();
final Plot plot = MainUtil.getPlot(loc); final Plot plot = MainUtil.getPlot(loc);
if (plot == null) { if (plot == null) {

View File

@ -38,7 +38,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
@CommandDeclaration( @CommandDeclaration(
command = "untrust", command = "untrust",
aliases = {"ut"}, aliases = {"ut"},
permission = "plot.untrust", permission = "plots.untrust",
description = "Remove a trusted user from a plot", description = "Remove a trusted user from a plot",
usage = "/plot untrust <player>", usage = "/plot untrust <player>",
requiredType = RequiredType.NONE, requiredType = RequiredType.NONE,