Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/main/java/serverutils/command/CmdBackup.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package serverutils.command;

import java.util.Arrays;

import net.minecraft.command.ICommandSender;

import serverutils.ServerUtilities;
Expand All @@ -26,10 +28,17 @@ public CmdBackupStart(String s) {

@Override
public void processCommand(ICommandSender sender, String[] args) {
BackupTask task = new BackupTask(sender, args.length == 0 ? "" : args[0]);
final boolean oc = Arrays.stream(args).anyMatch(arg -> arg.equalsIgnoreCase("=oc"));
final String target = Arrays.stream(args).filter(arg -> !arg.equalsIgnoreCase("=oc")).findFirst()
.orElse("");

final BackupTask task = new BackupTask(sender, target, oc);

if (BackupTask.thread == null) {
task.execute(Universe.get());
sender.addChatMessage(ServerUtilities.lang("cmd.backup_manual_launch", sender.getCommandSenderName()));
sender.addChatMessage(
ServerUtilities
.lang("cmd.backup_manual_launch" + (oc ? "_oc" : ""), sender.getCommandSenderName()));
} else {
sender.addChatMessage(ServerUtilities.lang(sender, "cmd.backup_already_running"));
}
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/serverutils/task/backup/BackupTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public class BackupTask extends Task {
private ICommandSender sender;
private String customName = "";
private boolean post = false;
private boolean forceOnlyClaimed = false;

static {
BACKUP_FOLDER = backups.backup_folder_path.isEmpty() ? new File("/backups/")
Expand All @@ -60,6 +61,11 @@ public BackupTask() {
super(Ticks.HOUR.x(backups.backup_timer));
}

public BackupTask(@Nullable ICommandSender ics, String customName, final boolean forceOnlyClaimed) {
this(ics, customName);
this.forceOnlyClaimed = forceOnlyClaimed;
}

public BackupTask(@Nullable ICommandSender ics, String customName) {
this.customName = customName;
this.sender = ics;
Expand Down Expand Up @@ -117,7 +123,7 @@ public void execute(Universe universe) {
BACKUP.sendAll(StringUtils.color("cmd.backup_start", EnumChatFormatting.LIGHT_PURPLE));
}
Set<ChunkDimPos> backupChunks = new HashSet<>();
if (backups.only_backup_claimed_chunks && ClaimedChunks.isActive()) {
if ((this.forceOnlyClaimed || backups.only_backup_claimed_chunks) && ClaimedChunks.isActive()) {
backupChunks.addAll(ClaimedChunks.instance.getAllClaimedPositions());
// noinspection ResultOfMethodCallIgnored
BACKUP_TEMP_FOLDER.mkdirs();
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/serverutilities/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@ cmd.backup_end_1=Server backup done in %s!
cmd.backup_end_2=Server backup done in %s! (%s)
cmd.backup_fail=Failed to save world! (%s)
cmd.backup_manual_launch=%s launched a manual backup!
cmd.backup_manual_launch_oc=%s launched a claimed only manual backup!
cmd.backup_already_running=Backup in progress!
cmd.backup_not_running=Backup is not running!
cmd.backup_size=Current world size: %s, total backups folder size: %s
Expand Down