Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-22 10:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Actually throw the interrupted exception if interrupted while loading

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-08-30 02:49:33 +02:00
parent 29e18506c1
commit a79ddace71
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/ResourcePack.java
View File

@ -135,6 +135,8 @@ public void load(Collection<File> sources) throws IOException, InterruptedExcept
public void load(File... sources) throws InterruptedException {
try (CombinedFileAccess combinedSources = new CombinedFileAccess()){
for (int i = 0; i < sources.length; i++) {
if (Thread.interrupted()) throw new InterruptedException();
File file = sources[i];
try {
combinedSources.addFileAccess(FileAccess.of(file));
@ -152,6 +154,8 @@ public void load(File... sources) throws InterruptedException {
Collection<String> namespaces = sourcesAccess.listFolders("assets");
int i = 0;
for (String namespaceRoot : namespaces) {
if (Thread.interrupted()) throw new InterruptedException();
i++;
//load blockstates
@ -160,10 +164,7 @@ public void load(File... sources) throws InterruptedException {
Collection<String> blockstateFiles = sourcesAccess.listFiles(namespaceRoot + "/blockstates", true);
for (String blockstateFile : blockstateFiles) {
if (Thread.interrupted()) {
Thread.currentThread().interrupt();
return;
}
if (Thread.interrupted()) throw new InterruptedException();
String filename = FileAccess.getFileName(blockstateFile);
if (!filename.endsWith(".json")) continue;