Merge branch 'stable' into develop

2020-09-27 18:45:05 +02:00
parent cff6034079 9cf8ec4e06
commit 9af562957f
18 changed files with 129 additions and 40 deletions
--- a/src/main/java/com/replaymod/editor/gui/MarkerProcessor.java
+++ b/src/main/java/com/replaymod/editor/gui/MarkerProcessor.java
@@ -127,6 +127,9 @@ public class MarkerProcessor {
        List<Pair<Path, ReplayMetaData>> outputPaths = new ArrayList<>();

        Path inputPath = path.resolveSibling("raw").resolve(path.getFileName());
+        for (int i = 1; Files.exists(inputPath); i++) {
+            inputPath = inputPath.resolveSibling(replayName + "." + i + ".mcpr");
+        }
        Files.createDirectories(inputPath.getParent());
        Files.move(path, inputPath);