From 417db979f4adcf70fad07c1013d491ccc8cae16f Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Wed, 9 Jan 2019 19:55:50 +0400 Subject: [PATCH] [FIX] Bug with AttachJarsTask, this bug lose AutogenConfig. --- LaunchServer/build.gradle | 2 +- .../ru/gravit/launchserver/binary/tasks/AttachJarsTask.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 153f9abd..4889e6a6 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -35,7 +35,7 @@ } dependencies { - bundle project(':libLauncher') + pack project(':libLauncher') bundle 'org.ow2.asm:asm-commons:7.0' bundle 'org.ow2.asm:asm-util:7.0' bundle 'mysql:mysql-connector-java:8.0.13' diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java index 6301498f..0a880d37 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java @@ -36,7 +36,7 @@ public Path process(Path inputFile) throws IOException { ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(outputFile))) { ZipEntry e = input.getNextEntry(); while (e != null) { - if (e.isDirectory() || srv.buildHookManager.isContainsBlacklist(e.getName())) { + if (e.isDirectory()) { e = input.getNextEntry(); continue; } @@ -57,7 +57,7 @@ private void attach(ZipOutputStream output, List lst) throws IOException { ZipEntry e = input.getNextEntry(); while (e != null) { String filename = e.getName(); - if (exclusions.stream().noneMatch(filename::startsWith) && !srv.buildHookManager.isContainsBlacklist(filename) && !e.isDirectory()) { + if (exclusions.stream().noneMatch(filename::startsWith) && !e.isDirectory()) { output.putNextEntry(IOHelper.newZipEntry(e)); IOHelper.transfer(input, output); }