bug fix and typo

This commit is contained in:
Vlammar 2020-11-07 01:04:24 +01:00
parent 1becb9faf4
commit c769f50835
6 changed files with 96 additions and 78 deletions

View File

@ -43,10 +43,11 @@ import fr.zcraft.zlib.components.commands.CommandException;
import fr.zcraft.zlib.components.commands.CommandInfo;
import fr.zcraft.zlib.components.gui.Gui;
import fr.zcraft.zlib.components.i18n.I;
import fr.zcraft.zlib.tools.PluginLogger;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import java.util.concurrent.ExecutionException;
import org.bukkit.entity.Player;
@CommandInfo (name = "exploreother")
@ -59,17 +60,27 @@ public class ExploreOtherCommand extends IoMCommand
warning(I.t("Not enough parameters! Usage: /maptool exploreother <playername>"));
return;
}
try{
OfflinePlayer player=getOfflinePlayerParameter(0);
String name=args[0];
if(player!=null)
Gui.open(playerSender(), new MapListGui(player,name));
}
catch (InterruptedException | ExecutionException e){
warning(I.t("Can't find player"));
Player sender=playerSender();
offlinePlayerParameter(0, uuid -> {
if(uuid==null){
try {
throwInvalidArgument(I.t("Player not found."));
} catch (CommandException e) {
PluginLogger.error("CommandException "+e);
return;
}
}
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
if (offlinePlayer != null) {
Gui.open(sender, new MapListGui(offlinePlayer, name));
}
else{
PluginLogger.warning(I.t("Can't find player"));
return;
}
});
}
@Override
public boolean canExecute(CommandSender sender)

View File

@ -18,10 +18,13 @@
package fr.moribus.imageonmap.commands.maptool;
import fr.moribus.imageonmap.Permissions;
import fr.moribus.imageonmap.commands.IoMCommand;
import fr.moribus.imageonmap.map.ImageMap;
import fr.zcraft.zlib.components.commands.CommandException;
import fr.zcraft.zlib.components.commands.CommandInfo;
import fr.zcraft.zlib.components.i18n.I;
import org.bukkit.command.CommandSender;
import java.util.List;
@ -30,13 +33,17 @@ public class RenameCommand extends IoMCommand {
@Override
protected void run() throws CommandException
{
if(args.length == 2)
{
ImageMap map = getMapFromArgs();
map.rename(args[1]);
} else {
info(I.t("Not enough or too many arguments"));
if(args.length != 4) {
warning(I.t("Not enough or too many arguments! Usage: /maptool rename <map name> <new map name>"));
return;
}
//if(args.length == 2)
//{
ImageMap map = getMapFromArgs();
map.rename(args[2]);
// } else {
// info(I.t("Not enough or too many arguments"));
// }
}
@Override
protected List<String> complete() throws CommandException

View File

@ -165,7 +165,7 @@ public class ImageRendererExecutor extends Worker
public ImageMap run() throws Throwable
{
final URLConnection connection = HTTPconnection(url);
final URLConnection connection = connecting(url);
final InputStream stream = connection.getInputStream();
final BufferedImage image = ImageIO.read(stream);