Merge branch 'openmultiplayer:master' into master

Author: NexiusTailer

Server/Source/core_impl.hpp

@@ -1085,20 +1085,25 @@ class Core final : public ICore, public PlayerConnectEventHandler, public Consol
 		auto excludeCfg = config.getStrings("exclude");
 		if (!componentsCfg || componentsCfg->empty())
 		{
-			for (auto& de : ghc::filesystem::directory_iterator(path))
+			for (auto& de : ghc::filesystem::recursive_directory_iterator(path))
 			{
 				ghc::filesystem::path p = de.path();
 				if (p.extension() == LIBRARY_EXT)
 				{
 					if (excludeCfg && !excludeCfg->empty())
 					{
-						p.replace_extension("");
+						ghc::filesystem::path rel = ghc::filesystem::relative(p, path);
+						rel.replace_extension();
 						// Is this in the "don't load" list?
-						if (std::find(excludeCfg->begin(), excludeCfg->end(), p.filename().string()) != excludeCfg->end())
+						const auto isExcluded = [rel = std::move(rel)](const String& exclude)
+						{
+							return ghc::filesystem::path(exclude) == rel;
+						};
+						if (std::find_if(excludeCfg->begin(), excludeCfg->end(), isExcluded)
+							!= excludeCfg->end())
 						{
 							continue;
 						}
-						p.replace_extension(LIBRARY_EXT);
 					}
 
 					IComponent* component = loadComponent(p);
@@ -1121,8 +1126,15 @@ class Core final : public ICore, public PlayerConnectEventHandler, public Consol
 
 				if (excludeCfg && !excludeCfg->empty())
 				{
+					ghc::filesystem::path rel = ghc::filesystem::relative(file, path);
+					rel.replace_extension();
 					// Is this in the "don't load" list?
-					if (std::find(excludeCfg->begin(), excludeCfg->end(), file.filename().string()) != excludeCfg->end())
+					const auto isExcluded = [rel = std::move(rel)](const String& exclude)
+					{
+						return ghc::filesystem::path(exclude) == rel;
+					};
+					if (std::find_if(excludeCfg->begin(), excludeCfg->end(), isExcluded)
+						!= excludeCfg->end())
 					{
 						continue;
 					}