mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-03-07 13:48:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Actually overwrite existing files in archiveunpack

Browse Source 
Fixes #1567
This commit is contained in:
Octavia Togami 2020-10-18 11:43:21 -07:00
parent f449e55f98
commit a2243be3dc
No known key found for this signature in database
GPG Key ID: CC364524D1983C99
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
worldedit-core/src/main/java/com/sk89q/worldedit/util/io/file/ArchiveUnpacker.java
View File

@ -19,6 +19,7 @@
package com.sk89q.worldedit.util.io.file;
import com.google.common.collect.ImmutableSet;
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteProcessor;
@ -28,10 +29,12 @@
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.net.URL;
import java.nio.channels.Channels;
import java.nio.channels.SeekableByteChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.zip.ZipEntry;
@ -103,11 +106,20 @@ public String getResult() {
SafeFiles.getOwnerOnlyFileAttributes(AttributeTarget.DIRECTORY)
);
} else {
Files.createFile(
try (SeekableByteChannel channel = Files.newByteChannel(
resolved,
ImmutableSet.of(
StandardOpenOption.CREATE,
StandardOpenOption.WRITE,
StandardOpenOption.TRUNCATE_EXISTING
),
SafeFiles.getOwnerOnlyFileAttributes(AttributeTarget.FILE)
);
Files.copy(zipReader, resolved, StandardCopyOption.REPLACE_EXISTING);
)) {
ByteStreams.copy(
Channels.newChannel(zipReader),
channel
);
}
}
}
}