Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-11-10 05:20:04 +01:00
Give a better error when a schematic being loaded doesn't exist
Only require the schemaitc format to be provided once more schematic formats are added
Dieser Commit ist enthalten in:
Ursprung
7b0570f714
Commit
b22921ffa6
@ -77,6 +77,11 @@ public class SchematicCommands {
|
|||||||
File dir = we.getWorkingDirectoryFile(config.saveDir);
|
File dir = we.getWorkingDirectoryFile(config.saveDir);
|
||||||
File f = we.getSafeOpenFile(player, dir, fileName, "schematic", "schematic");
|
File f = we.getSafeOpenFile(player, dir, fileName, "schematic", "schematic");
|
||||||
|
|
||||||
|
if (!f.exists()) {
|
||||||
|
player.printError("Schemtic " + fileName + " does not exist!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
SchematicFormat format = formatName == null ? null : SchematicFormat.getFormat(formatName);
|
SchematicFormat format = formatName == null ? null : SchematicFormat.getFormat(formatName);
|
||||||
if (format == null) {
|
if (format == null) {
|
||||||
format = SchematicFormat.getFormat(f);
|
format = SchematicFormat.getFormat(f);
|
||||||
@ -112,11 +117,11 @@ public class SchematicCommands {
|
|||||||
|
|
||||||
@Command(
|
@Command(
|
||||||
aliases = { "save", "s" },
|
aliases = { "save", "s" },
|
||||||
usage = "<format> <filename>",
|
usage = "[format] <filename>",
|
||||||
desc = "Save a schematic into your clipboard",
|
desc = "Save a schematic into your clipboard",
|
||||||
help = "Save a schematic into your clipboard\n" +
|
help = "Save a schematic into your clipboard\n" +
|
||||||
"Format is a format from \"//schematic formats\"\n",
|
"Format is a format from \"//schematic formats\"\n",
|
||||||
min = 2,
|
min = 1,
|
||||||
max = 2
|
max = 2
|
||||||
)
|
)
|
||||||
@CommandPermissions({"worldedit.clipboard.save", "worldedit.schematic.save"}) // TODO: Remove 'clipboard' perm
|
@CommandPermissions({"worldedit.clipboard.save", "worldedit.schematic.save"}) // TODO: Remove 'clipboard' perm
|
||||||
@ -124,13 +129,23 @@ public class SchematicCommands {
|
|||||||
EditSession editSession) throws WorldEditException, CommandException {
|
EditSession editSession) throws WorldEditException, CommandException {
|
||||||
|
|
||||||
LocalConfiguration config = we.getConfiguration();
|
LocalConfiguration config = we.getConfiguration();
|
||||||
SchematicFormat format = SchematicFormat.getFormat(args.getString(0));
|
SchematicFormat format;
|
||||||
|
if (args.argsLength() == 1) {
|
||||||
|
if (SchematicFormat.getFormats().size() == 1) {
|
||||||
|
format = SchematicFormat.getFormats().iterator().next();
|
||||||
|
} else {
|
||||||
|
player.printError("More than one schematic format is available. Please provide the desired format");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
format = SchematicFormat.getFormat(args.getString(0));
|
||||||
if (format == null) {
|
if (format == null) {
|
||||||
player.printError("Unknown schematic format: " + args.getString(0));
|
player.printError("Unknown schematic format: " + args.getString(0));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String filename = args.getString(1);
|
String filename = args.getString(args.argsLength() - 1);
|
||||||
|
|
||||||
File dir = we.getWorkingDirectoryFile(config.saveDir);
|
File dir = we.getWorkingDirectoryFile(config.saveDir);
|
||||||
File f = we.getSafeSaveFile(player, dir, filename, "schematic", "schematic");
|
File f = we.getSafeSaveFile(player, dir, filename, "schematic", "schematic");
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren