Fix odd NPE with list files for empty directories.
This commit is contained in:
parent
cdc8763fb0
commit
c6d0c93a50
|
@ -310,7 +310,7 @@ public class CoreModManager {
|
||||||
else
|
else
|
||||||
ret = ObjectArrays.concat(ret, dir.listFiles(filter), File.class);
|
ret = ObjectArrays.concat(ret, dir.listFiles(filter), File.class);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret == null ? new File[0] : ret;
|
||||||
}
|
}
|
||||||
private static File[] listFiles(FileFilter filter, File ... dirs)
|
private static File[] listFiles(FileFilter filter, File ... dirs)
|
||||||
{
|
{
|
||||||
|
@ -324,7 +324,7 @@ public class CoreModManager {
|
||||||
else
|
else
|
||||||
ret = ObjectArrays.concat(ret, dir.listFiles(filter), File.class);
|
ret = ObjectArrays.concat(ret, dir.listFiles(filter), File.class);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret == null ? new File[0] : ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader)
|
private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader)
|
||||||
|
|
Loading…
Reference in New Issue