From 52cc8a418307ae7a551d23e6bd2d367b544e7bf9 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 Jan 2022 17:12:42 +0000 Subject: Refactor CoreException and ModuleException. --- src/modules.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules.cpp') diff --git a/src/modules.cpp b/src/modules.cpp index b916f3d27..28a231268 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -589,7 +589,7 @@ void ModuleManager::AddService(ServiceProvider& item) case SERVICE_IOHOOK: { if ((!item.name.compare(0, 5, "mode/", 5)) || (!item.name.compare(0, 6, "umode/", 6))) - throw ModuleException("The \"mode/\" and the \"umode\" service name prefixes are reserved."); + throw ModuleException(item.creator, "The \"mode/\" and the \"umode\" service name prefixes are reserved."); DataProviders.emplace(item.name, &item); std::string::size_type slash = item.name.find('/'); @@ -617,7 +617,7 @@ void ModuleManager::DelService(ServiceProvider& item) { case SERVICE_MODE: if (!ServerInstance->Modes.DelMode(static_cast(&item))) - throw ModuleException("Mode "+std::string(item.name)+" does not exist."); + throw ModuleException(item.creator, "Mode " + std::string(item.name) + " does not exist."); [[fallthrough]]; case SERVICE_DATA: case SERVICE_IOHOOK: @@ -626,7 +626,7 @@ void ModuleManager::DelService(ServiceProvider& item) break; } default: - throw ModuleException("Cannot delete unknown service type"); + throw ModuleException(item.creator, "Cannot delete unknown service type"); } FOREACH_MOD(OnServiceDel, (item)); @@ -646,7 +646,7 @@ ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string& } // TODO implement finding of the other types default: - throw ModuleException("Cannot find unknown service type"); + throw CoreException("Cannot find unknown service type"); } } -- cgit v1.3.1-10-gc9f91