forked from SteamWar/SteamWar
Fix BackupCommand
Fix FixedRegion
This commit is contained in:
+2
-2
@@ -120,12 +120,12 @@ public class BackupCommand extends SWCommand {
|
||||
return new TypeMapper<RegionBackups.Backup>() {
|
||||
@Override
|
||||
public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
|
||||
return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s.replace('_', ' '));
|
||||
return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
|
||||
return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).map(name -> name.replace(' ', '_')).collect(Collectors.toList());
|
||||
return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).collect(Collectors.toList());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
+3
-3
@@ -100,10 +100,10 @@ public class FixedRegion implements Region {
|
||||
@Nullable
|
||||
@Override
|
||||
public Backup get(String name) {
|
||||
final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
|
||||
final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), FixedRegion.this.name);
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
definedBackupFolder.mkdirs();
|
||||
File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name + ".schem"));
|
||||
File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name.replace('_', ' ') + ".schem"));
|
||||
if (files == null || files.length == 0) return null;
|
||||
return new BackupImpl(files[0]);
|
||||
}
|
||||
@@ -114,7 +114,7 @@ public class FixedRegion implements Region {
|
||||
private final File file;
|
||||
|
||||
public BackupImpl(File file) {
|
||||
super(RegionBackups.BackupType.AUTOMATIC, file.getName(), flagStorage);
|
||||
super(RegionBackups.BackupType.AUTOMATIC, file.getName().replace(' ', '_'), flagStorage);
|
||||
this.file = file;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user