Skip to content

Commit 57de923

Browse files
Reorder the condition
1 parent 27b3760 commit 57de923

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

modules/remapper/src/main/java/cn/maxpixel/mcdecompiler/remapper/Deobfuscator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public Deobfuscator<T> deobfuscate(Path source, Path target) throws IOException
7171
.filter(p -> {
7272
String ps = p.toString();
7373
String k = AppUtils.file2Native(ps);
74-
return (deobfAll && ps.endsWith(".class")) || remapper.hasClassMapping(k) ||
75-
(extraClassesNotEmpty && extraClasses.stream().anyMatch(k::startsWith));
74+
return ps.endsWith(".class") && (deobfAll || remapper.hasClassMapping(k) ||
75+
(extraClassesNotEmpty && extraClasses.stream().anyMatch(k::startsWith)));
7676
}), true);
7777
options.extraJars.forEach(jar -> {
7878
try (FileSystem jarFs = JarUtil.createZipFs(jar);
@@ -89,8 +89,8 @@ public Deobfuscator<T> deobfuscate(Path source, Path target) throws IOException
8989
try {
9090
String pathString = path.toString();
9191
String classKeyName = AppUtils.file2Native(pathString);
92-
if ((deobfAll && pathString.endsWith(".class")) || remapper.hasClassMapping(classKeyName) ||
93-
(extraClassesNotEmpty && extraClasses.stream().anyMatch(classKeyName::startsWith))) {
92+
if (pathString.endsWith(".class") && (deobfAll || remapper.hasClassMapping(classKeyName) ||
93+
(extraClassesNotEmpty && extraClasses.stream().anyMatch(classKeyName::startsWith)))) {
9494
ClassReader reader = new ClassReader(IOUtil.readAllBytes(path));
9595
ClassWriter writer = new ClassWriter(0);
9696
String s = remapper.mapClass(classKeyName);

0 commit comments

Comments
 (0)