Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in.

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/commands/os_noop.cpp b/modules/commands/os_noop.cpp
index 1d619dbb6..204b0e6e8 100644
--- a/modules/commands/os_noop.cpp
+++ b/modules/commands/os_noop.cpp
@@ -49,7 +49,7 @@ class CommandOSNOOP : public Command
 				User *u2 = it->second;
 
 				if (u2->server == s && u2->HasMode("OPER"))
-					u2->Kill(Config->OperServ, reason);
+					u2->Kill(source.service->nick, reason);
 			}
 		}
 		else if (cmd.equals_ci("REVOKE"))
@@ -95,7 +95,7 @@ class OSNOOP : public Module
 			if (setter)
 			{
 				Anope::string reason = "NOOP command used by " + *setter;
-				u->Kill(Config->OperServ, reason);
+				u->Kill(OperServ ? OperServ->nick : "", reason);
 			}
 		}
 	}