diff --git a/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java b/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java index e0bbd8d97..64957587b 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java @@ -235,7 +235,6 @@ public class MainCommand extends CommandManager { catch (NumberFormatException e) {} } else if (ConsolePlayer.isConsole(player) && args.length >= 2) { - System.out.print(1); String[] split = args[0].split(";"); String world; PlotId id; @@ -252,10 +251,8 @@ public class MainCommand extends CommandManager { world = null; } if (id != null && PS.get().isPlotWorld(world)) { - System.out.print(2 + " | " + id + " | " + world); Plot plot = MainUtil.getPlot(world, id); if (plot != null) { - System.out.print(3 + " | " + plot); player.teleport(MainUtil.getPlotCenter(plot)); args = Arrays.copyOfRange(args, 1, args.length); } @@ -298,7 +295,12 @@ public class MainCommand extends CommandManager { { ArrayList> cmds = getCommands(); cmd = new StringComparison>(label, cmds).getMatchObject(); - MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("{label}", label)); + if (cmd == null) { + MainUtil.sendMessage(plr, C.DID_YOU_MEAN, "/plot help"); + } + else { + MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("{label}", label)); + } } return CommandHandlingOutput.NOT_FOUND; } diff --git a/src/main/java/com/intellectualcrafters/plot/commands/list.java b/src/main/java/com/intellectualcrafters/plot/commands/list.java index 2cc0354ec..9a7d7be5f 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/list.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/list.java @@ -25,6 +25,7 @@ import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.config.Settings; import com.intellectualcrafters.plot.flag.Flag; import com.intellectualcrafters.plot.flag.FlagManager; +import com.intellectualcrafters.plot.object.ConsolePlayer; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.object.Rating; @@ -32,6 +33,7 @@ import com.intellectualcrafters.plot.util.*; import com.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.util.bukkit.chat.FancyMessage; import com.plotsquared.general.commands.CommandDeclaration; + import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; @@ -325,7 +327,7 @@ public class list extends SubCommand { } } i++; - if (player != null && Settings.FANCY_CHAT) { + if (!ConsolePlayer.isConsole(player) && Settings.FANCY_CHAT) { ChatColor color; if (plot.owner == null) { color = ChatColor.GOLD; diff --git a/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java b/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java index 96ffcb7de..790caf7a1 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java +++ b/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java @@ -47,7 +47,6 @@ public class ConsolePlayer implements PlotPlayer { @Override public Location getLocation() { - System.out.print(loc); return loc; }